diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index a6c43ecc8e..29d87f9d8f 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -525,7 +525,7 @@ module.exports = React.createClass({
                         eventSendStatus={mxEv.status}
                         tileShape={this.props.tileShape}
                         isTwelveHour={this.props.isTwelveHour}
-                        permaLinkCreator={this.props.permaLinkCreator}
+                        permalinkCreator={this.props.permaLinkCreator}
                         last={last} isSelectedEvent={highlight} />
                 </li>,
         );
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 54ef6be558..2dd1b4b4db 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -30,7 +30,7 @@ import Promise from 'bluebird';
 import filesize from 'filesize';
 const classNames = require("classnames");
 import { _t } from '../../languageHandler';
-import {RoomPermaLinkCreator} from "../../matrix-to";
+import {RoomPermalinkCreator} from "../../matrix-to";
 
 const MatrixClientPeg = require("../../MatrixClientPeg");
 const ContentMessages = require("../../ContentMessages");
@@ -659,8 +659,8 @@ module.exports = React.createClass({
         this._calculateRecommendedVersion(room);
         this._updateE2EStatus(room);
         if (!this.state.permaLinkCreator) {
-            const permaLinkCreator = new RoomPermaLinkCreator(room);
-            permaLinkCreator.start();
+            const permalinkCreator = new RoomPermalinkCreator(room);
+            permalinkCreator.start();
             this.setState({permaLinkCreator});
         }
     },
@@ -1230,7 +1230,7 @@ module.exports = React.createClass({
                      searchResult={result}
                      searchHighlights={this.state.searchHighlights}
                      resultLink={resultLink}
-                     permaLinkCreator={this.state.permaLinkCreator}
+                     permalinkCreator={this.state.permaLinkCreator}
                      onWidgetLoad={onWidgetLoad} />);
         }
         return ret;
@@ -1838,7 +1838,7 @@ module.exports = React.createClass({
                 showUrlPreview = {this.state.showUrlPreview}
                 className="mx_RoomView_messagePanel"
                 membersLoaded={this.state.membersLoaded}
-                permaLinkCreator={this.state.permaLinkCreator}
+                permalinkCreator={this.state.permaLinkCreator}
             />);
 
         let topUnreadMessagesBar = null;
diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 1dc9162ef1..78b239939b 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -1202,7 +1202,7 @@ var TimelinePanel = React.createClass({
         return (
             <MessagePanel ref="messagePanel"
                           room={this.props.timelineSet.room}
-                          permaLinkCreator={this.props.permaLinkCreator}
+                          permalinkCreator={this.props.permaLinkCreator}
                           hidden={this.props.hidden}
                           backPaginating={this.state.backPaginating}
                           forwardPaginating={forwardPaginating}
diff --git a/src/components/views/rooms/SearchResultTile.js b/src/components/views/rooms/SearchResultTile.js
index bff2aad2c3..134f159d62 100644
--- a/src/components/views/rooms/SearchResultTile.js
+++ b/src/components/views/rooms/SearchResultTile.js
@@ -56,7 +56,7 @@ module.exports = React.createClass({
             }
             if (EventTile.haveTileForEvent(ev)) {
                 ret.push(<EventTile key={eventId+"+"+j} mxEvent={ev} contextual={contextual} highlights={highlights}
-                          permaLinkCreator={this.props.permaLinkCreator}
+                          permalinkCreator={this.props.permaLinkCreator}
                           highlightLink={this.props.resultLink}
                           onWidgetLoad={this.props.onWidgetLoad} />);
             }
diff --git a/src/matrix-to.js b/src/matrix-to.js
index 5f162a9af6..ad1bf22c65 100644
--- a/src/matrix-to.js
+++ b/src/matrix-to.js
@@ -69,7 +69,7 @@ const MAX_SERVER_CANDIDATES = 3;
 // The receiving user can then manually append the known-good server to
 // the list and magically have the link work.
 
-export class RoomPermaLinkCreator {
+export class RoomPermalinkCreator {
     constructor(room) {
         this._room = room;
         this._highestPlUserId = null;
@@ -243,9 +243,9 @@ export function makeRoomPermalink(roomId) {
 
     const client = MatrixClientPeg.get();
     const room = client.getRoom(roomId);
-    const permaLinkCreator = new RoomPermaLinkCreator(room);
-    permaLinkCreator.load();
-    return permaLinkCreator.forRoom();
+    const permalinkCreator = new RoomPermalinkCreator(room);
+    permalinkCreator.load();
+    return permalinkCreator.forRoom();
 }
 
 export function makeGroupPermalink(groupId) {
diff --git a/test/matrix-to-test.js b/test/matrix-to-test.js
index 2434ac48f0..45b5f74c5e 100644
--- a/test/matrix-to-test.js
+++ b/test/matrix-to-test.js
@@ -17,7 +17,7 @@ import {
     makeGroupPermalink,
     makeRoomPermalink,
     makeUserPermalink,
-    RoomPermaLinkCreator,
+    RoomPermalinkCreator,
 } from "../src/matrix-to";
 import * as testUtils from "./test-utils";
 
@@ -75,7 +75,7 @@ describe('matrix-to', function() {
 
     it('should pick no candidate servers when the room has no members', function() {
         const room = mockRoom(null, []);
-        const creator = new RoomPermaLinkCreator(room);
+        const creator = new RoomPermalinkCreator(room);
         creator.load();
         expect(creator._serverCandidates).toBeTruthy();
         expect(creator._serverCandidates.length).toBe(0);
@@ -96,7 +96,7 @@ describe('matrix-to', function() {
                 powerLevel: 95,
             },
         ]);
-        const creator = new RoomPermaLinkCreator(room);
+        const creator = new RoomPermalinkCreator(room);
         creator.load();
         expect(creator._serverCandidates).toBeTruthy();
         expect(creator._serverCandidates.length).toBe(3);
@@ -120,7 +120,7 @@ describe('matrix-to', function() {
             },
             member95,
         ]);
-        const creator = new RoomPermaLinkCreator(room);
+        const creator = new RoomPermalinkCreator(room);
         creator.load();
         expect(creator._serverCandidates[0]).toBe("pl_95");
         member95.membership = "left";
@@ -158,7 +158,7 @@ describe('matrix-to', function() {
                 powerLevel: 0,
             },
         ]);
-        const creator = new RoomPermaLinkCreator(room);
+        const creator = new RoomPermalinkCreator(room);
         creator.load();
         expect(creator._serverCandidates).toBeTruthy();
         expect(creator._serverCandidates.length).toBe(3);
@@ -186,7 +186,7 @@ describe('matrix-to', function() {
                 powerLevel: 0,
             },
         ]);
-        const creator = new RoomPermaLinkCreator(room);
+        const creator = new RoomPermalinkCreator(room);
         creator.load();
         expect(creator._serverCandidates.length).toBe(3);
         expect(creator._serverCandidates[0]).toBe("first");
@@ -217,7 +217,7 @@ describe('matrix-to', function() {
                 powerLevel: 0,
             },
         ]);
-        const creator = new RoomPermaLinkCreator(room);
+        const creator = new RoomPermalinkCreator(room);
         creator.load();
         expect(creator._serverCandidates).toBeTruthy();
         expect(creator._serverCandidates.length).toBe(3);
@@ -230,7 +230,7 @@ describe('matrix-to', function() {
                 powerLevel: 100,
             },
         ]);
-        const creator = new RoomPermaLinkCreator(room);
+        const creator = new RoomPermalinkCreator(room);
         creator.load();
         expect(creator._serverCandidates).toBeTruthy();
         expect(creator._serverCandidates.length).toBe(0);
@@ -243,7 +243,7 @@ describe('matrix-to', function() {
                 powerLevel: 100,
             },
         ]);
-        const creator = new RoomPermaLinkCreator(room);
+        const creator = new RoomPermalinkCreator(room);
         creator.load();
         expect(creator._serverCandidates).toBeTruthy();
         expect(creator._serverCandidates.length).toBe(0);
@@ -256,7 +256,7 @@ describe('matrix-to', function() {
                 powerLevel: 100,
             },
         ]);
-        const creator = new RoomPermaLinkCreator(room);
+        const creator = new RoomPermalinkCreator(room);
         creator.load();
         expect(creator._serverCandidates).toBeTruthy();
         expect(creator._serverCandidates.length).toBe(0);
@@ -269,7 +269,7 @@ describe('matrix-to', function() {
                 powerLevel: 100,
             },
         ]);
-        const creator = new RoomPermaLinkCreator(room);
+        const creator = new RoomPermalinkCreator(room);
         creator.load();
         expect(creator._serverCandidates).toBeTruthy();
         expect(creator._serverCandidates.length).toBe(0);
@@ -283,7 +283,7 @@ describe('matrix-to', function() {
             },
         ]);
 
-        const creator = new RoomPermaLinkCreator(room);
+        const creator = new RoomPermalinkCreator(room);
         creator.load();
         expect(creator._serverCandidates).toBeTruthy();
         expect(creator._serverCandidates.length).toBe(1);
@@ -304,7 +304,7 @@ describe('matrix-to', function() {
             deny: ["evilcorp.com", "*.evilcorp.com"],
             allow: ["*"],
         });
-        const creator = new RoomPermaLinkCreator(room);
+        const creator = new RoomPermalinkCreator(room);
         creator.load();
         expect(creator._serverCandidates).toBeTruthy();
         expect(creator._serverCandidates.length).toBe(0);
@@ -324,7 +324,7 @@ describe('matrix-to', function() {
             deny: [],
             allow: [], // implies "ban everyone"
         });
-        const creator = new RoomPermaLinkCreator(room);
+        const creator = new RoomPermalinkCreator(room);
         creator.load();
         expect(creator._serverCandidates).toBeTruthy();
         expect(creator._serverCandidates.length).toBe(0);
@@ -344,7 +344,7 @@ describe('matrix-to', function() {
             deny: ["*.evilcorp.com"], // evilcorp.com is still good though
             allow: ["*"],
         });
-        const creator = new RoomPermaLinkCreator(room);
+        const creator = new RoomPermalinkCreator(room);
         creator.load();
         expect(creator._serverCandidates).toBeTruthy();
         expect(creator._serverCandidates.length).toBe(1);
@@ -365,7 +365,7 @@ describe('matrix-to', function() {
             deny: [],
             allow: ["evilcorp.com"], // implies "ban everyone else"
         });
-        const creator = new RoomPermaLinkCreator(room);
+        const creator = new RoomPermalinkCreator(room);
         creator.load();
         expect(creator._serverCandidates).toBeTruthy();
         expect(creator._serverCandidates.length).toBe(1);
@@ -374,7 +374,7 @@ describe('matrix-to', function() {
 
     it('should generate an event permalink for room IDs with no candidate servers', function() {
         const room = mockRoom("!somewhere:example.org", []);
-        const creator = new RoomPermaLinkCreator(room);
+        const creator = new RoomPermalinkCreator(room);
         creator.load();
         const result = creator.forEvent("$something:example.com");
         expect(result).toBe("https://matrix.to/#/!somewhere:example.org/$something:example.com");
@@ -391,7 +391,7 @@ describe('matrix-to', function() {
                 powerLevel: 0,
             },
         ]);
-        const creator = new RoomPermaLinkCreator(room);
+        const creator = new RoomPermalinkCreator(room);
         creator.load();
         const result = creator.forEvent("$something:example.com");
         expect(result).toBe("https://matrix.to/#/!somewhere:example.org/$something:example.com?via=first&via=second");