diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMenuEvents.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMenuEvents.kt
index 77be3815e5..77854773c4 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMenuEvents.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMenuEvents.kt
@@ -20,7 +20,7 @@ import io.element.android.features.messages.impl.timeline.model.TimelineItem
 
 sealed interface RetrySendMenuEvents {
     data class EventSelected(val event: TimelineItem.Event) : RetrySendMenuEvents
-    data object RetrySend : RetrySendMenuEvents
-    data object RemoveFailed : RetrySendMenuEvents
+    data object Retry : RetrySendMenuEvents
+    data object Remove : RetrySendMenuEvents
     data object Dismiss : RetrySendMenuEvents
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMenuPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMenuPresenter.kt
index bc1415829f..8745df9e53 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMenuPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMenuPresenter.kt
@@ -41,7 +41,7 @@ class RetrySendMenuPresenter @Inject constructor(
                 is RetrySendMenuEvents.EventSelected -> {
                     selectedEvent = event.event
                 }
-                RetrySendMenuEvents.RetrySend -> {
+                RetrySendMenuEvents.Retry -> {
                     coroutineScope.launch {
                         selectedEvent?.transactionId?.let { transactionId ->
                             room.retrySendMessage(transactionId)
@@ -49,7 +49,7 @@ class RetrySendMenuPresenter @Inject constructor(
                         selectedEvent = null
                     }
                 }
-                RetrySendMenuEvents.RemoveFailed -> {
+                RetrySendMenuEvents.Remove -> {
                     coroutineScope.launch {
                         selectedEvent?.transactionId?.let { transactionId ->
                             room.cancelSend(transactionId)
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMessageMenu.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMessageMenu.kt
index 9382d6103a..ce01c18dfa 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMessageMenu.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMessageMenu.kt
@@ -53,18 +53,18 @@ internal fun RetrySendMessageMenu(
     }
 
     fun onRetry() {
-        state.eventSink(RetrySendMenuEvents.RetrySend)
+        state.eventSink(RetrySendMenuEvents.Retry)
     }
 
-    fun onRemoveFailed() {
-        state.eventSink(RetrySendMenuEvents.RemoveFailed)
+    fun onRemove() {
+        state.eventSink(RetrySendMenuEvents.Remove)
     }
 
     RetrySendMessageMenuBottomSheet(
         modifier = modifier,
         isVisible = isVisible,
         onRetry = ::onRetry,
-        onRemoveFailed = ::onRemoveFailed,
+        onRemove = ::onRemove,
         onDismiss = ::onDismiss
     )
 }
@@ -74,7 +74,7 @@ internal fun RetrySendMessageMenu(
 private fun RetrySendMessageMenuBottomSheet(
     isVisible: Boolean,
     onRetry: () -> Unit,
-    onRemoveFailed: () -> Unit,
+    onRemove: () -> Unit,
     onDismiss: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -94,7 +94,10 @@ private fun RetrySendMessageMenuBottomSheet(
                 }
             }
         ) {
-            RetrySendMenuContents(onRetry = onRetry, onRemoveFailed = onRemoveFailed)
+            RetrySendMenuContents(
+                onRetry = onRetry,
+                onRemove = onRemove,
+            )
             // FIXME remove after https://issuetracker.google.com/issues/275849044
             Spacer(modifier = Modifier.height(32.dp))
         }
@@ -105,7 +108,7 @@ private fun RetrySendMessageMenuBottomSheet(
 @Composable
 private fun ColumnScope.RetrySendMenuContents(
     onRetry: () -> Unit,
-    onRemoveFailed: () -> Unit,
+    onRemove: () -> Unit,
     sheetState: SheetState = rememberModalBottomSheetState(),
 ) {
     val coroutineScope = rememberCoroutineScope()
@@ -141,7 +144,7 @@ private fun ColumnScope.RetrySendMenuContents(
         modifier = Modifier.clickable {
             coroutineScope.launch {
                 sheetState.hide()
-                onRemoveFailed()
+                onRemove()
             }
         }
     )
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMenuPresenterTests.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMenuPresenterTests.kt
index afed2d8b8f..edf6509631 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMenuPresenterTests.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/components/retrysendmenu/RetrySendMenuPresenterTests.kt
@@ -73,7 +73,7 @@ class RetrySendMenuPresenterTests {
             initialState.eventSink(RetrySendMenuEvents.EventSelected(selectedEvent))
             skipItems(1)
 
-            initialState.eventSink(RetrySendMenuEvents.RetrySend)
+            initialState.eventSink(RetrySendMenuEvents.Retry)
             assertThat(room.retrySendMessageCount).isEqualTo(1)
             assertThat(awaitItem().selectedEvent).isNull()
         }
@@ -89,7 +89,7 @@ class RetrySendMenuPresenterTests {
             initialState.eventSink(RetrySendMenuEvents.EventSelected(selectedEvent))
             skipItems(1)
 
-            initialState.eventSink(RetrySendMenuEvents.RetrySend)
+            initialState.eventSink(RetrySendMenuEvents.Retry)
             assertThat(room.retrySendMessageCount).isEqualTo(0)
             assertThat(awaitItem().selectedEvent).isNull()
         }
@@ -106,7 +106,7 @@ class RetrySendMenuPresenterTests {
             initialState.eventSink(RetrySendMenuEvents.EventSelected(selectedEvent))
             skipItems(1)
 
-            initialState.eventSink(RetrySendMenuEvents.RetrySend)
+            initialState.eventSink(RetrySendMenuEvents.Retry)
             assertThat(room.retrySendMessageCount).isEqualTo(1)
             assertThat(awaitItem().selectedEvent).isNull()
         }
@@ -122,7 +122,7 @@ class RetrySendMenuPresenterTests {
             initialState.eventSink(RetrySendMenuEvents.EventSelected(selectedEvent))
             skipItems(1)
 
-            initialState.eventSink(RetrySendMenuEvents.RemoveFailed)
+            initialState.eventSink(RetrySendMenuEvents.Remove)
             assertThat(room.cancelSendCount).isEqualTo(1)
             assertThat(awaitItem().selectedEvent).isNull()
         }
@@ -138,7 +138,7 @@ class RetrySendMenuPresenterTests {
             initialState.eventSink(RetrySendMenuEvents.EventSelected(selectedEvent))
             skipItems(1)
 
-            initialState.eventSink(RetrySendMenuEvents.RemoveFailed)
+            initialState.eventSink(RetrySendMenuEvents.Remove)
             assertThat(room.cancelSendCount).isEqualTo(0)
             assertThat(awaitItem().selectedEvent).isNull()
         }
@@ -155,7 +155,7 @@ class RetrySendMenuPresenterTests {
             initialState.eventSink(RetrySendMenuEvents.EventSelected(selectedEvent))
             skipItems(1)
 
-            initialState.eventSink(RetrySendMenuEvents.RemoveFailed)
+            initialState.eventSink(RetrySendMenuEvents.Remove)
             assertThat(room.cancelSendCount).isEqualTo(1)
             assertThat(awaitItem().selectedEvent).isNull()
         }