diff --git a/src/web/app/common/mixins.ts b/src/web/app/common/mixins.ts
index 5949069624..98818118f4 100644
--- a/src/web/app/common/mixins.ts
+++ b/src/web/app/common/mixins.ts
@@ -3,7 +3,7 @@ import * as riot from 'riot';
 import MiOS from './mios';
 import ServerStreamManager from './scripts/server-stream-manager';
 import RequestsStreamManager from './scripts/requests-stream-manager';
-import MessagingIndexStream from './scripts/messaging-index-stream-manager';
+import MessagingIndexStreamManager from './scripts/messaging-index-stream-manager';
 import DriveStreamManager from './scripts/drive-stream-manager';
 
 export default (mios: MiOS) => {
@@ -31,10 +31,10 @@ export default (mios: MiOS) => {
 	(riot as any).mixin('api', {
 		api: mios.api
 	});
-	(riot as any).mixin('drive-stream', { driveStream: new DriveStreamManager(mios.i) });
-	(riot as any).mixin('stream', { stream: mios.stream });
 
+	(riot as any).mixin('stream', { stream: mios.stream });
+	(riot as any).mixin('drive-stream', { driveStream: new DriveStreamManager(mios.i) });
 	(riot as any).mixin('server-stream', { serverStream: new ServerStreamManager() });
 	(riot as any).mixin('requests-stream', { requestsStream: new RequestsStreamManager() });
-	(riot as any).mixin('messaging-index-stream', { messagingIndexStream: new MessagingIndexStream(mios.i) });
+	(riot as any).mixin('messaging-index-stream', { messagingIndexStream: new MessagingIndexStreamManager(mios.i) });
 };
diff --git a/src/web/app/common/scripts/messaging-index-stream-manager.ts b/src/web/app/common/scripts/messaging-index-stream-manager.ts
index dc386204ca..0f08b01481 100644
--- a/src/web/app/common/scripts/messaging-index-stream-manager.ts
+++ b/src/web/app/common/scripts/messaging-index-stream-manager.ts
@@ -1,7 +1,7 @@
 import StreamManager from './stream-manager';
 import Connection from './messaging-index-stream';
 
-export default class ServerStreamManager extends StreamManager<Connection> {
+export default class MessagingIndexStreamManager extends StreamManager<Connection> {
 	private me;
 
 	constructor(me) {