diff --git a/src/Skinner.js b/src/Skinner.js
index 934a68ddf1..6f0bd43074 100644
--- a/src/Skinner.js
+++ b/src/Skinner.js
@@ -32,7 +32,8 @@ class Skinner {
         if (comp) {
             return comp;
         }
-        // XXX
+        // XXX: Temporarily also try 'views.' as we're currently
+        // leaving the 'views.' off views.
         var comp = this.components['views.'+name];
         if (comp) {
             return comp;
diff --git a/src/component-index.js b/src/component-index.js
index bcefbd34bc..682553da14 100644
--- a/src/component-index.js
+++ b/src/component-index.js
@@ -17,18 +17,17 @@ module.exports.components['views.elements.UserSelector'] = require('./components
 module.exports.components['views.login.CaptchaForm'] = require('./components/views/login/CaptchaForm');
 module.exports.components['views.login.CasLogin'] = require('./components/views/login/CasLogin');
 module.exports.components['views.login.PasswordLogin'] = require('./components/views/login/PasswordLogin');
-module.exports.components['views.messages.Event'] = require('./components/views/messages/Event');
-module.exports.components['views.messages.Message'] = require('./components/views/messages/Message');
-module.exports.components['views.messages.MessageComposer'] = require('./components/views/messages/MessageComposer');
-module.exports.components['views.messages.MFileMessage'] = require('./components/views/messages/MFileMessage');
-module.exports.components['views.messages.MImageMessage'] = require('./components/views/messages/MImageMessage');
-module.exports.components['views.messages.MRoomMemberEvent'] = require('./components/views/messages/MRoomMemberEvent');
-module.exports.components['views.messages.MVideoMessage'] = require('./components/views/messages/MVideoMessage');
+module.exports.components['views.messages.MessageEvent'] = require('./components/views/messages/MessageEvent');
+module.exports.components['views.messages.MFileBody'] = require('./components/views/messages/MFileBody');
+module.exports.components['views.messages.MImageBody'] = require('./components/views/messages/MImageBody');
+module.exports.components['views.messages.MVideoBody'] = require('./components/views/messages/MVideoBody');
+module.exports.components['views.messages.TextualBody'] = require('./components/views/messages/TextualBody');
 module.exports.components['views.messages.TextualEvent'] = require('./components/views/messages/TextualEvent');
-module.exports.components['views.messages.TextualMessage'] = require('./components/views/messages/TextualMessage');
-module.exports.components['views.messages.UnknownMessage'] = require('./components/views/messages/UnknownMessage');
+module.exports.components['views.messages.UnknownBody'] = require('./components/views/messages/UnknownBody');
+module.exports.components['views.rooms.EventTile'] = require('./components/views/rooms/EventTile');
 module.exports.components['views.rooms.MemberInfo'] = require('./components/views/rooms/MemberInfo');
 module.exports.components['views.rooms.MemberTile'] = require('./components/views/rooms/MemberTile');
+module.exports.components['views.rooms.MessageComposer'] = require('./components/views/rooms/MessageComposer');
 module.exports.components['views.rooms.RoomHeader'] = require('./components/views/rooms/RoomHeader');
 module.exports.components['views.rooms.RoomSettings'] = require('./components/views/rooms/RoomSettings');
 module.exports.components['views.rooms.RoomTile'] = require('./components/views/rooms/RoomTile');