diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceFlowNode.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceFlowNode.kt
index 6684d07952..ba55203be6 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceFlowNode.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/SpaceFlowNode.kt
@@ -106,27 +106,27 @@ class SpaceFlowNode(
             }
             NavTarget.Settings -> {
                 val callback = object : SpaceSettingsNode.Callback {
-                    override fun onBackClick() {
+                    override fun closeSettings() {
                         backstack.pop()
                     }
 
-                    override fun onSpaceInfoClick() {
+                    override fun navigateToSpaceInfo() {
                         //TODO
                     }
 
-                    override fun onMembersClick() {
+                    override fun navigateToSpaceMembers() {
                         callback.navigateToRoomMemberList()
                     }
 
-                    override fun onRolesAndPermissionsClick() {
+                    override fun navigateToRolesAndPermissions() {
                         //TODO
                     }
 
-                    override fun onSecurityAndPrivacyClick() {
+                    override fun navigateToSecurityAndPrivacy() {
                         //TODO
                     }
 
-                    override fun onLeaveSpaceClick() {
+                    override fun startLeaveSpaceFlow() {
                         backstack.push(NavTarget.Leave)
                     }
                 }
diff --git a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsNode.kt b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsNode.kt
index 77ae924f94..9b81272153 100644
--- a/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsNode.kt
+++ b/features/space/impl/src/main/kotlin/io/element/android/features/space/impl/settings/SpaceSettingsNode.kt
@@ -29,13 +29,13 @@ class SpaceSettingsNode(
     private val presenter: SpaceSettingsPresenter,
 ) : Node(buildContext, plugins = plugins) {
     interface Callback : Plugin {
-        fun onBackClick()
+        fun closeSettings()
 
-        fun onSpaceInfoClick()
-        fun onMembersClick()
-        fun onRolesAndPermissionsClick()
-        fun onSecurityAndPrivacyClick()
-        fun onLeaveSpaceClick()
+        fun navigateToSpaceInfo()
+        fun navigateToSpaceMembers()
+        fun navigateToRolesAndPermissions()
+        fun navigateToSecurityAndPrivacy()
+        fun startLeaveSpaceFlow()
     }
 
     private val callback = plugins<Callback>().single()
@@ -47,12 +47,12 @@ class SpaceSettingsNode(
         SpaceSettingsView(
             state = state,
             modifier = modifier,
-            onSpaceInfoClick = callback::onSpaceInfoClick,
-            onBackClick = callback::onBackClick,
-            onMembersClick = callback::onMembersClick,
-            onRolesAndPermissionsClick = callback::onRolesAndPermissionsClick,
-            onSecurityAndPrivacyClick = callback::onSecurityAndPrivacyClick,
-            onLeaveSpaceClick = callback::onLeaveSpaceClick,
+            onSpaceInfoClick = callback::navigateToSpaceInfo,
+            onBackClick = callback::closeSettings,
+            onMembersClick = callback::navigateToSpaceMembers,
+            onRolesAndPermissionsClick = callback::navigateToRolesAndPermissions,
+            onSecurityAndPrivacyClick = callback::navigateToSecurityAndPrivacy,
+            onLeaveSpaceClick = callback::startLeaveSpaceFlow,
         )
     }
 }