diff --git a/res/css/views/auth/_AuthBody.scss b/res/css/views/auth/_AuthBody.scss
index 08a8b4ff4a..fd54cd135a 100644
--- a/res/css/views/auth/_AuthBody.scss
+++ b/res/css/views/auth/_AuthBody.scss
@@ -36,7 +36,7 @@ limitations under the License.
     color: $primary-fg-color;
 }
 
-.mx_Auth_editServerDetails {
+.mx_AuthBody_editServerDetails {
     padding-left: 1em;
     font-size: 12px;
     font-weight: normal;
@@ -47,21 +47,21 @@ limitations under the License.
     box-sizing: border-box;
 }
 
-.mx_Auth_fieldRow {
+.mx_AuthBody_fieldRow {
     display: flex;
     margin-bottom: 10px;
 }
 
-.mx_Auth_fieldRow > * {
+.mx_AuthBody_fieldRow > * {
     margin: 0 5px;
     flex: 1;
 }
 
-.mx_Auth_fieldRow > *:first-child {
+.mx_AuthBody_fieldRow > *:first-child {
     margin-left: 0;
 }
 
-.mx_Auth_fieldRow > *:last-child {
+.mx_AuthBody_fieldRow > *:last-child {
     margin-right: 0;
 }
 
@@ -72,7 +72,7 @@ limitations under the License.
     text-decoration: none;
 }
 
-.mx_Auth_changeFlow {
+.mx_AuthBody_changeFlow {
     display: block;
     text-align: center;
     width: 100%;
diff --git a/res/css/views/auth/_LanguageSelector.scss b/res/css/views/auth/_LanguageSelector.scss
index 89232ab8af..6f7eac0cf6 100644
--- a/res/css/views/auth/_LanguageSelector.scss
+++ b/res/css/views/auth/_LanguageSelector.scss
@@ -14,17 +14,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_Auth_language {
+.mx_AuthBody_language {
     width: 100%;
 }
 
-.mx_Auth_language .mx_Dropdown_input {
+.mx_AuthBody_language .mx_Dropdown_input {
     border: none;
     font-size: 14px;
     font-weight: 600;
     color: $authpage-lang-color;
 }
 
-.mx_Auth_language .mx_Dropdown_arrow {
+.mx_AuthBody_language .mx_Dropdown_arrow {
     background: $authpage-lang-color;
 }
diff --git a/src/components/structures/auth/ForgotPassword.js b/src/components/structures/auth/ForgotPassword.js
index 1b8b15981b..7b7a700d60 100644
--- a/src/components/structures/auth/ForgotPassword.js
+++ b/src/components/structures/auth/ForgotPassword.js
@@ -255,7 +255,7 @@ module.exports = React.createClass({
                     </form>
                     { serverConfigSection }
                     { errorText }
-                    <a className="mx_Auth_changeFlow" onClick={this.onLoginClick} href="#">
+                    <a className="mx_AuthBody_changeFlow" onClick={this.onLoginClick} href="#">
                         { _t('Sign in instead') }
                     </a>
                 </div>
diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js
index 91d8001e72..d1b0aad31a 100644
--- a/src/components/structures/auth/Login.js
+++ b/src/components/structures/auth/Login.js
@@ -689,7 +689,7 @@ module.exports = React.createClass({
         let loginAsGuestJsx;
         if (this.props.enableGuest) {
             loginAsGuestJsx =
-                <a className="mx_Auth_changeFlow" onClick={this._onLoginAsGuestClick} href="#">
+                <a className="mx_AuthBody_changeFlow" onClick={this._onLoginAsGuestClick} href="#">
                     { _t('Try the app first') }
                 </a>;
         }
@@ -714,7 +714,7 @@ module.exports = React.createClass({
                     { errorTextSection }
                     { this.renderServerComponentForStep() }
                     { this.renderLoginComponentForStep() }
-                    <a className="mx_Auth_changeFlow" onClick={this.onRegisterClick} href="#">
+                    <a className="mx_AuthBody_changeFlow" onClick={this.onRegisterClick} href="#">
                         { _t('Create account') }
                     </a>
                     { loginAsGuestJsx }
diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js
index e2d1bf1321..03b071ed48 100644
--- a/src/components/structures/auth/Registration.js
+++ b/src/components/structures/auth/Registration.js
@@ -487,7 +487,7 @@ module.exports = React.createClass({
         let signIn;
         if (!this.state.doingUIAuth) {
             signIn = (
-                <a className="mx_Auth_changeFlow" onClick={this.onLoginClick} href="#">
+                <a className="mx_AuthBody_changeFlow" onClick={this.onLoginClick} href="#">
                     { _t('Sign in instead') }
                 </a>
             );
diff --git a/src/components/views/auth/LanguageSelector.js b/src/components/views/auth/LanguageSelector.js
index d964af184c..32862478f4 100644
--- a/src/components/views/auth/LanguageSelector.js
+++ b/src/components/views/auth/LanguageSelector.js
@@ -32,7 +32,7 @@ export default function LanguageSelector() {
     if (SdkConfig.get()['disable_login_language_selector']) return <div />;
 
     const LanguageDropdown = sdk.getComponent('views.elements.LanguageDropdown');
-    return <LanguageDropdown className="mx_Auth_language"
+    return <LanguageDropdown className="mx_AuthBody_language"
         onOptionChange={onChange}
         value={getCurrentLanguage()}
     />;
diff --git a/src/components/views/auth/PasswordLogin.js b/src/components/views/auth/PasswordLogin.js
index d0ffe8fa1a..022de34011 100644
--- a/src/components/views/auth/PasswordLogin.js
+++ b/src/components/views/auth/PasswordLogin.js
@@ -268,7 +268,7 @@ class PasswordLogin extends React.Component {
 
         let editLink = null;
         if (this.props.onEditServerDetailsClick) {
-            editLink = <a className="mx_Auth_editServerDetails"
+            editLink = <a className="mx_AuthBody_editServerDetails"
                 href="#" onClick={this.props.onEditServerDetailsClick}
             >
                 {_t('Edit')}
diff --git a/src/components/views/auth/RegistrationForm.js b/src/components/views/auth/RegistrationForm.js
index e43537364b..14d170ecaa 100644
--- a/src/components/views/auth/RegistrationForm.js
+++ b/src/components/views/auth/RegistrationForm.js
@@ -270,7 +270,7 @@ module.exports = React.createClass({
 
         let editLink = null;
         if (this.props.onEditServerDetailsClick) {
-            editLink = <a className="mx_Auth_editServerDetails"
+            editLink = <a className="mx_AuthBody_editServerDetails"
                 href="#" onClick={this.props.onEditServerDetailsClick}
             >
                 {_t('Edit')}
@@ -335,13 +335,13 @@ module.exports = React.createClass({
                     {editLink}
                 </h3>
                 <form onSubmit={this.onSubmit}>
-                    <div className="mx_Auth_fieldRow">
+                    <div className="mx_AuthBody_fieldRow">
                         <input type="text" ref="username"
                             placeholder={placeholderUsername} defaultValue={this.props.defaultUsername}
                             className={this._classForField(FIELD_USERNAME, 'mx_Login_field')}
                             onBlur={function() {self.validateField(FIELD_USERNAME);}} />
                     </div>
-                    <div className="mx_Auth_fieldRow">
+                    <div className="mx_AuthBody_fieldRow">
                         <input type="password" ref="password"
                             className={this._classForField(FIELD_PASSWORD, 'mx_Login_field')}
                             onBlur={function() {self.validateField(FIELD_PASSWORD);}}
@@ -352,7 +352,7 @@ module.exports = React.createClass({
                             onBlur={function() {self.validateField(FIELD_PASSWORD_CONFIRM);}}
                             defaultValue={this.props.defaultPassword} />
                     </div>
-                    <div className="mx_Auth_fieldRow">
+                    <div className="mx_AuthBody_fieldRow">
                         { emailSection }
                         { phoneSection }
                     </div>