diff --git a/res/themes/status/css/_StatusLogin.scss b/res/themes/status/css/_StatusLogin.scss
index 437a9a2314..abb7881d21 100644
--- a/res/themes/status/css/_StatusLogin.scss
+++ b/res/themes/status/css/_StatusLogin.scss
@@ -106,7 +106,7 @@ limitations under the License.
         text-align: center;
     }
 
-    .mx_Login_logo {
+    .mx_AuthHeader_logo {
         background-color: #fff;
         width: 74px;
         height: 74px;
@@ -118,7 +118,7 @@ limitations under the License.
         margin-left: -36px;
     }
 
-    .mx_Login_logo img {
+    .mx_AuthHeader_logo img {
         width: 36px;
         height: 36px;
         padding: 19px;
diff --git a/src/components/views/auth/VectorLoginFooter.js b/src/components/views/auth/VectorAuthFooter.js
similarity index 91%
rename from src/components/views/auth/VectorLoginFooter.js
rename to src/components/views/auth/VectorAuthFooter.js
index 5fa423608c..8be68d38e1 100644
--- a/src/components/views/auth/VectorLoginFooter.js
+++ b/src/components/views/auth/VectorAuthFooter.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,9 +22,9 @@ import { _t } from 'matrix-react-sdk/lib/languageHandler';
 import SettingsStore from 'matrix-react-sdk/lib/settings/SettingsStore';
 
 module.exports = React.createClass({
-    displayName: 'VectorLoginFooter',
+    displayName: 'VectorAuthFooter',
     statics: {
-        replaces: 'LoginFooter',
+        replaces: 'AuthFooter',
     },
 
     render: function() {
@@ -32,7 +33,7 @@ module.exports = React.createClass({
         if (SettingsStore.getValue("theme") === 'status') return <div />;
 
         return (
-            <div className="mx_Login_links">
+            <div className="mx_AuthFooter">
                 <a href="https://medium.com/@RiotChat">blog</a>&nbsp;&nbsp;&middot;&nbsp;&nbsp;
                 <a href="https://twitter.com/@RiotChat">twitter</a>&nbsp;&nbsp;&middot;&nbsp;&nbsp;
                 <a href="https://github.com/vector-im/riot-web">github</a>&nbsp;&nbsp;&middot;&nbsp;&nbsp;
diff --git a/src/components/views/auth/VectorLoginHeader.js b/src/components/views/auth/VectorAuthHeader.js
similarity index 84%
rename from src/components/views/auth/VectorLoginHeader.js
rename to src/components/views/auth/VectorAuthHeader.js
index babd90d6cd..de023c72f3 100644
--- a/src/components/views/auth/VectorLoginHeader.js
+++ b/src/components/views/auth/VectorAuthHeader.js
@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -23,9 +24,9 @@ const i = [1, 2, 3, 4, 5][Math.floor(Math.random() * 5)];
 const DEFAULT_LOGO_URI = "themes/riot/img/logos/riot-im-logo-" + i + ".svg";
 
 module.exports = React.createClass({
-    displayName: 'VectorLoginHeader',
+    displayName: 'VectorAuthHeader',
     statics: {
-        replaces: 'LoginHeader',
+        replaces: 'AuthHeader',
     },
     propTypes: {
         icon: PropTypes.string,
@@ -33,8 +34,8 @@ module.exports = React.createClass({
 
     render: function() {
         return (
-            <div className="mx_Login_header">
-                <div className="mx_Login_logo">
+            <div className="mx_AuthHeader">
+                <div className="mx_AuthHeader_logo">
                     <img src={this.props.icon || DEFAULT_LOGO_URI} alt="Riot" />
                 </div>
             </div>