diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginServerSelectionFragment.kt b/vector/src/main/java/im/vector/riotx/features/login/LoginServerSelectionFragment.kt
index 5eef820e39..c533913718 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginServerSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/login/LoginServerSelectionFragment.kt
@@ -43,13 +43,13 @@ class LoginServerSelectionFragment @Inject constructor() : AbstractLoginFragment
     }
 
     private fun initTextViews() {
-        loginServerChoiceEMSLearnMore.text = span {
+        loginServerChoiceEmsLearnMore.text = span {
             text = getString(R.string.login_server_modular_learn_more)
             textDecorationLine = "underline"
         }
     }
 
-    @OnClick(R.id.loginServerChoiceEMSLearnMore)
+    @OnClick(R.id.loginServerChoiceEmsLearnMore)
     fun learnMore() {
         openUrlInChromeCustomTab(requireActivity(), null, EMS_LINK)
     }
@@ -59,7 +59,7 @@ class LoginServerSelectionFragment @Inject constructor() : AbstractLoginFragment
         loginViewModel.handle(LoginAction.UpdateServerType(ServerType.MatrixOrg))
     }
 
-    @OnClick(R.id.loginServerChoiceEMS)
+    @OnClick(R.id.loginServerChoiceEms)
     fun selectEMS() {
         loginViewModel.handle(LoginAction.UpdateServerType(ServerType.EMS))
     }
diff --git a/vector/src/main/res/layout/fragment_login_server_selection.xml b/vector/src/main/res/layout/fragment_login_server_selection.xml
index b33174bae3..73c9c33c06 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection.xml
@@ -81,7 +81,7 @@
             </im.vector.riotx.core.platform.CheckableConstraintLayout>
 
             <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/loginServerChoiceEMS"
+                android:id="@+id/loginServerChoiceEms"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/layout_vertical_margin"
@@ -95,19 +95,19 @@
                 app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceMatrixOrg">
 
                 <ImageView
-                    android:id="@+id/loginServerChoiceEMSIcon"
+                    android:id="@+id/loginServerChoiceEmsIcon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:importantForAccessibility="no"
                     android:src="@drawable/ic_logo_element_matrix_services"
                     android:tint="?riotx_text_primary"
-                    app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceEMSText"
+                    app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceEmsText"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintVertical_chainStyle="packed" />
 
                 <TextView
-                    android:id="@+id/loginServerChoiceEMSText"
+                    android:id="@+id/loginServerChoiceEmsText"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="7dp"
@@ -115,21 +115,21 @@
                     android:text="@string/login_server_modular_text"
                     android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toStartOf="@+id/loginServerChoiceEMSLearnMore"
+                    app:layout_constraintEnd_toStartOf="@+id/loginServerChoiceEmsLearnMore"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceEMSIcon" />
+                    app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceEmsIcon" />
 
                 <TextView
-                    android:id="@+id/loginServerChoiceEMSLearnMore"
+                    android:id="@+id/loginServerChoiceEmsLearnMore"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:padding="16dp"
                     android:text="@string/login_server_modular_learn_more"
                     android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
                     android:textColor="@color/riotx_accent"
-                    app:layout_constraintBottom_toBottomOf="@+id/loginServerChoiceEMSText"
+                    app:layout_constraintBottom_toBottomOf="@+id/loginServerChoiceEmsText"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="@+id/loginServerChoiceEMSText" />
+                    app:layout_constraintTop_toTopOf="@+id/loginServerChoiceEmsText" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -145,7 +145,7 @@
                 android:paddingEnd="@dimen/layout_horizontal_margin"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceEMS">
+                app:layout_constraintTop_toBottomOf="@+id/loginServerChoiceEms">
 
                 <TextView
                     android:id="@+id/loginServerChoiceOtherTitle"