diff --git a/src/SlashCommands.js b/src/SlashCommands.js
index 759a95c8ff..be007496dd 100644
--- a/src/SlashCommands.js
+++ b/src/SlashCommands.js
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 var MatrixClientPeg = require("./MatrixClientPeg");
-var MatrixTools = require("./MatrixTools");
 var dis = require("./dispatcher");
 var Tinter = require("./Tinter");
 
diff --git a/src/autocomplete/RoomProvider.js b/src/autocomplete/RoomProvider.js
index 39cf1179d7..ac7f1b418a 100644
--- a/src/autocomplete/RoomProvider.js
+++ b/src/autocomplete/RoomProvider.js
@@ -4,7 +4,7 @@ import Q from 'q';
 import MatrixClientPeg from '../MatrixClientPeg';
 import Fuse from 'fuse.js';
 import {PillCompletion} from './Components';
-import {getDisplayAliasForRoom} from '../MatrixTools';
+import {getDisplayAliasForRoom} from '../Rooms';
 import sdk from '../index';
 
 const ROOM_REGEX = /(?=#)([^\s]*)/g;
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index e1e622af65..251f3f1dc8 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -36,7 +36,7 @@ var PostRegistration = require("./login/PostRegistration");
 var Modal = require("../../Modal");
 var Tinter = require("../../Tinter");
 var sdk = require('../../index');
-var MatrixTools = require('../../MatrixTools');
+var Rooms = require('../../Rooms');
 var linkifyMatrix = require("../../linkify-matrix");
 var KeyCode = require('../../KeyCode');
 var Lifecycle = require('../../Lifecycle');
@@ -479,7 +479,7 @@ module.exports = React.createClass({
             var presentedId = room_info.room_alias || room_info.room_id;
             var room = MatrixClientPeg.get().getRoom(room_info.room_id);
             if (room) {
-                var theAlias = MatrixTools.getDisplayAliasForRoom(room);
+                var theAlias = Rooms.getDisplayAliasForRoom(room);
                 if (theAlias) presentedId = theAlias;
 
                 // No need to do this given RoomView triggers it itself...
@@ -592,7 +592,7 @@ module.exports = React.createClass({
                 var presentedId = self.state.currentRoomId;
                 var room = MatrixClientPeg.get().getRoom(self.state.currentRoomId);
                 if (room) {
-                    var theAlias = MatrixTools.getDisplayAliasForRoom(room);
+                    var theAlias = Rooms.getDisplayAliasForRoom(room);
                     if (theAlias) presentedId = theAlias;
                 }
 
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 3d0bcf7445..041493d420 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -36,7 +36,6 @@ var dis = require("../../dispatcher");
 var Tinter = require("../../Tinter");
 var rate_limited_func = require('../../ratelimitedfunc');
 var ObjectUtils = require('../../ObjectUtils');
-var MatrixTools = require('../../MatrixTools');
 
 import UserProvider from '../../autocomplete/UserProvider';
 
diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index bdb1ea3c8c..d679a1f4c6 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -25,7 +25,7 @@ var Unread = require('../../../Unread');
 var dis = require("../../../dispatcher");
 var sdk = require('../../../index');
 var rate_limited_func = require('../../../ratelimitedfunc');
-var MatrixTools = require('../../../MatrixTools');
+var Rooms = require('../../../Rooms');
 var DMRoomMap = require('../../../utils/DMRoomMap');
 
 var HIDE_CONFERENCE_CHANS = true;
@@ -224,7 +224,7 @@ module.exports = React.createClass({
             if (me.membership == "invite") {
                 s.lists["im.vector.fake.invite"].push(room);
             }
-            else if (HIDE_CONFERENCE_CHANS && MatrixTools.isConfCallRoom(room, me, self.props.ConferenceHandler)) {
+            else if (HIDE_CONFERENCE_CHANS && Rooms.isConfCallRoom(room, me, self.props.ConferenceHandler)) {
                 // skip past this room & don't put it in any lists
             }
             else if (dmRoomMap.getUserIdForRoomId(room.roomId)) {
@@ -265,7 +265,7 @@ module.exports = React.createClass({
             for (const room of oldRecents) {
                 const me = room.getMember(MatrixClientPeg.get().credentials.userId);
 
-                if (me && MatrixTools.looksLikeDirectMessageRoom(room, me)) {
+                if (me && Rooms.looksLikeDirectMessageRoom(room, me)) {
                     s.lists["im.vector.fake.direct"].push(room);
                 } else {
                     s.lists["im.vector.fake.recent"].push(room);
@@ -276,7 +276,7 @@ module.exports = React.createClass({
             const newMDirectEvent = {};
             for (const room of s.lists["im.vector.fake.direct"]) {
                 const me = room.getMember(MatrixClientPeg.get().credentials.userId);
-                const otherPerson = MatrixTools.getOnlyOtherMember(room, me);
+                const otherPerson = Rooms.getOnlyOtherMember(room, me);
                 if (!otherPerson) continue;
 
                 const roomList = newMDirectEvent[otherPerson.userId] || [];