diff --git a/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesEvents.kt b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesEvent.kt
similarity index 76%
rename from features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesEvents.kt
rename to features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesEvent.kt
index 0161a5d657..9fab72424f 100644
--- a/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesEvents.kt
+++ b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesEvent.kt
@@ -8,6 +8,6 @@
 
 package io.element.android.features.forward.impl
 
-sealed interface ForwardMessagesEvents {
-    data object ClearError : ForwardMessagesEvents
+sealed interface ForwardMessagesEvent {
+    data object ClearError : ForwardMessagesEvent
 }
diff --git a/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesPresenter.kt b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesPresenter.kt
index 1145f294a3..6068866653 100644
--- a/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesPresenter.kt
+++ b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesPresenter.kt
@@ -48,9 +48,9 @@ class ForwardMessagesPresenter(
 
     @Composable
     override fun present(): ForwardMessagesState {
-        fun handleEvent(event: ForwardMessagesEvents) {
+        fun handleEvent(event: ForwardMessagesEvent) {
             when (event) {
-                ForwardMessagesEvents.ClearError -> forwardingActionState.value = AsyncAction.Uninitialized
+                ForwardMessagesEvent.ClearError -> forwardingActionState.value = AsyncAction.Uninitialized
             }
         }
 
diff --git a/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesState.kt b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesState.kt
index b1e46adb03..141c1bad38 100644
--- a/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesState.kt
+++ b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesState.kt
@@ -13,5 +13,5 @@ import io.element.android.libraries.matrix.api.core.RoomId
 
 data class ForwardMessagesState(
     val forwardAction: AsyncAction<List<RoomId>>,
-    val eventSink: (ForwardMessagesEvents) -> Unit
+    val eventSink: (ForwardMessagesEvent) -> Unit
 )
diff --git a/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesStatePreviewParam.kt b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesStatePreviewParam.kt
index 8ff621c2a6..fc61925fcc 100644
--- a/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesStatePreviewParam.kt
+++ b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesStatePreviewParam.kt
@@ -32,7 +32,7 @@ open class ForwardMessagesStatePreviewParam : PreviewParameterProvider<ForwardMe
 
 fun aForwardMessagesState(
     forwardAction: AsyncAction<List<RoomId>> = AsyncAction.Uninitialized,
-    eventSink: (ForwardMessagesEvents) -> Unit = {}
+    eventSink: (ForwardMessagesEvent) -> Unit = {}
 ) = ForwardMessagesState(
     forwardAction = forwardAction,
     eventSink = eventSink
diff --git a/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesView.kt b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesView.kt
index f350c5b516..8c622d8e29 100644
--- a/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesView.kt
+++ b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesView.kt
@@ -31,7 +31,7 @@ fun ForwardMessagesView(
             stringResource(id = CommonStrings.error_unknown)
         },
         onErrorDismiss = {
-            state.eventSink(ForwardMessagesEvents.ClearError)
+            state.eventSink(ForwardMessagesEvent.ClearError)
         },
     )
 }
diff --git a/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/ForwardMessagesPresenterTest.kt b/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/ForwardMessagesPresenterTest.kt
index 5e2f74ccad..0ff3210f2e 100644
--- a/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/ForwardMessagesPresenterTest.kt
+++ b/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/ForwardMessagesPresenterTest.kt
@@ -86,7 +86,7 @@ class ForwardMessagesPresenterTest {
             val failedForwardState = awaitItem()
             assertThat(failedForwardState.forwardAction.isFailure()).isTrue()
             // Then clear error
-            failedForwardState.eventSink(ForwardMessagesEvents.ClearError)
+            failedForwardState.eventSink(ForwardMessagesEvent.ClearError)
             assertThat(awaitItem().forwardAction.isUninitialized()).isTrue()
             forwardEventLambda.assertions().isCalledOnce()
         }
diff --git a/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/ForwardMessagesViewTest.kt b/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/ForwardMessagesViewTest.kt
index a73478479e..3302e3430f 100644
--- a/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/ForwardMessagesViewTest.kt
+++ b/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/ForwardMessagesViewTest.kt
@@ -29,7 +29,7 @@ import org.junit.Test
 class ForwardMessagesViewTest : RobolectricTest() {
     @Test
     fun `cancel error emits the expected event`() = runAndroidComposeUiTest {
-        val eventsRecorder = EventsRecorder<ForwardMessagesEvents>()
+        val eventsRecorder = EventsRecorder<ForwardMessagesEvent>()
         setForwardMessagesView(
             aForwardMessagesState(
                 forwardAction = AsyncAction.Failure(AN_EXCEPTION),
@@ -37,13 +37,13 @@ class ForwardMessagesViewTest : RobolectricTest() {
             ),
         )
         pressTag(TestTags.dialogPositive.value)
-        eventsRecorder.assertSingle(ForwardMessagesEvents.ClearError)
+        eventsRecorder.assertSingle(ForwardMessagesEvent.ClearError)
     }
 
     @Test
     fun `success invokes onForwardSuccess`() = runAndroidComposeUiTest {
         val data = listOf(A_ROOM_ID)
-        val eventsRecorder = EventsRecorder<ForwardMessagesEvents>(expectEvents = false)
+        val eventsRecorder = EventsRecorder<ForwardMessagesEvent>(expectEvents = false)
         ensureCalledOnceWithParam<List<RoomId>?>(data) { callback ->
             setForwardMessagesView(
                 aForwardMessagesState(