diff --git a/src/views/atoms/LogoutButton.js b/src/views/atoms/LogoutButton.js
index 4e09b197c0..2bb7b3cba0 100644
--- a/src/views/atoms/LogoutButton.js
+++ b/src/views/atoms/LogoutButton.js
@@ -3,6 +3,7 @@ var React = require('react');
 var LogoutButtonController = require("../../controllers/atoms/LogoutButton");
 
 module.exports = React.createClass({
+    displayName: 'LogoutButton',
     mixins: [LogoutButtonController],
 
     render: function() {
diff --git a/src/views/atoms/MessageTimestamp.js b/src/views/atoms/MessageTimestamp.js
index 340e6e02a0..8e3318f25c 100644
--- a/src/views/atoms/MessageTimestamp.js
+++ b/src/views/atoms/MessageTimestamp.js
@@ -3,6 +3,7 @@ var React = require('react');
 var MessageTimestampController = require("../../controllers/atoms/MessageTimestamp");
 
 module.exports = React.createClass({
+    displayName: 'MessageTimestamp',
     mixins: [MessageTimestampController],
 
     render: function() {
diff --git a/src/views/molecules/MEmoteTile.js b/src/views/molecules/MEmoteTile.js
index b0f62e7b0b..dc12ce5590 100644
--- a/src/views/molecules/MEmoteTile.js
+++ b/src/views/molecules/MEmoteTile.js
@@ -3,6 +3,7 @@ var React = require('react');
 var MEmoteTileController = require("../../controllers/molecules/MEmoteTile");
 
 module.exports = React.createClass({
+    displayName: 'MEmoteTile',
     mixins: [MEmoteTileController],
 
     render: function() {
diff --git a/src/views/molecules/MNoticeTile.js b/src/views/molecules/MNoticeTile.js
index 042f17b9c6..21c7404a45 100644
--- a/src/views/molecules/MNoticeTile.js
+++ b/src/views/molecules/MNoticeTile.js
@@ -3,6 +3,7 @@ var React = require('react');
 var MNoticeTileController = require("../../controllers/molecules/MNoticeTile");
 
 module.exports = React.createClass({
+    displayName: 'MNoticeTile',
     mixins: [MNoticeTileController],
 
     render: function() {
diff --git a/src/views/molecules/MTextTile.js b/src/views/molecules/MTextTile.js
index 0d877c5a27..a1642650a3 100644
--- a/src/views/molecules/MTextTile.js
+++ b/src/views/molecules/MTextTile.js
@@ -3,6 +3,7 @@ var React = require('react');
 var MTextTileController = require("../../controllers/molecules/MTextTile");
 
 module.exports = React.createClass({
+    displayName: 'MTextTile',
     mixins: [MTextTileController],
 
     render: function() {
diff --git a/src/views/molecules/MatrixToolbar.js b/src/views/molecules/MatrixToolbar.js
index aebc6d8fab..1f4b4c4aa6 100644
--- a/src/views/molecules/MatrixToolbar.js
+++ b/src/views/molecules/MatrixToolbar.js
@@ -7,6 +7,7 @@ var LogoutButton = ComponentBroker.get("atoms/LogoutButton");
 var MatrixToolbarController = require("../../controllers/molecules/MatrixToolbar");
 
 module.exports = React.createClass({
+    displayName: 'MatrixToolbar',
     mixins: [MatrixToolbarController],
 
     render: function() {
diff --git a/src/views/molecules/MessageComposer.js b/src/views/molecules/MessageComposer.js
index c891aa890e..b1b4e7ab7b 100644
--- a/src/views/molecules/MessageComposer.js
+++ b/src/views/molecules/MessageComposer.js
@@ -3,6 +3,7 @@ var React = require('react');
 var MessageComposerController = require("../../controllers/molecules/MessageComposer");
 
 module.exports = React.createClass({
+    displayName: 'MessageComposer',
     mixins: [MessageComposerController],
 
     render: function() {
diff --git a/src/views/molecules/MessageTile.js b/src/views/molecules/MessageTile.js
index 96218b719f..a06ea696ed 100644
--- a/src/views/molecules/MessageTile.js
+++ b/src/views/molecules/MessageTile.js
@@ -18,6 +18,7 @@ var tileTypes = {
 var MessageTileController = require("../../controllers/molecules/MessageTile");
 
 module.exports = React.createClass({
+    displayName: 'MessageTile',
     mixins: [MessageTileController],
 
     render: function() {
diff --git a/src/views/molecules/ProgressBar.js b/src/views/molecules/ProgressBar.js
index 5522bdd76d..b4e012d3ea 100644
--- a/src/views/molecules/ProgressBar.js
+++ b/src/views/molecules/ProgressBar.js
@@ -3,6 +3,7 @@ var React = require('react');
 var ProgressBarController = require("./../molecules/ProgressBar");
 
 module.exports = React.createClass({
+    displayName: 'ProgressBar',
     mixins: [ProgressBarController],
 
     render: function() {
diff --git a/src/views/molecules/RoomHeader.js b/src/views/molecules/RoomHeader.js
index 11d97950eb..84743bcd37 100644
--- a/src/views/molecules/RoomHeader.js
+++ b/src/views/molecules/RoomHeader.js
@@ -3,6 +3,7 @@ var React = require('react');
 var RoomHeaderController = require("../../controllers/molecules/RoomHeader");
 
 module.exports = React.createClass({
+    displayName: 'RoomHeader',
     mixins: [RoomHeaderController],
 
     render: function() {
diff --git a/src/views/molecules/RoomTile.js b/src/views/molecules/RoomTile.js
index ef2579e5ab..f77e881ef8 100644
--- a/src/views/molecules/RoomTile.js
+++ b/src/views/molecules/RoomTile.js
@@ -4,6 +4,7 @@ var classNames = require('classnames');
 var RoomTileController = require("../../controllers/molecules/RoomTile");
 
 module.exports = React.createClass({
+    displayName: 'RoomTile',
     mixins: [RoomTileController],
     render: function() {
         var classes = classNames({
diff --git a/src/views/molecules/SenderProfile.js b/src/views/molecules/SenderProfile.js
index f5d4c60538..f295e20c9e 100644
--- a/src/views/molecules/SenderProfile.js
+++ b/src/views/molecules/SenderProfile.js
@@ -3,6 +3,7 @@ var React = require('react');
 var SenderProfileController = require("../../controllers/molecules/SenderProfile");
 
 module.exports = React.createClass({
+    displayName: 'SenderProfile',
     mixins: [SenderProfileController],
 
     render: function() {
diff --git a/src/views/molecules/ServerConfig.js b/src/views/molecules/ServerConfig.js
index 791c9c9755..b8beb53b85 100644
--- a/src/views/molecules/ServerConfig.js
+++ b/src/views/molecules/ServerConfig.js
@@ -3,6 +3,7 @@ var React = require('react');
 var ServerConfigController = require("../../controllers/molecules/ServerConfig");
 
 module.exports = React.createClass({
+    displayName: 'ServerConfig',
     mixins: [ServerConfigController],
 
     render: function() {
diff --git a/src/views/molecules/UnknownMessageTile.js b/src/views/molecules/UnknownMessageTile.js
index 3df272d18f..24485d9b5d 100644
--- a/src/views/molecules/UnknownMessageTile.js
+++ b/src/views/molecules/UnknownMessageTile.js
@@ -3,6 +3,7 @@ var React = require('react');
 var UnknownMessageTileController = require("../../controllers/molecules/UnknownMessageTile");
 
 module.exports = React.createClass({
+    displayName: 'UnknownMessageTile',
     mixins: [UnknownMessageTileController],
 
     render: function() {
diff --git a/src/views/organisms/RoomList.js b/src/views/organisms/RoomList.js
index 6e994cdfac..22168b44d6 100644
--- a/src/views/organisms/RoomList.js
+++ b/src/views/organisms/RoomList.js
@@ -4,6 +4,7 @@ var RoomListController = require("../../controllers/organisms/RoomList");
 
 
 module.exports = React.createClass({
+    displayName: 'RoomList',
     mixins: [RoomListController],
 
     render: function() {
diff --git a/src/views/organisms/RoomView.js b/src/views/organisms/RoomView.js
index db06e1b576..1610f8bc11 100644
--- a/src/views/organisms/RoomView.js
+++ b/src/views/organisms/RoomView.js
@@ -10,6 +10,7 @@ var RoomViewController = require("../../controllers/organisms/RoomView");
 
 
 module.exports = React.createClass({
+    displayName: 'RoomView',
     mixins: [RoomViewController],
 
     getMessageTiles: function() {
diff --git a/src/views/pages/MatrixChat.js b/src/views/pages/MatrixChat.js
index 1dccc5c88f..c013d8c361 100644
--- a/src/views/pages/MatrixChat.js
+++ b/src/views/pages/MatrixChat.js
@@ -13,6 +13,7 @@ var Loader = require("react-loader");
 
 
 module.exports = React.createClass({
+    displayName: 'MatrixChat',
     mixins: [MatrixChatController],
 
     render: function() {
diff --git a/src/views/templates/Login.js b/src/views/templates/Login.js
index cec74eff3f..2c87f193f0 100644
--- a/src/views/templates/Login.js
+++ b/src/views/templates/Login.js
@@ -8,6 +8,7 @@ var Loader = require("react-loader");
 var LoginController = require("../../controllers/templates/Login");
 
 module.exports = React.createClass({
+    displayName: 'Login',
     mixins: [LoginController],
 
     loginContent: function() {