diff --git a/vector/src/main/java/im/vector/app/core/ui/views/TypingMessageView.kt b/vector/src/main/java/im/vector/app/core/ui/views/TypingMessageView.kt
index 2dc9eedd99..263f043fad 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/TypingMessageView.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/TypingMessageView.kt
@@ -31,7 +31,8 @@ import javax.inject.Inject
 class TypingMessageView @JvmOverloads constructor(
         context: Context,
         attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0) : ConstraintLayout(context, attrs, defStyleAttr) {
+        defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
 
     val views: TypingMessageLayoutBinding
 
@@ -44,8 +45,8 @@ class TypingMessageView @JvmOverloads constructor(
     }
 
     fun render(typingUsers: List<SenderInfo>, avatarRenderer: AvatarRenderer) {
-        views.usersName.text = typingHelper.getNotificationTypingMessage(typingUsers)
-        views.avatars.render(typingUsers, avatarRenderer)
+        views.typingUserText.text = typingHelper.getNotificationTypingMessage(typingUsers)
+        views.typingUserAvatars.render(typingUsers, avatarRenderer)
     }
 
     override fun onDetachedFromWindow() {
diff --git a/vector/src/main/res/layout/typing_message_layout.xml b/vector/src/main/res/layout/typing_message_layout.xml
index 22fd29ca0b..a4a2cd3305 100644
--- a/vector/src/main/res/layout/typing_message_layout.xml
+++ b/vector/src/main/res/layout/typing_message_layout.xml
@@ -8,7 +8,7 @@
 
     <!-- This is a LinearLayout which will contain avatars of the typing users -->
     <im.vector.app.core.ui.views.TypingMessageAvatar
-        android:id="@+id/avatars"
+        android:id="@+id/typingUserAvatars"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/typing_avatar_size"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
@@ -17,7 +17,7 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/users_name"
+        android:id="@+id/typingUserText"
         style="@style/Widget.Vector.TextView.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -25,18 +25,18 @@
         android:gravity="center"
         android:textColor="?vctr_content_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/avatars"
+        app:layout_constraintStart_toEndOf="@id/typingUserAvatars"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="@sample/users.json/data/displayName" />
 
     <im.vector.app.core.ui.views.TypingMessageDotsView
-        android:id="@+id/viewDots"
+        android:id="@+id/typingUserDots"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:gravity="center"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/users_name"
+        app:layout_constraintStart_toEndOf="@id/typingUserText"
         app:layout_constraintTop_toTopOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>