diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/RoomNavigationTarget.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/RoomNavigationTarget.kt
index 776171d141..c8d8cf9030 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/room/RoomNavigationTarget.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/RoomNavigationTarget.kt
@@ -22,7 +22,7 @@ import kotlinx.parcelize.Parcelize
 
 sealed interface RoomNavigationTarget : Parcelable {
     @Parcelize
-    data class Messages(val eventId: EventId? = null) : RoomNavigationTarget
+    data class Messages(val focusedEventId: EventId? = null) : RoomNavigationTarget
 
     @Parcelize
     data object Details : RoomNavigationTarget
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt
index 7a6c736385..5f9a6b6eb3 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt
@@ -66,7 +66,7 @@ class JoinedRoomLoadedFlowNode @AssistedInject constructor(
 ) : BaseFlowNode<JoinedRoomLoadedFlowNode.NavTarget>(
     backstack = BackStack(
         initialElement = when (val input = plugins.filterIsInstance(Inputs::class.java).first().initialElement) {
-            is RoomNavigationTarget.Messages -> NavTarget.Messages(input.eventId)
+            is RoomNavigationTarget.Messages -> NavTarget.Messages(input.focusedEventId)
             RoomNavigationTarget.Details -> NavTarget.RoomDetails
             RoomNavigationTarget.NotificationSettings -> NavTarget.RoomNotificationSettings
         },
@@ -161,7 +161,7 @@ class JoinedRoomLoadedFlowNode @AssistedInject constructor(
                     }
                 }
                 messagesEntryPoint.nodeBuilder(this, buildContext)
-                    .params(MessagesEntryPoint.Params(navTarget.eventId))
+                    .params(MessagesEntryPoint.Params(navTarget.focusedEventId))
                     .callback(callback)
                     .build()
             }
@@ -179,7 +179,7 @@ class JoinedRoomLoadedFlowNode @AssistedInject constructor(
 
     sealed interface NavTarget : Parcelable {
         @Parcelize
-        data class Messages(val eventId: EventId? = null) : NavTarget
+        data class Messages(val focusedEventId: EventId? = null) : NavTarget
 
         @Parcelize
         data object RoomDetails : NavTarget
diff --git a/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/MessagesEntryPoint.kt b/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/MessagesEntryPoint.kt
index 9012d3a776..15d6e5fd95 100644
--- a/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/MessagesEntryPoint.kt
+++ b/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/MessagesEntryPoint.kt
@@ -35,7 +35,7 @@ interface MessagesEntryPoint : FeatureEntryPoint {
     }
 
     data class Params(
-        val eventId: EventId?,
+        val focusedEventId: EventId?,
     )
 
     interface Callback : Plugin {
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/DefaultMessagesEntryPoint.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/DefaultMessagesEntryPoint.kt
index b45c7fc6b5..73ab29bfeb 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/DefaultMessagesEntryPoint.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/DefaultMessagesEntryPoint.kt
@@ -32,7 +32,7 @@ class DefaultMessagesEntryPoint @Inject constructor() : MessagesEntryPoint {
 
         return object : MessagesEntryPoint.NodeBuilder {
             override fun params(params: MessagesEntryPoint.Params): MessagesEntryPoint.NodeBuilder {
-                plugins += MessagesNode.Inputs(eventId = params.eventId)
+                plugins += MessagesNode.Inputs(focusedEventId = params.focusedEventId)
                 return this
             }
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt
index c8a0a753c4..f92214b679 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt
@@ -81,7 +81,7 @@ class MessagesFlowNode @AssistedInject constructor(
     private val createPollEntryPoint: CreatePollEntryPoint,
 ) : BaseFlowNode<MessagesFlowNode.NavTarget>(
     backstack = BackStack(
-        initialElement = NavTarget.Messages(plugins.filterIsInstance<Inputs>().firstOrNull()?.eventId),
+        initialElement = NavTarget.Messages(plugins.filterIsInstance<Inputs>().firstOrNull()?.focusedEventId),
         savedStateMap = buildContext.savedStateMap,
     ),
     overlay = Overlay(
@@ -90,7 +90,7 @@ class MessagesFlowNode @AssistedInject constructor(
     buildContext = buildContext,
     plugins = plugins
 ) {
-    data class Inputs(val eventId: EventId?) : NodeInputs
+    data class Inputs(val focusedEventId: EventId?) : NodeInputs
 
     sealed interface NavTarget : Parcelable {
         @Parcelize
@@ -98,7 +98,7 @@ class MessagesFlowNode @AssistedInject constructor(
 
         @Parcelize
         data class Messages(
-            val eventId: EventId? = null,
+            val focusedEventId: EventId? = null,
         ) : NavTarget
 
         @Parcelize
@@ -192,7 +192,7 @@ class MessagesFlowNode @AssistedInject constructor(
                     }
                 }
                 val params = MessagesNode.Inputs(
-                    eventId = navTarget.eventId,
+                    focusedEventId = navTarget.focusedEventId,
                 )
                 createNode<MessagesNode>(buildContext, listOf(callback, params))
             }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt
index 37292f5e08..88472956c0 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt
@@ -69,7 +69,7 @@ class MessagesNode @AssistedInject constructor(
     private val callback = plugins<Callback>().firstOrNull()
 
     // TODO Handle navigation to the Event
-    data class Inputs(val eventId: EventId?) : NodeInputs
+    data class Inputs(val focusedEventId: EventId?) : NodeInputs
 
     interface Callback : Plugin {
         fun onRoomDetailsClicked()