diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerStateProvider.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerStateProvider.kt
index 460d1c7462..0324239fd9 100644
--- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerStateProvider.kt
+++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerStateProvider.kt
@@ -9,7 +9,7 @@ package io.element.android.features.knockrequests.impl.banner
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.knockrequests.impl.data.KnockRequestPresentable
-import io.element.android.features.knockrequests.impl.data.aKnockRequest
+import io.element.android.features.knockrequests.impl.data.aKnockRequestPresentable
 import kotlinx.collections.immutable.toImmutableList
 
 class KnockRequestsBannerStateProvider : PreviewParameterProvider<KnockRequestsBannerState> {
@@ -18,7 +18,7 @@ class KnockRequestsBannerStateProvider : PreviewParameterProvider<KnockRequestsB
             aKnockRequestsBannerState(),
             aKnockRequestsBannerState(
                 knockRequests = listOf(
-                    aKnockRequest(
+                    aKnockRequestPresentable(
                         reason = "A very long reason that should probably be truncated, " +
                             "but could be also expanded so you can see it over the lines, wow," +
                             "very amazing reason, I know, right, I'm so good at writing reasons."
@@ -27,16 +27,16 @@ class KnockRequestsBannerStateProvider : PreviewParameterProvider<KnockRequestsB
             ),
             aKnockRequestsBannerState(
                 knockRequests = listOf(
-                    aKnockRequest(),
-                    aKnockRequest(displayName = "Alice")
+                    aKnockRequestPresentable(),
+                    aKnockRequestPresentable(displayName = "Alice")
                 )
             ),
             aKnockRequestsBannerState(
                 knockRequests = listOf(
-                    aKnockRequest(),
-                    aKnockRequest(displayName = "Alice"),
-                    aKnockRequest(displayName = "Bob"),
-                    aKnockRequest(displayName = "Charlie")
+                    aKnockRequestPresentable(),
+                    aKnockRequestPresentable(displayName = "Alice"),
+                    aKnockRequestPresentable(displayName = "Bob"),
+                    aKnockRequestPresentable(displayName = "Charlie")
                 )
             ),
             aKnockRequestsBannerState(
@@ -47,7 +47,7 @@ class KnockRequestsBannerStateProvider : PreviewParameterProvider<KnockRequestsB
             ),
             aKnockRequestsBannerState(
                 knockRequests = listOf(
-                    aKnockRequest(
+                    aKnockRequestPresentable(
                         displayName = "A_very_long_display_name_so_that_the_text_can_be_displayed_on_multiple_lines"
                     )
                 )
@@ -56,7 +56,7 @@ class KnockRequestsBannerStateProvider : PreviewParameterProvider<KnockRequestsB
 }
 
 fun aKnockRequestsBannerState(
-    knockRequests: List<KnockRequestPresentable> = listOf(aKnockRequest()),
+    knockRequests: List<KnockRequestPresentable> = listOf(aKnockRequestPresentable()),
     displayAcceptError: Boolean = false,
     canAccept: Boolean = true,
     isVisible: Boolean = true,
diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestFixture.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestFixture.kt
index 5fbc2bb047..cfecb8355e 100644
--- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestFixture.kt
+++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/data/KnockRequestFixture.kt
@@ -10,7 +10,7 @@ package io.element.android.features.knockrequests.impl.data
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.UserId
 
-fun aKnockRequest(
+fun aKnockRequestPresentable(
     eventId: EventId = EventId("\$eventId"),
     userId: UserId = UserId("@jacob_ross:example.com"),
     displayName: String? = "Jacob Ross",
diff --git a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListStateProvider.kt b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListStateProvider.kt
index f6d5aba7f6..7b5ee23353 100644
--- a/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListStateProvider.kt
+++ b/features/knockrequests/impl/src/main/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListStateProvider.kt
@@ -10,7 +10,7 @@ package io.element.android.features.knockrequests.impl.list
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.knockrequests.impl.data.KnockRequestPermissions
 import io.element.android.features.knockrequests.impl.data.KnockRequestPresentable
-import io.element.android.features.knockrequests.impl.data.aKnockRequest
+import io.element.android.features.knockrequests.impl.data.aKnockRequestPresentable
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.matrix.api.core.UserId
@@ -31,14 +31,14 @@ open class KnockRequestsListStateProvider : PreviewParameterProvider<KnockReques
             aKnockRequestsListState(
                 knockRequests = AsyncData.Success(
                     persistentListOf(
-                        aKnockRequest()
+                        aKnockRequestPresentable()
                     )
                 ),
             ),
             aKnockRequestsListState(
                 knockRequests = AsyncData.Success(
                     persistentListOf(
-                        aKnockRequest(
+                        aKnockRequestPresentable(
                             reason = "A very long reason that should probably be truncated, " +
                                 "but could be also expanded so you can see it over the lines, wow," +
                                 "very amazing reason, I know, right, I'm so good at writing reasons."
@@ -49,8 +49,8 @@ open class KnockRequestsListStateProvider : PreviewParameterProvider<KnockReques
             aKnockRequestsListState(
                 knockRequests = AsyncData.Success(
                     persistentListOf(
-                        aKnockRequest(),
-                        aKnockRequest(
+                        aKnockRequestPresentable(),
+                        aKnockRequestPresentable(
                             userId = UserId("@user:example.com"),
                             displayName = null,
                             avatarUrl = null,
@@ -62,7 +62,7 @@ open class KnockRequestsListStateProvider : PreviewParameterProvider<KnockReques
             aKnockRequestsListState(
                 knockRequests = AsyncData.Success(
                     persistentListOf(
-                        aKnockRequest()
+                        aKnockRequestPresentable()
                     )
                 ),
                 actionTarget = KnockRequestsActionTarget.AcceptAll,
@@ -71,7 +71,7 @@ open class KnockRequestsListStateProvider : PreviewParameterProvider<KnockReques
             aKnockRequestsListState(
                 knockRequests = AsyncData.Success(
                     persistentListOf(
-                        aKnockRequest()
+                        aKnockRequestPresentable()
                     )
                 ),
                 actionTarget = KnockRequestsActionTarget.AcceptAll,
@@ -80,7 +80,7 @@ open class KnockRequestsListStateProvider : PreviewParameterProvider<KnockReques
             aKnockRequestsListState(
                 knockRequests = AsyncData.Success(
                     persistentListOf(
-                        aKnockRequest()
+                        aKnockRequestPresentable()
                     )
                 ),
                 permissions = KnockRequestPermissions(
@@ -94,7 +94,7 @@ open class KnockRequestsListStateProvider : PreviewParameterProvider<KnockReques
             aKnockRequestsListState(
                 knockRequests = AsyncData.Success(
                     persistentListOf(
-                        aKnockRequest()
+                        aKnockRequestPresentable()
                     )
                 ),
                 permissions = KnockRequestPermissions(
@@ -106,7 +106,7 @@ open class KnockRequestsListStateProvider : PreviewParameterProvider<KnockReques
             aKnockRequestsListState(
                 knockRequests = AsyncData.Success(
                     persistentListOf(
-                        aKnockRequest()
+                        aKnockRequestPresentable()
                     )
                 ),
                 permissions = KnockRequestPermissions(
@@ -118,7 +118,7 @@ open class KnockRequestsListStateProvider : PreviewParameterProvider<KnockReques
             aKnockRequestsListState(
                 knockRequests = AsyncData.Success(
                     persistentListOf(
-                        aKnockRequest()
+                        aKnockRequestPresentable()
                     )
                 ),
                 permissions = KnockRequestPermissions(
diff --git a/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerViewTest.kt b/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerViewTest.kt
index 19716c349a..ec594086fc 100644
--- a/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerViewTest.kt
+++ b/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerViewTest.kt
@@ -14,7 +14,7 @@ import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.performClick
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.element.android.features.knockrequests.impl.R
-import io.element.android.features.knockrequests.impl.data.aKnockRequest
+import io.element.android.features.knockrequests.impl.data.aKnockRequestPresentable
 import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EnsureNeverCalled
 import io.element.android.tests.testutils.EventsRecorder
@@ -51,9 +51,9 @@ class KnockRequestsBannerViewTest {
             rule.setKnockRequestsBannerView(
                 state = aKnockRequestsBannerState(
                     knockRequests = listOf(
-                        aKnockRequest(displayName = "Alice"),
-                        aKnockRequest(displayName = "Bob"),
-                        aKnockRequest(displayName = "Charlie")
+                        aKnockRequestPresentable(displayName = "Alice"),
+                        aKnockRequestPresentable(displayName = "Bob"),
+                        aKnockRequestPresentable(displayName = "Charlie")
                     ),
                     eventSink = eventsRecorder,
                 ),
diff --git a/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListViewTest.kt b/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListViewTest.kt
index 5620c65ea7..2de89aef58 100644
--- a/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListViewTest.kt
+++ b/features/knockrequests/impl/src/test/kotlin/io/element/android/features/knockrequests/impl/list/KnockRequestsListViewTest.kt
@@ -12,7 +12,7 @@ import androidx.compose.ui.test.junit4.AndroidComposeTestRule
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.element.android.features.knockrequests.impl.R
-import io.element.android.features.knockrequests.impl.data.aKnockRequest
+import io.element.android.features.knockrequests.impl.data.aKnockRequestPresentable
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -48,7 +48,7 @@ class KnockRequestsListViewTest {
     @Test
     fun `clicking on accept emit the expected event`() {
         val eventsRecorder = EventsRecorder<KnockRequestsListEvents>()
-        val knockRequest = aKnockRequest()
+        val knockRequest = aKnockRequestPresentable()
         rule.setKnockRequestsListView(
             aKnockRequestsListState(
                 knockRequests = AsyncData.Success(persistentListOf(knockRequest)),
@@ -62,7 +62,7 @@ class KnockRequestsListViewTest {
     @Test
     fun `clicking on decline emit the expected event`() {
         val eventsRecorder = EventsRecorder<KnockRequestsListEvents>()
-        val knockRequest = aKnockRequest()
+        val knockRequest = aKnockRequestPresentable()
         rule.setKnockRequestsListView(
             aKnockRequestsListState(
                 knockRequests = AsyncData.Success(persistentListOf(knockRequest)),
@@ -76,7 +76,7 @@ class KnockRequestsListViewTest {
     @Test
     fun `clicking on decline and ban emit the expected event`() {
         val eventsRecorder = EventsRecorder<KnockRequestsListEvents>()
-        val knockRequest = aKnockRequest()
+        val knockRequest = aKnockRequestPresentable()
         rule.setKnockRequestsListView(
             aKnockRequestsListState(
                 knockRequests = AsyncData.Success(persistentListOf(knockRequest)),
@@ -90,7 +90,7 @@ class KnockRequestsListViewTest {
     @Test
     fun `clicking on accept all emit the expected event`() {
         val eventsRecorder = EventsRecorder<KnockRequestsListEvents>()
-        val knockRequests = persistentListOf(aKnockRequest(), aKnockRequest())
+        val knockRequests = persistentListOf(aKnockRequestPresentable(), aKnockRequestPresentable())
         rule.setKnockRequestsListView(
             aKnockRequestsListState(
                 knockRequests = AsyncData.Success(knockRequests),
@@ -104,7 +104,7 @@ class KnockRequestsListViewTest {
     @Test
     fun `retry on async view retry emit the expected event`() {
         val eventsRecorder = EventsRecorder<KnockRequestsListEvents>()
-        val knockRequests = persistentListOf(aKnockRequest(), aKnockRequest())
+        val knockRequests = persistentListOf(aKnockRequestPresentable(), aKnockRequestPresentable())
         rule.setKnockRequestsListView(
             aKnockRequestsListState(
                 knockRequests = AsyncData.Success(knockRequests),
@@ -120,7 +120,7 @@ class KnockRequestsListViewTest {
     @Test
     fun `canceling async view emit the expected event`() {
         val eventsRecorder = EventsRecorder<KnockRequestsListEvents>()
-        val knockRequests = persistentListOf(aKnockRequest(), aKnockRequest())
+        val knockRequests = persistentListOf(aKnockRequestPresentable(), aKnockRequestPresentable())
         rule.setKnockRequestsListView(
             aKnockRequestsListState(
                 knockRequests = AsyncData.Success(knockRequests),
@@ -136,7 +136,7 @@ class KnockRequestsListViewTest {
     @Test
     fun `confirming async view emit the expected event`() {
         val eventsRecorder = EventsRecorder<KnockRequestsListEvents>()
-        val knockRequests = persistentListOf(aKnockRequest(), aKnockRequest())
+        val knockRequests = persistentListOf(aKnockRequestPresentable(), aKnockRequestPresentable())
         rule.setKnockRequestsListView(
             aKnockRequestsListState(
                 knockRequests = AsyncData.Success(knockRequests),