diff --git a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
index 6bb803dd2f..35a6232294 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_message_preview.xml
@@ -37,7 +37,8 @@
         app:layout_constraintEnd_toStartOf="@+id/bottom_sheet_message_preview_timestamp"
         app:layout_constraintStart_toEndOf="@id/bottom_sheet_message_preview_avatar"
         app:layout_constraintTop_toTopOf="@id/bottom_sheet_message_preview_avatar"
-        tools:text="@tools:sample/full_names" />
+        tools:fontFamily="sans-serif"
+        tools:text="@sample/matrix.json/data/displayName" />
 
     <TextView
         android:id="@+id/bottom_sheet_message_preview_timestamp"
diff --git a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
index 87d6475fde..384a097f18 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
@@ -41,7 +41,8 @@
         app:layout_constraintEnd_toStartOf="@+id/bottomSheetRoomPreviewLowPriority"
         app:layout_constraintStart_toEndOf="@id/bottomSheetRoomPreviewAvatar"
         app:layout_constraintTop_toTopOf="@id/bottomSheetRoomPreviewAvatar"
-        tools:text="@tools:sample/full_names" />
+        tools:fontFamily="sans-serif"
+        tools:text="@sample/matrix.json/data/roomName" />
 
     <ImageView
         android:id="@+id/bottomSheetRoomPreviewLowPriority"
diff --git a/vector/src/main/res/layout/item_contact_detail.xml b/vector/src/main/res/layout/item_contact_detail.xml
index c6a16bdb69..ddc005b318 100644
--- a/vector/src/main/res/layout/item_contact_detail.xml
+++ b/vector/src/main/res/layout/item_contact_detail.xml
@@ -24,7 +24,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_chainStyle="packed"
-        tools:text="@tools:sample/full_names" />
+        tools:text="@sample/matrix.json/data/displayName" />
 
     <TextView
         android:id="@+id/contactDetailMatrixId"
diff --git a/vector/src/main/res/layout/item_create_direct_room_user.xml b/vector/src/main/res/layout/item_create_direct_room_user.xml
index 4ba3b22538..66ee9889c3 100644
--- a/vector/src/main/res/layout/item_create_direct_room_user.xml
+++ b/vector/src/main/res/layout/item_create_direct_room_user.xml
@@ -55,7 +55,7 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/createDirectRoomUserAvatarContainer"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="@tools:sample/full_names" />
+        tools:text="@sample/matrix.json/data/displayName" />
 
     <TextView
         android:id="@+id/createDirectRoomUserID"
@@ -70,6 +70,6 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="@+id/createDirectRoomUserName"
         app:layout_constraintTop_toBottomOf="@+id/createDirectRoomUserName"
-        tools:text="Blabla" />
+        tools:text="@sample/matrix.json/data/mxid" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_known_user.xml b/vector/src/main/res/layout/item_known_user.xml
index a2429e159f..24eb6e94fc 100644
--- a/vector/src/main/res/layout/item_known_user.xml
+++ b/vector/src/main/res/layout/item_known_user.xml
@@ -54,7 +54,7 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/knownUserAvatarContainer"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="@tools:sample/full_names" />
+        tools:text="@sample/matrix.json/data/displayName" />
 
     <TextView
         android:id="@+id/knownUserID"
@@ -69,6 +69,6 @@
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="@+id/knownUserName"
         app:layout_constraintTop_toBottomOf="@+id/knownUserName"
-        tools:text="Blabla" />
+        tools:text="@sample/matrix.json/data/mxid" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_space_roomchild.xml b/vector/src/main/res/layout/item_space_roomchild.xml
index f6083b408b..799f9730a1 100644
--- a/vector/src/main/res/layout/item_space_roomchild.xml
+++ b/vector/src/main/res/layout/item_space_roomchild.xml
@@ -57,7 +57,7 @@
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toEndOf="@+id/childRoomAvatar"
             app:layout_constraintTop_toTopOf="parent"
-            tools:text="@tools:sample/full_names" />
+            tools:text="@sample/matrix.json/data/spaceName" />
 
         <TextView
             android:id="@+id/childRoomTopic"
diff --git a/vector/src/main/res/layout/item_space_subspace.xml b/vector/src/main/res/layout/item_space_subspace.xml
index 2d435df912..a8445f8c8c 100644
--- a/vector/src/main/res/layout/item_space_subspace.xml
+++ b/vector/src/main/res/layout/item_space_subspace.xml
@@ -62,6 +62,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/childSpaceAvatar"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="@tools:sample/full_names" />
+        tools:text="@sample/matrix.json/data/spaceName" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file