diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
index bd68a9151e..032b4ce70e 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
@@ -229,31 +229,31 @@ class LoggedInFlowNode @AssistedInject constructor(
             }
             NavTarget.RoomList -> {
                 val callback = object : RoomListEntryPoint.Callback {
-                    override fun onRoomClicked(roomId: RoomId) {
+                    override fun onRoomClick(roomId: RoomId) {
                         backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias()))
                     }
 
-                    override fun onSettingsClicked() {
+                    override fun onSettingsClick() {
                         backstack.push(NavTarget.Settings())
                     }
 
-                    override fun onCreateRoomClicked() {
+                    override fun onCreateRoomClick() {
                         backstack.push(NavTarget.CreateRoom)
                     }
 
-                    override fun onSessionConfirmRecoveryKeyClicked() {
+                    override fun onSessionConfirmRecoveryKeyClick() {
                         backstack.push(NavTarget.SecureBackup(initialElement = SecureBackupEntryPoint.InitialTarget.EnterRecoveryKey))
                     }
 
-                    override fun onRoomSettingsClicked(roomId: RoomId) {
+                    override fun onRoomSettingsClick(roomId: RoomId) {
                         backstack.push(NavTarget.Room(roomId.toRoomIdOrAlias(), initialElement = RoomNavigationTarget.Details))
                     }
 
-                    override fun onReportBugClicked() {
+                    override fun onReportBugClick() {
                         plugins<Callback>().forEach { it.onOpenBugReport() }
                     }
 
-                    override fun onRoomDirectorySearchClicked() {
+                    override fun onRoomDirectorySearchClick() {
                         backstack.push(NavTarget.RoomDirectorySearch)
                     }
                 }
@@ -272,7 +272,7 @@ class LoggedInFlowNode @AssistedInject constructor(
                         coroutineScope.launch { attachRoom(roomId.toRoomIdOrAlias()) }
                     }
 
-                    override fun onPermalinkClicked(data: PermalinkData) {
+                    override fun onPermalinkClick(data: PermalinkData) {
                         when (data) {
                             is PermalinkData.UserLink -> {
                                 // Should not happen (handled by MessagesNode)
@@ -325,7 +325,7 @@ class LoggedInFlowNode @AssistedInject constructor(
                         plugins<Callback>().forEach { it.onOpenBugReport() }
                     }
 
-                    override fun onSecureBackupClicked() {
+                    override fun onSecureBackupClick() {
                         backstack.push(NavTarget.SecureBackup())
                     }
 
@@ -363,7 +363,7 @@ class LoggedInFlowNode @AssistedInject constructor(
             NavTarget.RoomDirectorySearch -> {
                 roomDirectoryEntryPoint.nodeBuilder(this, buildContext)
                     .callback(object : RoomDirectoryEntryPoint.Callback {
-                        override fun onResultClicked(roomDescription: RoomDescription) {
+                        override fun onResultClick(roomDescription: RoomDescription) {
                             backstack.push(
                                 NavTarget.Room(
                                     roomIdOrAlias = roomDescription.roomId.toRoomIdOrAlias(),
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt
index 70337e8d33..7133fae9f0 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/RoomFlowNode.kt
@@ -217,7 +217,7 @@ class RoomFlowNode @AssistedInject constructor(
         LoadingRoomNodeView(
             state = LoadingRoomState.Loading,
             hasNetworkConnection = networkStatus == NetworkStatus.Online,
-            onBackClicked = { navigateUp() },
+            onBackClick = { navigateUp() },
             modifier = modifier,
         )
     }
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomFlowNode.kt
index 49bcb53048..6adb371fdc 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomFlowNode.kt
@@ -121,14 +121,14 @@ class JoinedRoomFlowNode @AssistedInject constructor(
         }
     }
 
-    private fun loadingNode(buildContext: BuildContext, onBackClicked: () -> Unit) = node(buildContext) { modifier ->
+    private fun loadingNode(buildContext: BuildContext, onBackClick: () -> Unit) = node(buildContext) { modifier ->
         val loadingRoomState by loadingRoomStateStateFlow.collectAsState()
         val networkStatus by networkMonitor.connectivity.collectAsState()
         LoadingRoomNodeView(
             state = loadingRoomState,
             hasNetworkConnection = networkStatus == NetworkStatus.Online,
             modifier = modifier,
-            onBackClicked = onBackClicked
+            onBackClick = onBackClick
         )
     }
 
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 142b658e5e..915001c919 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
@@ -77,7 +77,7 @@ class JoinedRoomLoadedFlowNode @AssistedInject constructor(
 ), DaggerComponentOwner {
     interface Callback : Plugin {
         fun onOpenRoom(roomId: RoomId)
-        fun onPermalinkClicked(data: PermalinkData)
+        fun onPermalinkClick(data: PermalinkData)
         fun onForwardedToSingleRoom(roomId: RoomId)
         fun onOpenGlobalNotificationSettings()
     }
@@ -144,16 +144,16 @@ class JoinedRoomLoadedFlowNode @AssistedInject constructor(
         return when (navTarget) {
             is NavTarget.Messages -> {
                 val callback = object : MessagesEntryPoint.Callback {
-                    override fun onRoomDetailsClicked() {
+                    override fun onRoomDetailsClick() {
                         backstack.push(NavTarget.RoomDetails)
                     }
 
-                    override fun onUserDataClicked(userId: UserId) {
+                    override fun onUserDataClick(userId: UserId) {
                         backstack.push(NavTarget.RoomMemberDetails(userId))
                     }
 
-                    override fun onPermalinkClicked(data: PermalinkData) {
-                        callbacks.forEach { it.onPermalinkClicked(data) }
+                    override fun onPermalinkClick(data: PermalinkData) {
+                        callbacks.forEach { it.onPermalinkClick(data) }
                     }
 
                     override fun onForwardedToSingleRoom(roomId: RoomId) {
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/LoadingRoomNodeView.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/LoadingRoomNodeView.kt
index 14fb955cb5..d85ccfa398 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/LoadingRoomNodeView.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/LoadingRoomNodeView.kt
@@ -46,7 +46,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
 fun LoadingRoomNodeView(
     state: LoadingRoomState,
     hasNetworkConnection: Boolean,
-    onBackClicked: () -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Scaffold(
@@ -54,7 +54,7 @@ fun LoadingRoomNodeView(
         topBar = {
             Column {
                 ConnectivityIndicatorView(isOnline = hasNetworkConnection)
-                LoadingRoomTopBar(onBackClicked)
+                LoadingRoomTopBar(onBackClick)
             }
         },
         content = { padding ->
@@ -83,11 +83,11 @@ fun LoadingRoomNodeView(
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun LoadingRoomTopBar(
-    onBackClicked: () -> Unit,
+    onBackClick: () -> Unit,
 ) {
     TopAppBar(
         navigationIcon = {
-            BackButton(onClick = onBackClicked)
+            BackButton(onClick = onBackClick)
         },
         title = {
             IconTitlePlaceholdersRowMolecule(iconSize = AvatarSize.TimelineRoom.dp)
@@ -101,7 +101,7 @@ private fun LoadingRoomTopBar(
 internal fun LoadingRoomNodeViewPreview(@PreviewParameter(LoadingRoomStateProvider::class) state: LoadingRoomState) = ElementPreview {
     LoadingRoomNodeView(
         state = state,
-        onBackClicked = {},
+        onBackClick = {},
         hasNetworkConnection = false
     )
 }
diff --git a/appnav/src/test/kotlin/io/element/android/appnav/JoinRoomLoadedFlowNodeTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/JoinRoomLoadedFlowNodeTest.kt
index 93e727da75..d307f851cd 100644
--- a/appnav/src/test/kotlin/io/element/android/appnav/JoinRoomLoadedFlowNodeTest.kt
+++ b/appnav/src/test/kotlin/io/element/android/appnav/JoinRoomLoadedFlowNodeTest.kt
@@ -156,7 +156,7 @@ class JoinRoomLoadedFlowNodeTest {
         )
         val roomFlowNodeTestHelper = roomFlowNode.parentNodeTestHelper()
         // WHEN
-        fakeMessagesEntryPoint.callback?.onRoomDetailsClicked()
+        fakeMessagesEntryPoint.callback?.onRoomDetailsClick()
         // THEN
         roomFlowNodeTestHelper.assertChildHasLifecycle(JoinedRoomLoadedFlowNode.NavTarget.RoomDetails, Lifecycle.State.CREATED)
         val roomDetailsNode = roomFlowNode.childNode(JoinedRoomLoadedFlowNode.NavTarget.RoomDetails)!!
diff --git a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInView.kt b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInView.kt
index a2290619ae..73fe9e083a 100644
--- a/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInView.kt
+++ b/features/analytics/impl/src/main/kotlin/io/element/android/features/analytics/impl/AnalyticsOptInView.kt
@@ -63,15 +63,15 @@ fun AnalyticsOptInView(
 ) {
     val eventSink = state.eventSink
 
-    fun onTermsAccepted() {
+    fun onAcceptTerms() {
         eventSink(AnalyticsOptInEvents.EnableAnalytics(true))
     }
 
-    fun onTermsDeclined() {
+    fun onDeclineTerms() {
         eventSink(AnalyticsOptInEvents.EnableAnalytics(false))
     }
 
-    BackHandler(onBack = ::onTermsDeclined)
+    BackHandler(onBack = ::onDeclineTerms)
     HeaderFooterPage(
         modifier = modifier
             .fillMaxSize()
@@ -82,8 +82,8 @@ fun AnalyticsOptInView(
         content = { AnalyticsOptInContent() },
         footer = {
             AnalyticsOptInFooter(
-                onTermsAccepted = ::onTermsAccepted,
-                onTermsDeclined = ::onTermsDeclined,
+                onAcceptTerms = ::onAcceptTerms,
+                onDeclineTerms = ::onDeclineTerms,
             )
         }
     )
@@ -165,19 +165,19 @@ private fun AnalyticsOptInContent() {
 
 @Composable
 private fun AnalyticsOptInFooter(
-    onTermsAccepted: () -> Unit,
-    onTermsDeclined: () -> Unit,
+    onAcceptTerms: () -> Unit,
+    onDeclineTerms: () -> Unit,
 ) {
     ButtonColumnMolecule {
         Button(
             text = stringResource(id = CommonStrings.action_ok),
-            onClick = onTermsAccepted,
+            onClick = onAcceptTerms,
             modifier = Modifier.fillMaxWidth(),
         )
         TextButton(
             text = stringResource(id = CommonStrings.action_not_now),
             size = ButtonSize.Medium,
-            onClick = onTermsDeclined,
+            onClick = onDeclineTerms,
             modifier = Modifier.fillMaxWidth(),
         )
     }
diff --git a/features/call/src/main/kotlin/io/element/android/features/call/ui/CallScreenView.kt b/features/call/src/main/kotlin/io/element/android/features/call/ui/CallScreenView.kt
index c3f157a876..cc62ce03e1 100644
--- a/features/call/src/main/kotlin/io/element/android/features/call/ui/CallScreenView.kt
+++ b/features/call/src/main/kotlin/io/element/android/features/call/ui/CallScreenView.kt
@@ -81,12 +81,12 @@ internal fun CallScreenView(
                 .fillMaxSize(),
             url = state.urlState,
             userAgent = state.userAgent,
-            onPermissionsRequested = { request ->
+            onPermissionsRequest = { request ->
                 val androidPermissions = mapWebkitPermissions(request.resources)
                 val callback: RequestPermissionCallback = { request.grant(it) }
                 requestPermissions(androidPermissions.toTypedArray(), callback)
             },
-            onWebViewCreated = { webView ->
+            onWebViewCreate = { webView ->
                 val interceptor = WebViewWidgetMessageInterceptor(webView)
                 state.eventSink(CallScreenEvents.SetupMessageChannels(interceptor))
             }
@@ -98,8 +98,8 @@ internal fun CallScreenView(
 private fun CallWebView(
     url: AsyncData<String>,
     userAgent: String,
-    onPermissionsRequested: (PermissionRequest) -> Unit,
-    onWebViewCreated: (WebView) -> Unit,
+    onPermissionsRequest: (PermissionRequest) -> Unit,
+    onWebViewCreate: (WebView) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     if (LocalInspectionMode.current) {
@@ -111,8 +111,8 @@ private fun CallWebView(
             modifier = modifier,
             factory = { context ->
                 WebView(context).apply {
-                    onWebViewCreated(this)
-                    setup(userAgent, onPermissionsRequested)
+                    onWebViewCreate(this)
+                    setup(userAgent, onPermissionsRequest)
                 }
             },
             update = { webView ->
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleNode.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleNode.kt
index f00f10905d..eba288859c 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleNode.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleNode.kt
@@ -47,8 +47,8 @@ class AddPeopleNode @AssistedInject constructor(
         AddPeopleView(
             state = state,
             modifier = modifier,
-            onBackPressed = this::navigateUp,
-            onNextPressed = this::onContinue,
+            onBackClick = this::navigateUp,
+            onNextClick = this::onContinue,
         )
     }
 }
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt
index 1bfb680d00..93a71cda53 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleView.kt
@@ -42,8 +42,8 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun AddPeopleView(
     state: UserListState,
-    onBackPressed: () -> Unit,
-    onNextPressed: () -> Unit,
+    onBackClick: () -> Unit,
+    onNextClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Scaffold(
@@ -51,14 +51,14 @@ fun AddPeopleView(
         topBar = {
             AddPeopleViewTopBar(
                 hasSelectedUsers = state.selectedUsers.isNotEmpty(),
-                onBackPressed = {
+                onBackClick = {
                     if (state.isSearchActive) {
                         state.eventSink(UserListEvents.OnSearchActiveChanged(false))
                     } else {
-                        onBackPressed()
+                        onBackClick()
                     }
                 },
-                onNextPressed = onNextPressed,
+                onNextClick = onNextClick,
             )
         }
     ) { padding ->
@@ -69,8 +69,8 @@ fun AddPeopleView(
                 .consumeWindowInsets(padding),
             state = state,
             showBackButton = false,
-            onUserSelected = {},
-            onUserDeselected = {},
+            onSelectUser = {},
+            onDeselectUser = {},
         )
     }
 }
@@ -79,8 +79,8 @@ fun AddPeopleView(
 @Composable
 private fun AddPeopleViewTopBar(
     hasSelectedUsers: Boolean,
-    onBackPressed: () -> Unit,
-    onNextPressed: () -> Unit,
+    onBackClick: () -> Unit,
+    onNextClick: () -> Unit,
 ) {
     TopAppBar(
         title = {
@@ -89,12 +89,12 @@ private fun AddPeopleViewTopBar(
                 style = ElementTheme.typography.aliasScreenTitle
             )
         },
-        navigationIcon = { BackButton(onClick = onBackPressed) },
+        navigationIcon = { BackButton(onClick = onBackClick) },
         actions = {
             val textActionResId = if (hasSelectedUsers) CommonStrings.action_next else CommonStrings.action_skip
             TextButton(
                 text = stringResource(id = textActionResId),
-                onClick = onNextPressed,
+                onClick = onNextClick,
             )
         }
     )
@@ -105,7 +105,7 @@ private fun AddPeopleViewTopBar(
 internal fun AddPeopleViewPreview(@PreviewParameter(AddPeopleUserListStateProvider::class) state: UserListState) = ElementPreview {
     AddPeopleView(
         state = state,
-        onBackPressed = {},
-        onNextPressed = {},
+        onBackClick = {},
+        onNextClick = {},
     )
 }
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/RoomPrivacyOption.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/RoomPrivacyOption.kt
index 1bfd1567c2..f204aa6259 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/RoomPrivacyOption.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/RoomPrivacyOption.kt
@@ -41,7 +41,7 @@ import io.element.android.libraries.designsystem.theme.components.Text
 @Composable
 fun RoomPrivacyOption(
     roomPrivacyItem: RoomPrivacyItem,
-    onOptionSelected: (RoomPrivacyItem) -> Unit,
+    onOptionClick: (RoomPrivacyItem) -> Unit,
     modifier: Modifier = Modifier,
     isSelected: Boolean = false,
 ) {
@@ -50,7 +50,7 @@ fun RoomPrivacyOption(
             .fillMaxWidth()
             .selectable(
                 selected = isSelected,
-                onClick = { onOptionSelected(roomPrivacyItem) },
+                onClick = { onOptionClick(roomPrivacyItem) },
                 role = Role.RadioButton,
             )
             .padding(8.dp),
@@ -98,12 +98,12 @@ internal fun RoomPrivacyOptionPreview() = ElementPreview {
     Column {
         RoomPrivacyOption(
             roomPrivacyItem = aRoomPrivacyItem,
-            onOptionSelected = {},
+            onOptionClick = {},
             isSelected = true,
         )
         RoomPrivacyOption(
             roomPrivacyItem = aRoomPrivacyItem,
-            onOptionSelected = {},
+            onOptionClick = {},
             isSelected = false,
         )
     }
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/SearchUserBar.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/SearchUserBar.kt
index 415ca054ff..0aafd515f8 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/SearchUserBar.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/SearchUserBar.kt
@@ -53,11 +53,11 @@ fun SearchUserBar(
     showLoader: Boolean,
     selectedUsers: ImmutableList<MatrixUser>,
     active: Boolean,
-    isMultiSelectionEnabled: Boolean,
-    onActiveChanged: (Boolean) -> Unit,
-    onTextChanged: (String) -> Unit,
-    onUserSelected: (MatrixUser) -> Unit,
-    onUserDeselected: (MatrixUser) -> Unit,
+    isMultiSelectionEnable: Boolean,
+    onActiveChange: (Boolean) -> Unit,
+    onTextChange: (String) -> Unit,
+    onUserSelect: (MatrixUser) -> Unit,
+    onUserDeselect: (MatrixUser) -> Unit,
     modifier: Modifier = Modifier,
     showBackButton: Boolean = true,
     placeHolderTitle: String = stringResource(CommonStrings.common_search_for_someone),
@@ -66,14 +66,14 @@ fun SearchUserBar(
 
     SearchBar(
         query = query,
-        onQueryChange = onTextChanged,
+        onQueryChange = onTextChange,
         active = active,
-        onActiveChange = onActiveChanged,
+        onActiveChange = onActiveChange,
         modifier = modifier,
         placeHolderTitle = placeHolderTitle,
         showBackButton = showBackButton,
         contentPrefix = {
-            if (isMultiSelectionEnabled && active && selectedUsers.isNotEmpty()) {
+            if (isMultiSelectionEnable && active && selectedUsers.isNotEmpty()) {
                 // We want the selected users to behave a bit like a top bar - when the list below is scrolled, the colour
                 // should change to indicate elevation.
 
@@ -96,7 +96,7 @@ fun SearchUserBar(
                     contentPadding = PaddingValues(16.dp),
                     selectedUsers = selectedUsers,
                     autoScroll = true,
-                    onUserRemoved = onUserDeselected,
+                    onUserRemove = onUserDeselect,
                     modifier = Modifier.background(appBarContainerColor)
                 )
             }
@@ -109,7 +109,7 @@ fun SearchUserBar(
         resultState = state,
         resultHandler = { users ->
             LazyColumn(state = columnState) {
-                if (isMultiSelectionEnabled) {
+                if (isMultiSelectionEnable) {
                     itemsIndexed(users) { index, searchResult ->
                         SearchMultipleUsersResultItem(
                             modifier = Modifier.fillMaxWidth(),
@@ -117,9 +117,9 @@ fun SearchUserBar(
                             isUserSelected = selectedUsers.contains(searchResult.matrixUser),
                             onCheckedChange = { checked ->
                                 if (checked) {
-                                    onUserSelected(searchResult.matrixUser)
+                                    onUserSelect(searchResult.matrixUser)
                                 } else {
-                                    onUserDeselected(searchResult.matrixUser)
+                                    onUserDeselect(searchResult.matrixUser)
                                 }
                             }
                         )
@@ -132,7 +132,7 @@ fun SearchUserBar(
                         SearchSingleUserResultItem(
                             modifier = Modifier.fillMaxWidth(),
                             searchResult = searchResult,
-                            onClick = { onUserSelected(searchResult.matrixUser) }
+                            onClick = { onUserSelect(searchResult.matrixUser) }
                         )
                         if (index < users.lastIndex) {
                             HorizontalDivider()
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/UserListView.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/UserListView.kt
index 0e1c448015..7eead66276 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/UserListView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/components/UserListView.kt
@@ -44,8 +44,8 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun UserListView(
     state: UserListState,
-    onUserSelected: (MatrixUser) -> Unit,
-    onUserDeselected: (MatrixUser) -> Unit,
+    onSelectUser: (MatrixUser) -> Unit,
+    onDeselectUser: (MatrixUser) -> Unit,
     modifier: Modifier = Modifier,
     showBackButton: Boolean = true,
 ) {
@@ -59,17 +59,17 @@ fun UserListView(
             selectedUsers = state.selectedUsers,
             active = state.isSearchActive,
             showLoader = state.showSearchLoader,
-            isMultiSelectionEnabled = state.isMultiSelectionEnabled,
+            isMultiSelectionEnable = state.isMultiSelectionEnabled,
             showBackButton = showBackButton,
-            onActiveChanged = { state.eventSink(UserListEvents.OnSearchActiveChanged(it)) },
-            onTextChanged = { state.eventSink(UserListEvents.UpdateSearchQuery(it)) },
-            onUserSelected = {
+            onActiveChange = { state.eventSink(UserListEvents.OnSearchActiveChanged(it)) },
+            onTextChange = { state.eventSink(UserListEvents.UpdateSearchQuery(it)) },
+            onUserSelect = {
                 state.eventSink(UserListEvents.AddToSelection(it))
-                onUserSelected(it)
+                onSelectUser(it)
             },
-            onUserDeselected = {
+            onUserDeselect = {
                 state.eventSink(UserListEvents.RemoveFromSelection(it))
-                onUserDeselected(it)
+                onDeselectUser(it)
             },
         )
 
@@ -78,9 +78,9 @@ fun UserListView(
                 contentPadding = PaddingValues(16.dp),
                 selectedUsers = state.selectedUsers,
                 autoScroll = true,
-                onUserRemoved = {
+                onUserRemove = {
                     state.eventSink(UserListEvents.RemoveFromSelection(it))
-                    onUserDeselected(it)
+                    onDeselectUser(it)
                 },
             )
         }
@@ -102,10 +102,10 @@ fun UserListView(
                             onCheckedChange = {
                                 if (isSelected) {
                                     state.eventSink(UserListEvents.RemoveFromSelection(recentDirectRoom.matrixUser))
-                                    onUserDeselected(recentDirectRoom.matrixUser)
+                                    onDeselectUser(recentDirectRoom.matrixUser)
                                 } else {
                                     state.eventSink(UserListEvents.AddToSelection(recentDirectRoom.matrixUser))
-                                    onUserSelected(recentDirectRoom.matrixUser)
+                                    onSelectUser(recentDirectRoom.matrixUser)
                                 }
                             },
                             data = CheckableUserRowData.Resolved(
@@ -129,7 +129,7 @@ fun UserListView(
 internal fun UserListViewPreview(@PreviewParameter(UserListStateProvider::class) state: UserListState) = ElementPreview {
     UserListView(
         state = state,
-        onUserSelected = {},
-        onUserDeselected = {},
+        onSelectUser = {},
+        onDeselectUser = {},
     )
 }
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomNode.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomNode.kt
index 1d3499f743..3d8f96b9d6 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomNode.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomNode.kt
@@ -50,7 +50,7 @@ class ConfigureRoomNode @AssistedInject constructor(
         fun onCreateRoomSuccess(roomId: RoomId)
     }
 
-    private fun onRoomCreated(roomId: RoomId) {
+    private fun onCreateRoomSuccess(roomId: RoomId) {
         plugins<Callback>().forEach { it.onCreateRoomSuccess(roomId) }
     }
 
@@ -60,8 +60,8 @@ class ConfigureRoomNode @AssistedInject constructor(
         ConfigureRoomView(
             state = state,
             modifier = modifier,
-            onBackPressed = this::navigateUp,
-            onRoomCreated = this::onRoomCreated,
+            onBackClick = this::navigateUp,
+            onCreateRoomSuccess = this::onCreateRoomSuccess,
         )
     }
 }
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt
index ad9bb7bfdf..73441f9d16 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt
@@ -65,14 +65,14 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun ConfigureRoomView(
     state: ConfigureRoomState,
-    onBackPressed: () -> Unit,
-    onRoomCreated: (RoomId) -> Unit,
+    onBackClick: () -> Unit,
+    onCreateRoomSuccess: (RoomId) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val focusManager = LocalFocusManager.current
     val isAvatarActionsSheetVisible = remember { mutableStateOf(false) }
 
-    fun onAvatarClicked() {
+    fun onAvatarClick() {
         focusManager.clearFocus()
         isAvatarActionsSheetVisible.value = true
     }
@@ -82,8 +82,8 @@ fun ConfigureRoomView(
         topBar = {
             ConfigureRoomToolbar(
                 isNextActionEnabled = state.isCreateButtonEnabled,
-                onBackPressed = onBackPressed,
-                onNextPressed = {
+                onBackClick = onBackClick,
+                onNextClick = {
                     focusManager.clearFocus()
                     state.eventSink(ConfigureRoomEvents.CreateRoom(state.config))
                 },
@@ -102,20 +102,20 @@ fun ConfigureRoomView(
                 modifier = Modifier.padding(horizontal = 16.dp),
                 avatarUri = state.config.avatarUri,
                 roomName = state.config.roomName.orEmpty(),
-                onAvatarClick = ::onAvatarClicked,
-                onRoomNameChanged = { state.eventSink(ConfigureRoomEvents.RoomNameChanged(it)) },
+                onAvatarClick = ::onAvatarClick,
+                onChangeRoomName = { state.eventSink(ConfigureRoomEvents.RoomNameChanged(it)) },
             )
             RoomTopic(
                 modifier = Modifier.padding(horizontal = 16.dp),
                 topic = state.config.topic.orEmpty(),
-                onTopicChanged = { state.eventSink(ConfigureRoomEvents.TopicChanged(it)) },
+                onTopicChange = { state.eventSink(ConfigureRoomEvents.TopicChanged(it)) },
             )
             if (state.config.invites.isNotEmpty()) {
                 SelectedUsersRowList(
                     modifier = Modifier.padding(bottom = 16.dp),
                     contentPadding = PaddingValues(horizontal = 24.dp),
                     selectedUsers = state.config.invites,
-                    onUserRemoved = {
+                    onUserRemove = {
                         focusManager.clearFocus()
                         state.eventSink(ConfigureRoomEvents.RemoveFromSelection(it))
                     },
@@ -124,7 +124,7 @@ fun ConfigureRoomView(
             RoomPrivacyOptions(
                 modifier = Modifier.padding(bottom = 40.dp),
                 selected = state.config.privacy,
-                onOptionSelected = {
+                onOptionClick = {
                     focusManager.clearFocus()
                     state.eventSink(ConfigureRoomEvents.RoomPrivacyChanged(it.privacy))
                 },
@@ -136,7 +136,7 @@ fun ConfigureRoomView(
         actions = state.avatarActions,
         isVisible = isAvatarActionsSheetVisible.value,
         onDismiss = { isAvatarActionsSheetVisible.value = false },
-        onActionSelected = { state.eventSink(ConfigureRoomEvents.HandleAvatarAction(it)) }
+        onSelectAction = { state.eventSink(ConfigureRoomEvents.HandleAvatarAction(it)) }
     )
 
     AsyncActionView(
@@ -146,7 +146,7 @@ fun ConfigureRoomView(
                 progressText = stringResource(CommonStrings.common_creating_room),
             )
         },
-        onSuccess = { onRoomCreated(it) },
+        onSuccess = { onCreateRoomSuccess(it) },
         errorMessage = { stringResource(R.string.screen_create_room_error_creating_room) },
         onRetry = { state.eventSink(ConfigureRoomEvents.CreateRoom(state.config)) },
         onErrorDismiss = { state.eventSink(ConfigureRoomEvents.CancelCreateRoom) },
@@ -161,8 +161,8 @@ fun ConfigureRoomView(
 @Composable
 private fun ConfigureRoomToolbar(
     isNextActionEnabled: Boolean,
-    onBackPressed: () -> Unit,
-    onNextPressed: () -> Unit,
+    onBackClick: () -> Unit,
+    onNextClick: () -> Unit,
 ) {
     TopAppBar(
         title = {
@@ -171,12 +171,12 @@ private fun ConfigureRoomToolbar(
                 style = ElementTheme.typography.aliasScreenTitle,
             )
         },
-        navigationIcon = { BackButton(onClick = onBackPressed) },
+        navigationIcon = { BackButton(onClick = onBackClick) },
         actions = {
             TextButton(
                 text = stringResource(CommonStrings.action_create),
                 enabled = isNextActionEnabled,
-                onClick = onNextPressed,
+                onClick = onNextClick,
             )
         }
     )
@@ -187,7 +187,7 @@ private fun RoomNameWithAvatar(
     avatarUri: Uri?,
     roomName: String,
     onAvatarClick: () -> Unit,
-    onRoomNameChanged: (String) -> Unit,
+    onChangeRoomName: (String) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Row(
@@ -205,7 +205,7 @@ private fun RoomNameWithAvatar(
             value = roomName,
             placeholder = stringResource(CommonStrings.common_room_name_placeholder),
             singleLine = true,
-            onValueChange = onRoomNameChanged,
+            onValueChange = onChangeRoomName,
         )
     }
 }
@@ -213,7 +213,7 @@ private fun RoomNameWithAvatar(
 @Composable
 private fun RoomTopic(
     topic: String,
-    onTopicChanged: (String) -> Unit,
+    onTopicChange: (String) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     LabelledTextField(
@@ -221,7 +221,7 @@ private fun RoomTopic(
         label = stringResource(R.string.screen_create_room_topic_label),
         value = topic,
         placeholder = stringResource(CommonStrings.common_topic_placeholder),
-        onValueChange = onTopicChanged,
+        onValueChange = onTopicChange,
         maxLines = 3,
         keyboardOptions = KeyboardOptions(
             capitalization = KeyboardCapitalization.Sentences,
@@ -232,7 +232,7 @@ private fun RoomTopic(
 @Composable
 private fun RoomPrivacyOptions(
     selected: RoomPrivacy?,
-    onOptionSelected: (RoomPrivacyItem) -> Unit,
+    onOptionClick: (RoomPrivacyItem) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val items = roomPrivacyItems()
@@ -241,7 +241,7 @@ private fun RoomPrivacyOptions(
             RoomPrivacyOption(
                 roomPrivacyItem = item,
                 isSelected = selected == item.privacy,
-                onOptionSelected = onOptionSelected,
+                onOptionClick = onOptionClick,
             )
         }
     }
@@ -252,7 +252,7 @@ private fun RoomPrivacyOptions(
 internal fun ConfigureRoomViewPreview(@PreviewParameter(ConfigureRoomStateProvider::class) state: ConfigureRoomState) = ElementPreview {
     ConfigureRoomView(
         state = state,
-        onBackPressed = {},
-        onRoomCreated = {},
+        onBackClick = {},
+        onCreateRoomSuccess = {},
     )
 }
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootNode.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootNode.kt
index 14b0061f53..745fb3377e 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootNode.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootNode.kt
@@ -68,10 +68,10 @@ class CreateRoomRootNode @AssistedInject constructor(
         CreateRoomRootView(
             state = state,
             modifier = modifier,
-            onClosePressed = this::navigateUp,
-            onNewRoomClicked = ::onCreateNewRoom,
+            onCloseClick = this::navigateUp,
+            onNewRoomClick = ::onCreateNewRoom,
             onOpenDM = ::onStartChatSuccess,
-            onInviteFriendsClicked = { invitePeople(activity) }
+            onInviteFriendsClick = { invitePeople(activity) }
         )
     }
 
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt
index 33707896fa..015483ff7f 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt
@@ -59,17 +59,17 @@ import kotlinx.collections.immutable.persistentListOf
 @Composable
 fun CreateRoomRootView(
     state: CreateRoomRootState,
-    onClosePressed: () -> Unit,
-    onNewRoomClicked: () -> Unit,
+    onCloseClick: () -> Unit,
+    onNewRoomClick: () -> Unit,
     onOpenDM: (RoomId) -> Unit,
-    onInviteFriendsClicked: () -> Unit,
+    onInviteFriendsClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Scaffold(
         modifier = modifier.fillMaxWidth(),
         topBar = {
             if (!state.userListState.isSearchActive) {
-                CreateRoomRootViewTopBar(onClosePressed = onClosePressed)
+                CreateRoomRootViewTopBar(onCloseClick = onCloseClick)
             }
         }
     ) { paddingValues ->
@@ -86,18 +86,18 @@ fun CreateRoomRootView(
                 state = state.userListState.copy(
                     recentDirectRooms = persistentListOf(),
                 ),
-                onUserSelected = {
+                onSelectUser = {
                     state.eventSink(CreateRoomRootEvents.StartDM(it))
                 },
-                onUserDeselected = { },
+                onDeselectUser = { },
             )
 
             if (!state.userListState.isSearchActive) {
                 CreateRoomActionButtonsList(
                     state = state,
-                    onNewRoomClicked = onNewRoomClicked,
-                    onInvitePeopleClicked = onInviteFriendsClicked,
-                    onDmClicked = onOpenDM,
+                    onNewRoomClick = onNewRoomClick,
+                    onInvitePeopleClick = onInviteFriendsClick,
+                    onDmClick = onOpenDM,
                 )
             }
         }
@@ -125,7 +125,7 @@ fun CreateRoomRootView(
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun CreateRoomRootViewTopBar(
-    onClosePressed: () -> Unit,
+    onCloseClick: () -> Unit,
 ) {
     TopAppBar(
         title = {
@@ -137,7 +137,7 @@ private fun CreateRoomRootViewTopBar(
         navigationIcon = {
             BackButton(
                 imageVector = CompoundIcons.Close(),
-                onClick = onClosePressed,
+                onClick = onCloseClick,
             )
         }
     )
@@ -146,23 +146,23 @@ private fun CreateRoomRootViewTopBar(
 @Composable
 private fun CreateRoomActionButtonsList(
     state: CreateRoomRootState,
-    onNewRoomClicked: () -> Unit,
-    onInvitePeopleClicked: () -> Unit,
-    onDmClicked: (RoomId) -> Unit,
+    onNewRoomClick: () -> Unit,
+    onInvitePeopleClick: () -> Unit,
+    onDmClick: (RoomId) -> Unit,
 ) {
     LazyColumn {
         item {
             CreateRoomActionButton(
                 iconRes = CompoundDrawables.ic_compound_plus,
                 text = stringResource(id = R.string.screen_create_room_action_create_room),
-                onClick = onNewRoomClicked,
+                onClick = onNewRoomClick,
             )
         }
         item {
             CreateRoomActionButton(
                 iconRes = CompoundDrawables.ic_compound_share_android,
                 text = stringResource(id = CommonStrings.action_invite_friends_to_app, state.applicationName),
-                onClick = onInvitePeopleClicked,
+                onClick = onInvitePeopleClick,
             )
         }
         if (state.userListState.recentDirectRooms.isNotEmpty()) {
@@ -177,7 +177,7 @@ private fun CreateRoomActionButtonsList(
                     MatrixUserRow(
                         modifier = Modifier.clickable(
                             onClick = {
-                                onDmClicked(recentDirectRoom.roomId)
+                                onDmClick(recentDirectRoom.roomId)
                             }
                         ),
                         matrixUser = recentDirectRoom.matrixUser,
@@ -222,9 +222,9 @@ internal fun CreateRoomRootViewPreview(@PreviewParameter(CreateRoomRootStateProv
     ElementPreview {
         CreateRoomRootView(
             state = state,
-            onClosePressed = {},
-            onNewRoomClicked = {},
+            onCloseClick = {},
+            onNewRoomClick = {},
             onOpenDM = {},
-            onInviteFriendsClicked = {},
+            onInviteFriendsClick = {},
         )
     }
diff --git a/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleViewTest.kt b/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleViewTest.kt
index 36741347e5..da9f1594e5 100644
--- a/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleViewTest.kt
+++ b/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/addpeople/AddPeopleViewTest.kt
@@ -47,7 +47,7 @@ class AddPeopleViewTest {
                 aUserListState(
                     eventSink = eventsRecorder,
                 ),
-                onBackPressed = it
+                onBackClick = it
             )
             rule.pressBack()
         }
@@ -75,7 +75,7 @@ class AddPeopleViewTest {
                 aUserListState(
                     eventSink = eventsRecorder,
                 ),
-                onNextPressed = it
+                onNextClick = it
             )
             rule.clickOn(CommonStrings.action_skip)
         }
@@ -85,14 +85,14 @@ class AddPeopleViewTest {
 
 private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setAddPeopleView(
     state: UserListState,
-    onBackPressed: () -> Unit = EnsureNeverCalled(),
-    onNextPressed: () -> Unit = EnsureNeverCalled(),
+    onBackClick: () -> Unit = EnsureNeverCalled(),
+    onNextClick: () -> Unit = EnsureNeverCalled(),
 ) {
     setContent {
         AddPeopleView(
             state = state,
-            onBackPressed = onBackPressed,
-            onNextPressed = onNextPressed,
+            onBackClick = onBackClick,
+            onNextClick = onNextClick,
         )
     }
 }
diff --git a/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootViewTest.kt b/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootViewTest.kt
index dcb2e02347..bdcb524e33 100644
--- a/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootViewTest.kt
+++ b/features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootViewTest.kt
@@ -54,7 +54,7 @@ class CreateRoomRootViewTest {
                 aCreateRoomRootState(
                     eventSink = eventsRecorder,
                 ),
-                onClosePressed = it
+                onCloseClick = it
             )
             rule.pressBack()
         }
@@ -68,7 +68,7 @@ class CreateRoomRootViewTest {
                 aCreateRoomRootState(
                     eventSink = eventsRecorder,
                 ),
-                onNewRoomClicked = it
+                onNewRoomClick = it
             )
             rule.clickOn(R.string.screen_create_room_action_create_room)
         }
@@ -84,7 +84,7 @@ class CreateRoomRootViewTest {
                     applicationName = "test",
                     eventSink = eventsRecorder,
                 ),
-                onInviteFriendsClicked = it
+                onInviteFriendsClick = it
             )
             val text = rule.activity.getString(CommonStrings.action_invite_friends_to_app, "test")
             rule.onNodeWithText(text).performClick()
@@ -114,18 +114,18 @@ class CreateRoomRootViewTest {
 
 private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setCreateRoomRootView(
     state: CreateRoomRootState,
-    onClosePressed: () -> Unit = EnsureNeverCalled(),
-    onNewRoomClicked: () -> Unit = EnsureNeverCalled(),
+    onCloseClick: () -> Unit = EnsureNeverCalled(),
+    onNewRoomClick: () -> Unit = EnsureNeverCalled(),
     onOpenDM: (RoomId) -> Unit = EnsureNeverCalledWithParam(),
-    onInviteFriendsClicked: () -> Unit = EnsureNeverCalled(),
+    onInviteFriendsClick: () -> Unit = EnsureNeverCalled(),
 ) {
     setContent {
         CreateRoomRootView(
             state = state,
-            onClosePressed = onClosePressed,
-            onNewRoomClicked = onNewRoomClicked,
+            onCloseClick = onCloseClick,
+            onNewRoomClick = onNewRoomClick,
             onOpenDM = onOpenDM,
-            onInviteFriendsClicked = onInviteFriendsClicked,
+            onInviteFriendsClick = onInviteFriendsClick,
         )
     }
 }
diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/welcome/WelcomeNode.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/welcome/WelcomeNode.kt
index 2f2d838269..68c2bc6410 100644
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/welcome/WelcomeNode.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/welcome/WelcomeNode.kt
@@ -34,18 +34,18 @@ class WelcomeNode @AssistedInject constructor(
     private val buildMeta: BuildMeta,
 ) : Node(buildContext, plugins = plugins) {
     interface Callback : Plugin {
-        fun onContinueClicked()
+        fun onContinueClick()
     }
 
-    private fun onContinueClicked() {
-        plugins.filterIsInstance<Callback>().forEach { it.onContinueClicked() }
+    private fun onContinueClick() {
+        plugins.filterIsInstance<Callback>().forEach { it.onContinueClick() }
     }
 
     @Composable
     override fun View(modifier: Modifier) {
         WelcomeView(
             applicationName = buildMeta.applicationName,
-            onContinueClicked = ::onContinueClicked,
+            onContinueClick = ::onContinueClick,
             modifier = modifier
         )
     }
diff --git a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/welcome/WelcomeView.kt b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/welcome/WelcomeView.kt
index 50af73903e..c491b7d4a1 100644
--- a/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/welcome/WelcomeView.kt
+++ b/features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/welcome/WelcomeView.kt
@@ -52,9 +52,9 @@ import kotlinx.collections.immutable.persistentListOf
 fun WelcomeView(
     applicationName: String,
     modifier: Modifier = Modifier,
-    onContinueClicked: () -> Unit,
+    onContinueClick: () -> Unit,
 ) {
-    BackHandler(onBack = onContinueClicked)
+    BackHandler(onBack = onContinueClick)
     OnBoardingPage(
         modifier = modifier
             .systemBarsPadding()
@@ -90,7 +90,7 @@ fun WelcomeView(
             Button(
                 text = stringResource(CommonStrings.action_continue),
                 modifier = Modifier.fillMaxWidth(),
-                onClick = onContinueClicked
+                onClick = onContinueClick
             )
             Spacer(modifier = Modifier.height(32.dp))
         }
@@ -113,6 +113,6 @@ private fun listItems() = persistentListOf(
 @Composable
 internal fun WelcomeViewPreview() {
     ElementPreview {
-        WelcomeView(applicationName = "Element X", onContinueClicked = {})
+        WelcomeView(applicationName = "Element X", onContinueClick = {})
     }
 }
diff --git a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/response/AcceptDeclineInviteView.kt b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/response/AcceptDeclineInviteView.kt
index c969458122..02afe4fe94 100644
--- a/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/response/AcceptDeclineInviteView.kt
+++ b/features/invite/api/src/main/kotlin/io/element/android/features/invite/api/response/AcceptDeclineInviteView.kt
@@ -24,8 +24,8 @@ interface AcceptDeclineInviteView {
     @Composable
     fun Render(
         state: AcceptDeclineInviteState,
-        onInviteAccepted: (RoomId) -> Unit,
-        onInviteDeclined: (RoomId) -> Unit,
+        onAcceptInvite: (RoomId) -> Unit,
+        onDeclineInvite: (RoomId) -> Unit,
         modifier: Modifier,
     )
 }
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInviteView.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInviteView.kt
index 3f229fbe85..38615fa553 100644
--- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInviteView.kt
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInviteView.kt
@@ -36,21 +36,21 @@ import kotlin.jvm.optionals.getOrNull
 @Composable
 fun AcceptDeclineInviteView(
     state: AcceptDeclineInviteState,
-    onInviteAccepted: (RoomId) -> Unit,
-    onInviteDeclined: (RoomId) -> Unit,
+    onAcceptInvite: (RoomId) -> Unit,
+    onDeclineInvite: (RoomId) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Box(modifier = modifier) {
         AsyncActionView(
             async = state.acceptAction,
-            onSuccess = onInviteAccepted,
+            onSuccess = onAcceptInvite,
             onErrorDismiss = {
                 state.eventSink(InternalAcceptDeclineInviteEvents.DismissAcceptError)
             },
         )
         AsyncActionView(
             async = state.declineAction,
-            onSuccess = onInviteDeclined,
+            onSuccess = onDeclineInvite,
             onErrorDismiss = {
                 state.eventSink(InternalAcceptDeclineInviteEvents.DismissDeclineError)
             },
@@ -59,10 +59,10 @@ fun AcceptDeclineInviteView(
                 if (invite != null) {
                     DeclineConfirmationDialog(
                         invite = invite,
-                        onConfirmClicked = {
+                        onConfirmClick = {
                             state.eventSink(InternalAcceptDeclineInviteEvents.ConfirmDeclineInvite)
                         },
-                        onDismissClicked = {
+                        onDismissClick = {
                             state.eventSink(InternalAcceptDeclineInviteEvents.CancelDeclineInvite)
                         }
                     )
@@ -75,8 +75,8 @@ fun AcceptDeclineInviteView(
 @Composable
 private fun DeclineConfirmationDialog(
     invite: InviteData,
-    onConfirmClicked: () -> Unit,
-    onDismissClicked: () -> Unit,
+    onConfirmClick: () -> Unit,
+    onDismissClick: () -> Unit,
     modifier: Modifier = Modifier
 ) {
     val contentResource = if (invite.isDirect) {
@@ -97,8 +97,8 @@ private fun DeclineConfirmationDialog(
         title = stringResource(titleResource),
         submitText = stringResource(CommonStrings.action_decline),
         cancelText = stringResource(CommonStrings.action_cancel),
-        onSubmitClicked = onConfirmClicked,
-        onDismiss = onDismissClicked,
+        onSubmitClick = onConfirmClick,
+        onDismiss = onDismissClick,
     )
 }
 
@@ -108,7 +108,7 @@ internal fun AcceptDeclineInviteViewPreview(@PreviewParameter(AcceptDeclineInvit
     ElementPreview {
         AcceptDeclineInviteView(
             state = state,
-            onInviteAccepted = {},
-            onInviteDeclined = {},
+            onAcceptInvite = {},
+            onDeclineInvite = {},
         )
     }
diff --git a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInviteViewWrapper.kt b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInviteViewWrapper.kt
index a86b220364..14080cdf12 100644
--- a/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInviteViewWrapper.kt
+++ b/features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInviteViewWrapper.kt
@@ -30,14 +30,14 @@ class AcceptDeclineInviteViewWrapper @Inject constructor() : AcceptDeclineInvite
     @Composable
     override fun Render(
         state: AcceptDeclineInviteState,
-        onInviteAccepted: (RoomId) -> Unit,
-        onInviteDeclined: (RoomId) -> Unit,
+        onAcceptInvite: (RoomId) -> Unit,
+        onDeclineInvite: (RoomId) -> Unit,
         modifier: Modifier,
     ) {
         AcceptDeclineInviteView(
             state = state,
-            onInviteAccepted = onInviteAccepted,
-            onInviteDeclined = onInviteDeclined,
+            onAcceptInvite = onAcceptInvite,
+            onDeclineInvite = onDeclineInvite,
             modifier = modifier
         )
     }
diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomNode.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomNode.kt
index 2cddd9d45b..fa320a6545 100644
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomNode.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomNode.kt
@@ -50,15 +50,15 @@ class JoinRoomNode @AssistedInject constructor(
         val state = presenter.present()
         JoinRoomView(
             state = state,
-            onBackPressed = ::navigateUp,
+            onBackClick = ::navigateUp,
             onJoinSuccess = ::navigateUp,
             onKnockSuccess = ::navigateUp,
             modifier = modifier
         )
         acceptDeclineInviteView.Render(
             state = state.acceptDeclineInviteState,
-            onInviteAccepted = {},
-            onInviteDeclined = { navigateUp() },
+            onAcceptInvite = {},
+            onDeclineInvite = { navigateUp() },
             modifier = Modifier
         )
     }
diff --git a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt
index 435cd1bf8b..2a4989e613 100644
--- a/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt
+++ b/features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt
@@ -65,7 +65,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun JoinRoomView(
     state: JoinRoomState,
-    onBackPressed: () -> Unit,
+    onBackClick: () -> Unit,
     onJoinSuccess: () -> Unit,
     onKnockSuccess: () -> Unit,
     modifier: Modifier = Modifier,
@@ -78,7 +78,7 @@ fun JoinRoomView(
             containerColor = Color.Transparent,
             paddingValues = PaddingValues(16.dp),
             topBar = {
-                JoinRoomTopBar(onBackClicked = onBackPressed)
+                JoinRoomTopBar(onBackClick = onBackClick)
             },
             content = {
                 JoinRoomContent(
@@ -104,7 +104,7 @@ fun JoinRoomView(
                     onRetry = {
                         state.eventSink(JoinRoomEvents.RetryFetchingContent)
                     },
-                    onGoBack = onBackPressed,
+                    onGoBack = onBackClick,
                 )
             }
         )
@@ -312,11 +312,11 @@ private fun JoinRoomContent(
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun JoinRoomTopBar(
-    onBackClicked: () -> Unit,
+    onBackClick: () -> Unit,
 ) {
     TopAppBar(
         navigationIcon = {
-            BackButton(onClick = onBackClicked)
+            BackButton(onClick = onBackClick)
         },
         title = {},
     )
@@ -327,7 +327,7 @@ private fun JoinRoomTopBar(
 internal fun JoinRoomViewPreview(@PreviewParameter(JoinRoomStateProvider::class) state: JoinRoomState) = ElementPreview {
     JoinRoomView(
         state = state,
-        onBackPressed = { },
+        onBackClick = { },
         onJoinSuccess = { },
         onKnockSuccess = { },
     )
diff --git a/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomViewTest.kt b/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomViewTest.kt
index bf4449be41..c0ae1c0a64 100644
--- a/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomViewTest.kt
+++ b/features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomViewTest.kt
@@ -45,7 +45,7 @@ class JoinRoomViewTest {
                 aJoinRoomState(
                     eventSink = eventsRecorder,
                 ),
-                onBackPressed = it
+                onBackClick = it
             )
             rule.pressBack()
         }
@@ -167,7 +167,7 @@ class JoinRoomViewTest {
                     contentState = aLoadedContentState(roomType = RoomType.Space),
                     eventSink = eventsRecorder,
                 ),
-                onBackPressed = it
+                onBackClick = it
             )
             rule.clickOn(CommonStrings.action_go_back)
         }
@@ -176,14 +176,14 @@ class JoinRoomViewTest {
 
 private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setJoinRoomView(
     state: JoinRoomState,
-    onBackPressed: () -> Unit = EnsureNeverCalled(),
+    onBackClick: () -> Unit = EnsureNeverCalled(),
     onJoinSuccess: () -> Unit = EnsureNeverCalled(),
     onKnockSuccess: () -> Unit = EnsureNeverCalled(),
 ) {
     setContent {
         JoinRoomView(
             state = state,
-            onBackPressed = onBackPressed,
+            onBackClick = onBackClick,
             onJoinSuccess = onJoinSuccess,
             onKnockSuccess = onKnockSuccess,
         )
diff --git a/features/leaveroom/api/src/main/kotlin/io/element/android/features/leaveroom/api/LeaveRoomView.kt b/features/leaveroom/api/src/main/kotlin/io/element/android/features/leaveroom/api/LeaveRoomView.kt
index 5168ee9936..58bbd6b1ad 100644
--- a/features/leaveroom/api/src/main/kotlin/io/element/android/features/leaveroom/api/LeaveRoomView.kt
+++ b/features/leaveroom/api/src/main/kotlin/io/element/android/features/leaveroom/api/LeaveRoomView.kt
@@ -89,7 +89,7 @@ private fun LeaveRoomConfirmationDialog(
         title = stringResource(if (isDm) CommonStrings.action_leave_conversation else CommonStrings.action_leave_room),
         content = stringResource(text),
         submitText = stringResource(CommonStrings.action_leave),
-        onSubmitClicked = { eventSink(LeaveRoomEvent.LeaveRoom(roomId)) },
+        onSubmitClick = { eventSink(LeaveRoomEvent.LeaveRoom(roomId)) },
         onDismiss = { eventSink(LeaveRoomEvent.HideConfirmation) },
     )
 }
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/PermissionDeniedDialog.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/PermissionDeniedDialog.kt
index 0a488ded85..ad8aafc385 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/PermissionDeniedDialog.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/PermissionDeniedDialog.kt
@@ -29,7 +29,7 @@ internal fun PermissionDeniedDialog(
 ) {
     ConfirmationDialog(
         content = stringResource(CommonStrings.error_missing_location_auth_android, appName),
-        onSubmitClicked = onContinue,
+        onSubmitClick = onContinue,
         onDismiss = onDismiss,
         submitText = stringResource(CommonStrings.action_continue),
         cancelText = stringResource(CommonStrings.action_cancel),
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/PermissionRationaleDialog.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/PermissionRationaleDialog.kt
index 4f4f19c6b3..0f44804977 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/PermissionRationaleDialog.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/common/PermissionRationaleDialog.kt
@@ -29,7 +29,7 @@ internal fun PermissionRationaleDialog(
 ) {
     ConfirmationDialog(
         content = stringResource(CommonStrings.error_missing_location_rationale_android, appName),
-        onSubmitClicked = onContinue,
+        onSubmitClick = onContinue,
         onDismiss = onDismiss,
         submitText = stringResource(CommonStrings.action_continue),
         cancelText = stringResource(CommonStrings.action_cancel),
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationNode.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationNode.kt
index 610f0b9079..3e02866cb7 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationNode.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationNode.kt
@@ -54,7 +54,7 @@ class ShowLocationNode @AssistedInject constructor(
         ShowLocationView(
             state = presenter.present(),
             modifier = modifier,
-            onBackPressed = ::navigateUp
+            onBackClick = ::navigateUp
         )
     }
 }
diff --git a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt
index 2f352d50d2..fd6b1ed1cd 100644
--- a/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt
+++ b/features/location/impl/src/main/kotlin/io/element/android/features/location/impl/show/ShowLocationView.kt
@@ -67,7 +67,7 @@ import kotlinx.collections.immutable.toImmutableMap
 @Composable
 fun ShowLocationView(
     state: ShowLocationState,
-    onBackPressed: () -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     when (state.permissionDialog) {
@@ -121,7 +121,7 @@ fun ShowLocationView(
                 },
                 navigationIcon = {
                     BackButton(
-                        onClick = onBackPressed,
+                        onClick = onBackClick,
                     )
                 },
                 actions = {
@@ -194,7 +194,7 @@ fun ShowLocationView(
 internal fun ShowLocationViewPreview(@PreviewParameter(ShowLocationStateProvider::class) state: ShowLocationState) = ElementPreview {
     ShowLocationView(
         state = state,
-        onBackPressed = {},
+        onBackClick = {},
     )
 }
 
diff --git a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationViewTest.kt b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationViewTest.kt
index 05160dca56..7aa0756b75 100644
--- a/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationViewTest.kt
+++ b/features/location/impl/src/test/kotlin/io/element/android/features/location/impl/show/ShowLocationViewTest.kt
@@ -49,7 +49,7 @@ class ShowLocationViewTest {
                 state = aShowLocationState(
                     eventSink = eventsRecorder
                 ),
-                onBackPressed = callback,
+                onBackClick = callback,
             )
             rule.pressBack()
         }
@@ -62,7 +62,7 @@ class ShowLocationViewTest {
             aShowLocationState(
                 eventSink = eventsRecorder
             ),
-            onBackPressed = EnsureNeverCalled(),
+            onBackClick = EnsureNeverCalled(),
         )
         val shareContentDescription = rule.activity.getString(CommonStrings.action_share)
         rule.onNodeWithContentDescription(shareContentDescription).performClick()
@@ -76,7 +76,7 @@ class ShowLocationViewTest {
             aShowLocationState(
                 eventSink = eventsRecorder
             ),
-            onBackPressed = EnsureNeverCalled(),
+            onBackClick = EnsureNeverCalled(),
         )
         rule.onNodeWithTag(TestTags.floatingActionButton.value).performClick()
         eventsRecorder.assertSingle(ShowLocationEvents.TrackMyLocation(true))
@@ -90,7 +90,7 @@ class ShowLocationViewTest {
                 permissionDialog = ShowLocationState.Dialog.PermissionDenied,
                 eventSink = eventsRecorder
             ),
-            onBackPressed = EnsureNeverCalled(),
+            onBackClick = EnsureNeverCalled(),
         )
         rule.clickOn(CommonStrings.action_continue)
         eventsRecorder.assertSingle(ShowLocationEvents.OpenAppSettings)
@@ -104,7 +104,7 @@ class ShowLocationViewTest {
                 permissionDialog = ShowLocationState.Dialog.PermissionDenied,
                 eventSink = eventsRecorder
             ),
-            onBackPressed = EnsureNeverCalled(),
+            onBackClick = EnsureNeverCalled(),
         )
         rule.clickOn(CommonStrings.action_cancel)
         eventsRecorder.assertSingle(ShowLocationEvents.DismissDialog)
@@ -118,7 +118,7 @@ class ShowLocationViewTest {
                 permissionDialog = ShowLocationState.Dialog.PermissionRationale,
                 eventSink = eventsRecorder
             ),
-            onBackPressed = EnsureNeverCalled(),
+            onBackClick = EnsureNeverCalled(),
         )
         rule.clickOn(CommonStrings.action_continue)
         eventsRecorder.assertSingle(ShowLocationEvents.RequestPermissions)
@@ -132,7 +132,7 @@ class ShowLocationViewTest {
                 permissionDialog = ShowLocationState.Dialog.PermissionRationale,
                 eventSink = eventsRecorder
             ),
-            onBackPressed = EnsureNeverCalled(),
+            onBackClick = EnsureNeverCalled(),
         )
         rule.clickOn(CommonStrings.action_cancel)
         eventsRecorder.assertSingle(ShowLocationEvents.DismissDialog)
@@ -141,14 +141,14 @@ class ShowLocationViewTest {
 
 private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setShowLocationView(
     state: ShowLocationState,
-    onBackPressed: () -> Unit = EnsureNeverCalled(),
+    onBackClick: () -> Unit = EnsureNeverCalled(),
 ) {
     setContent {
         // Simulate a LocalInspectionMode for MapboxMap
         CompositionLocalProvider(LocalInspectionMode provides true) {
             ShowLocationView(
                 state = state,
-                onBackPressed = onBackPressed,
+                onBackClick = onBackClick,
             )
         }
     }
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsFlowNode.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsFlowNode.kt
index 13fe1e62aa..5cebdfbf01 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsFlowNode.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsFlowNode.kt
@@ -115,7 +115,7 @@ class LockScreenSettingsFlowNode @AssistedInject constructor(
             }
             NavTarget.Settings -> {
                 val callback = object : LockScreenSettingsNode.Callback {
-                    override fun onChangePinClicked() {
+                    override fun onChangePinClick() {
                         backstack.push(NavTarget.SetupPin)
                     }
                 }
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsNode.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsNode.kt
index edc50df50e..4f80c7fff0 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsNode.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsNode.kt
@@ -34,11 +34,11 @@ class LockScreenSettingsNode @AssistedInject constructor(
     private val presenter: LockScreenSettingsPresenter,
 ) : Node(buildContext, plugins = plugins) {
     interface Callback : Plugin {
-        fun onChangePinClicked()
+        fun onChangePinClick()
     }
 
-    private fun onChangePinClicked() {
-        plugins<Callback>().forEach { it.onChangePinClicked() }
+    private fun onChangePinClick() {
+        plugins<Callback>().forEach { it.onChangePinClick() }
     }
 
     @Composable
@@ -46,8 +46,8 @@ class LockScreenSettingsNode @AssistedInject constructor(
         val state = presenter.present()
         LockScreenSettingsView(
             state = state,
-            onBackPressed = this::navigateUp,
-            onChangePinClicked = this::onChangePinClicked,
+            onBackClick = this::navigateUp,
+            onChangePinClick = this::onChangePinClick,
             modifier = modifier,
         )
     }
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsView.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsView.kt
index b53618df11..375c5cde41 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsView.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/settings/LockScreenSettingsView.kt
@@ -34,19 +34,19 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 @Composable
 fun LockScreenSettingsView(
     state: LockScreenSettingsState,
-    onChangePinClicked: () -> Unit,
-    onBackPressed: () -> Unit,
+    onChangePinClick: () -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     PreferencePage(
         title = stringResource(id = io.element.android.libraries.ui.strings.R.string.common_screen_lock),
-        onBackPressed = onBackPressed,
+        onBackClick = onBackClick,
         modifier = modifier
     ) {
         PreferenceCategory(showTopDivider = false) {
             PreferenceText(
                 title = stringResource(id = R.string.screen_app_lock_settings_change_pin),
-                onClick = onChangePinClicked
+                onClick = onChangePinClick
             )
             PreferenceDivider()
             if (state.showRemovePinOption) {
@@ -74,7 +74,7 @@ fun LockScreenSettingsView(
         ConfirmationDialog(
             title = stringResource(id = R.string.screen_app_lock_settings_remove_pin_alert_title),
             content = stringResource(id = R.string.screen_app_lock_settings_remove_pin_alert_message),
-            onSubmitClicked = {
+            onSubmitClick = {
                 state.eventSink(LockScreenSettingsEvents.ConfirmRemovePin)
             },
             onDismiss = {
@@ -92,8 +92,8 @@ internal fun LockScreenSettingsViewPreview(
     ElementPreview {
         LockScreenSettingsView(
             state = state,
-            onChangePinClicked = {},
-            onBackPressed = {},
+            onChangePinClick = {},
+            onBackClick = {},
         )
     }
 }
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricView.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricView.kt
index 99001e5334..6d3325d480 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricView.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/biometric/SetupBiometricView.kt
@@ -49,8 +49,8 @@ fun SetupBiometricView(
         },
         footer = {
             SetupBiometricFooter(
-                onAllowClicked = { state.eventSink(SetupBiometricEvents.AllowBiometric) },
-                onSkipClicked = { state.eventSink(SetupBiometricEvents.UsePin) }
+                onAllowClick = { state.eventSink(SetupBiometricEvents.AllowBiometric) },
+                onSkipClick = { state.eventSink(SetupBiometricEvents.UsePin) }
             )
         },
     )
@@ -68,18 +68,18 @@ private fun SetupBiometricHeader() {
 
 @Composable
 private fun SetupBiometricFooter(
-    onAllowClicked: () -> Unit,
-    onSkipClicked: () -> Unit,
+    onAllowClick: () -> Unit,
+    onSkipClick: () -> Unit,
 ) {
     ButtonColumnMolecule {
         val biometricAuth = stringResource(id = R.string.screen_app_lock_biometric_authentication)
         Button(
             text = stringResource(id = R.string.screen_app_lock_setup_biometric_unlock_allow_title, biometricAuth),
-            onClick = onAllowClicked
+            onClick = onAllowClick
         )
         TextButton(
             text = stringResource(id = R.string.screen_app_lock_setup_biometric_unlock_skip),
-            onClick = onSkipClicked
+            onClick = onSkipClick
         )
     }
 }
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinNode.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinNode.kt
index ddd12f65df..b56b0daa86 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinNode.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinNode.kt
@@ -37,7 +37,7 @@ class SetupPinNode @AssistedInject constructor(
         val state = presenter.present()
         SetupPinView(
             state = state,
-            onBackClicked = this::navigateUp,
+            onBackClick = this::navigateUp,
             modifier = modifier
         )
     }
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinView.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinView.kt
index a3dcab5a43..2a0e890470 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinView.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/setup/pin/SetupPinView.kt
@@ -52,7 +52,7 @@ import io.element.android.libraries.designsystem.theme.components.TopAppBar
 @Composable
 fun SetupPinView(
     state: SetupPinState,
-    onBackClicked: () -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Scaffold(
@@ -60,7 +60,7 @@ fun SetupPinView(
         topBar = {
             TopAppBar(
                 navigationIcon = {
-                    BackButton(onClick = onBackClicked)
+                    BackButton(onClick = onBackClick)
                 },
                 title = {}
             )
@@ -154,7 +154,7 @@ internal fun SetupPinViewPreview(@PreviewParameter(SetupPinStateProvider::class)
     ElementPreview {
         SetupPinView(
             state = state,
-            onBackClicked = {},
+            onBackClick = {},
         )
     }
 }
diff --git a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockView.kt b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockView.kt
index 467de77d2b..70b6a6c634 100644
--- a/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockView.kt
+++ b/features/lockscreen/impl/src/main/kotlin/io/element/android/features/lockscreen/impl/unlock/PinUnlockView.kt
@@ -192,7 +192,7 @@ private fun SignOutPrompt(
         ConfirmationDialog(
             title = stringResource(id = R.string.screen_app_lock_signout_alert_title),
             content = stringResource(id = R.string.screen_app_lock_signout_alert_message),
-            onSubmitClicked = onSignOut,
+            onSubmitClick = onSignOut,
             onDismiss = onDismiss,
         )
     } else {
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt
index cd17a7daf3..6b7f9de6f4 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt
@@ -163,7 +163,7 @@ class LoginFlowNode @AssistedInject constructor(
                         backstack.singleTop(NavTarget.ConfirmAccountProvider)
                     }
 
-                    override fun onOtherClicked() {
+                    override fun onOtherClick() {
                         backstack.push(NavTarget.SearchAccountProvider)
                     }
                 }
@@ -197,7 +197,7 @@ class LoginFlowNode @AssistedInject constructor(
                     loginFormState = navTarget.loginFormState,
                 )
                 val callback = object : WaitListNode.Callback {
-                    override fun onCancelClicked() {
+                    override fun onCancelClick() {
                         navigateUp()
                     }
                 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerView.kt
index 9f71ccc7e5..6818caadb8 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/ChangeServerView.kt
@@ -33,8 +33,8 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 @Composable
 fun ChangeServerView(
     state: ChangeServerState,
-    onLearnMoreClicked: () -> Unit,
-    onDone: () -> Unit,
+    onLearnMoreClick: () -> Unit,
+    onSuccess: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val eventSink = state.eventSink
@@ -53,8 +53,8 @@ fun ChangeServerView(
                 is ChangeServerError.SlidingSyncAlert -> {
                     SlidingSyncNotSupportedDialog(
                         modifier = modifier,
-                        onLearnMoreClicked = {
-                            onLearnMoreClicked()
+                        onLearnMoreClick = {
+                            onLearnMoreClick()
                             eventSink.invoke(ChangeServerEvents.ClearError)
                         },
                         onDismiss = {
@@ -66,9 +66,9 @@ fun ChangeServerView(
         }
         is AsyncData.Loading -> ProgressDialog()
         is AsyncData.Success -> {
-            val latestOnDone by rememberUpdatedState(onDone)
+            val latestOnSuccess by rememberUpdatedState(onSuccess)
             LaunchedEffect(state.changeServerAction) {
-                latestOnDone()
+                latestOnSuccess()
             }
         }
         AsyncData.Uninitialized -> Unit
@@ -80,7 +80,7 @@ fun ChangeServerView(
 internal fun ChangeServerViewPreview(@PreviewParameter(ChangeServerStateProvider::class) state: ChangeServerState) = ElementPreview {
     ChangeServerView(
         state = state,
-        onLearnMoreClicked = {},
-        onDone = {},
+        onLearnMoreClick = {},
+        onSuccess = {},
     )
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/dialogs/SlidingSyncNotSupportedDialog.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/dialogs/SlidingSyncNotSupportedDialog.kt
index a151b34303..ff83283ff2 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/dialogs/SlidingSyncNotSupportedDialog.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/dialogs/SlidingSyncNotSupportedDialog.kt
@@ -27,7 +27,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
 internal fun SlidingSyncNotSupportedDialog(
-    onLearnMoreClicked: () -> Unit,
+    onLearnMoreClick: () -> Unit,
     onDismiss: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -35,8 +35,8 @@ internal fun SlidingSyncNotSupportedDialog(
         modifier = modifier,
         onDismiss = onDismiss,
         submitText = stringResource(CommonStrings.action_learn_more),
-        onSubmitClicked = onLearnMoreClicked,
-        onCancelClicked = onDismiss,
+        onSubmitClick = onLearnMoreClick,
+        onCancelClick = onDismiss,
         title = stringResource(CommonStrings.dialog_title_error),
         content = stringResource(R.string.screen_change_server_error_no_sliding_sync_message),
     )
@@ -46,7 +46,7 @@ internal fun SlidingSyncNotSupportedDialog(
 @Composable
 internal fun SlidingSyncNotSupportedDialogPreview() = ElementPreview {
     SlidingSyncNotSupportedDialog(
-        onLearnMoreClicked = {},
+        onLearnMoreClick = {},
         onDismiss = {},
     )
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderNode.kt
index 66025a2f1e..e9dd021ae5 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderNode.kt
@@ -37,15 +37,15 @@ class ChangeAccountProviderNode @AssistedInject constructor(
 ) : Node(buildContext, plugins = plugins) {
     interface Callback : Plugin {
         fun onDone()
-        fun onOtherClicked()
+        fun onOtherClick()
     }
 
     private fun onDone() {
         plugins<Callback>().forEach { it.onDone() }
     }
 
-    private fun onOtherClicked() {
-        plugins<Callback>().forEach { it.onOtherClicked() }
+    private fun onOtherClick() {
+        plugins<Callback>().forEach { it.onOtherClick() }
     }
 
     @Composable
@@ -55,10 +55,10 @@ class ChangeAccountProviderNode @AssistedInject constructor(
         ChangeAccountProviderView(
             state = state,
             modifier = modifier,
-            onBackPressed = ::navigateUp,
-            onLearnMoreClicked = { openLearnMorePage(context) },
-            onDone = ::onDone,
-            onOtherProviderClicked = ::onOtherClicked,
+            onBackClick = ::navigateUp,
+            onLearnMoreClick = { openLearnMorePage(context) },
+            onSuccess = ::onDone,
+            onOtherProviderClick = ::onOtherClick,
         )
     }
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderView.kt
index 5daf4e8f1c..3d9b73bc87 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderView.kt
@@ -55,10 +55,10 @@ import io.element.android.libraries.designsystem.theme.components.TopAppBar
 @Composable
 fun ChangeAccountProviderView(
     state: ChangeAccountProviderState,
-    onBackPressed: () -> Unit,
-    onLearnMoreClicked: () -> Unit,
-    onDone: () -> Unit,
-    onOtherProviderClicked: () -> Unit,
+    onBackClick: () -> Unit,
+    onLearnMoreClick: () -> Unit,
+    onSuccess: () -> Unit,
+    onOtherProviderClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Scaffold(
@@ -66,7 +66,7 @@ fun ChangeAccountProviderView(
         topBar = {
             TopAppBar(
                 title = {},
-                navigationIcon = { BackButton(onClick = onBackPressed) }
+                navigationIcon = { BackButton(onClick = onBackClick) }
             )
         }
     ) { padding ->
@@ -111,14 +111,14 @@ fun ChangeAccountProviderView(
                         url = "",
                         title = stringResource(id = R.string.screen_change_account_provider_other),
                     ),
-                    onClick = onOtherProviderClicked
+                    onClick = onOtherProviderClick
                 )
                 Spacer(Modifier.height(32.dp))
             }
             ChangeServerView(
                 state = state.changeServerState,
-                onLearnMoreClicked = onLearnMoreClicked,
-                onDone = onDone,
+                onLearnMoreClick = onLearnMoreClick,
+                onSuccess = onSuccess,
             )
         }
     }
@@ -129,9 +129,9 @@ fun ChangeAccountProviderView(
 internal fun ChangeAccountProviderViewPreview(@PreviewParameter(ChangeAccountProviderStateProvider::class) state: ChangeAccountProviderState) = ElementPreview {
     ChangeAccountProviderView(
         state = state,
-        onBackPressed = { },
-        onLearnMoreClicked = { },
-        onDone = { },
-        onOtherProviderClicked = { },
+        onBackClick = { },
+        onLearnMoreClick = { },
+        onSuccess = { },
+        onOtherProviderClick = { },
     )
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderNode.kt
index 8ba488d9f4..fe80d06e16 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderNode.kt
@@ -75,9 +75,9 @@ class ConfirmAccountProviderNode @AssistedInject constructor(
             state = state,
             modifier = modifier,
             onOidcDetails = ::onOidcDetails,
-            onLoginPasswordNeeded = ::onLoginPasswordNeeded,
+            onNeedLoginPassword = ::onLoginPasswordNeeded,
             onChange = ::onChangeAccountProvider,
-            onLearnMoreClicked = { openLearnMorePage(context) },
+            onLearnMoreClick = { openLearnMorePage(context) },
         )
     }
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderView.kt
index dc4e7f3b7b..f8a2f09e2c 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderView.kt
@@ -49,8 +49,8 @@ import io.element.android.libraries.ui.strings.CommonStrings
 fun ConfirmAccountProviderView(
     state: ConfirmAccountProviderState,
     onOidcDetails: (OidcDetails) -> Unit,
-    onLoginPasswordNeeded: () -> Unit,
-    onLearnMoreClicked: () -> Unit,
+    onNeedLoginPassword: () -> Unit,
+    onLearnMoreClick: () -> Unit,
     onChange: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -118,8 +118,8 @@ fun ConfirmAccountProviderView(
                         )
                     }
                     is ChangeServerError.SlidingSyncAlert -> {
-                        SlidingSyncNotSupportedDialog(onLearnMoreClicked = {
-                            onLearnMoreClicked()
+                        SlidingSyncNotSupportedDialog(onLearnMoreClick = {
+                            onLearnMoreClick()
                             eventSink(ConfirmAccountProviderEvents.ClearError)
                         }, onDismiss = {
                             eventSink(ConfirmAccountProviderEvents.ClearError)
@@ -131,7 +131,7 @@ fun ConfirmAccountProviderView(
             is AsyncData.Success -> {
                 when (val loginFlowState = state.loginFlow.data) {
                     is LoginFlow.OidcFlow -> onOidcDetails(loginFlowState.oidcDetails)
-                    LoginFlow.PasswordLogin -> onLoginPasswordNeeded()
+                    LoginFlow.PasswordLogin -> onNeedLoginPassword()
                 }
             }
             AsyncData.Uninitialized -> Unit
@@ -147,8 +147,8 @@ internal fun ConfirmAccountProviderViewPreview(
     ConfirmAccountProviderView(
         state = state,
         onOidcDetails = {},
-        onLoginPasswordNeeded = {},
-        onLearnMoreClicked = {},
+        onNeedLoginPassword = {},
+        onLearnMoreClick = {},
         onChange = {},
     )
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordNode.kt
index f444c7a7dc..e0f611834a 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordNode.kt
@@ -47,7 +47,7 @@ class LoginPasswordNode @AssistedInject constructor(
         LoginPasswordView(
             state = state,
             modifier = modifier,
-            onBackPressed = ::navigateUp,
+            onBackClick = ::navigateUp,
             onWaitListError = ::onWaitListError,
         )
     }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordView.kt
index 926601bcee..55f4d9e028 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/loginpassword/LoginPasswordView.kt
@@ -80,7 +80,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun LoginPasswordView(
     state: LoginPasswordState,
-    onBackPressed: () -> Unit,
+    onBackClick: () -> Unit,
     onWaitListError: (LoginFormState) -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -103,7 +103,7 @@ fun LoginPasswordView(
         topBar = {
             TopAppBar(
                 title = {},
-                navigationIcon = { BackButton(onClick = onBackPressed) },
+                navigationIcon = { BackButton(onClick = onBackClick) },
             )
         }
     ) { padding ->
@@ -310,7 +310,7 @@ private fun LoginErrorDialog(error: Throwable, onDismiss: () -> Unit) {
 internal fun LoginPasswordViewPreview(@PreviewParameter(LoginPasswordStateProvider::class) state: LoginPasswordState) = ElementPreview {
     LoginPasswordView(
         state = state,
-        onBackPressed = {},
+        onBackClick = {},
         onWaitListError = {},
     )
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderNode.kt
index 834d0400da..ca432cc619 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderNode.kt
@@ -50,9 +50,9 @@ class SearchAccountProviderNode @AssistedInject constructor(
         SearchAccountProviderView(
             state = state,
             modifier = modifier,
-            onBackPressed = ::navigateUp,
-            onLearnMoreClicked = { openLearnMorePage(context) },
-            onDone = ::onDone,
+            onBackClick = ::navigateUp,
+            onLearnMoreClick = { openLearnMorePage(context) },
+            onSuccess = ::onDone,
         )
     }
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderView.kt
index 69b145ffd1..9cfa64ba98 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderView.kt
@@ -77,9 +77,9 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun SearchAccountProviderView(
     state: SearchAccountProviderState,
-    onBackPressed: () -> Unit,
-    onLearnMoreClicked: () -> Unit,
-    onDone: () -> Unit,
+    onBackClick: () -> Unit,
+    onLearnMoreClick: () -> Unit,
+    onSuccess: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val eventSink = state.eventSink
@@ -88,7 +88,7 @@ fun SearchAccountProviderView(
         topBar = {
             TopAppBar(
                 title = {},
-                navigationIcon = { BackButton(onClick = onBackPressed) }
+                navigationIcon = { BackButton(onClick = onBackClick) }
             )
         }
     ) { padding ->
@@ -188,8 +188,8 @@ fun SearchAccountProviderView(
             }
             ChangeServerView(
                 state = state.changeServerState,
-                onLearnMoreClicked = onLearnMoreClicked,
-                onDone = onDone,
+                onLearnMoreClick = onLearnMoreClick,
+                onSuccess = onSuccess,
             )
         }
     }
@@ -214,8 +214,8 @@ private fun HomeserverData.toAccountProvider(): AccountProvider {
 internal fun SearchAccountProviderViewPreview(@PreviewParameter(SearchAccountProviderStateProvider::class) state: SearchAccountProviderState) = ElementPreview {
     SearchAccountProviderView(
         state = state,
-        onBackPressed = {},
-        onLearnMoreClicked = {},
-        onDone = {},
+        onBackClick = {},
+        onLearnMoreClick = {},
+        onSuccess = {},
     )
 }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/waitlistscreen/WaitListNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/waitlistscreen/WaitListNode.kt
index e27d5f5608..237e7ed8ef 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/waitlistscreen/WaitListNode.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/waitlistscreen/WaitListNode.kt
@@ -42,11 +42,11 @@ class WaitListNode @AssistedInject constructor(
     private val presenter = presenterFactory.create(inputs.loginFormState)
 
     interface Callback : Plugin {
-        fun onCancelClicked()
+        fun onCancelClick()
     }
 
-    private fun onCancelClicked() {
-        plugins<Callback>().forEach { it.onCancelClicked() }
+    private fun onCancelClick() {
+        plugins<Callback>().forEach { it.onCancelClick() }
     }
 
     @Composable
@@ -54,7 +54,7 @@ class WaitListNode @AssistedInject constructor(
         val state = presenter.present()
         WaitListView(
             state = state,
-            onCancelClicked = ::onCancelClicked,
+            onCancelClick = ::onCancelClick,
             modifier = modifier
         )
     }
diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/waitlistscreen/WaitListView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/waitlistscreen/WaitListView.kt
index 7a47255b6c..e21be61b5c 100644
--- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/waitlistscreen/WaitListView.kt
+++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/waitlistscreen/WaitListView.kt
@@ -48,7 +48,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun WaitListView(
     state: WaitListState,
-    onCancelClicked: () -> Unit,
+    onCancelClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     OnLifecycleEvent { _, event ->
@@ -57,7 +57,7 @@ fun WaitListView(
             else -> Unit
         }
     }
-    WaitListContent(state, onCancelClicked, modifier)
+    WaitListContent(state, onCancelClick, modifier)
 }
 
 @Composable
@@ -81,7 +81,7 @@ private fun WaitListError(state: WaitListState) {
 @Composable
 private fun WaitListContent(
     state: WaitListState,
-    onCancelClicked: () -> Unit,
+    onCancelClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Box(
@@ -109,7 +109,7 @@ private fun WaitListContent(
             title = title,
             subtitle = subtitle,
         ) {
-            OverallContent(state, onCancelClicked)
+            OverallContent(state, onCancelClick)
         }
         WaitListError(state)
     }
@@ -118,14 +118,14 @@ private fun WaitListContent(
 @Composable
 private fun OverallContent(
     state: WaitListState,
-    onCancelClicked: () -> Unit,
+    onCancelClick: () -> Unit,
 ) {
     Box(modifier = Modifier.fillMaxSize()) {
         if (state.loginAction !is AsyncData.Success) {
             CompositionLocalProvider(LocalContentColor provides ElementTheme.colors.textOnSolidPrimary) {
                 TextButton(
                     text = stringResource(CommonStrings.action_cancel),
-                    onClick = onCancelClicked,
+                    onClick = onCancelClick,
                 )
             }
         }
@@ -147,6 +147,6 @@ private fun OverallContent(
 internal fun WaitListViewPreview(@PreviewParameter(WaitListStateProvider::class) state: WaitListState) = ElementPreview {
     WaitListView(
         state = state,
-        onCancelClicked = {},
+        onCancelClick = {},
     )
 }
diff --git a/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/LogoutEntryPoint.kt b/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/LogoutEntryPoint.kt
index b750a47e6d..89ccfb227e 100644
--- a/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/LogoutEntryPoint.kt
+++ b/features/logout/api/src/main/kotlin/io/element/android/features/logout/api/LogoutEntryPoint.kt
@@ -30,6 +30,6 @@ interface LogoutEntryPoint : FeatureEntryPoint {
     }
 
     interface Callback : Plugin {
-        fun onChangeRecoveryKeyClicked()
+        fun onChangeRecoveryKeyClick()
     }
 }
diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutNode.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutNode.kt
index 14c7199416..4f5bab10b9 100644
--- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutNode.kt
+++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutNode.kt
@@ -38,8 +38,8 @@ class LogoutNode @AssistedInject constructor(
     @Assisted plugins: List<Plugin>,
     private val presenter: LogoutPresenter,
 ) : Node(buildContext, plugins = plugins) {
-    private fun onChangeRecoveryKeyClicked() {
-        plugins<LogoutEntryPoint.Callback>().forEach { it.onChangeRecoveryKeyClicked() }
+    private fun onChangeRecoveryKeyClick() {
+        plugins<LogoutEntryPoint.Callback>().forEach { it.onChangeRecoveryKeyClick() }
     }
 
     private fun onSuccessLogout(activity: Activity, url: String?) {
@@ -55,9 +55,9 @@ class LogoutNode @AssistedInject constructor(
         val activity = LocalContext.current as Activity
         LogoutView(
             state = state,
-            onChangeRecoveryKeyClicked = ::onChangeRecoveryKeyClicked,
+            onChangeRecoveryKeyClick = ::onChangeRecoveryKeyClick,
             onSuccessLogout = { onSuccessLogout(activity, it) },
-            onBackClicked = ::navigateUp,
+            onBackClick = ::navigateUp,
             modifier = modifier,
         )
     }
diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt
index 19160236ac..66f72d478f 100644
--- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt
+++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt
@@ -51,15 +51,15 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun LogoutView(
     state: LogoutState,
-    onChangeRecoveryKeyClicked: () -> Unit,
-    onBackClicked: () -> Unit,
+    onChangeRecoveryKeyClick: () -> Unit,
+    onBackClick: () -> Unit,
     onSuccessLogout: (logoutUrlResult: String?) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val eventSink = state.eventSink
 
     FlowStepPage(
-        onBackClicked = onBackClicked,
+        onBackClick = onBackClick,
         title = title(state),
         subTitle = subtitle(state),
         iconVector = CompoundIcons.KeySolid(),
@@ -68,8 +68,8 @@ fun LogoutView(
         buttons = {
             Buttons(
                 state = state,
-                onChangeRecoveryKeyClicked = onChangeRecoveryKeyClicked,
-                onLogoutClicked = {
+                onChangeRecoveryKeyClick = onChangeRecoveryKeyClick,
+                onLogoutClick = {
                     eventSink(LogoutEvents.Logout(ignoreSdkError = false))
                 }
             )
@@ -78,10 +78,10 @@ fun LogoutView(
 
     LogoutActionDialog(
         state.logoutAction,
-        onConfirmClicked = {
+        onConfirmClick = {
             eventSink(LogoutEvents.Logout(ignoreSdkError = false))
         },
-        onForceLogoutClicked = {
+        onForceLogoutClick = {
             eventSink(LogoutEvents.Logout(ignoreSdkError = true))
         },
         onDismissDialog = {
@@ -124,15 +124,15 @@ private fun subtitle(state: LogoutState): String? {
 @Composable
 private fun ColumnScope.Buttons(
     state: LogoutState,
-    onLogoutClicked: () -> Unit,
-    onChangeRecoveryKeyClicked: () -> Unit,
+    onLogoutClick: () -> Unit,
+    onChangeRecoveryKeyClick: () -> Unit,
 ) {
     val logoutAction = state.logoutAction
     if (state.isLastDevice) {
         OutlinedButton(
             text = stringResource(id = CommonStrings.common_settings),
             modifier = Modifier.fillMaxWidth(),
-            onClick = onChangeRecoveryKeyClicked,
+            onClick = onChangeRecoveryKeyClick,
         )
     }
     val signOutSubmitRes = when {
@@ -147,7 +147,7 @@ private fun ColumnScope.Buttons(
         modifier = Modifier
             .fillMaxWidth()
             .testTag(TestTags.signOut),
-        onClick = onLogoutClicked,
+        onClick = onLogoutClick,
     )
 }
 
@@ -183,8 +183,8 @@ internal fun LogoutViewPreview(
 ) = ElementPreview {
     LogoutView(
         state,
-        onChangeRecoveryKeyClicked = {},
+        onChangeRecoveryKeyClick = {},
         onSuccessLogout = {},
-        onBackClicked = {},
+        onBackClick = {},
     )
 }
diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/direct/DefaultDirectLogoutView.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/direct/DefaultDirectLogoutView.kt
index 0cc5cfe476..b0c6c4b70e 100644
--- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/direct/DefaultDirectLogoutView.kt
+++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/direct/DefaultDirectLogoutView.kt
@@ -39,10 +39,10 @@ class DefaultDirectLogoutView @Inject constructor() : DirectLogoutView {
         val eventSink = state.eventSink
         LogoutActionDialog(
             state.logoutAction,
-            onConfirmClicked = {
+            onConfirmClick = {
                 eventSink(DirectLogoutEvents.Logout(ignoreSdkError = false))
             },
-            onForceLogoutClicked = {
+            onForceLogoutClick = {
                 eventSink(DirectLogoutEvents.Logout(ignoreSdkError = true))
             },
             onDismissDialog = {
diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/LogoutActionDialog.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/LogoutActionDialog.kt
index 18e2809034..36fff3afee 100644
--- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/LogoutActionDialog.kt
+++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/LogoutActionDialog.kt
@@ -30,8 +30,8 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun LogoutActionDialog(
     state: AsyncAction<String?>,
-    onConfirmClicked: () -> Unit,
-    onForceLogoutClicked: () -> Unit,
+    onConfirmClick: () -> Unit,
+    onForceLogoutClick: () -> Unit,
     onDismissDialog: () -> Unit,
     onSuccessLogout: (String?) -> Unit,
 ) {
@@ -40,7 +40,7 @@ fun LogoutActionDialog(
             Unit
         AsyncAction.Confirming ->
             LogoutConfirmationDialog(
-                onSubmitClicked = onConfirmClicked,
+                onSubmitClick = onConfirmClick,
                 onDismiss = onDismissDialog
             )
         is AsyncAction.Loading ->
@@ -50,7 +50,7 @@ fun LogoutActionDialog(
                 title = stringResource(id = CommonStrings.dialog_title_error),
                 content = stringResource(id = CommonStrings.error_unknown),
                 retryText = stringResource(id = CommonStrings.action_signout_anyway),
-                onRetry = onForceLogoutClicked,
+                onRetry = onForceLogoutClick,
                 onDismiss = onDismissDialog,
             )
         is AsyncAction.Success -> {
diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/LogoutConfirmationDialog.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/LogoutConfirmationDialog.kt
index caf04a2752..ea2a9656e0 100644
--- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/LogoutConfirmationDialog.kt
+++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/LogoutConfirmationDialog.kt
@@ -24,14 +24,14 @@ import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
 fun LogoutConfirmationDialog(
-    onSubmitClicked: () -> Unit,
+    onSubmitClick: () -> Unit,
     onDismiss: () -> Unit,
 ) {
     ConfirmationDialog(
         title = stringResource(id = CommonStrings.action_signout),
         content = stringResource(id = R.string.screen_signout_confirmation_dialog_content),
         submitText = stringResource(id = CommonStrings.action_signout),
-        onSubmitClicked = onSubmitClicked,
+        onSubmitClick = onSubmitClick,
         onDismiss = onDismiss,
     )
 }
diff --git a/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/LogoutViewTest.kt b/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/LogoutViewTest.kt
index 8ebe6c175b..95b87886d7 100644
--- a/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/LogoutViewTest.kt
+++ b/features/logout/impl/src/test/kotlin/io/element/android/features/logout/impl/LogoutViewTest.kt
@@ -73,7 +73,7 @@ class LogoutViewTest {
                 aLogoutState(
                     eventSink = eventsRecorder
                 ),
-                onBackClicked = callback,
+                onBackClick = callback,
             )
             rule.pressBack()
         }
@@ -129,7 +129,7 @@ class LogoutViewTest {
                     isLastDevice = true,
                     eventSink = eventsRecorder
                 ),
-                onChangeRecoveryKeyClicked = callback,
+                onChangeRecoveryKeyClick = callback,
             )
             rule.clickOn(CommonStrings.common_settings)
         }
@@ -138,15 +138,15 @@ class LogoutViewTest {
 
 private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setLogoutView(
     state: LogoutState,
-    onChangeRecoveryKeyClicked: () -> Unit = EnsureNeverCalled(),
-    onBackClicked: () -> Unit = EnsureNeverCalled(),
+    onChangeRecoveryKeyClick: () -> Unit = EnsureNeverCalled(),
+    onBackClick: () -> Unit = EnsureNeverCalled(),
     onSuccessLogout: (logoutUrlResult: String?) -> Unit = EnsureNeverCalledWithParam()
 ) {
     setContent {
         LogoutView(
             state = state,
-            onChangeRecoveryKeyClicked = onChangeRecoveryKeyClicked,
-            onBackClicked = onBackClicked,
+            onChangeRecoveryKeyClick = onChangeRecoveryKeyClick,
+            onBackClick = onBackClick,
             onSuccessLogout = onSuccessLogout,
         )
     }
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 15d6e5fd95..6bd1045c12 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
@@ -39,9 +39,9 @@ interface MessagesEntryPoint : FeatureEntryPoint {
     )
 
     interface Callback : Plugin {
-        fun onRoomDetailsClicked()
-        fun onUserDataClicked(userId: UserId)
-        fun onPermalinkClicked(data: PermalinkData)
+        fun onRoomDetailsClick()
+        fun onUserDataClick(userId: UserId)
+        fun onPermalinkClick(data: PermalinkData)
         fun onForwardedToSingleRoom(roomId: RoomId)
     }
 }
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 ca35ac7fee..8ea3075af3 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
@@ -139,31 +139,31 @@ class MessagesFlowNode @AssistedInject constructor(
         return when (navTarget) {
             is NavTarget.Messages -> {
                 val callback = object : MessagesNode.Callback {
-                    override fun onRoomDetailsClicked() {
-                        callback?.onRoomDetailsClicked()
+                    override fun onRoomDetailsClick() {
+                        callback?.onRoomDetailsClick()
                     }
 
-                    override fun onEventClicked(event: TimelineItem.Event): Boolean {
-                        return processEventClicked(event)
+                    override fun onEventClick(event: TimelineItem.Event): Boolean {
+                        return processEventClick(event)
                     }
 
                     override fun onPreviewAttachments(attachments: ImmutableList<Attachment>) {
                         backstack.push(NavTarget.AttachmentPreview(attachments.first()))
                     }
 
-                    override fun onUserDataClicked(userId: UserId) {
-                        callback?.onUserDataClicked(userId)
+                    override fun onUserDataClick(userId: UserId) {
+                        callback?.onUserDataClick(userId)
                     }
 
-                    override fun onPermalinkClicked(data: PermalinkData) {
-                        callback?.onPermalinkClicked(data)
+                    override fun onPermalinkClick(data: PermalinkData) {
+                        callback?.onPermalinkClick(data)
                     }
 
-                    override fun onShowEventDebugInfoClicked(eventId: EventId?, debugInfo: TimelineItemDebugInfo) {
+                    override fun onShowEventDebugInfoClick(eventId: EventId?, debugInfo: TimelineItemDebugInfo) {
                         backstack.push(NavTarget.EventDebugInfo(eventId, debugInfo))
                     }
 
-                    override fun onForwardEventClicked(eventId: EventId) {
+                    override fun onForwardEventClick(eventId: EventId) {
                         backstack.push(NavTarget.ForwardEvent(eventId))
                     }
 
@@ -171,19 +171,19 @@ class MessagesFlowNode @AssistedInject constructor(
                         backstack.push(NavTarget.ReportMessage(eventId, senderId))
                     }
 
-                    override fun onSendLocationClicked() {
+                    override fun onSendLocationClick() {
                         backstack.push(NavTarget.SendLocation)
                     }
 
-                    override fun onCreatePollClicked() {
+                    override fun onCreatePollClick() {
                         backstack.push(NavTarget.CreatePoll)
                     }
 
-                    override fun onEditPollClicked(eventId: EventId) {
+                    override fun onEditPollClick(eventId: EventId) {
                         backstack.push(NavTarget.EditPoll(eventId))
                     }
 
-                    override fun onJoinCallClicked(roomId: RoomId) {
+                    override fun onJoinCallClick(roomId: RoomId) {
                         val inputs = CallType.RoomCall(
                             sessionId = matrixClient.sessionId,
                             roomId = roomId,
@@ -250,7 +250,7 @@ class MessagesFlowNode @AssistedInject constructor(
         }
     }
 
-    private fun processEventClicked(event: TimelineItem.Event): Boolean {
+    private fun processEventClick(event: TimelineItem.Event): Boolean {
         return when (event.content) {
             is TimelineItemImageContent -> {
                 val navTarget = NavTarget.MediaViewer(
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNavigator.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNavigator.kt
index cda8b7ddcd..6f1b09a7ff 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNavigator.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNavigator.kt
@@ -21,8 +21,8 @@ import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugInfo
 
 interface MessagesNavigator {
-    fun onShowEventDebugInfoClicked(eventId: EventId?, debugInfo: TimelineItemDebugInfo)
-    fun onForwardEventClicked(eventId: EventId)
-    fun onReportContentClicked(eventId: EventId, senderId: UserId)
-    fun onEditPollClicked(eventId: EventId)
+    fun onShowEventDebugInfoClick(eventId: EventId?, debugInfo: TimelineItemDebugInfo)
+    fun onForwardEventClick(eventId: EventId)
+    fun onReportContentClick(eventId: EventId, senderId: UserId)
+    fun onEditPollClick(eventId: EventId)
 }
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 cbdd20c770..e542dfc563 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
@@ -82,18 +82,18 @@ class MessagesNode @AssistedInject constructor(
     private val inputs = inputs<Inputs>()
 
     interface Callback : Plugin {
-        fun onRoomDetailsClicked()
-        fun onEventClicked(event: TimelineItem.Event): Boolean
+        fun onRoomDetailsClick()
+        fun onEventClick(event: TimelineItem.Event): Boolean
         fun onPreviewAttachments(attachments: ImmutableList<Attachment>)
-        fun onUserDataClicked(userId: UserId)
-        fun onPermalinkClicked(data: PermalinkData)
-        fun onShowEventDebugInfoClicked(eventId: EventId?, debugInfo: TimelineItemDebugInfo)
-        fun onForwardEventClicked(eventId: EventId)
+        fun onUserDataClick(userId: UserId)
+        fun onPermalinkClick(data: PermalinkData)
+        fun onShowEventDebugInfoClick(eventId: EventId?, debugInfo: TimelineItemDebugInfo)
+        fun onForwardEventClick(eventId: EventId)
         fun onReportMessage(eventId: EventId, senderId: UserId)
-        fun onSendLocationClicked()
-        fun onCreatePollClicked()
-        fun onEditPollClicked(eventId: EventId)
-        fun onJoinCallClicked(roomId: RoomId)
+        fun onSendLocationClick()
+        fun onCreatePollClick()
+        fun onEditPollClick(eventId: EventId)
+        fun onJoinCallClick(roomId: RoomId)
     }
 
     override fun onBuilt() {
@@ -109,23 +109,23 @@ class MessagesNode @AssistedInject constructor(
         )
     }
 
-    private fun onRoomDetailsClicked() {
-        callback?.onRoomDetailsClicked()
+    private fun onRoomDetailsClick() {
+        callback?.onRoomDetailsClick()
     }
 
-    private fun onEventClicked(event: TimelineItem.Event): Boolean {
-        return callback?.onEventClicked(event).orFalse()
+    private fun onEventClick(event: TimelineItem.Event): Boolean {
+        return callback?.onEventClick(event).orFalse()
     }
 
     private fun onPreviewAttachments(attachments: ImmutableList<Attachment>) {
         callback?.onPreviewAttachments(attachments)
     }
 
-    private fun onUserDataClicked(userId: UserId) {
-        callback?.onUserDataClicked(userId)
+    private fun onUserDataClick(userId: UserId) {
+        callback?.onUserDataClick(userId)
     }
 
-    private fun onLinkClicked(
+    private fun onLinkClick(
         context: Context,
         url: String,
         eventSink: (TimelineEvents) -> Unit,
@@ -134,10 +134,10 @@ class MessagesNode @AssistedInject constructor(
             is PermalinkData.UserLink -> {
                 // Open the room member profile, it will fallback to
                 // the user profile if the user is not in the room
-                callback?.onUserDataClicked(permalink.userId)
+                callback?.onUserDataClick(permalink.userId)
             }
             is PermalinkData.RoomLink -> {
-                handleRoomLinkClicked(permalink, eventSink)
+                handleRoomLinkClick(permalink, eventSink)
             }
             is PermalinkData.FallbackLink,
             is PermalinkData.RoomEmailInviteLink -> {
@@ -146,7 +146,7 @@ class MessagesNode @AssistedInject constructor(
         }
     }
 
-    private fun handleRoomLinkClicked(roomLink: PermalinkData.RoomLink, eventSink: (TimelineEvents) -> Unit) {
+    private fun handleRoomLinkClick(roomLink: PermalinkData.RoomLink, eventSink: (TimelineEvents) -> Unit) {
         if (room.matches(roomLink.roomIdOrAlias)) {
             val eventId = roomLink.eventId
             if (eventId != null) {
@@ -156,36 +156,36 @@ class MessagesNode @AssistedInject constructor(
                 context.toast("Already viewing this room!")
             }
         } else {
-            callback?.onPermalinkClicked(roomLink)
+            callback?.onPermalinkClick(roomLink)
         }
     }
 
-    override fun onShowEventDebugInfoClicked(eventId: EventId?, debugInfo: TimelineItemDebugInfo) {
-        callback?.onShowEventDebugInfoClicked(eventId, debugInfo)
+    override fun onShowEventDebugInfoClick(eventId: EventId?, debugInfo: TimelineItemDebugInfo) {
+        callback?.onShowEventDebugInfoClick(eventId, debugInfo)
     }
 
-    override fun onForwardEventClicked(eventId: EventId) {
-        callback?.onForwardEventClicked(eventId)
+    override fun onForwardEventClick(eventId: EventId) {
+        callback?.onForwardEventClick(eventId)
     }
 
-    override fun onReportContentClicked(eventId: EventId, senderId: UserId) {
+    override fun onReportContentClick(eventId: EventId, senderId: UserId) {
         callback?.onReportMessage(eventId, senderId)
     }
 
-    override fun onEditPollClicked(eventId: EventId) {
-        callback?.onEditPollClicked(eventId)
+    override fun onEditPollClick(eventId: EventId) {
+        callback?.onEditPollClick(eventId)
     }
 
-    private fun onSendLocationClicked() {
-        callback?.onSendLocationClicked()
+    private fun onSendLocationClick() {
+        callback?.onSendLocationClick()
     }
 
-    private fun onCreatePollClicked() {
-        callback?.onCreatePollClicked()
+    private fun onCreatePollClick() {
+        callback?.onCreatePollClick()
     }
 
-    private fun onJoinCallClicked() {
-        callback?.onJoinCallClicked(room.roomId)
+    private fun onJoinCallClick() {
+        callback?.onJoinCallClick(room.roomId)
     }
 
     @Composable
@@ -197,15 +197,15 @@ class MessagesNode @AssistedInject constructor(
             val state = presenter.present()
             MessagesView(
                 state = state,
-                onBackPressed = this::navigateUp,
-                onRoomDetailsClicked = this::onRoomDetailsClicked,
-                onEventClicked = this::onEventClicked,
+                onBackClick = this::navigateUp,
+                onRoomDetailsClick = this::onRoomDetailsClick,
+                onEventClick = this::onEventClick,
                 onPreviewAttachments = this::onPreviewAttachments,
-                onUserDataClicked = this::onUserDataClicked,
-                onLinkClicked = { onLinkClicked(context, it, state.timelineState.eventSink) },
-                onSendLocationClicked = this::onSendLocationClicked,
-                onCreatePollClicked = this::onCreatePollClicked,
-                onJoinCallClicked = this::onJoinCallClicked,
+                onUserDataClick = this::onUserDataClick,
+                onLinkClick = { onLinkClick(context, it, state.timelineState.eventSink) },
+                onSendLocationClick = this::onSendLocationClick,
+                onCreatePollClick = this::onCreatePollClick,
+                onJoinCallClick = this::onJoinCallClick,
                 modifier = modifier,
             )
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt
index 579ea87868..47fdcde912 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt
@@ -324,7 +324,7 @@ class MessagesPresenter @AssistedInject constructor(
         when (targetEvent.content) {
             is TimelineItemPollContent -> {
                 if (targetEvent.eventId == null) return
-                navigator.onEditPollClicked(targetEvent.eventId)
+                navigator.onEditPollClick(targetEvent.eventId)
             }
             else -> {
                 val composerMode = MessageComposerMode.Edit(
@@ -407,17 +407,17 @@ class MessagesPresenter @AssistedInject constructor(
     }
 
     private fun handleShowDebugInfoAction(event: TimelineItem.Event) {
-        navigator.onShowEventDebugInfoClicked(event.eventId, event.debugInfo)
+        navigator.onShowEventDebugInfoClick(event.eventId, event.debugInfo)
     }
 
     private fun handleForwardAction(event: TimelineItem.Event) {
         if (event.eventId == null) return
-        navigator.onForwardEventClicked(event.eventId)
+        navigator.onForwardEventClick(event.eventId)
     }
 
     private fun handleReportAction(event: TimelineItem.Event) {
         if (event.eventId == null) return
-        navigator.onReportContentClicked(event.eventId, event.senderId)
+        navigator.onReportContentClick(event.eventId, event.senderId)
     }
 
     private fun handleEndPollAction(
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
index e7b65f353f..13f6ccf4a2 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt
@@ -115,15 +115,15 @@ import androidx.compose.material3.Button as Material3Button
 @Composable
 fun MessagesView(
     state: MessagesState,
-    onBackPressed: () -> Unit,
-    onRoomDetailsClicked: () -> Unit,
-    onEventClicked: (event: TimelineItem.Event) -> Boolean,
-    onUserDataClicked: (UserId) -> Unit,
-    onLinkClicked: (String) -> Unit,
+    onBackClick: () -> Unit,
+    onRoomDetailsClick: () -> Unit,
+    onEventClick: (event: TimelineItem.Event) -> Boolean,
+    onUserDataClick: (UserId) -> Unit,
+    onLinkClick: (String) -> Unit,
     onPreviewAttachments: (ImmutableList<Attachment>) -> Unit,
-    onSendLocationClicked: () -> Unit,
-    onCreatePollClicked: () -> Unit,
-    onJoinCallClicked: () -> Unit,
+    onSendLocationClick: () -> Unit,
+    onCreatePollClick: () -> Unit,
+    onJoinCallClick: () -> Unit,
     modifier: Modifier = Modifier,
     forceJumpToBottomVisibility: Boolean = false
 ) {
@@ -144,15 +144,15 @@ fun MessagesView(
     // This is needed because the composer is inside an AndroidView that can't be affected by the FocusManager in Compose
     val localView = LocalView.current
 
-    fun onMessageClicked(event: TimelineItem.Event) {
-        Timber.v("OnMessageClicked= ${event.id}")
-        val hideKeyboard = onEventClicked(event)
+    fun onMessageClick(event: TimelineItem.Event) {
+        Timber.v("onMessageClick= ${event.id}")
+        val hideKeyboard = onEventClick(event)
         if (hideKeyboard) {
             localView.hideKeyboard()
         }
     }
 
-    fun onMessageLongClicked(event: TimelineItem.Event) {
+    fun onMessageLongClick(event: TimelineItem.Event) {
         Timber.v("OnMessageLongClicked= ${event.id}")
         localView.hideKeyboard()
         state.actionListState.eventSink(
@@ -170,17 +170,17 @@ fun MessagesView(
         state.eventSink(MessagesEvents.HandleAction(action, event))
     }
 
-    fun onEmojiReactionClicked(emoji: String, event: TimelineItem.Event) {
+    fun onEmojiReactionClick(emoji: String, event: TimelineItem.Event) {
         if (event.eventId == null) return
         state.eventSink(MessagesEvents.ToggleReaction(emoji, event.eventId))
     }
 
-    fun onEmojiReactionLongClicked(emoji: String, event: TimelineItem.Event) {
+    fun onEmojiReactionLongClick(emoji: String, event: TimelineItem.Event) {
         if (event.eventId == null) return
         state.reactionSummaryState.eventSink(ReactionSummaryEvents.ShowReactionSummary(event.eventId, event.reactionsState.reactions, emoji))
     }
 
-    fun onMoreReactionsClicked(event: TimelineItem.Event) {
+    fun onMoreReactionsClick(event: TimelineItem.Event) {
         state.customReactionState.eventSink(CustomReactionEvents.ShowCustomReactionSheet(event))
     }
 
@@ -194,14 +194,14 @@ fun MessagesView(
                     roomName = state.roomName.dataOrNull(),
                     roomAvatar = state.roomAvatar.dataOrNull(),
                     callState = state.callState,
-                    onBackPressed = {
+                    onBackClick = {
                         // Since the textfield is now based on an Android view, this is no longer done automatically.
                         // We need to hide the keyboard when navigating out of this screen.
                         localView.hideKeyboard()
-                        onBackPressed()
+                        onBackClick()
                     },
-                    onRoomDetailsClicked = onRoomDetailsClicked,
-                    onJoinCallClicked = onJoinCallClicked,
+                    onRoomDetailsClick = onRoomDetailsClick,
+                    onJoinCallClick = onJoinCallClick,
                 )
             }
         },
@@ -211,23 +211,23 @@ fun MessagesView(
                 modifier = Modifier
                     .padding(padding)
                     .consumeWindowInsets(padding),
-                onMessageClicked = ::onMessageClicked,
-                onMessageLongClicked = ::onMessageLongClicked,
-                onUserDataClicked = onUserDataClicked,
-                onLinkClicked = onLinkClicked,
-                onTimestampClicked = { event ->
+                onMessageClick = ::onMessageClick,
+                onMessageLongClick = ::onMessageLongClick,
+                onUserDataClick = onUserDataClick,
+                onLinkClick = onLinkClick,
+                onTimestampClick = { event ->
                     if (event.localSendState is LocalEventSendState.SendingFailed) {
                         state.retrySendMenuState.eventSink(RetrySendMenuEvents.EventSelected(event))
                     }
                 },
-                onReactionClicked = ::onEmojiReactionClicked,
-                onReactionLongClicked = ::onEmojiReactionLongClicked,
-                onMoreReactionsClicked = ::onMoreReactionsClicked,
+                onReactionClick = ::onEmojiReactionClick,
+                onReactionLongClick = ::onEmojiReactionLongClick,
+                onMoreReactionsClick = ::onMoreReactionsClick,
                 onReadReceiptClick = { event ->
                     state.readReceiptBottomSheetState.eventSink(ReadReceiptBottomSheetEvents.EventSelected(event))
                 },
-                onSendLocationClicked = onSendLocationClicked,
-                onCreatePollClicked = onCreatePollClicked,
+                onSendLocationClick = onSendLocationClick,
+                onCreatePollClick = onCreatePollClick,
                 onSwipeToReply = { targetEvent ->
                     state.eventSink(MessagesEvents.HandleAction(TimelineItemAction.Reply, targetEvent))
                 },
@@ -244,17 +244,17 @@ fun MessagesView(
 
     ActionListView(
         state = state.actionListState,
-        onActionSelected = ::onActionSelected,
-        onCustomReactionClicked = { event ->
+        onSelectAction = ::onActionSelected,
+        onCustomReactionClick = { event ->
             if (event.eventId == null) return@ActionListView
             state.customReactionState.eventSink(CustomReactionEvents.ShowCustomReactionSheet(event))
         },
-        onEmojiReactionClicked = ::onEmojiReactionClicked,
+        onEmojiReactionClick = ::onEmojiReactionClick,
     )
 
     CustomReactionBottomSheet(
         state = state.customReactionState,
-        onEmojiSelected = { eventId, emoji ->
+        onSelectEmoji = { eventId, emoji ->
             state.eventSink(MessagesEvents.ToggleReaction(emoji.unicode, eventId))
         }
     )
@@ -263,7 +263,7 @@ fun MessagesView(
     RetrySendMessageMenu(state = state.retrySendMenuState)
     ReadReceiptBottomSheet(
         state = state.readReceiptBottomSheetState,
-        onUserDataClicked = onUserDataClicked,
+        onUserDataClick = onUserDataClick,
     )
     ReinviteDialog(state = state)
 }
@@ -276,7 +276,7 @@ private fun ReinviteDialog(state: MessagesState) {
             content = stringResource(id = R.string.screen_room_invite_again_alert_message),
             cancelText = stringResource(id = CommonStrings.action_cancel),
             submitText = stringResource(id = CommonStrings.action_invite),
-            onSubmitClicked = { state.eventSink(MessagesEvents.InviteDialogDismissed(InviteDialogAction.Invite)) },
+            onSubmitClick = { state.eventSink(MessagesEvents.InviteDialogDismissed(InviteDialogAction.Invite)) },
             onDismiss = { state.eventSink(MessagesEvents.InviteDialogDismissed(InviteDialogAction.Cancel)) }
         )
     }
@@ -313,17 +313,17 @@ private fun AttachmentStateView(
 @Composable
 private fun MessagesViewContent(
     state: MessagesState,
-    onMessageClicked: (TimelineItem.Event) -> Unit,
-    onUserDataClicked: (UserId) -> Unit,
-    onLinkClicked: (String) -> Unit,
-    onReactionClicked: (key: String, TimelineItem.Event) -> Unit,
-    onReactionLongClicked: (key: String, TimelineItem.Event) -> Unit,
-    onMoreReactionsClicked: (TimelineItem.Event) -> Unit,
+    onMessageClick: (TimelineItem.Event) -> Unit,
+    onUserDataClick: (UserId) -> Unit,
+    onLinkClick: (String) -> Unit,
+    onReactionClick: (key: String, TimelineItem.Event) -> Unit,
+    onReactionLongClick: (key: String, TimelineItem.Event) -> Unit,
+    onMoreReactionsClick: (TimelineItem.Event) -> Unit,
     onReadReceiptClick: (TimelineItem.Event) -> Unit,
-    onMessageLongClicked: (TimelineItem.Event) -> Unit,
-    onTimestampClicked: (TimelineItem.Event) -> Unit,
-    onSendLocationClicked: () -> Unit,
-    onCreatePollClicked: () -> Unit,
+    onMessageLongClick: (TimelineItem.Event) -> Unit,
+    onTimestampClick: (TimelineItem.Event) -> Unit,
+    onSendLocationClick: () -> Unit,
+    onCreatePollClick: () -> Unit,
     forceJumpToBottomVisibility: Boolean,
     modifier: Modifier = Modifier,
     onSwipeToReply: (TimelineItem.Event) -> Unit,
@@ -336,8 +336,8 @@ private fun MessagesViewContent(
     ) {
         AttachmentsBottomSheet(
             state = state.composerState,
-            onSendLocationClicked = onSendLocationClicked,
-            onCreatePollClicked = onCreatePollClicked,
+            onSendLocationClick = onSendLocationClick,
+            onCreatePollClick = onCreatePollClick,
             enableTextFormatting = state.enableTextFormatting,
         )
 
@@ -384,15 +384,15 @@ private fun MessagesViewContent(
                 TimelineView(
                     state = state.timelineState,
                     typingNotificationState = state.typingNotificationState,
-                    onUserDataClicked = onUserDataClicked,
-                    onLinkClicked = onLinkClicked,
-                    onMessageClicked = onMessageClicked,
-                    onMessageLongClicked = onMessageLongClicked,
-                    onTimestampClicked = onTimestampClicked,
+                    onUserDataClick = onUserDataClick,
+                    onLinkClick = onLinkClick,
+                    onMessageClick = onMessageClick,
+                    onMessageLongClick = onMessageLongClick,
+                    onTimestampClick = onTimestampClick,
                     onSwipeToReply = onSwipeToReply,
-                    onReactionClicked = onReactionClicked,
-                    onReactionLongClicked = onReactionLongClicked,
-                    onMoreReactionsClicked = onMoreReactionsClicked,
+                    onReactionClick = onReactionClick,
+                    onReactionLongClick = onReactionLongClick,
+                    onMoreReactionsClick = onMoreReactionsClick,
                     onReadReceiptClick = onReadReceiptClick,
                     modifier = Modifier.padding(paddingValues),
                     forceJumpToBottomVisibility = forceJumpToBottomVisibility,
@@ -431,7 +431,7 @@ private fun MessagesViewComposerBottomSheetContents(
                 roomName = state.roomName.dataOrNull(),
                 roomAvatarData = state.roomAvatar.dataOrNull(),
                 memberSuggestions = state.composerState.memberSuggestions,
-                onSuggestionSelected = {
+                onSelectSuggestion = {
                     state.composerState.eventSink(MessageComposerEvents.InsertMention(it))
                 }
             )
@@ -454,16 +454,16 @@ private fun MessagesViewTopBar(
     roomName: String?,
     roomAvatar: AvatarData?,
     callState: RoomCallState,
-    onRoomDetailsClicked: () -> Unit,
-    onJoinCallClicked: () -> Unit,
-    onBackPressed: () -> Unit,
+    onRoomDetailsClick: () -> Unit,
+    onJoinCallClick: () -> Unit,
+    onBackClick: () -> Unit,
 ) {
     TopAppBar(
         navigationIcon = {
-            BackButton(onClick = onBackPressed)
+            BackButton(onClick = onBackClick)
         },
         title = {
-            val titleModifier = Modifier.clickable { onRoomDetailsClicked() }
+            val titleModifier = Modifier.clickable { onRoomDetailsClick() }
             if (roomName != null && roomAvatar != null) {
                 RoomAvatarAndNameRow(
                     roomName = roomName,
@@ -479,9 +479,9 @@ private fun MessagesViewTopBar(
         },
         actions = {
             if (callState == RoomCallState.ONGOING) {
-                JoinCallMenuItem(onJoinCallClicked = onJoinCallClicked)
+                JoinCallMenuItem(onJoinCallClick = onJoinCallClick)
             } else {
-                IconButton(onClick = onJoinCallClicked, enabled = callState != RoomCallState.DISABLED) {
+                IconButton(onClick = onJoinCallClick, enabled = callState != RoomCallState.DISABLED) {
                     Icon(
                         imageVector = CompoundIcons.VideoCallSolid(),
                         contentDescription = stringResource(CommonStrings.a11y_start_call),
@@ -496,10 +496,10 @@ private fun MessagesViewTopBar(
 
 @Composable
 private fun JoinCallMenuItem(
-    onJoinCallClicked: () -> Unit,
+    onJoinCallClick: () -> Unit,
 ) {
     Material3Button(
-        onClick = onJoinCallClicked,
+        onClick = onJoinCallClick,
         colors = ButtonDefaults.buttonColors(
             contentColor = ElementTheme.colors.bgCanvasDefault,
             containerColor = ElementTheme.colors.iconAccentTertiary
@@ -567,15 +567,15 @@ private fun CantSendMessageBanner() {
 internal fun MessagesViewPreview(@PreviewParameter(MessagesStateProvider::class) state: MessagesState) = ElementPreview {
     MessagesView(
         state = state,
-        onBackPressed = {},
-        onRoomDetailsClicked = {},
-        onEventClicked = { false },
+        onBackClick = {},
+        onRoomDetailsClick = {},
+        onEventClick = { false },
         onPreviewAttachments = {},
-        onUserDataClicked = {},
-        onLinkClicked = {},
-        onSendLocationClicked = {},
-        onCreatePollClicked = {},
-        onJoinCallClicked = {},
+        onUserDataClick = {},
+        onLinkClick = {},
+        onSendLocationClick = {},
+        onCreatePollClick = {},
+        onJoinCallClick = {},
         forceJumpToBottomVisibility = true,
     )
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt
index 2fe6a0cd2b..cf366c1fba 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt
@@ -94,38 +94,38 @@ import kotlinx.collections.immutable.ImmutableList
 @Composable
 fun ActionListView(
     state: ActionListState,
-    onActionSelected: (action: TimelineItemAction, TimelineItem.Event) -> Unit,
-    onEmojiReactionClicked: (String, TimelineItem.Event) -> Unit,
-    onCustomReactionClicked: (TimelineItem.Event) -> Unit,
+    onSelectAction: (action: TimelineItemAction, TimelineItem.Event) -> Unit,
+    onEmojiReactionClick: (String, TimelineItem.Event) -> Unit,
+    onCustomReactionClick: (TimelineItem.Event) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val sheetState = rememberModalBottomSheetState()
     val coroutineScope = rememberCoroutineScope()
     val targetItem = (state.target as? ActionListState.Target.Success)?.event
 
-    fun onItemActionClicked(
+    fun onItemActionClick(
         itemAction: TimelineItemAction
     ) {
         if (targetItem == null) return
         sheetState.hide(coroutineScope) {
             state.eventSink(ActionListEvents.Clear)
-            onActionSelected(itemAction, targetItem)
+            onSelectAction(itemAction, targetItem)
         }
     }
 
-    fun onEmojiReactionClicked(emoji: String) {
+    fun onEmojiReactionClick(emoji: String) {
         if (targetItem == null) return
         sheetState.hide(coroutineScope) {
             state.eventSink(ActionListEvents.Clear)
-            onEmojiReactionClicked(emoji, targetItem)
+            onEmojiReactionClick(emoji, targetItem)
         }
     }
 
-    fun onCustomReactionClicked() {
+    fun onCustomReactionClick() {
         if (targetItem == null) return
         sheetState.hide(coroutineScope) {
             state.eventSink(ActionListEvents.Clear)
-            onCustomReactionClicked(targetItem)
+            onCustomReactionClick(targetItem)
         }
     }
 
@@ -141,9 +141,9 @@ fun ActionListView(
         ) {
             SheetContent(
                 state = state,
-                onActionClicked = ::onItemActionClicked,
-                onEmojiReactionClicked = ::onEmojiReactionClicked,
-                onCustomReactionClicked = ::onCustomReactionClicked,
+                onActionClick = ::onItemActionClick,
+                onEmojiReactionClick = ::onEmojiReactionClick,
+                onCustomReactionClick = ::onCustomReactionClick,
                 modifier = Modifier
                     .navigationBarsPadding()
                     .imePadding()
@@ -155,9 +155,9 @@ fun ActionListView(
 @Composable
 private fun SheetContent(
     state: ActionListState,
-    onActionClicked: (TimelineItemAction) -> Unit,
-    onEmojiReactionClicked: (String) -> Unit,
-    onCustomReactionClicked: () -> Unit,
+    onActionClick: (TimelineItemAction) -> Unit,
+    onEmojiReactionClick: (String) -> Unit,
+    onCustomReactionClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     when (val target = state.target) {
@@ -188,8 +188,8 @@ private fun SheetContent(
                     item {
                         EmojiReactionsRow(
                             highlightedEmojis = target.event.reactionsState.highlightedKeys,
-                            onEmojiReactionClicked = onEmojiReactionClicked,
-                            onCustomReactionClicked = onCustomReactionClicked,
+                            onEmojiReactionClick = onEmojiReactionClick,
+                            onCustomReactionClick = onCustomReactionClick,
                             modifier = Modifier.fillMaxWidth(),
                         )
                         HorizontalDivider()
@@ -200,7 +200,7 @@ private fun SheetContent(
                 ) { action ->
                     ListItem(
                         modifier = Modifier.clickable {
-                            onActionClicked(action)
+                            onActionClick(action)
                         },
                         headlineContent = {
                             Text(text = stringResource(id = action.titleRes))
@@ -292,8 +292,8 @@ private val emojiRippleRadius = 24.dp
 @Composable
 private fun EmojiReactionsRow(
     highlightedEmojis: ImmutableList<String>,
-    onEmojiReactionClicked: (String) -> Unit,
-    onCustomReactionClicked: () -> Unit,
+    onEmojiReactionClick: (String) -> Unit,
+    onCustomReactionClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Row(
@@ -310,7 +310,7 @@ private fun EmojiReactionsRow(
         )
         for (emoji in defaultEmojis) {
             val isHighlighted = highlightedEmojis.contains(emoji)
-            EmojiButton(emoji, isHighlighted, onEmojiReactionClicked)
+            EmojiButton(emoji, isHighlighted, onEmojiReactionClick)
         }
         Box(
             modifier = Modifier
@@ -325,7 +325,7 @@ private fun EmojiReactionsRow(
                     .size(24.dp)
                     .clickable(
                         enabled = true,
-                        onClick = onCustomReactionClicked,
+                        onClick = onCustomReactionClick,
                         indication = rememberRipple(bounded = false, radius = emojiRippleRadius),
                         interactionSource = remember { MutableInteractionSource() }
                     )
@@ -338,7 +338,7 @@ private fun EmojiReactionsRow(
 private fun EmojiButton(
     emoji: String,
     isHighlighted: Boolean,
-    onClicked: (String) -> Unit,
+    onClick: (String) -> Unit,
 ) {
     val backgroundColor = if (isHighlighted) {
         ElementTheme.colors.bgActionPrimaryRest
@@ -365,7 +365,7 @@ private fun EmojiButton(
             modifier = Modifier
                 .clickable(
                     enabled = true,
-                    onClick = { onClicked(emoji) },
+                    onClick = { onClick(emoji) },
                     indication = rememberRipple(bounded = false, radius = emojiRippleRadius),
                     interactionSource = remember { MutableInteractionSource() }
                 )
@@ -380,8 +380,8 @@ internal fun SheetContentPreview(
 ) = ElementPreview {
     SheetContent(
         state = state,
-        onActionClicked = {},
-        onEmojiReactionClicked = {},
-        onCustomReactionClicked = {},
+        onActionClick = {},
+        onEmojiReactionClick = {},
+        onCustomReactionClick = {},
     )
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewView.kt
index e440a8a9cb..dc13758bd1 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewView.kt
@@ -73,22 +73,22 @@ fun AttachmentsPreviewView(
     Scaffold(modifier) {
         AttachmentPreviewContent(
             attachment = state.attachment,
-            onSendClicked = ::postSendAttachment,
+            onSendClick = ::postSendAttachment,
             onDismiss = onDismiss
         )
     }
     AttachmentSendStateView(
         sendActionState = state.sendActionState,
-        onDismissClicked = ::postClearSendState,
-        onRetryClicked = ::postSendAttachment
+        onDismissClick = ::postClearSendState,
+        onRetryClick = ::postSendAttachment
     )
 }
 
 @Composable
 private fun AttachmentSendStateView(
     sendActionState: SendActionState,
-    onDismissClicked: () -> Unit,
-    onRetryClicked: () -> Unit
+    onDismissClick: () -> Unit,
+    onRetryClick: () -> Unit
 ) {
     when (sendActionState) {
         is SendActionState.Sending -> {
@@ -99,14 +99,14 @@ private fun AttachmentSendStateView(
                 },
                 text = stringResource(id = CommonStrings.common_sending),
                 isCancellable = true,
-                onDismissRequest = onDismissClicked,
+                onDismissRequest = onDismissClick,
             )
         }
         is SendActionState.Failure -> {
             RetryDialog(
                 content = stringResource(sendAttachmentError(sendActionState.error)),
-                onDismiss = onDismissClicked,
-                onRetry = onRetryClicked
+                onDismiss = onDismissClick,
+                onRetry = onRetryClick
             )
         }
         else -> Unit
@@ -116,7 +116,7 @@ private fun AttachmentSendStateView(
 @Composable
 private fun AttachmentPreviewContent(
     attachment: Attachment,
-    onSendClicked: () -> Unit,
+    onSendClick: () -> Unit,
     onDismiss: () -> Unit,
 ) {
     Box(
@@ -146,8 +146,8 @@ private fun AttachmentPreviewContent(
             }
         }
         AttachmentsPreviewBottomActions(
-            onCancelClicked = onDismiss,
-            onSendClicked = onSendClicked,
+            onCancelClick = onDismiss,
+            onSendClick = onSendClick,
             modifier = Modifier
                 .fillMaxWidth()
                 .background(Color.Black.copy(alpha = 0.7f))
@@ -159,13 +159,13 @@ private fun AttachmentPreviewContent(
 
 @Composable
 private fun AttachmentsPreviewBottomActions(
-    onCancelClicked: () -> Unit,
-    onSendClicked: () -> Unit,
+    onCancelClick: () -> Unit,
+    onSendClick: () -> Unit,
     modifier: Modifier = Modifier
 ) {
     ButtonRowMolecule(modifier = modifier) {
-        TextButton(stringResource(id = CommonStrings.action_cancel), onClick = onCancelClicked)
-        TextButton(stringResource(id = CommonStrings.action_send), onClick = onSendClicked)
+        TextButton(stringResource(id = CommonStrings.action_cancel), onClick = onCancelClick)
+        TextButton(stringResource(id = CommonStrings.action_send), onClick = onSendClick)
     }
 }
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesNode.kt
index 4f58cfa274..04d562abde 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesNode.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesNode.kt
@@ -94,12 +94,12 @@ class ForwardMessagesNode @AssistedInject constructor(
             val state = presenter.present()
             ForwardMessagesView(
                 state = state,
-                onForwardingSucceeded = ::onSucceeded,
+                onForwardSuccess = ::onForwardSuccess,
             )
         }
     }
 
-    private fun onSucceeded(roomIds: ImmutableList<RoomId>) {
+    private fun onForwardSuccess(roomIds: ImmutableList<RoomId>) {
         navigateUp()
         if (roomIds.size == 1) {
             val targetRoomId = roomIds.first()
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesView.kt
index 089046544b..030b137c04 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesView.kt
@@ -30,11 +30,11 @@ import kotlinx.collections.immutable.ImmutableList
 @Composable
 fun ForwardMessagesView(
     state: ForwardMessagesState,
-    onForwardingSucceeded: (ImmutableList<RoomId>) -> Unit,
+    onForwardSuccess: (ImmutableList<RoomId>) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     if (state.forwardingSucceeded != null) {
-        onForwardingSucceeded(state.forwardingSucceeded)
+        onForwardSuccess(state.forwardingSucceeded)
         return
     }
 
@@ -64,6 +64,6 @@ private fun ForwardingErrorDialog(onDismiss: () -> Unit, modifier: Modifier = Mo
 internal fun ForwardMessagesViewPreview(@PreviewParameter(ForwardMessagesStateProvider::class) state: ForwardMessagesState) = ElementPreview {
     ForwardMessagesView(
         state = state,
-        onForwardingSucceeded = {}
+        onForwardSuccess = {}
     )
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/mentions/MentionSuggestionsPickerView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/mentions/MentionSuggestionsPickerView.kt
index 6639910ec9..9af2407657 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/mentions/MentionSuggestionsPickerView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/mentions/MentionSuggestionsPickerView.kt
@@ -53,7 +53,7 @@ fun MentionSuggestionsPickerView(
     roomName: String?,
     roomAvatarData: AvatarData?,
     memberSuggestions: ImmutableList<ResolvedMentionSuggestion>,
-    onSuggestionSelected: (ResolvedMentionSuggestion) -> Unit,
+    onSelectSuggestion: (ResolvedMentionSuggestion) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     LazyColumn(
@@ -74,7 +74,7 @@ fun MentionSuggestionsPickerView(
                     roomId = roomId.value,
                     roomName = roomName,
                     roomAvatar = roomAvatarData,
-                    onSuggestionSelected = onSuggestionSelected,
+                    onSelectSuggestion = onSelectSuggestion,
                     modifier = Modifier.fillMaxWidth()
                 )
                 HorizontalDivider(modifier = Modifier.fillMaxWidth())
@@ -89,10 +89,10 @@ private fun RoomMemberSuggestionItemView(
     roomId: String,
     roomName: String?,
     roomAvatar: AvatarData?,
-    onSuggestionSelected: (ResolvedMentionSuggestion) -> Unit,
+    onSelectSuggestion: (ResolvedMentionSuggestion) -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    Row(modifier = modifier.clickable { onSuggestionSelected(memberSuggestion) }, horizontalArrangement = Arrangement.spacedBy(16.dp)) {
+    Row(modifier = modifier.clickable { onSelectSuggestion(memberSuggestion) }, horizontalArrangement = Arrangement.spacedBy(16.dp)) {
         val avatarSize = AvatarSize.TimelineRoom
         val avatarData = when (memberSuggestion) {
             is ResolvedMentionSuggestion.AtRoom -> roomAvatar?.copy(size = avatarSize) ?: AvatarData(roomId, roomName, null, avatarSize)
@@ -164,7 +164,7 @@ internal fun MentionSuggestionsPickerViewPreview() {
                 ResolvedMentionSuggestion.Member(roomMember),
                 ResolvedMentionSuggestion.Member(roomMember.copy(userId = UserId("@bob:server.org"), displayName = "Bob")),
             ),
-            onSuggestionSelected = {}
+            onSelectSuggestion = {}
         )
     }
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/AttachmentsBottomSheet.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/AttachmentsBottomSheet.kt
index 8845854602..8ba8ceec01 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/AttachmentsBottomSheet.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/AttachmentsBottomSheet.kt
@@ -48,8 +48,8 @@ import io.element.android.libraries.designsystem.theme.components.Text
 @Composable
 internal fun AttachmentsBottomSheet(
     state: MessageComposerState,
-    onSendLocationClicked: () -> Unit,
-    onCreatePollClicked: () -> Unit,
+    onSendLocationClick: () -> Unit,
+    onCreatePollClick: () -> Unit,
     enableTextFormatting: Boolean,
     modifier: Modifier = Modifier,
 ) {
@@ -87,8 +87,8 @@ internal fun AttachmentsBottomSheet(
             AttachmentSourcePickerMenu(
                 state = state,
                 enableTextFormatting = enableTextFormatting,
-                onSendLocationClicked = onSendLocationClicked,
-                onCreatePollClicked = onCreatePollClicked,
+                onSendLocationClick = onSendLocationClick,
+                onCreatePollClick = onCreatePollClick,
             )
         }
     }
@@ -97,8 +97,8 @@ internal fun AttachmentsBottomSheet(
 @Composable
 private fun AttachmentSourcePickerMenu(
     state: MessageComposerState,
-    onSendLocationClicked: () -> Unit,
-    onCreatePollClicked: () -> Unit,
+    onSendLocationClick: () -> Unit,
+    onCreatePollClick: () -> Unit,
     enableTextFormatting: Boolean,
 ) {
     Column(
@@ -134,7 +134,7 @@ private fun AttachmentSourcePickerMenu(
             ListItem(
                 modifier = Modifier.clickable {
                     state.eventSink(MessageComposerEvents.PickAttachmentSource.Location)
-                    onSendLocationClicked()
+                    onSendLocationClick()
                 },
                 leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.LocationPin())),
                 headlineContent = { Text(stringResource(R.string.screen_room_attachment_source_location)) },
@@ -145,7 +145,7 @@ private fun AttachmentSourcePickerMenu(
             ListItem(
                 modifier = Modifier.clickable {
                     state.eventSink(MessageComposerEvents.PickAttachmentSource.Poll)
-                    onCreatePollClicked()
+                    onCreatePollClick()
                 },
                 leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Polls())),
                 headlineContent = { Text(stringResource(R.string.screen_room_attachment_source_poll)) },
@@ -170,8 +170,8 @@ internal fun AttachmentSourcePickerMenuPreview() = ElementPreview {
         state = aMessageComposerState(
             canShareLocation = true,
         ),
-        onSendLocationClicked = {},
-        onCreatePollClicked = {},
+        onSendLocationClick = {},
+        onCreatePollClick = {},
         enableTextFormatting = true,
     )
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerView.kt
index 207d811707..cd2e93e45f 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerView.kt
@@ -121,11 +121,11 @@ internal fun MessageComposerView(
         onVoicePlayerEvent = onVoicePlayerEvent,
         onSendVoiceMessage = onSendVoiceMessage,
         onDeleteVoiceMessage = onDeleteVoiceMessage,
-        onSuggestionReceived = ::onSuggestionReceived,
+        onReceiveSuggestion = ::onSuggestionReceived,
         onError = ::onError,
         onTyping = ::onTyping,
         currentUserId = state.currentUserId,
-        onRichContentSelected = ::sendUri,
+        onSelectRichContent = ::sendUri,
     )
 }
 
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageNode.kt
index a1157e2830..910de10ff2 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageNode.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageNode.kt
@@ -52,7 +52,7 @@ class ReportMessageNode @AssistedInject constructor(
         val state = presenter.present()
         ReportMessageView(
             state = state,
-            onBackClicked = ::navigateUp,
+            onBackClick = ::navigateUp,
             modifier = modifier
         )
     }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageView.kt
index 2791ee632c..720c65dfc1 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/report/ReportMessageView.kt
@@ -58,7 +58,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun ReportMessageView(
     state: ReportMessageState,
-    onBackClicked: () -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val focusManager = LocalFocusManager.current
@@ -66,7 +66,7 @@ fun ReportMessageView(
     AsyncActionView(
         async = state.result,
         progressDialog = {},
-        onSuccess = { onBackClicked() },
+        onSuccess = { onBackClick() },
         errorMessage = { stringResource(CommonStrings.error_unknown) },
         onErrorDismiss = { state.eventSink(ReportMessageEvents.ClearError) }
     )
@@ -81,7 +81,7 @@ fun ReportMessageView(
                     )
                 },
                 navigationIcon = {
-                    BackButton(onClick = onBackClicked)
+                    BackButton(onClick = onBackClick)
                 }
             )
         },
@@ -160,7 +160,7 @@ fun ReportMessageView(
 @Composable
 internal fun ReportMessageViewPreview(@PreviewParameter(ReportMessageStateProvider::class) state: ReportMessageState) = ElementPreview {
     ReportMessageView(
-        onBackClicked = {},
+        onBackClick = {},
         state = state,
     )
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
index d6a02959c0..9be590932b 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
@@ -134,7 +134,7 @@ class TimelinePresenter @AssistedInject constructor(
                     )
                 }
                 is TimelineEvents.PollEditClicked -> {
-                    navigator.onEditPollClicked(event.pollStartId)
+                    navigator.onEditPollClick(event.pollStartId)
                 }
                 is TimelineEvents.FocusOnEvent -> localScope.launch {
                     focusedEventId.value = event.eventId
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt
index 3483c27f85..46761d15cb 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt
@@ -79,15 +79,15 @@ import kotlin.math.abs
 fun TimelineView(
     state: TimelineState,
     typingNotificationState: TypingNotificationState,
-    onUserDataClicked: (UserId) -> Unit,
-    onLinkClicked: (String) -> Unit,
-    onMessageClicked: (TimelineItem.Event) -> Unit,
-    onMessageLongClicked: (TimelineItem.Event) -> Unit,
-    onTimestampClicked: (TimelineItem.Event) -> Unit,
+    onUserDataClick: (UserId) -> Unit,
+    onLinkClick: (String) -> Unit,
+    onMessageClick: (TimelineItem.Event) -> Unit,
+    onMessageLongClick: (TimelineItem.Event) -> Unit,
+    onTimestampClick: (TimelineItem.Event) -> Unit,
     onSwipeToReply: (TimelineItem.Event) -> Unit,
-    onReactionClicked: (emoji: String, TimelineItem.Event) -> Unit,
-    onReactionLongClicked: (emoji: String, TimelineItem.Event) -> Unit,
-    onMoreReactionsClicked: (TimelineItem.Event) -> Unit,
+    onReactionClick: (emoji: String, TimelineItem.Event) -> Unit,
+    onReactionLongClick: (emoji: String, TimelineItem.Event) -> Unit,
+    onMoreReactionsClick: (TimelineItem.Event) -> Unit,
     onReadReceiptClick: (TimelineItem.Event) -> Unit,
     modifier: Modifier = Modifier,
     forceJumpToBottomVisibility: Boolean = false
@@ -96,7 +96,7 @@ fun TimelineView(
         state.eventSink(TimelineEvents.ClearFocusRequestState)
     }
 
-    fun onScrollFinishedAt(firstVisibleIndex: Int) {
+    fun onScrollFinishAt(firstVisibleIndex: Int) {
         state.eventSink(TimelineEvents.OnScrollFinished(firstVisibleIndex))
     }
 
@@ -108,7 +108,7 @@ fun TimelineView(
         accessibilityManager.isTouchExplorationEnabled.not()
     }
 
-    fun inReplyToClicked(eventId: EventId) {
+    fun inReplyToClick(eventId: EventId) {
         state.eventSink(TimelineEvents.FocusOnEvent(eventId))
     }
 
@@ -138,16 +138,16 @@ fun TimelineView(
                         isLastOutgoingMessage = (timelineItem as? TimelineItem.Event)?.isMine == true &&
                             state.timelineItems.first().identifier() == timelineItem.identifier(),
                         focusedEventId = state.focusedEventId,
-                        onClick = onMessageClicked,
-                        onLongClick = onMessageLongClicked,
-                        onUserDataClick = onUserDataClicked,
-                        onLinkClicked = onLinkClicked,
-                        inReplyToClick = ::inReplyToClicked,
-                        onReactionClick = onReactionClicked,
-                        onReactionLongClick = onReactionLongClicked,
-                        onMoreReactionsClick = onMoreReactionsClicked,
+                        onClick = onMessageClick,
+                        onLongClick = onMessageLongClick,
+                        onUserDataClick = onUserDataClick,
+                        onLinkClick = onLinkClick,
+                        inReplyToClick = ::inReplyToClick,
+                        onReactionClick = onReactionClick,
+                        onReactionLongClick = onReactionLongClick,
+                        onMoreReactionsClick = onMoreReactionsClick,
                         onReadReceiptClick = onReadReceiptClick,
-                        onTimestampClicked = onTimestampClicked,
+                        onTimestampClick = onTimestampClick,
                         eventSink = state.eventSink,
                         onSwipeToReply = onSwipeToReply,
                     )
@@ -166,7 +166,7 @@ fun TimelineView(
                 newEventState = state.newEventState,
                 isLive = state.isLive,
                 focusRequestState = state.focusRequestState,
-                onScrollFinishedAt = ::onScrollFinishedAt,
+                onScrollFinishAt = ::onScrollFinishAt,
                 onClearFocusRequestState = ::clearFocusRequestState,
                 onJumpToLive = { state.eventSink(TimelineEvents.JumpToLive) },
             )
@@ -183,7 +183,7 @@ private fun BoxScope.TimelineScrollHelper(
     forceJumpToBottomVisibility: Boolean,
     focusRequestState: FocusRequestState,
     onClearFocusRequestState: () -> Unit,
-    onScrollFinishedAt: (Int) -> Unit,
+    onScrollFinishAt: (Int) -> Unit,
     onJumpToLive: () -> Unit,
 ) {
     val coroutineScope = rememberCoroutineScope()
@@ -231,11 +231,11 @@ private fun BoxScope.TimelineScrollHelper(
         }
     }
 
-    val latestOnScrollFinishedAt by rememberUpdatedState(onScrollFinishedAt)
+    val latestOnScrollFinishAt by rememberUpdatedState(onScrollFinishAt)
     LaunchedEffect(isScrollFinished, hasAnyEvent) {
         if (isScrollFinished && hasAnyEvent) {
             // Notify the parent composable about the first visible item index when scrolling finishes
-            latestOnScrollFinishedAt(lazyListState.firstVisibleItemIndex)
+            latestOnScrollFinishAt(lazyListState.firstVisibleItemIndex)
         }
     }
 
@@ -295,15 +295,15 @@ internal fun TimelineViewPreview(
                 focusedEventIndex = 0,
             ),
             typingNotificationState = aTypingNotificationState(),
-            onUserDataClicked = {},
-            onLinkClicked = {},
-            onMessageClicked = {},
-            onMessageLongClicked = {},
-            onTimestampClicked = {},
+            onUserDataClick = {},
+            onLinkClick = {},
+            onMessageClick = {},
+            onMessageLongClick = {},
+            onTimestampClick = {},
             onSwipeToReply = {},
-            onReactionClicked = { _, _ -> },
-            onReactionLongClicked = { _, _ -> },
-            onMoreReactionsClicked = {},
+            onReactionClick = { _, _ -> },
+            onReactionLongClick = { _, _ -> },
+            onMoreReactionsClick = {},
             onReadReceiptClick = {},
             forceJumpToBottomVisibility = true,
         )
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/ATimelineItemEventRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/ATimelineItemEventRow.kt
index 92b12b2dc8..b6e6646c1e 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/ATimelineItemEventRow.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/ATimelineItemEventRow.kt
@@ -38,13 +38,13 @@ internal fun ATimelineItemEventRow(
     onClick = {},
     onLongClick = {},
     onUserDataClick = {},
-    onLinkClicked = {},
+    onLinkClick = {},
     inReplyToClick = {},
     onReactionClick = { _, _ -> },
     onReactionLongClick = { _, _ -> },
     onMoreReactionsClick = {},
     onReadReceiptClick = {},
     onSwipeToReply = {},
-    onTimestampClicked = {},
+    onTimestampClick = {},
     eventSink = {},
 )
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt
index 87dd60b8a7..993d872852 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt
@@ -127,10 +127,10 @@ fun TimelineItemEventRow(
     isHighlighted: Boolean,
     onClick: () -> Unit,
     onLongClick: () -> Unit,
-    onLinkClicked: (String) -> Unit,
+    onLinkClick: (String) -> Unit,
     onUserDataClick: (UserId) -> Unit,
     inReplyToClick: (EventId) -> Unit,
-    onTimestampClicked: (TimelineItem.Event) -> Unit,
+    onTimestampClick: (TimelineItem.Event) -> Unit,
     onReactionClick: (emoji: String, eventId: TimelineItem.Event) -> Unit,
     onReactionLongClick: (emoji: String, eventId: TimelineItem.Event) -> Unit,
     onMoreReactionsClick: (eventId: TimelineItem.Event) -> Unit,
@@ -142,11 +142,11 @@ fun TimelineItemEventRow(
     val coroutineScope = rememberCoroutineScope()
     val interactionSource = remember { MutableInteractionSource() }
 
-    fun onUserDataClicked() {
+    fun onUserDataClick() {
         onUserDataClick(event.senderId)
     }
 
-    fun inReplyToClicked() {
+    fun inReplyToClick() {
         val inReplyToEventId = event.inReplyTo?.eventId() ?: return
         inReplyToClick(inReplyToEventId)
     }
@@ -190,13 +190,13 @@ fun TimelineItemEventRow(
                         interactionSource = interactionSource,
                         onClick = onClick,
                         onLongClick = onLongClick,
-                        onTimestampClicked = onTimestampClicked,
-                        inReplyToClicked = ::inReplyToClicked,
-                        onUserDataClicked = ::onUserDataClicked,
-                        onReactionClicked = { emoji -> onReactionClick(emoji, event) },
-                        onReactionLongClicked = { emoji -> onReactionLongClick(emoji, event) },
-                        onMoreReactionsClicked = { onMoreReactionsClick(event) },
-                        onLinkClicked = onLinkClicked,
+                        onTimestampClick = onTimestampClick,
+                        inReplyToClick = ::inReplyToClick,
+                        onUserDataClick = ::onUserDataClick,
+                        onReactionClick = { emoji -> onReactionClick(emoji, event) },
+                        onReactionLongClick = { emoji -> onReactionLongClick(emoji, event) },
+                        onMoreReactionsClick = { onMoreReactionsClick(event) },
+                        onLinkClick = onLinkClick,
                         eventSink = eventSink,
                     )
                 }
@@ -209,13 +209,13 @@ fun TimelineItemEventRow(
                 interactionSource = interactionSource,
                 onClick = onClick,
                 onLongClick = onLongClick,
-                onTimestampClicked = onTimestampClicked,
-                inReplyToClicked = ::inReplyToClicked,
-                onUserDataClicked = ::onUserDataClicked,
-                onReactionClicked = { emoji -> onReactionClick(emoji, event) },
-                onReactionLongClicked = { emoji -> onReactionLongClick(emoji, event) },
-                onMoreReactionsClicked = { onMoreReactionsClick(event) },
-                onLinkClicked = onLinkClicked,
+                onTimestampClick = onTimestampClick,
+                inReplyToClick = ::inReplyToClick,
+                onUserDataClick = ::onUserDataClick,
+                onReactionClick = { emoji -> onReactionClick(emoji, event) },
+                onReactionLongClick = { emoji -> onReactionLongClick(emoji, event) },
+                onMoreReactionsClick = { onMoreReactionsClick(event) },
+                onLinkClick = onLinkClick,
                 eventSink = eventSink,
             )
         }
@@ -227,7 +227,7 @@ fun TimelineItemEventRow(
                 receipts = event.readReceiptState.receipts,
             ),
             renderReadReceipts = renderReadReceipts,
-            onReadReceiptsClicked = { onReadReceiptClick(event) },
+            onReadReceiptsClick = { onReadReceiptClick(event) },
             modifier = Modifier.padding(top = 4.dp),
         )
     }
@@ -265,13 +265,13 @@ private fun TimelineItemEventRowContent(
     interactionSource: MutableInteractionSource,
     onClick: () -> Unit,
     onLongClick: () -> Unit,
-    onTimestampClicked: (TimelineItem.Event) -> Unit,
-    inReplyToClicked: () -> Unit,
-    onUserDataClicked: () -> Unit,
-    onReactionClicked: (emoji: String) -> Unit,
-    onReactionLongClicked: (emoji: String) -> Unit,
-    onMoreReactionsClicked: (event: TimelineItem.Event) -> Unit,
-    onLinkClicked: (String) -> Unit,
+    onTimestampClick: (TimelineItem.Event) -> Unit,
+    inReplyToClick: () -> Unit,
+    onUserDataClick: () -> Unit,
+    onReactionClick: (emoji: String) -> Unit,
+    onReactionLongClick: (emoji: String) -> Unit,
+    onMoreReactionsClick: (event: TimelineItem.Event) -> Unit,
+    onLinkClick: (String) -> Unit,
     eventSink: (TimelineEvents.EventFromTimelineItem) -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -306,7 +306,7 @@ private fun TimelineItemEventRowContent(
                     }
                     .padding(horizontal = 16.dp)
                     .zIndex(1f)
-                    .clickable(onClick = onUserDataClicked)
+                    .clickable(onClick = onUserDataClick)
                     // This is redundant when using talkback
                     .clearAndSetSemantics {
                         invisibleToUser()
@@ -336,11 +336,11 @@ private fun TimelineItemEventRowContent(
             MessageEventBubbleContent(
                 event = event,
                 onMessageLongClick = onLongClick,
-                inReplyToClick = inReplyToClicked,
-                onTimestampClicked = {
-                    onTimestampClicked(event)
+                inReplyToClick = inReplyToClick,
+                onTimestampClick = {
+                    onTimestampClick(event)
                 },
-                onLinkClicked = onLinkClicked,
+                onLinkClick = onLinkClick,
                 eventSink = eventSink,
             )
         }
@@ -351,9 +351,9 @@ private fun TimelineItemEventRowContent(
                 reactionsState = event.reactionsState,
                 userCanSendReaction = timelineRoomInfo.userHasPermissionToSendReaction,
                 isOutgoing = event.isMine,
-                onReactionClicked = onReactionClicked,
-                onReactionLongClicked = onReactionLongClicked,
-                onMoreReactionsClicked = { onMoreReactionsClicked(event) },
+                onReactionClick = onReactionClick,
+                onReactionLongClick = onReactionLongClick,
+                onMoreReactionsClick = { onMoreReactionsClick(event) },
                 modifier = Modifier
                     .constrainAs(reactions) {
                         top.linkTo(message.bottom, margin = (-4).dp)
@@ -419,8 +419,8 @@ private fun MessageEventBubbleContent(
     event: TimelineItem.Event,
     onMessageLongClick: () -> Unit,
     inReplyToClick: () -> Unit,
-    onTimestampClicked: () -> Unit,
-    onLinkClicked: (String) -> Unit,
+    onTimestampClick: () -> Unit,
+    onLinkClick: (String) -> Unit,
     eventSink: (TimelineEvents.EventFromTimelineItem) -> Unit,
     @SuppressLint("ModifierParameter")
     // need to rename this modifier to prevent linter false positives
@@ -460,7 +460,7 @@ private fun MessageEventBubbleContent(
         timestampPosition: TimestampPosition,
         modifier: Modifier = Modifier,
         canShrinkContent: Boolean = false,
-        content: @Composable (onContentLayoutChanged: (ContentAvoidingLayoutData) -> Unit) -> Unit,
+        content: @Composable (onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit) -> Unit,
     ) {
         when (timestampPosition) {
             TimestampPosition.Overlay ->
@@ -468,7 +468,7 @@ private fun MessageEventBubbleContent(
                     content {}
                     TimelineEventTimestampView(
                         event = event,
-                        onClick = onTimestampClicked,
+                        onClick = onTimestampClick,
                         onLongClick = ::onTimestampLongClick,
                         modifier = Modifier
                             // Outer padding
@@ -486,11 +486,11 @@ private fun MessageEventBubbleContent(
                     spacing = (-4).dp,
                     overlayOffset = DpOffset(0.dp, -1.dp),
                     shrinkContent = canShrinkContent,
-                    content = { content(this::onContentLayoutChanged) },
+                    content = { content(this::onContentLayoutChange) },
                     overlay = {
                         TimelineEventTimestampView(
                             event = event,
-                            onClick = onTimestampClicked,
+                            onClick = onTimestampClick,
                             onLongClick = ::onTimestampLongClick,
                             modifier = Modifier
                                 .padding(horizontal = 8.dp, vertical = 4.dp)
@@ -502,7 +502,7 @@ private fun MessageEventBubbleContent(
                     content {}
                     TimelineEventTimestampView(
                         event = event,
-                        onClick = onTimestampClicked,
+                        onClick = onTimestampClick,
                         onLongClick = ::onTimestampLongClick,
                         modifier = Modifier
                             .align(Alignment.End)
@@ -553,12 +553,12 @@ private fun MessageEventBubbleContent(
                 timestampPosition = timestampPosition,
                 canShrinkContent = canShrinkContent,
                 modifier = timestampLayoutModifier,
-            ) { onContentLayoutChanged ->
+            ) { onContentLayoutChange ->
                 TimelineItemEventContentView(
                     content = event.content,
-                    onLinkClicked = onLinkClicked,
+                    onLinkClick = onLinkClick,
                     eventSink = eventSink,
-                    onContentLayoutChanged = onContentLayoutChanged,
+                    onContentLayoutChange = onContentLayoutChange,
                     modifier = contentModifier
                 )
             }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemGroupedEventsRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemGroupedEventsRow.kt
index 2dcc0c1b55..6f9f8146a2 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemGroupedEventsRow.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemGroupedEventsRow.kt
@@ -48,8 +48,8 @@ fun TimelineItemGroupedEventsRow(
     onLongClick: (TimelineItem.Event) -> Unit,
     inReplyToClick: (EventId) -> Unit,
     onUserDataClick: (UserId) -> Unit,
-    onLinkClicked: (String) -> Unit,
-    onTimestampClicked: (TimelineItem.Event) -> Unit,
+    onLinkClick: (String) -> Unit,
+    onTimestampClick: (TimelineItem.Event) -> Unit,
     onReactionClick: (key: String, TimelineItem.Event) -> Unit,
     onReactionLongClick: (key: String, TimelineItem.Event) -> Unit,
     onMoreReactionsClick: (TimelineItem.Event) -> Unit,
@@ -75,8 +75,8 @@ fun TimelineItemGroupedEventsRow(
         onLongClick = onLongClick,
         inReplyToClick = inReplyToClick,
         onUserDataClick = onUserDataClick,
-        onLinkClicked = onLinkClicked,
-        onTimestampClicked = onTimestampClicked,
+        onLinkClick = onLinkClick,
+        onTimestampClick = onTimestampClick,
         onReactionClick = onReactionClick,
         onReactionLongClick = onReactionLongClick,
         onMoreReactionsClick = onMoreReactionsClick,
@@ -99,8 +99,8 @@ private fun TimelineItemGroupedEventsRowContent(
     onLongClick: (TimelineItem.Event) -> Unit,
     inReplyToClick: (EventId) -> Unit,
     onUserDataClick: (UserId) -> Unit,
-    onLinkClicked: (String) -> Unit,
-    onTimestampClicked: (TimelineItem.Event) -> Unit,
+    onLinkClick: (String) -> Unit,
+    onTimestampClick: (TimelineItem.Event) -> Unit,
     onReactionClick: (key: String, TimelineItem.Event) -> Unit,
     onReactionLongClick: (key: String, TimelineItem.Event) -> Unit,
     onMoreReactionsClick: (TimelineItem.Event) -> Unit,
@@ -132,8 +132,8 @@ private fun TimelineItemGroupedEventsRowContent(
                         onLongClick = onLongClick,
                         inReplyToClick = inReplyToClick,
                         onUserDataClick = onUserDataClick,
-                        onLinkClicked = onLinkClicked,
-                        onTimestampClicked = onTimestampClicked,
+                        onLinkClick = onLinkClick,
+                        onTimestampClick = onTimestampClick,
                         onReactionClick = onReactionClick,
                         onReactionLongClick = onReactionLongClick,
                         onMoreReactionsClick = onMoreReactionsClick,
@@ -151,7 +151,7 @@ private fun TimelineItemGroupedEventsRowContent(
                     receipts = timelineItem.aggregatedReadReceipts,
                 ),
                 renderReadReceipts = true,
-                onReadReceiptsClicked = onExpandGroupClick
+                onReadReceiptsClick = onExpandGroupClick
             )
         }
     }
@@ -173,8 +173,8 @@ internal fun TimelineItemGroupedEventsRowContentExpandedPreview() = ElementPrevi
         onLongClick = {},
         inReplyToClick = {},
         onUserDataClick = {},
-        onLinkClicked = {},
-        onTimestampClicked = {},
+        onLinkClick = {},
+        onTimestampClick = {},
         onReactionClick = { _, _ -> },
         onReactionLongClick = { _, _ -> },
         onMoreReactionsClick = {},
@@ -198,8 +198,8 @@ internal fun TimelineItemGroupedEventsRowContentCollapsePreview() = ElementPrevi
         onLongClick = {},
         inReplyToClick = {},
         onUserDataClick = {},
-        onLinkClicked = {},
-        onTimestampClicked = {},
+        onLinkClick = {},
+        onTimestampClick = {},
         onReactionClick = { _, _ -> },
         onReactionLongClick = { _, _ -> },
         onMoreReactionsClick = {},
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsView.kt
index ba357ab573..0b9d43d285 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemReactionsView.kt
@@ -42,9 +42,9 @@ fun TimelineItemReactionsView(
     reactionsState: TimelineItemReactions,
     isOutgoing: Boolean,
     userCanSendReaction: Boolean,
-    onReactionClicked: (emoji: String) -> Unit,
-    onReactionLongClicked: (emoji: String) -> Unit,
-    onMoreReactionsClicked: () -> Unit,
+    onReactionClick: (emoji: String) -> Unit,
+    onReactionLongClick: (emoji: String) -> Unit,
+    onMoreReactionsClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     var expanded: Boolean by rememberSaveable { mutableStateOf(false) }
@@ -54,9 +54,9 @@ fun TimelineItemReactionsView(
         userCanSendReaction = userCanSendReaction,
         expanded = expanded,
         isOutgoing = isOutgoing,
-        onReactionClick = onReactionClicked,
-        onReactionLongClick = onReactionLongClicked,
-        onMoreReactionsClick = onMoreReactionsClicked,
+        onReactionClick = onReactionClick,
+        onReactionLongClick = onReactionLongClick,
+        onMoreReactionsClick = onMoreReactionsClick,
         onToggleExpandClick = { expanded = !expanded },
     )
 }
@@ -179,8 +179,8 @@ private fun ContentToPreview(
         ),
         userCanSendReaction = true,
         isOutgoing = isOutgoing,
-        onReactionClicked = {},
-        onReactionLongClicked = {},
-        onMoreReactionsClicked = {},
+        onReactionClick = {},
+        onReactionLongClick = {},
+        onMoreReactionsClick = {},
     )
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemRow.kt
index 4193a9f131..d1e49a8c43 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemRow.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemRow.kt
@@ -45,7 +45,7 @@ internal fun TimelineItemRow(
     isLastOutgoingMessage: Boolean,
     focusedEventId: EventId?,
     onUserDataClick: (UserId) -> Unit,
-    onLinkClicked: (String) -> Unit,
+    onLinkClick: (String) -> Unit,
     onClick: (TimelineItem.Event) -> Unit,
     onLongClick: (TimelineItem.Event) -> Unit,
     inReplyToClick: (EventId) -> Unit,
@@ -53,7 +53,7 @@ internal fun TimelineItemRow(
     onReactionLongClick: (key: String, TimelineItem.Event) -> Unit,
     onMoreReactionsClick: (TimelineItem.Event) -> Unit,
     onReadReceiptClick: (TimelineItem.Event) -> Unit,
-    onTimestampClicked: (TimelineItem.Event) -> Unit,
+    onTimestampClick: (TimelineItem.Event) -> Unit,
     onSwipeToReply: (TimelineItem.Event) -> Unit,
     eventSink: (TimelineEvents.EventFromTimelineItem) -> Unit,
     modifier: Modifier = Modifier
@@ -99,13 +99,13 @@ internal fun TimelineItemRow(
                         onClick = { onClick(timelineItem) },
                         onLongClick = { onLongClick(timelineItem) },
                         onUserDataClick = onUserDataClick,
-                        onLinkClicked = onLinkClicked,
+                        onLinkClick = onLinkClick,
                         inReplyToClick = inReplyToClick,
                         onReactionClick = onReactionClick,
                         onReactionLongClick = onReactionLongClick,
                         onMoreReactionsClick = onMoreReactionsClick,
                         onReadReceiptClick = onReadReceiptClick,
-                        onTimestampClicked = onTimestampClicked,
+                        onTimestampClick = onTimestampClick,
                         onSwipeToReply = { onSwipeToReply(timelineItem) },
                         eventSink = eventSink,
                     )
@@ -122,8 +122,8 @@ internal fun TimelineItemRow(
                     onLongClick = onLongClick,
                     inReplyToClick = inReplyToClick,
                     onUserDataClick = onUserDataClick,
-                    onLinkClicked = onLinkClicked,
-                    onTimestampClicked = onTimestampClicked,
+                    onLinkClick = onLinkClick,
+                    onTimestampClick = onTimestampClick,
                     onReactionClick = onReactionClick,
                     onReactionLongClick = onReactionLongClick,
                     onMoreReactionsClick = onMoreReactionsClick,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemStateEventRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemStateEventRow.kt
index e0132ea75f..04c5c227ed 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemStateEventRow.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemStateEventRow.kt
@@ -79,7 +79,7 @@ fun TimelineItemStateEventRow(
             ) {
                 TimelineItemEventContentView(
                     content = event.content,
-                    onLinkClicked = {},
+                    onLinkClick = {},
                     eventSink = eventSink,
                     modifier = Modifier.defaultTimelineContentPadding()
                 )
@@ -92,7 +92,7 @@ fun TimelineItemStateEventRow(
                 receipts = event.readReceiptState.receipts,
             ),
             renderReadReceipts = renderReadReceipts,
-            onReadReceiptsClicked = { onReadReceiptsClick(event) },
+            onReadReceiptsClick = { onReadReceiptsClick(event) },
         )
     }
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/CustomReactionBottomSheet.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/CustomReactionBottomSheet.kt
index 3fe739a592..face810bc7 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/CustomReactionBottomSheet.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/CustomReactionBottomSheet.kt
@@ -31,7 +31,7 @@ import io.element.android.libraries.matrix.api.core.EventId
 @Composable
 fun CustomReactionBottomSheet(
     state: CustomReactionState,
-    onEmojiSelected: (EventId, Emoji) -> Unit,
+    onSelectEmoji: (EventId, Emoji) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val sheetState = rememberModalBottomSheetState()
@@ -46,7 +46,7 @@ fun CustomReactionBottomSheet(
         if (target?.event?.eventId == null) return
         sheetState.hide(coroutineScope) {
             state.eventSink(CustomReactionEvents.DismissCustomReactionSheet)
-            onEmojiSelected(target.event.eventId, emoji)
+            onSelectEmoji(target.event.eventId, emoji)
         }
     }
 
@@ -57,7 +57,7 @@ fun CustomReactionBottomSheet(
             modifier = modifier
         ) {
             EmojiPicker(
-                onEmojiSelected = ::onEmojiSelectedDismiss,
+                onSelectEmoji = ::onEmojiSelectedDismiss,
                 emojibaseStore = target.emojibaseStore,
                 selectedEmojis = state.selectedEmoji,
                 modifier = Modifier.fillMaxSize(),
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojiItem.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojiItem.kt
index 8b720ce390..25bc605e73 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojiItem.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojiItem.kt
@@ -49,7 +49,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
 fun EmojiItem(
     item: Emoji,
     isSelected: Boolean,
-    onEmojiSelected: (Emoji) -> Unit,
+    onSelectEmoji: (Emoji) -> Unit,
     modifier: Modifier = Modifier,
     emojiSize: TextUnit = 20.sp,
 ) {
@@ -69,7 +69,7 @@ fun EmojiItem(
             .background(backgroundColor, CircleShape)
             .clickable(
                 enabled = true,
-                onClick = { onEmojiSelected(item) },
+                onClick = { onSelectEmoji(item) },
                 indication = rememberRipple(bounded = false, radius = emojiSize.toDp() / 2 + 10.dp),
                 interactionSource = remember { MutableInteractionSource() }
             )
@@ -102,7 +102,7 @@ internal fun EmojiItemPreview() = ElementPreview {
                     skins = null
                 ),
                 isSelected = isSelected,
-                onEmojiSelected = {},
+                onSelectEmoji = {},
             )
         }
     }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojiPicker.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojiPicker.kt
index ddf524b656..3af55a6e93 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojiPicker.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/EmojiPicker.kt
@@ -53,7 +53,7 @@ import kotlinx.coroutines.launch
 @OptIn(ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class)
 @Composable
 fun EmojiPicker(
-    onEmojiSelected: (Emoji) -> Unit,
+    onSelectEmoji: (Emoji) -> Unit,
     emojibaseStore: EmojibaseStore,
     selectedEmojis: ImmutableSet<String>,
     modifier: Modifier = Modifier,
@@ -99,7 +99,7 @@ fun EmojiPicker(
                         modifier = Modifier.aspectRatio(1f),
                         item = item,
                         isSelected = selectedEmojis.contains(item.unicode),
-                        onEmojiSelected = onEmojiSelected,
+                        onSelectEmoji = onSelectEmoji,
                         emojiSize = 32.dp.toSp(),
                     )
                 }
@@ -112,7 +112,7 @@ fun EmojiPicker(
 @Composable
 internal fun EmojiPickerPreview() = ElementPreview {
     EmojiPicker(
-        onEmojiSelected = {},
+        onSelectEmoji = {},
         emojibaseStore = EmojibaseDatasource().load(LocalContext.current),
         selectedEmojis = persistentSetOf("😀", "😄", "😃"),
         modifier = Modifier.fillMaxWidth(),
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemAudioView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemAudioView.kt
index d4a2dbabc9..d618fe4244 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemAudioView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemAudioView.kt
@@ -46,7 +46,7 @@ import io.element.android.libraries.designsystem.theme.components.Text
 @Composable
 fun TimelineItemAudioView(
     content: TimelineItemAudioContent,
-    onContentLayoutChanged: (ContentAvoidingLayoutData) -> Unit,
+    onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val iconSize = 32.dp
@@ -85,7 +85,7 @@ fun TimelineItemAudioView(
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis,
                 onTextLayout = ContentAvoidingLayout.measureLastTextLine(
-                    onContentLayoutChanged = onContentLayoutChanged,
+                    onContentLayoutChange = onContentLayoutChange,
                     extraWidth = iconSize + spacing
                 )
             )
@@ -99,6 +99,6 @@ internal fun TimelineItemAudioViewPreview(@PreviewParameter(TimelineItemAudioCon
     ElementPreview {
         TimelineItemAudioView(
             content,
-            onContentLayoutChanged = {},
+            onContentLayoutChange = {},
         )
     }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemEncryptedView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemEncryptedView.kt
index b0753be9b1..8cb9c9e58f 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemEncryptedView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemEncryptedView.kt
@@ -33,7 +33,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun TimelineItemEncryptedView(
     content: TimelineItemEncryptedContent,
-    onContentLayoutChanged: (ContentAvoidingLayoutData) -> Unit,
+    onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit,
     modifier: Modifier = Modifier
 ) {
     val isMembershipUtd = (content.data as? UnableToDecryptContent.Data.MegolmV1AesSha2)?.utdCause == UtdCause.Membership
@@ -46,7 +46,7 @@ fun TimelineItemEncryptedView(
         text = stringResource(id = textId),
         iconDescription = stringResource(id = CommonStrings.dialog_title_warning),
         iconResourceId = iconId,
-        onContentLayoutChanged = onContentLayoutChanged,
+        onContentLayoutChange = onContentLayoutChange,
         modifier = modifier
     )
 }
@@ -58,6 +58,6 @@ internal fun TimelineItemEncryptedViewPreview(
 ) = ElementPreview {
     TimelineItemEncryptedView(
         content = content,
-        onContentLayoutChanged = {},
+        onContentLayoutChange = {},
     )
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemEventContentView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemEventContentView.kt
index 8663f60bba..09eeee22e0 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemEventContentView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemEventContentView.kt
@@ -43,32 +43,32 @@ import io.element.android.libraries.architecture.Presenter
 @Composable
 fun TimelineItemEventContentView(
     content: TimelineItemEventContent,
-    onLinkClicked: (url: String) -> Unit,
+    onLinkClick: (url: String) -> Unit,
     eventSink: (TimelineEvents.EventFromTimelineItem) -> Unit,
     modifier: Modifier = Modifier,
-    onContentLayoutChanged: (ContentAvoidingLayoutData) -> Unit = {},
+    onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit = {},
 ) {
     val presenterFactories = LocalTimelineItemPresenterFactories.current
     when (content) {
         is TimelineItemEncryptedContent -> TimelineItemEncryptedView(
             content = content,
-            onContentLayoutChanged = onContentLayoutChanged,
+            onContentLayoutChange = onContentLayoutChange,
             modifier = modifier
         )
         is TimelineItemRedactedContent -> TimelineItemRedactedView(
             content = content,
-            onContentLayoutChanged = onContentLayoutChanged,
+            onContentLayoutChange = onContentLayoutChange,
             modifier = modifier
         )
         is TimelineItemTextBasedContent -> TimelineItemTextView(
             content = content,
             modifier = modifier,
-            onLinkClicked = onLinkClicked,
-            onContentLayoutChanged = onContentLayoutChanged
+            onLinkClick = onLinkClick,
+            onContentLayoutChange = onContentLayoutChange
         )
         is TimelineItemUnknownContent -> TimelineItemUnknownView(
             content = content,
-            onContentLayoutChanged = onContentLayoutChanged,
+            onContentLayoutChange = onContentLayoutChange,
             modifier = modifier
         )
         is TimelineItemLocationContent -> TimelineItemLocationView(
@@ -77,7 +77,7 @@ fun TimelineItemEventContentView(
         )
         is TimelineItemImageContent -> TimelineItemImageView(
             content = content,
-            onContentLayoutChanged = onContentLayoutChanged,
+            onContentLayoutChange = onContentLayoutChange,
             modifier = modifier,
         )
         is TimelineItemStickerContent -> TimelineItemStickerView(
@@ -86,17 +86,17 @@ fun TimelineItemEventContentView(
         )
         is TimelineItemVideoContent -> TimelineItemVideoView(
             content = content,
-            onContentLayoutChanged = onContentLayoutChanged,
+            onContentLayoutChange = onContentLayoutChange,
             modifier = modifier
         )
         is TimelineItemFileContent -> TimelineItemFileView(
             content = content,
-            onContentLayoutChanged = onContentLayoutChanged,
+            onContentLayoutChange = onContentLayoutChange,
             modifier = modifier
         )
         is TimelineItemAudioContent -> TimelineItemAudioView(
             content = content,
-            onContentLayoutChanged = onContentLayoutChanged,
+            onContentLayoutChange = onContentLayoutChange,
             modifier = modifier
         )
         is TimelineItemLegacyCallInviteContent -> TimelineItemLegacyCallInviteView(modifier = modifier)
@@ -114,7 +114,7 @@ fun TimelineItemEventContentView(
             TimelineItemVoiceView(
                 state = presenter.present(),
                 content = content,
-                onContentLayoutChanged = onContentLayoutChanged,
+                onContentLayoutChange = onContentLayoutChange,
                 modifier = modifier
             )
         }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemFileView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemFileView.kt
index c30a3aa89b..bd395c01f1 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemFileView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemFileView.kt
@@ -46,7 +46,7 @@ import io.element.android.libraries.designsystem.theme.components.Text
 @Composable
 fun TimelineItemFileView(
     content: TimelineItemFileContent,
-    onContentLayoutChanged: (ContentAvoidingLayoutData) -> Unit,
+    onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val iconSize = 32.dp
@@ -86,7 +86,7 @@ fun TimelineItemFileView(
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis,
                 onTextLayout = ContentAvoidingLayout.measureLastTextLine(
-                    onContentLayoutChanged = onContentLayoutChanged,
+                    onContentLayoutChange = onContentLayoutChange,
                     extraWidth = iconSize + spacing
                 )
             )
@@ -99,6 +99,6 @@ fun TimelineItemFileView(
 internal fun TimelineItemFileViewPreview(@PreviewParameter(TimelineItemFileContentProvider::class) content: TimelineItemFileContent) = ElementPreview {
     TimelineItemFileView(
         content,
-        onContentLayoutChanged = {},
+        onContentLayoutChange = {},
     )
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemImageView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemImageView.kt
index c514b192d4..5ef2196e59 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemImageView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemImageView.kt
@@ -67,7 +67,7 @@ import io.element.android.wysiwyg.compose.EditorStyledText
 @Composable
 fun TimelineItemImageView(
     content: TimelineItemImageContent,
-    onContentLayoutChanged: (ContentAvoidingLayoutData) -> Unit,
+    onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val description = stringResource(CommonStrings.common_image)
@@ -115,7 +115,7 @@ fun TimelineItemImageView(
                     text = caption,
                     style = ElementRichTextEditorStyle.textStyle(),
                     releaseOnDetach = false,
-                    onTextLayout = ContentAvoidingLayout.measureLegacyLastTextLine(onContentLayoutChanged = onContentLayoutChanged),
+                    onTextLayout = ContentAvoidingLayout.measureLegacyLastTextLine(onContentLayoutChange = onContentLayoutChange),
                 )
             }
         }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemInformativeView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemInformativeView.kt
index b6f5d0e23b..6d627cf360 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemInformativeView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemInformativeView.kt
@@ -41,12 +41,12 @@ fun TimelineItemInformativeView(
     text: String,
     iconDescription: String,
     @DrawableRes iconResourceId: Int,
-    onContentLayoutChanged: (ContentAvoidingLayoutData) -> Unit,
+    onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit,
     modifier: Modifier = Modifier
 ) {
     Row(
         modifier = modifier.onSizeChanged { size ->
-            onContentLayoutChanged(
+            onContentLayoutChange(
                 ContentAvoidingLayoutData(
                     contentWidth = size.width,
                     contentHeight = size.height,
@@ -78,6 +78,6 @@ internal fun TimelineItemInformativeViewPreview() = ElementPreview {
         text = "Info",
         iconDescription = "",
         iconResourceId = CompoundDrawables.ic_compound_delete,
-        onContentLayoutChanged = {},
+        onContentLayoutChange = {},
     )
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemPollView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemPollView.kt
index 47f4aa7da6..c192d55a36 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemPollView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemPollView.kt
@@ -34,7 +34,7 @@ fun TimelineItemPollView(
     eventSink: (TimelineEvents.TimelineItemPollEvents) -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    fun onAnswerSelected(pollStartId: EventId, answerId: String) {
+    fun onSelectAnswer(pollStartId: EventId, answerId: String) {
         eventSink(TimelineEvents.PollAnswerSelected(pollStartId, answerId))
     }
 
@@ -54,7 +54,7 @@ fun TimelineItemPollView(
         isPollEnded = content.isEnded,
         isPollEditable = content.isEditable,
         isMine = content.isMine,
-        onAnswerSelected = ::onAnswerSelected,
+        onSelectAnswer = ::onSelectAnswer,
         onPollEdit = ::onPollEdit,
         onPollEnd = ::onPollEnd,
         modifier = modifier,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemRedactedView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemRedactedView.kt
index 0c001fae26..8859f93ceb 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemRedactedView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemRedactedView.kt
@@ -29,14 +29,14 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun TimelineItemRedactedView(
     @Suppress("UNUSED_PARAMETER") content: TimelineItemRedactedContent,
-    onContentLayoutChanged: (ContentAvoidingLayoutData) -> Unit,
+    onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit,
     modifier: Modifier = Modifier
 ) {
     TimelineItemInformativeView(
         text = stringResource(id = CommonStrings.common_message_removed),
         iconDescription = stringResource(id = CommonStrings.common_message_removed),
         iconResourceId = CompoundDrawables.ic_compound_delete,
-        onContentLayoutChanged = onContentLayoutChanged,
+        onContentLayoutChange = onContentLayoutChange,
         modifier = modifier
     )
 }
@@ -46,6 +46,6 @@ fun TimelineItemRedactedView(
 internal fun TimelineItemRedactedViewPreview() = ElementPreview {
     TimelineItemRedactedView(
         TimelineItemRedactedContent,
-        onContentLayoutChanged = {},
+        onContentLayoutChange = {},
     )
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemTextView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemTextView.kt
index c7e1b37bb2..a72a6354ed 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemTextView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemTextView.kt
@@ -39,9 +39,9 @@ import io.element.android.wysiwyg.compose.EditorStyledText
 @Composable
 fun TimelineItemTextView(
     content: TimelineItemTextBasedContent,
-    onLinkClicked: (String) -> Unit,
+    onLinkClick: (String) -> Unit,
     modifier: Modifier = Modifier,
-    onContentLayoutChanged: (ContentAvoidingLayoutData) -> Unit = {},
+    onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit = {},
 ) {
     CompositionLocalProvider(
         LocalContentColor provides ElementTheme.colors.textPrimary,
@@ -53,9 +53,9 @@ fun TimelineItemTextView(
         Box(modifier.semantics { contentDescription = body.toString() }) {
             EditorStyledText(
                 text = body,
-                onLinkClickedListener = onLinkClicked,
+                onLinkClickedListener = onLinkClick,
                 style = ElementRichTextEditorStyle.textStyle(),
-                onTextLayout = ContentAvoidingLayout.measureLegacyLastTextLine(onContentLayoutChanged = onContentLayoutChanged),
+                onTextLayout = ContentAvoidingLayout.measureLegacyLastTextLine(onContentLayoutChange = onContentLayoutChange),
                 releaseOnDetach = false,
             )
         }
@@ -69,6 +69,6 @@ internal fun TimelineItemTextViewPreview(
 ) = ElementPreview {
     TimelineItemTextView(
         content = content,
-        onLinkClicked = {},
+        onLinkClick = {},
     )
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemUnknownView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemUnknownView.kt
index 0c0961a2a6..d4d0b69427 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemUnknownView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemUnknownView.kt
@@ -29,14 +29,14 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun TimelineItemUnknownView(
     @Suppress("UNUSED_PARAMETER") content: TimelineItemUnknownContent,
-    onContentLayoutChanged: (ContentAvoidingLayoutData) -> Unit,
+    onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit,
     modifier: Modifier = Modifier
 ) {
     TimelineItemInformativeView(
         text = stringResource(id = CommonStrings.common_unsupported_event),
         iconDescription = stringResource(id = CommonStrings.dialog_title_warning),
         iconResourceId = CompoundDrawables.ic_compound_info_solid,
-        onContentLayoutChanged = onContentLayoutChanged,
+        onContentLayoutChange = onContentLayoutChange,
         modifier = modifier
     )
 }
@@ -46,6 +46,6 @@ fun TimelineItemUnknownView(
 internal fun TimelineItemUnknownViewPreview() = ElementPreview {
     TimelineItemUnknownView(
         content = TimelineItemUnknownContent,
-        onContentLayoutChanged = {},
+        onContentLayoutChange = {},
     )
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVideoView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVideoView.kt
index 6711c18118..5aea80356a 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVideoView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVideoView.kt
@@ -73,7 +73,7 @@ import io.element.android.wysiwyg.compose.EditorStyledText
 @Composable
 fun TimelineItemVideoView(
     content: TimelineItemVideoContent,
-    onContentLayoutChanged: (ContentAvoidingLayoutData) -> Unit,
+    onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val description = stringResource(CommonStrings.common_image)
@@ -131,7 +131,7 @@ fun TimelineItemVideoView(
                     text = caption,
                     style = ElementRichTextEditorStyle.textStyle(),
                     releaseOnDetach = false,
-                    onTextLayout = ContentAvoidingLayout.measureLegacyLastTextLine(onContentLayoutChanged = onContentLayoutChanged),
+                    onTextLayout = ContentAvoidingLayout.measureLegacyLastTextLine(onContentLayoutChange = onContentLayoutChange),
                 )
             }
         }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVoiceView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVoiceView.kt
index 927e38371c..19fb526b87 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVoiceView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/event/TimelineItemVoiceView.kt
@@ -67,7 +67,7 @@ import kotlinx.coroutines.delay
 fun TimelineItemVoiceView(
     state: VoiceMessageState,
     content: TimelineItemVoiceContent,
-    onContentLayoutChanged: (ContentAvoidingLayoutData) -> Unit,
+    onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     fun playPause() {
@@ -81,7 +81,7 @@ fun TimelineItemVoiceView(
                 contentDescription = a11y
             }
             .onSizeChanged {
-                onContentLayoutChanged(
+                onContentLayoutChange(
                     ContentAvoidingLayoutData(
                         contentWidth = it.width,
                         contentHeight = it.height,
@@ -258,7 +258,7 @@ internal fun TimelineItemVoiceViewPreview(
     TimelineItemVoiceView(
         state = timelineItemVoiceViewParameters.state,
         content = timelineItemVoiceViewParameters.content,
-        onContentLayoutChanged = {},
+        onContentLayoutChange = {},
     )
 }
 
@@ -271,7 +271,7 @@ internal fun TimelineItemVoiceViewUnifiedPreview() = ElementPreview {
             TimelineItemVoiceView(
                 state = it.state,
                 content = it.content,
-                onContentLayoutChanged = {},
+                onContentLayoutChange = {},
             )
         }
     }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/layout/ContentAvoidingLayout.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/layout/ContentAvoidingLayout.kt
index 334899288d..4ff8c66e8b 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/layout/ContentAvoidingLayout.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/layout/ContentAvoidingLayout.kt
@@ -136,26 +136,26 @@ interface ContentAvoidingLayoutScope {
     /**
      * It should be called when the content layout changes, so it can update the [ContentAvoidingLayoutData] and measure and layout the content properly.
      */
-    fun onContentLayoutChanged(data: ContentAvoidingLayoutData)
+    fun onContentLayoutChange(data: ContentAvoidingLayoutData)
 }
 
 private class ContentAvoidingLayoutScopeInstance(
     val data: MutableState<ContentAvoidingLayoutData> = mutableStateOf(ContentAvoidingLayoutData()),
 ) : ContentAvoidingLayoutScope {
-    override fun onContentLayoutChanged(data: ContentAvoidingLayoutData) {
+    override fun onContentLayoutChange(data: ContentAvoidingLayoutData) {
         this.data.value = data
     }
 }
 
 object ContentAvoidingLayout {
     /**
-     * Measures the last line of a [TextLayoutResult] and calls [onContentLayoutChanged] with the [ContentAvoidingLayoutData].
+     * Measures the last line of a [TextLayoutResult] and calls [onContentLayoutChange] with the [ContentAvoidingLayoutData].
      *
      * This is supposed to be used in the `onTextLayout` parameter of a Text based component.
      */
     @Composable
     internal fun measureLastTextLine(
-        onContentLayoutChanged: (ContentAvoidingLayoutData) -> Unit,
+        onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit,
         extraWidth: Dp = 0.dp,
     ): ((TextLayoutResult) -> Unit) {
         val layoutDirection = LocalLayoutDirection.current
@@ -167,7 +167,7 @@ object ContentAvoidingLayout {
                 LayoutDirection.Rtl -> textLayout.getLineLeft(textLayout.lineCount - 1).roundToInt()
             }
             val lastLineHeight = textLayout.getLineBottom(textLayout.lineCount - 1).roundToInt()
-            onContentLayoutChanged(
+            onContentLayoutChange(
                 ContentAvoidingLayoutData(
                     contentWidth = textLayout.size.width + extraWidthPx,
                     contentHeight = textLayout.size.height,
@@ -179,13 +179,13 @@ object ContentAvoidingLayout {
     }
 
     /**
-     * Measures the last line of a [Layout] and calls [onContentLayoutChanged] with the [ContentAvoidingLayoutData].
+     * Measures the last line of a [Layout] and calls [onContentLayoutChange] with the [ContentAvoidingLayoutData].
      *
      * This is supposed to be used in the `onTextLayout` parameter of an [EditorStyledText] component.
      */
     @Composable
     internal fun measureLegacyLastTextLine(
-        onContentLayoutChanged: (ContentAvoidingLayoutData) -> Unit,
+        onContentLayoutChange: (ContentAvoidingLayoutData) -> Unit,
         extraWidth: Dp = 0.dp,
     ): ((Layout) -> Unit) {
         val extraWidthPx = extraWidth.roundToPx()
@@ -193,7 +193,7 @@ object ContentAvoidingLayout {
             // We need to add the external extra width so it's not taken into account as 'free space'
             val lastLineWidth = textLayout.getLineWidth(textLayout.lineCount - 1).roundToInt()
             val lastLineHeight = textLayout.getLineBottom(textLayout.lineCount - 1)
-            onContentLayoutChanged(
+            onContentLayoutChange(
                 ContentAvoidingLayoutData(
                     contentWidth = textLayout.width + extraWidthPx,
                     contentHeight = textLayout.height,
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/TimelineItemReadReceiptView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/TimelineItemReadReceiptView.kt
index 540bff9a2b..3bce2b389b 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/TimelineItemReadReceiptView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/TimelineItemReadReceiptView.kt
@@ -61,7 +61,7 @@ import kotlinx.collections.immutable.ImmutableList
 fun TimelineItemReadReceiptView(
     state: ReadReceiptViewState,
     renderReadReceipts: Boolean,
-    onReadReceiptsClicked: () -> Unit,
+    onReadReceiptsClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     if (state.receipts.isNotEmpty()) {
@@ -73,7 +73,7 @@ fun TimelineItemReadReceiptView(
                         .testTag(TestTags.messageReadReceipts)
                         .clip(RoundedCornerShape(4.dp))
                         .clickable {
-                            onReadReceiptsClicked()
+                            onReadReceiptsClick()
                         }
                         .padding(2.dp)
                 )
@@ -213,6 +213,6 @@ internal fun TimelineItemReadReceiptViewPreview(
     TimelineItemReadReceiptView(
         state = state,
         renderReadReceipts = true,
-        onReadReceiptsClicked = {},
+        onReadReceiptsClick = {},
     )
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheet.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheet.kt
index be63fa3409..1062e11977 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheet.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheet.kt
@@ -47,7 +47,7 @@ import kotlinx.coroutines.launch
 @Composable
 internal fun ReadReceiptBottomSheet(
     state: ReadReceiptBottomSheetState,
-    onUserDataClicked: (UserId) -> Unit,
+    onUserDataClick: (UserId) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val isVisible = state.selectedEvent != null
@@ -69,11 +69,11 @@ internal fun ReadReceiptBottomSheet(
         ) {
             ReadReceiptBottomSheetContent(
                 state = state,
-                onUserDataClicked = {
+                onUserDataClick = {
                     coroutineScope.launch {
                         sheetState.hide()
                         state.eventSink(ReadReceiptBottomSheetEvents.Dismiss)
-                        onUserDataClicked.invoke(it)
+                        onUserDataClick.invoke(it)
                     }
                 },
             )
@@ -86,7 +86,7 @@ internal fun ReadReceiptBottomSheet(
 @Composable
 private fun ReadReceiptBottomSheetContent(
     state: ReadReceiptBottomSheetState,
-    onUserDataClicked: (UserId) -> Unit,
+    onUserDataClick: (UserId) -> Unit,
 ) {
     LazyColumn {
         item {
@@ -101,7 +101,7 @@ private fun ReadReceiptBottomSheetContent(
         ) {
             val userId = UserId(it.avatarData.id)
             MatrixUserRow(
-                modifier = Modifier.clickable { onUserDataClicked(userId) },
+                modifier = Modifier.clickable { onUserDataClick(userId) },
                 matrixUser = MatrixUser(
                     userId = userId,
                     displayName = it.avatarData.name,
@@ -127,7 +127,7 @@ internal fun ReadReceiptBottomSheetPreview(@PreviewParameter(ReadReceiptBottomSh
     Column {
         ReadReceiptBottomSheetContent(
             state = state,
-            onUserDataClicked = {},
+            onUserDataClick = {},
         )
     }
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/debug/EventDebugInfoNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/debug/EventDebugInfoNode.kt
index 6f53c5a306..824ef24f8b 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/debug/EventDebugInfoNode.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/debug/EventDebugInfoNode.kt
@@ -42,7 +42,7 @@ class EventDebugInfoNode @AssistedInject constructor(
 
     private val inputs = inputs<Inputs>()
 
-    private fun onBackPressed() {
+    private fun onBackClick() {
         navigateUp()
     }
 
@@ -53,7 +53,7 @@ class EventDebugInfoNode @AssistedInject constructor(
             model = timelineItemDebugInfo.model,
             originalJson = timelineItemDebugInfo.originalJson,
             latestEditedJson = timelineItemDebugInfo.latestEditedJson,
-            onBackPressed = ::onBackPressed
+            onBackClick = ::onBackClick
         )
     }
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/debug/EventDebugInfoView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/debug/EventDebugInfoView.kt
index acff89e97c..0a893c1cea 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/debug/EventDebugInfoView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/debug/EventDebugInfoView.kt
@@ -73,7 +73,7 @@ fun EventDebugInfoView(
     model: String,
     originalJson: String?,
     latestEditedJson: String?,
-    onBackPressed: () -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
     isTest: Boolean = false,
 ) {
@@ -87,7 +87,7 @@ fun EventDebugInfoView(
                         style = ElementTheme.typography.aliasScreenTitle,
                     )
                 },
-                navigationIcon = { BackButton(onClick = onBackPressed) }
+                navigationIcon = { BackButton(onClick = onBackClick) }
             )
         },
         modifier = modifier
@@ -190,6 +190,6 @@ internal fun EventDebugInfoViewPreview() = ElementPreview {
         model = "Rust(\n\tModel()\n)",
         originalJson = "{\"name\": \"original\"}",
         latestEditedJson = "{\"name\": \"edited\"}",
-        onBackPressed = { }
+        onBackClick = { }
     )
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/typing/MessagesViewWithTypingPreview.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/typing/MessagesViewWithTypingPreview.kt
index 3b09afb7fc..c4a8a88153 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/typing/MessagesViewWithTypingPreview.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/typing/MessagesViewWithTypingPreview.kt
@@ -30,14 +30,14 @@ internal fun MessagesViewWithTypingPreview(
 ) = ElementPreview {
     MessagesView(
         state = aMessagesState().copy(typingNotificationState = typingState),
-        onBackPressed = {},
-        onRoomDetailsClicked = {},
-        onEventClicked = { false },
+        onBackClick = {},
+        onRoomDetailsClick = {},
+        onEventClick = { false },
         onPreviewAttachments = {},
-        onUserDataClicked = {},
-        onLinkClicked = {},
-        onSendLocationClicked = {},
-        onCreatePollClicked = {},
-        onJoinCallClicked = {},
+        onUserDataClick = {},
+        onLinkClick = {},
+        onSendLocationClick = {},
+        onCreatePollClick = {},
+        onJoinCallClick = {},
     )
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessagePermissionRationaleDialog.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessagePermissionRationaleDialog.kt
index 9898aba95a..73da921488 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessagePermissionRationaleDialog.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/voicemessages/composer/VoiceMessagePermissionRationaleDialog.kt
@@ -29,7 +29,7 @@ internal fun VoiceMessagePermissionRationaleDialog(
 ) {
     ConfirmationDialog(
         content = stringResource(CommonStrings.error_missing_microphone_voice_rationale_android, appName),
-        onSubmitClicked = onContinue,
+        onSubmitClick = onContinue,
         onDismiss = onDismiss,
         submitText = stringResource(CommonStrings.action_continue),
         cancelText = stringResource(CommonStrings.action_cancel),
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/FakeMessagesNavigator.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/FakeMessagesNavigator.kt
index de2b2e5bf5..466acfa192 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/FakeMessagesNavigator.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/FakeMessagesNavigator.kt
@@ -33,19 +33,19 @@ class FakeMessagesNavigator : MessagesNavigator {
     var onEditPollClickedCount = 0
         private set
 
-    override fun onShowEventDebugInfoClicked(eventId: EventId?, debugInfo: TimelineItemDebugInfo) {
+    override fun onShowEventDebugInfoClick(eventId: EventId?, debugInfo: TimelineItemDebugInfo) {
         onShowEventDebugInfoClickedCount++
     }
 
-    override fun onForwardEventClicked(eventId: EventId) {
+    override fun onForwardEventClick(eventId: EventId) {
         onForwardEventClickedCount++
     }
 
-    override fun onReportContentClicked(eventId: EventId, senderId: UserId) {
+    override fun onReportContentClick(eventId: EventId, senderId: UserId) {
         onReportContentClickedCount++
     }
 
-    override fun onEditPollClicked(eventId: EventId) {
+    override fun onEditPollClick(eventId: EventId) {
         onEditPollClickedCount++
     }
 }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt
index e176e20805..dd64f0b967 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesViewTest.kt
@@ -88,7 +88,7 @@ class MessagesViewTest {
         ensureCalledOnce { callback ->
             rule.setMessagesView(
                 state = state,
-                onBackPressed = callback,
+                onBackClick = callback,
             )
             rule.pressBack()
         }
@@ -103,7 +103,7 @@ class MessagesViewTest {
         ensureCalledOnce { callback ->
             rule.setMessagesView(
                 state = state,
-                onRoomDetailsClicked = callback,
+                onRoomDetailsClick = callback,
             )
             rule.onNodeWithText(state.roomName.dataOrNull().orEmpty()).performClick()
         }
@@ -118,7 +118,7 @@ class MessagesViewTest {
         ensureCalledOnce { callback ->
             rule.setMessagesView(
                 state = state,
-                onJoinCallClicked = callback,
+                onJoinCallClick = callback,
             )
             val joinCallContentDescription = rule.activity.getString(CommonStrings.a11y_start_call)
             rule.onNodeWithContentDescription(joinCallContentDescription).performClick()
@@ -138,7 +138,7 @@ class MessagesViewTest {
         )
         rule.setMessagesView(
             state = state,
-            onEventClicked = callback,
+            onEventClick = callback,
         )
         // Cannot perform click on "Text", it's not detected. Use tag instead
         rule.onAllNodesWithTag(TestTags.messageBubble.value).onFirst().performClick()
@@ -287,7 +287,7 @@ class MessagesViewTest {
         ensureCalledOnce { callback ->
             rule.setMessagesView(
                 state = state,
-                onSendLocationClicked = callback,
+                onSendLocationClick = callback,
             )
             rule.clickOn(R.string.screen_room_attachment_source_location)
         }
@@ -305,7 +305,7 @@ class MessagesViewTest {
         ensureCalledOnce { callback ->
             rule.setMessagesView(
                 state = state,
-                onCreatePollClicked = callback,
+                onCreatePollClick = callback,
             )
             // Then click on the poll action
             rule.clickOn(R.string.screen_room_attachment_source_poll)
@@ -324,7 +324,7 @@ class MessagesViewTest {
         ) { callback ->
             rule.setMessagesView(
                 state = state,
-                onUserDataClicked = callback,
+                onUserDataClick = callback,
             )
             rule.onNodeWithTag(TestTags.timelineItemSenderInfo.value).performClick()
         }
@@ -474,30 +474,30 @@ class MessagesViewTest {
 
 private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setMessagesView(
     state: MessagesState,
-    onBackPressed: () -> Unit = EnsureNeverCalled(),
-    onRoomDetailsClicked: () -> Unit = EnsureNeverCalled(),
-    onEventClicked: (event: TimelineItem.Event) -> Boolean = EnsureNeverCalledWithParamAndResult(),
-    onUserDataClicked: (UserId) -> Unit = EnsureNeverCalledWithParam(),
-    onLinkClicked: (String) -> Unit = EnsureNeverCalledWithParam(),
+    onBackClick: () -> Unit = EnsureNeverCalled(),
+    onRoomDetailsClick: () -> Unit = EnsureNeverCalled(),
+    onEventClick: (event: TimelineItem.Event) -> Boolean = EnsureNeverCalledWithParamAndResult(),
+    onUserDataClick: (UserId) -> Unit = EnsureNeverCalledWithParam(),
+    onLinkClick: (String) -> Unit = EnsureNeverCalledWithParam(),
     onPreviewAttachments: (ImmutableList<Attachment>) -> Unit = EnsureNeverCalledWithParam(),
-    onSendLocationClicked: () -> Unit = EnsureNeverCalled(),
-    onCreatePollClicked: () -> Unit = EnsureNeverCalled(),
-    onJoinCallClicked: () -> Unit = EnsureNeverCalled(),
+    onSendLocationClick: () -> Unit = EnsureNeverCalled(),
+    onCreatePollClick: () -> Unit = EnsureNeverCalled(),
+    onJoinCallClick: () -> Unit = EnsureNeverCalled(),
 ) {
     setContent {
         // Cannot use the RichTextEditor, so simulate a LocalInspectionMode
         CompositionLocalProvider(LocalInspectionMode provides true) {
             MessagesView(
                 state = state,
-                onBackPressed = onBackPressed,
-                onRoomDetailsClicked = onRoomDetailsClicked,
-                onEventClicked = onEventClicked,
-                onUserDataClicked = onUserDataClicked,
-                onLinkClicked = onLinkClicked,
+                onBackClick = onBackClick,
+                onRoomDetailsClick = onRoomDetailsClick,
+                onEventClick = onEventClick,
+                onUserDataClick = onUserDataClick,
+                onLinkClick = onLinkClick,
                 onPreviewAttachments = onPreviewAttachments,
-                onSendLocationClicked = onSendLocationClicked,
-                onCreatePollClicked = onCreatePollClicked,
-                onJoinCallClicked = onJoinCallClicked,
+                onSendLocationClick = onSendLocationClick,
+                onCreatePollClick = onCreatePollClick,
+                onJoinCallClick = onJoinCallClick,
             )
         }
     }
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelineViewTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelineViewTest.kt
index 29d46d2da2..f5d78860b3 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelineViewTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelineViewTest.kt
@@ -101,15 +101,15 @@ class TimelineViewTest {
 private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setTimelineView(
     state: TimelineState,
     typingNotificationState: TypingNotificationState = aTypingNotificationState(),
-    onUserDataClicked: (UserId) -> Unit = EnsureNeverCalledWithParam(),
-    onLinkClicked: (String) -> Unit = EnsureNeverCalledWithParam(),
-    onMessageClicked: (TimelineItem.Event) -> Unit = EnsureNeverCalledWithParam(),
-    onMessageLongClicked: (TimelineItem.Event) -> Unit = EnsureNeverCalledWithParam(),
-    onTimestampClicked: (TimelineItem.Event) -> Unit = EnsureNeverCalledWithParam(),
+    onUserDataClick: (UserId) -> Unit = EnsureNeverCalledWithParam(),
+    onLinkClick: (String) -> Unit = EnsureNeverCalledWithParam(),
+    onMessageClick: (TimelineItem.Event) -> Unit = EnsureNeverCalledWithParam(),
+    onMessageLongClick: (TimelineItem.Event) -> Unit = EnsureNeverCalledWithParam(),
+    onTimestampClick: (TimelineItem.Event) -> Unit = EnsureNeverCalledWithParam(),
     onSwipeToReply: (TimelineItem.Event) -> Unit = EnsureNeverCalledWithParam(),
-    onReactionClicked: (emoji: String, TimelineItem.Event) -> Unit = EnsureNeverCalledWithTwoParams(),
-    onReactionLongClicked: (emoji: String, TimelineItem.Event) -> Unit = EnsureNeverCalledWithTwoParams(),
-    onMoreReactionsClicked: (TimelineItem.Event) -> Unit = EnsureNeverCalledWithParam(),
+    onReactionClick: (emoji: String, TimelineItem.Event) -> Unit = EnsureNeverCalledWithTwoParams(),
+    onReactionLongClick: (emoji: String, TimelineItem.Event) -> Unit = EnsureNeverCalledWithTwoParams(),
+    onMoreReactionsClick: (TimelineItem.Event) -> Unit = EnsureNeverCalledWithParam(),
     onReadReceiptClick: (TimelineItem.Event) -> Unit = EnsureNeverCalledWithParam(),
     forceJumpToBottomVisibility: Boolean = false,
 ) {
@@ -117,15 +117,15 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setTimel
         TimelineView(
             state = state,
             typingNotificationState = typingNotificationState,
-            onUserDataClicked = onUserDataClicked,
-            onLinkClicked = onLinkClicked,
-            onMessageClicked = onMessageClicked,
-            onMessageLongClicked = onMessageLongClicked,
-            onTimestampClicked = onTimestampClicked,
+            onUserDataClick = onUserDataClick,
+            onLinkClick = onLinkClick,
+            onMessageClick = onMessageClick,
+            onMessageLongClick = onMessageLongClick,
+            onTimestampClick = onTimestampClick,
             onSwipeToReply = onSwipeToReply,
-            onReactionClicked = onReactionClicked,
-            onReactionLongClicked = onReactionLongClicked,
-            onMoreReactionsClicked = onMoreReactionsClicked,
+            onReactionClick = onReactionClick,
+            onReactionLongClick = onReactionLongClick,
+            onMoreReactionsClick = onMoreReactionsClick,
             onReadReceiptClick = onReadReceiptClick,
             forceJumpToBottomVisibility = forceJumpToBottomVisibility,
         )
diff --git a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollContentView.kt b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollContentView.kt
index b8f77ce3af..4f141713c3 100644
--- a/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollContentView.kt
+++ b/features/poll/api/src/main/kotlin/io/element/android/features/poll/api/pollcontent/PollContentView.kt
@@ -52,7 +52,7 @@ import kotlinx.collections.immutable.ImmutableList
 @Composable
 fun PollContentView(
     state: PollContentState,
-    onAnswerSelected: (pollStartId: EventId, answerId: String) -> Unit,
+    onSelectAnswer: (pollStartId: EventId, answerId: String) -> Unit,
     onPollEdit: (pollStartId: EventId) -> Unit,
     onPollEnd: (pollStartId: EventId) -> Unit,
     modifier: Modifier = Modifier,
@@ -66,7 +66,7 @@ fun PollContentView(
         isPollEnded = state.isPollEnded,
         isMine = state.isMine,
         onPollEdit = onPollEdit,
-        onAnswerSelected = onAnswerSelected,
+        onSelectAnswer = onSelectAnswer,
         onPollEnd = onPollEnd,
         modifier = modifier,
     )
@@ -81,15 +81,15 @@ fun PollContentView(
     isPollEditable: Boolean,
     isPollEnded: Boolean,
     isMine: Boolean,
-    onAnswerSelected: (pollStartId: EventId, answerId: String) -> Unit,
+    onSelectAnswer: (pollStartId: EventId, answerId: String) -> Unit,
     onPollEdit: (pollStartId: EventId) -> Unit,
     onPollEnd: (pollStartId: EventId) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val votesCount = remember(answerItems) { answerItems.sumOf { it.votesCount } }
 
-    fun onAnswerSelected(pollAnswer: PollAnswer) {
-        eventId?.let { onAnswerSelected(it, pollAnswer.id) }
+    fun onSelectAnswer(pollAnswer: PollAnswer) {
+        eventId?.let { onSelectAnswer(it, pollAnswer.id) }
     }
 
     fun onPollEdit() {
@@ -105,7 +105,7 @@ fun PollContentView(
     if (showConfirmation) {
         ConfirmationDialog(
             content = stringResource(id = CommonStrings.common_poll_end_confirmation),
-            onSubmitClicked = {
+            onSubmitClick = {
                 onPollEnd()
                 showConfirmation = false
             },
@@ -119,7 +119,7 @@ fun PollContentView(
     ) {
         PollTitle(title = question, isPollEnded = isPollEnded)
 
-        PollAnswers(answerItems = answerItems, onAnswerSelected = ::onAnswerSelected)
+        PollAnswers(answerItems = answerItems, onSelectAnswer = ::onSelectAnswer)
 
         if (isPollEnded || pollKind == PollKind.Disclosed) {
             DisclosedPollBottomNotice(votesCount = votesCount)
@@ -170,7 +170,7 @@ private fun PollTitle(
 @Composable
 private fun PollAnswers(
     answerItems: ImmutableList<PollAnswerItem>,
-    onAnswerSelected: (PollAnswer) -> Unit,
+    onSelectAnswer: (PollAnswer) -> Unit,
 ) {
     Column(
         modifier = Modifier.selectableGroup(),
@@ -183,7 +183,7 @@ private fun PollAnswers(
                     .selectable(
                         selected = it.isSelected,
                         enabled = it.isEnabled,
-                        onClick = { onAnswerSelected(it.answer) },
+                        onClick = { onSelectAnswer(it.answer) },
                         role = Role.RadioButton,
                     ),
             )
@@ -250,7 +250,7 @@ internal fun PollContentViewUndisclosedPreview() = ElementPreview {
         isPollEnded = false,
         isPollEditable = false,
         isMine = false,
-        onAnswerSelected = { _, _ -> },
+        onSelectAnswer = { _, _ -> },
         onPollEdit = {},
         onPollEnd = {},
     )
@@ -267,7 +267,7 @@ internal fun PollContentViewDisclosedPreview() = ElementPreview {
         isPollEnded = false,
         isPollEditable = false,
         isMine = false,
-        onAnswerSelected = { _, _ -> },
+        onSelectAnswer = { _, _ -> },
         onPollEdit = {},
         onPollEnd = {},
     )
@@ -284,7 +284,7 @@ internal fun PollContentViewEndedPreview() = ElementPreview {
         isPollEnded = true,
         isPollEditable = false,
         isMine = false,
-        onAnswerSelected = { _, _ -> },
+        onSelectAnswer = { _, _ -> },
         onPollEdit = {},
         onPollEnd = {},
     )
@@ -301,7 +301,7 @@ internal fun PollContentViewCreatorEditablePreview() = ElementPreview {
         isPollEnded = false,
         isPollEditable = true,
         isMine = true,
-        onAnswerSelected = { _, _ -> },
+        onSelectAnswer = { _, _ -> },
         onPollEdit = {},
         onPollEnd = {},
     )
@@ -318,7 +318,7 @@ internal fun PollContentViewCreatorPreview() = ElementPreview {
         isPollEnded = false,
         isPollEditable = false,
         isMine = true,
-        onAnswerSelected = { _, _ -> },
+        onSelectAnswer = { _, _ -> },
         onPollEdit = {},
         onPollEnd = {},
     )
@@ -335,7 +335,7 @@ internal fun PollContentViewCreatorEndedPreview() = ElementPreview {
         isPollEnded = true,
         isPollEditable = false,
         isMine = true,
-        onAnswerSelected = { _, _ -> },
+        onSelectAnswer = { _, _ -> },
         onPollEdit = {},
         onPollEnd = {},
     )
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollView.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollView.kt
index 65b1d5b38e..41f704e006 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollView.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollView.kt
@@ -79,7 +79,7 @@ fun CreatePollView(
     if (state.showBackConfirmation) {
         ConfirmationDialog(
             content = stringResource(id = R.string.screen_create_poll_cancel_confirmation_content_android),
-            onSubmitClicked = { state.eventSink(CreatePollEvents.NavBack) },
+            onSubmitClick = { state.eventSink(CreatePollEvents.NavBack) },
             onDismiss = { state.eventSink(CreatePollEvents.HideConfirmation) }
         )
     }
@@ -87,7 +87,7 @@ fun CreatePollView(
         ConfirmationDialog(
             title = stringResource(id = R.string.screen_edit_poll_delete_confirmation_title),
             content = stringResource(id = R.string.screen_edit_poll_delete_confirmation),
-            onSubmitClicked = { state.eventSink(CreatePollEvents.Delete(confirmed = true)) },
+            onSubmitClick = { state.eventSink(CreatePollEvents.Delete(confirmed = true)) },
             onDismiss = { state.eventSink(CreatePollEvents.HideConfirmation) }
         )
     }
@@ -103,7 +103,7 @@ fun CreatePollView(
                 mode = state.mode,
                 saveEnabled = state.canSave,
                 onBackPress = navBack,
-                onSaveClicked = { state.eventSink(CreatePollEvents.Save) }
+                onSaveClick = { state.eventSink(CreatePollEvents.Save) }
             )
         },
     ) { paddingValues ->
@@ -220,7 +220,7 @@ private fun CreatePollTopAppBar(
     mode: CreatePollState.Mode,
     saveEnabled: Boolean,
     onBackPress: () -> Unit = {},
-    onSaveClicked: () -> Unit = {},
+    onSaveClick: () -> Unit = {},
 ) {
     TopAppBar(
         title = {
@@ -241,7 +241,7 @@ private fun CreatePollTopAppBar(
                     CreatePollState.Mode.New -> stringResource(id = CommonStrings.action_create)
                     CreatePollState.Mode.Edit -> stringResource(id = CommonStrings.action_done)
                 },
-                onClick = onSaveClicked,
+                onClick = onSaveClick,
                 enabled = saveEnabled,
             )
         }
diff --git a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryView.kt b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryView.kt
index 466ddc54f9..6a9b338587 100644
--- a/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryView.kt
+++ b/features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryView.kt
@@ -74,7 +74,7 @@ fun PollHistoryView(
         state.eventSink(PollHistoryEvents.LoadMore)
     }
 
-    fun onAnswerSelected(pollStartId: EventId, answerId: String) {
+    fun onSelectAnswer(pollStartId: EventId, answerId: String) {
         state.eventSink(PollHistoryEvents.PollAnswerSelected(pollStartId, answerId))
     }
 
@@ -111,7 +111,7 @@ fun PollHistoryView(
             }
             PollHistoryFilterButtons(
                 activeFilter = state.activeFilter,
-                onFilterSelected = { state.eventSink(PollHistoryEvents.OnFilterSelected(it)) },
+                onSelectFilter = { state.eventSink(PollHistoryEvents.OnFilterSelected(it)) },
                 modifier = Modifier
                     .fillMaxWidth()
                     .padding(horizontal = 16.dp, vertical = 8.dp),
@@ -128,7 +128,7 @@ fun PollHistoryView(
                     pollHistoryItems = pollHistoryItems,
                     hasMoreToLoad = state.hasMoreToLoad,
                     isLoading = state.isLoading,
-                    onAnswerSelected = ::onAnswerSelected,
+                    onSelectAnswer = ::onSelectAnswer,
                     onPollEdit = onEditPoll,
                     onPollEnd = ::onPollEnd,
                     onLoadMore = ::onLoadMore,
@@ -143,7 +143,7 @@ fun PollHistoryView(
 @Composable
 private fun PollHistoryFilterButtons(
     activeFilter: PollHistoryFilter,
-    onFilterSelected: (PollHistoryFilter) -> Unit,
+    onSelectFilter: (PollHistoryFilter) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     SingleChoiceSegmentedButtonRow(modifier = modifier) {
@@ -152,7 +152,7 @@ private fun PollHistoryFilterButtons(
                 index = filter.ordinal,
                 count = PollHistoryFilter.entries.size,
                 selected = activeFilter == filter,
-                onClick = { onFilterSelected(filter) },
+                onClick = { onSelectFilter(filter) },
                 text = stringResource(filter.stringResource),
             )
         }
@@ -165,7 +165,7 @@ private fun PollHistoryList(
     pollHistoryItems: ImmutableList<PollHistoryItem>,
     hasMoreToLoad: Boolean,
     isLoading: Boolean,
-    onAnswerSelected: (pollStartId: EventId, answerId: String) -> Unit,
+    onSelectAnswer: (pollStartId: EventId, answerId: String) -> Unit,
     onPollEdit: (pollStartId: EventId) -> Unit,
     onPollEnd: (pollStartId: EventId) -> Unit,
     onLoadMore: () -> Unit,
@@ -180,7 +180,7 @@ private fun PollHistoryList(
         items(pollHistoryItems) { pollHistoryItem ->
             PollHistoryItemRow(
                 pollHistoryItem = pollHistoryItem,
-                onAnswerSelected = onAnswerSelected,
+                onSelectAnswer = onSelectAnswer,
                 onPollEdit = onPollEdit,
                 onPollEnd = onPollEnd,
                 modifier = Modifier.padding(vertical = 8.dp, horizontal = 16.dp)
@@ -232,7 +232,7 @@ private fun LoadMoreButton(isLoading: Boolean, onClick: () -> Unit) {
 @Composable
 private fun PollHistoryItemRow(
     pollHistoryItem: PollHistoryItem,
-    onAnswerSelected: (pollStartId: EventId, answerId: String) -> Unit,
+    onSelectAnswer: (pollStartId: EventId, answerId: String) -> Unit,
     onPollEdit: (pollStartId: EventId) -> Unit,
     onPollEnd: (pollStartId: EventId) -> Unit,
     modifier: Modifier = Modifier,
@@ -251,7 +251,7 @@ private fun PollHistoryItemRow(
             Spacer(modifier = Modifier.height(4.dp))
             PollContentView(
                 state = pollHistoryItem.state,
-                onAnswerSelected = onAnswerSelected,
+                onSelectAnswer = onSelectAnswer,
                 onPollEdit = onPollEdit,
                 onPollEnd = onPollEnd,
             )
diff --git a/features/preferences/api/src/main/kotlin/io/element/android/features/preferences/api/PreferencesEntryPoint.kt b/features/preferences/api/src/main/kotlin/io/element/android/features/preferences/api/PreferencesEntryPoint.kt
index e488d911ed..0453fa0ce2 100644
--- a/features/preferences/api/src/main/kotlin/io/element/android/features/preferences/api/PreferencesEntryPoint.kt
+++ b/features/preferences/api/src/main/kotlin/io/element/android/features/preferences/api/PreferencesEntryPoint.kt
@@ -45,7 +45,7 @@ interface PreferencesEntryPoint : FeatureEntryPoint {
 
     interface Callback : Plugin {
         fun onOpenBugReport()
-        fun onSecureBackupClicked()
+        fun onSecureBackupClick()
         fun onOpenRoomNotificationSettings(roomId: RoomId)
     }
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt
index ac8a881348..8fef6053a4 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt
@@ -115,8 +115,8 @@ class PreferencesFlowNode @AssistedInject constructor(
                         plugins<PreferencesEntryPoint.Callback>().forEach { it.onOpenBugReport() }
                     }
 
-                    override fun onSecureBackupClicked() {
-                        plugins<PreferencesEntryPoint.Callback>().forEach { it.onSecureBackupClicked() }
+                    override fun onSecureBackupClick() {
+                        plugins<PreferencesEntryPoint.Callback>().forEach { it.onSecureBackupClick() }
                     }
 
                     override fun onOpenAnalytics() {
@@ -151,7 +151,7 @@ class PreferencesFlowNode @AssistedInject constructor(
                         backstack.push(NavTarget.BlockedUsers)
                     }
 
-                    override fun onSignOutClicked() {
+                    override fun onSignOutClick() {
                         backstack.push(NavTarget.SignOut)
                     }
                 }
@@ -180,7 +180,7 @@ class PreferencesFlowNode @AssistedInject constructor(
                         backstack.push(NavTarget.EditDefaultNotificationSetting(isOneToOne))
                     }
 
-                    override fun onTroubleshootNotificationsClicked() {
+                    override fun onTroubleshootNotificationsClick() {
                         backstack.push(NavTarget.TroubleshootNotifications)
                     }
                 }
@@ -219,8 +219,8 @@ class PreferencesFlowNode @AssistedInject constructor(
             }
             NavTarget.SignOut -> {
                 val callBack: LogoutEntryPoint.Callback = object : LogoutEntryPoint.Callback {
-                    override fun onChangeRecoveryKeyClicked() {
-                        plugins<PreferencesEntryPoint.Callback>().forEach { it.onSecureBackupClicked() }
+                    override fun onChangeRecoveryKeyClick() {
+                        plugins<PreferencesEntryPoint.Callback>().forEach { it.onSecureBackupClick() }
                     }
                 }
                 logoutEntryPoint.nodeBuilder(this, buildContext)
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutNode.kt
index 5936b26b1a..bc2ff7894b 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutNode.kt
@@ -36,7 +36,7 @@ class AboutNode @AssistedInject constructor(
     @Assisted plugins: List<Plugin>,
     private val presenter: AboutPresenter,
 ) : Node(buildContext, plugins = plugins) {
-    private fun onElementLegalClicked(
+    private fun onElementLegalClick(
         activity: Activity,
         darkTheme: Boolean,
         elementLegal: ElementLegal,
@@ -51,9 +51,9 @@ class AboutNode @AssistedInject constructor(
         val state = presenter.present()
         AboutView(
             state = state,
-            onBackPressed = ::navigateUp,
-            onElementLegalClicked = { elementLegal ->
-                onElementLegalClicked(activity, isDark, elementLegal)
+            onBackClick = ::navigateUp,
+            onElementLegalClick = { elementLegal ->
+                onElementLegalClick(activity, isDark, elementLegal)
             },
             modifier = modifier
         )
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutView.kt
index c581811b6b..4a55217275 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutView.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutView.kt
@@ -29,19 +29,19 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun AboutView(
     state: AboutState,
-    onElementLegalClicked: (ElementLegal) -> Unit,
-    onBackPressed: () -> Unit,
+    onElementLegalClick: (ElementLegal) -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     PreferencePage(
         modifier = modifier,
-        onBackPressed = onBackPressed,
+        onBackClick = onBackClick,
         title = stringResource(id = CommonStrings.common_about)
     ) {
         state.elementLegals.forEach { elementLegal ->
             PreferenceText(
                 title = stringResource(id = elementLegal.titleRes),
-                onClick = { onElementLegalClicked(elementLegal) }
+                onClick = { onElementLegalClick(elementLegal) }
             )
         }
     }
@@ -52,7 +52,7 @@ fun AboutView(
 internal fun AboutViewPreview(@PreviewParameter(AboutStateProvider::class) state: AboutState) = ElementPreview {
     AboutView(
         state = state,
-        onElementLegalClicked = {},
-        onBackPressed = {},
+        onElementLegalClick = {},
+        onBackClick = {},
     )
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsNode.kt
index 45d2a07a71..8989fba04a 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsNode.kt
@@ -38,7 +38,7 @@ class AdvancedSettingsNode @AssistedInject constructor(
         AdvancedSettingsView(
             state = state,
             modifier = modifier,
-            onBackPressed = ::navigateUp
+            onBackClick = ::navigateUp
         )
     }
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsView.kt
index 68e1c7ea22..38311ee6ef 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsView.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsView.kt
@@ -38,12 +38,12 @@ import kotlinx.collections.immutable.toImmutableList
 @Composable
 fun AdvancedSettingsView(
     state: AdvancedSettingsState,
-    onBackPressed: () -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     PreferencePage(
         modifier = modifier,
-        onBackPressed = onBackPressed,
+        onBackClick = onBackClick,
         title = stringResource(id = CommonStrings.common_advanced_settings)
     ) {
         ListItem(
@@ -87,7 +87,7 @@ fun AdvancedSettingsView(
         SingleSelectionDialog(
             options = getOptions(),
             initialSelection = themes.indexOf(state.theme),
-            onOptionSelected = {
+            onSelectOption = {
                 state.eventSink(
                     AdvancedSettingsEvents.SetTheme(
                         themes[it]
@@ -121,5 +121,5 @@ private fun Theme.toHumanReadable(): String {
 @Composable
 internal fun AdvancedSettingsViewPreview(@PreviewParameter(AdvancedSettingsStateProvider::class) state: AdvancedSettingsState) =
     ElementPreview {
-        AdvancedSettingsView(state = state, onBackPressed = { })
+        AdvancedSettingsView(state = state, onBackClick = { })
     }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsNode.kt
index 1ef0ec10e6..49d65819b9 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsNode.kt
@@ -37,7 +37,7 @@ class AnalyticsSettingsNode @AssistedInject constructor(
         val state = presenter.present()
         AnalyticsSettingsView(
             state = state,
-            onBackPressed = ::navigateUp,
+            onBackClick = ::navigateUp,
             modifier = modifier
         )
     }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsView.kt
index c41249b1e2..67c12f31a1 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsView.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/analytics/AnalyticsSettingsView.kt
@@ -29,12 +29,12 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun AnalyticsSettingsView(
     state: AnalyticsSettingsState,
-    onBackPressed: () -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     PreferencePage(
         modifier = modifier,
-        onBackPressed = onBackPressed,
+        onBackClick = onBackClick,
         title = stringResource(id = CommonStrings.common_analytics)
     ) {
         AnalyticsPreferencesView(
@@ -48,6 +48,6 @@ fun AnalyticsSettingsView(
 internal fun AnalyticsSettingsViewPreview(@PreviewParameter(AnalyticsSettingsStateProvider::class) state: AnalyticsSettingsState) = ElementPreview {
     AnalyticsSettingsView(
         state = state,
-        onBackPressed = {},
+        onBackClick = {},
     )
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersNode.kt
index e277ecc9b2..ba253bf549 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersNode.kt
@@ -37,7 +37,7 @@ class BlockedUsersNode @AssistedInject constructor(
         val state = presenter.present()
         BlockedUsersView(
             state = state,
-            onBackPressed = ::navigateUp,
+            onBackClick = ::navigateUp,
             modifier = modifier,
         )
     }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersView.kt
index 0a5e027beb..680f22cc45 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersView.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUsersView.kt
@@ -51,7 +51,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun BlockedUsersView(
     state: BlockedUsersState,
-    onBackPressed: () -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Box(modifier = modifier) {
@@ -65,7 +65,7 @@ fun BlockedUsersView(
                         )
                     },
                     navigationIcon = {
-                        BackButton(onClick = onBackPressed)
+                        BackButton(onClick = onBackClick)
                     }
                 )
             }
@@ -110,7 +110,7 @@ fun BlockedUsersView(
                     title = stringResource(R.string.screen_blocked_users_unblock_alert_title),
                     content = stringResource(R.string.screen_blocked_users_unblock_alert_description),
                     submitText = stringResource(R.string.screen_blocked_users_unblock_alert_action),
-                    onSubmitClicked = { state.eventSink(BlockedUsersEvents.ConfirmUnblock) },
+                    onSubmitClick = { state.eventSink(BlockedUsersEvents.ConfirmUnblock) },
                     onDismiss = { state.eventSink(BlockedUsersEvents.Cancel) }
                 )
             }
@@ -136,7 +136,7 @@ internal fun BlockedUsersViewPreview(@PreviewParameter(BlockedUsersStatePreviewP
     ElementPreview {
         BlockedUsersView(
             state = state,
-            onBackPressed = {}
+            onBackClick = {}
         )
     }
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsNode.kt
index 8cec8fa85f..412f89e14f 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsNode.kt
@@ -59,7 +59,7 @@ class DeveloperSettingsNode @AssistedInject constructor(
             modifier = modifier,
             onOpenShowkase = ::openShowkase,
             onOpenConfigureTracing = ::onOpenConfigureTracing,
-            onBackPressed = ::navigateUp
+            onBackClick = ::navigateUp
         )
     }
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsView.kt
index dceeb795f1..dd684fcaaa 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsView.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsView.kt
@@ -39,12 +39,12 @@ fun DeveloperSettingsView(
     state: DeveloperSettingsState,
     onOpenShowkase: () -> Unit,
     onOpenConfigureTracing: () -> Unit,
-    onBackPressed: () -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     PreferencePage(
         modifier = modifier,
-        onBackPressed = onBackPressed,
+        onBackClick = onBackClick,
         title = stringResource(id = CommonStrings.common_developer_options)
     ) {
         // Note: this is OK to hardcode strings in this debug screen.
@@ -141,6 +141,6 @@ internal fun DeveloperSettingsViewPreview(@PreviewParameter(DeveloperSettingsSta
         state = state,
         onOpenShowkase = {},
         onOpenConfigureTracing = {},
-        onBackPressed = {}
+        onBackClick = {}
     )
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/tracing/ConfigureTracingNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/tracing/ConfigureTracingNode.kt
index b95f85dbeb..a624f38d08 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/tracing/ConfigureTracingNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/tracing/ConfigureTracingNode.kt
@@ -37,7 +37,7 @@ class ConfigureTracingNode @AssistedInject constructor(
         val state = presenter.present()
         ConfigureTracingView(
             state = state,
-            onBackPressed = ::navigateUp,
+            onBackClick = ::navigateUp,
             modifier = modifier
         )
     }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/tracing/ConfigureTracingView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/tracing/ConfigureTracingView.kt
index bf77762a64..c44b9e4ad5 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/tracing/ConfigureTracingView.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/tracing/ConfigureTracingView.kt
@@ -62,7 +62,7 @@ import kotlinx.collections.immutable.ImmutableMap
 @Composable
 fun ConfigureTracingView(
     state: ConfigureTracingState,
-    onBackPressed: () -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     var showMenu by remember { mutableStateOf(false) }
@@ -75,7 +75,7 @@ fun ConfigureTracingView(
         topBar = {
             TopAppBar(
                 navigationIcon = {
-                    BackButton(onClick = onBackPressed)
+                    BackButton(onClick = onBackClick)
                 },
                 title = {
                     Text(
@@ -234,6 +234,6 @@ internal fun ConfigureTracingViewPreview(
 ) = ElementPreview {
     ConfigureTracingView(
         state = state,
-        onBackPressed = {},
+        onBackClick = {},
     )
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsNode.kt
index 621b0ed8b1..0c6e7660ef 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsNode.kt
@@ -35,7 +35,7 @@ class NotificationSettingsNode @AssistedInject constructor(
 ) : Node(buildContext, plugins = plugins) {
     interface Callback : Plugin {
         fun editDefaultNotificationMode(isOneToOne: Boolean)
-        fun onTroubleshootNotificationsClicked()
+        fun onTroubleshootNotificationsClick()
     }
 
     private val callbacks = plugins<Callback>()
@@ -44,8 +44,8 @@ class NotificationSettingsNode @AssistedInject constructor(
         callbacks.forEach { it.editDefaultNotificationMode(isOneToOne) }
     }
 
-    private fun onTroubleshootNotificationsClicked() {
-        callbacks.forEach { it.onTroubleshootNotificationsClicked() }
+    private fun onTroubleshootNotificationsClick() {
+        callbacks.forEach { it.onTroubleshootNotificationsClick() }
     }
 
     @Composable
@@ -54,8 +54,8 @@ class NotificationSettingsNode @AssistedInject constructor(
         NotificationSettingsView(
             state = state,
             onOpenEditDefault = { openEditDefault(isOneToOne = it) },
-            onBackPressed = ::navigateUp,
-            onTroubleshootNotificationsClicked = ::onTroubleshootNotificationsClicked,
+            onBackClick = ::navigateUp,
+            onTroubleshootNotificationsClick = ::onTroubleshootNotificationsClick,
             modifier = modifier,
         )
     }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsView.kt
index 0594d8ffd3..cf5127cee0 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsView.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsView.kt
@@ -56,8 +56,8 @@ import kotlinx.collections.immutable.toImmutableList
 fun NotificationSettingsView(
     state: NotificationSettingsState,
     onOpenEditDefault: (isOneToOne: Boolean) -> Unit,
-    onTroubleshootNotificationsClicked: () -> Unit,
-    onBackPressed: () -> Unit,
+    onTroubleshootNotificationsClick: () -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     OnLifecycleEvent { _, event ->
@@ -68,27 +68,27 @@ fun NotificationSettingsView(
     }
     PreferencePage(
         modifier = modifier,
-        onBackPressed = onBackPressed,
+        onBackClick = onBackClick,
         title = stringResource(id = R.string.screen_notification_settings_title)
     ) {
         when (state.matrixSettings) {
             is NotificationSettingsState.MatrixSettings.Invalid -> InvalidNotificationSettingsView(
                 showError = state.matrixSettings.fixFailed,
-                onContinueClicked = { state.eventSink(NotificationSettingsEvents.FixConfigurationMismatch) },
+                onContinueClick = { state.eventSink(NotificationSettingsEvents.FixConfigurationMismatch) },
                 onDismissError = { state.eventSink(NotificationSettingsEvents.ClearConfigurationMismatchError) },
             )
             NotificationSettingsState.MatrixSettings.Uninitialized -> return@PreferencePage
             is NotificationSettingsState.MatrixSettings.Valid -> NotificationSettingsContentView(
                 matrixSettings = state.matrixSettings,
                 state = state,
-                onNotificationsEnabledChanged = { state.eventSink(NotificationSettingsEvents.SetNotificationsEnabled(it)) },
-                onGroupChatsClicked = { onOpenEditDefault(false) },
-                onDirectChatsClicked = { onOpenEditDefault(true) },
-                onMentionNotificationsChanged = { state.eventSink(NotificationSettingsEvents.SetAtRoomNotificationsEnabled(it)) },
+                onNotificationsEnabledChange = { state.eventSink(NotificationSettingsEvents.SetNotificationsEnabled(it)) },
+                onGroupChatsClick = { onOpenEditDefault(false) },
+                onDirectChatsClick = { onOpenEditDefault(true) },
+                onMentionNotificationsChange = { state.eventSink(NotificationSettingsEvents.SetAtRoomNotificationsEnabled(it)) },
                 // TODO We are removing the call notification toggle until support for call notifications has been added
 //                onCallsNotificationsChanged = { state.eventSink(NotificationSettingsEvents.SetCallNotificationsEnabled(it)) },
-                onInviteForMeNotificationsChanged = { state.eventSink(NotificationSettingsEvents.SetInviteForMeNotificationsEnabled(it)) },
-                onTroubleshootNotificationsClicked = onTroubleshootNotificationsClicked,
+                onInviteForMeNotificationsChange = { state.eventSink(NotificationSettingsEvents.SetInviteForMeNotificationsEnabled(it)) },
+                onTroubleshootNotificationsClick = onTroubleshootNotificationsClick,
             )
         }
         AsyncActionView(
@@ -104,14 +104,14 @@ fun NotificationSettingsView(
 private fun NotificationSettingsContentView(
     matrixSettings: NotificationSettingsState.MatrixSettings.Valid,
     state: NotificationSettingsState,
-    onNotificationsEnabledChanged: (Boolean) -> Unit,
-    onGroupChatsClicked: () -> Unit,
-    onDirectChatsClicked: () -> Unit,
-    onMentionNotificationsChanged: (Boolean) -> Unit,
+    onNotificationsEnabledChange: (Boolean) -> Unit,
+    onGroupChatsClick: () -> Unit,
+    onDirectChatsClick: () -> Unit,
+    onMentionNotificationsChange: (Boolean) -> Unit,
     // TODO We are removing the call notification toggle until support for call notifications has been added
 //    onCallsNotificationsChanged: (Boolean) -> Unit,
-    onInviteForMeNotificationsChanged: (Boolean) -> Unit,
-    onTroubleshootNotificationsClicked: () -> Unit,
+    onInviteForMeNotificationsChange: (Boolean) -> Unit,
+    onTroubleshootNotificationsClick: () -> Unit,
 ) {
     val context = LocalContext.current
     val systemSettings: NotificationSettingsState.AppSettings = state.appSettings
@@ -132,7 +132,7 @@ private fun NotificationSettingsContentView(
     PreferenceSwitch(
         title = stringResource(id = R.string.screen_notification_settings_enable_notifications),
         isChecked = systemSettings.appNotificationsEnabled,
-        onCheckedChange = onNotificationsEnabledChanged
+        onCheckedChange = onNotificationsEnabledChange
     )
 
     if (systemSettings.appNotificationsEnabled) {
@@ -140,13 +140,13 @@ private fun NotificationSettingsContentView(
             PreferenceText(
                 title = stringResource(id = R.string.screen_notification_settings_group_chats),
                 subtitle = getTitleForRoomNotificationMode(mode = matrixSettings.defaultGroupNotificationMode),
-                onClick = onGroupChatsClicked
+                onClick = onGroupChatsClick
             )
 
             PreferenceText(
                 title = stringResource(id = R.string.screen_notification_settings_direct_chats),
                 subtitle = getTitleForRoomNotificationMode(mode = matrixSettings.defaultOneToOneNotificationMode),
-                onClick = onDirectChatsClicked
+                onClick = onDirectChatsClick
             )
         }
 
@@ -155,7 +155,7 @@ private fun NotificationSettingsContentView(
                 modifier = Modifier,
                 title = stringResource(id = R.string.screen_notification_settings_room_mention_label),
                 isChecked = matrixSettings.atRoomNotificationsEnabled,
-                onCheckedChange = onMentionNotificationsChanged
+                onCheckedChange = onMentionNotificationsChange
             )
         }
         PreferenceCategory(title = stringResource(id = R.string.screen_notification_settings_additional_settings_section_title)) {
@@ -171,14 +171,14 @@ private fun NotificationSettingsContentView(
                 modifier = Modifier,
                 title = stringResource(id = R.string.screen_notification_settings_invite_for_me_label),
                 isChecked = matrixSettings.inviteForMeNotificationsEnabled,
-                onCheckedChange = onInviteForMeNotificationsChanged
+                onCheckedChange = onInviteForMeNotificationsChange
             )
         }
         PreferenceCategory(title = stringResource(id = R.string.troubleshoot_notifications_entry_point_section)) {
             PreferenceText(
                 modifier = Modifier,
                 title = stringResource(id = R.string.troubleshoot_notifications_entry_point_title),
-                onClick = onTroubleshootNotificationsClicked
+                onClick = onTroubleshootNotificationsClick
             )
         }
         if (state.showAdvancedSettings) {
@@ -218,7 +218,7 @@ private fun NotificationSettingsContentView(
                         ListOption(title = it)
                     }.toImmutableList(),
                     initialSelection = state.availablePushDistributors.indexOf(state.currentPushDistributor.dataOrNull()),
-                    onOptionSelected = { index ->
+                    onSelectOption = { index ->
                         state.eventSink(
                             NotificationSettingsEvents.SetPushProvider(index)
                         )
@@ -242,14 +242,14 @@ private fun getTitleForRoomNotificationMode(mode: RoomNotificationMode?) =
 @Composable
 private fun InvalidNotificationSettingsView(
     showError: Boolean,
-    onContinueClicked: () -> Unit,
+    onContinueClick: () -> Unit,
     onDismissError: () -> Unit,
 ) {
     DialogLikeBannerMolecule(
         title = stringResource(R.string.screen_notification_settings_configuration_mismatch),
         content = stringResource(R.string.screen_notification_settings_configuration_mismatch_description),
-        onSubmitClicked = onContinueClicked,
-        onDismissClicked = null,
+        onSubmitClick = onContinueClick,
+        onDismissClick = null,
     )
 
     if (showError) {
@@ -266,8 +266,8 @@ private fun InvalidNotificationSettingsView(
 internal fun NotificationSettingsViewPreview(@PreviewParameter(NotificationSettingsStateProvider::class) state: NotificationSettingsState) = ElementPreview {
     NotificationSettingsView(
         state = state,
-        onBackPressed = {},
+        onBackClick = {},
         onOpenEditDefault = {},
-        onTroubleshootNotificationsClicked = {},
+        onTroubleshootNotificationsClick = {},
     )
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/DefaultNotificationSettingOption.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/DefaultNotificationSettingOption.kt
index b5a79947af..e6d1234d04 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/DefaultNotificationSettingOption.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/DefaultNotificationSettingOption.kt
@@ -30,7 +30,7 @@ import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 @Composable
 fun DefaultNotificationSettingOption(
     mode: RoomNotificationMode,
-    onOptionSelected: (RoomNotificationMode) -> Unit,
+    onSelectOption: (RoomNotificationMode) -> Unit,
     displayMentionsOnlyDisclaimer: Boolean,
     modifier: Modifier = Modifier,
     isSelected: Boolean = false,
@@ -51,7 +51,7 @@ fun DefaultNotificationSettingOption(
         headlineContent = { Text(title) },
         supportingContent = subtitle?.let { { Text(it) } },
         trailingContent = ListItemContent.RadioButton(selected = isSelected),
-        onClick = { onOptionSelected(mode) },
+        onClick = { onSelectOption(mode) },
     )
 }
 
@@ -63,19 +63,19 @@ internal fun DefaultNotificationSettingOptionPreview() = ElementPreview {
             mode = RoomNotificationMode.ALL_MESSAGES,
             isSelected = true,
             displayMentionsOnlyDisclaimer = false,
-            onOptionSelected = {},
+            onSelectOption = {},
         )
         DefaultNotificationSettingOption(
             mode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY,
             isSelected = false,
             displayMentionsOnlyDisclaimer = false,
-            onOptionSelected = {},
+            onSelectOption = {},
         )
         DefaultNotificationSettingOption(
             mode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY,
             isSelected = false,
             displayMentionsOnlyDisclaimer = true,
-            onOptionSelected = {},
+            onSelectOption = {},
         )
     }
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingNode.kt
index de365878ad..92dc1f94f6 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingNode.kt
@@ -58,7 +58,7 @@ class EditDefaultNotificationSettingNode @AssistedInject constructor(
         EditDefaultNotificationSettingView(
             state = state,
             openRoomNotificationSettings = { openRoomNotificationSettings(it) },
-            onBackPressed = ::navigateUp,
+            onBackClick = ::navigateUp,
             modifier = modifier,
         )
     }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingView.kt
index b3ac493b0e..f13aa90c4d 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingView.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingView.kt
@@ -47,7 +47,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
 fun EditDefaultNotificationSettingView(
     state: EditDefaultNotificationSettingState,
     openRoomNotificationSettings: (roomId: RoomId) -> Unit,
-    onBackPressed: () -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val title = if (state.isOneToOne) {
@@ -57,7 +57,7 @@ fun EditDefaultNotificationSettingView(
     }
     PreferencePage(
         modifier = modifier,
-        onBackPressed = onBackPressed,
+        onBackClick = onBackClick,
         title = stringResource(id = title)
     ) {
         // Only ALL_MESSAGES and MENTIONS_AND_KEYWORDS_ONLY are valid global defaults.
@@ -79,7 +79,7 @@ fun EditDefaultNotificationSettingView(
                             mode = item,
                             isSelected = state.mode == item,
                             displayMentionsOnlyDisclaimer = state.displayMentionsOnlyDisclaimer,
-                            onOptionSelected = { state.eventSink(EditDefaultNotificationSettingStateEvents.SetNotificationMode(it)) }
+                            onSelectOption = { state.eventSink(EditDefaultNotificationSettingStateEvents.SetNotificationMode(it)) }
                         )
                     }
                 }
@@ -140,6 +140,6 @@ internal fun EditDefaultNotificationSettingViewPreview(
     EditDefaultNotificationSettingView(
         state = state,
         openRoomNotificationSettings = {},
-        onBackPressed = {},
+        onBackClick = {},
     )
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootNode.kt
index 11f3fc3dd3..106f07ecc2 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootNode.kt
@@ -44,7 +44,7 @@ class PreferencesRootNode @AssistedInject constructor(
 ) : Node(buildContext, plugins = plugins) {
     interface Callback : Plugin {
         fun onOpenBugReport()
-        fun onSecureBackupClicked()
+        fun onSecureBackupClick()
         fun onOpenAnalytics()
         fun onOpenAbout()
         fun onOpenDeveloperSettings()
@@ -53,15 +53,15 @@ class PreferencesRootNode @AssistedInject constructor(
         fun onOpenAdvancedSettings()
         fun onOpenUserProfile(matrixUser: MatrixUser)
         fun onOpenBlockedUsers()
-        fun onSignOutClicked()
+        fun onSignOutClick()
     }
 
     private fun onOpenBugReport() {
         plugins<Callback>().forEach { it.onOpenBugReport() }
     }
 
-    private fun onSecureBackupClicked() {
-        plugins<Callback>().forEach { it.onSecureBackupClicked() }
+    private fun onSecureBackupClick() {
+        plugins<Callback>().forEach { it.onSecureBackupClick() }
     }
 
     private fun onOpenDeveloperSettings() {
@@ -80,7 +80,7 @@ class PreferencesRootNode @AssistedInject constructor(
         plugins<Callback>().forEach { it.onOpenAbout() }
     }
 
-    private fun onManageAccountClicked(
+    private fun onManageAccountClick(
         activity: Activity,
         url: String?,
         isDark: Boolean,
@@ -117,8 +117,8 @@ class PreferencesRootNode @AssistedInject constructor(
         plugins<Callback>().forEach { it.onOpenBlockedUsers() }
     }
 
-    private fun onSignOutClicked() {
-        plugins<Callback>().forEach { it.onSignOutClicked() }
+    private fun onSignOutClick() {
+        plugins<Callback>().forEach { it.onSignOutClick() }
     }
 
     @Composable
@@ -129,23 +129,23 @@ class PreferencesRootNode @AssistedInject constructor(
         PreferencesRootView(
             state = state,
             modifier = modifier,
-            onBackPressed = this::navigateUp,
+            onBackClick = this::navigateUp,
             onOpenRageShake = this::onOpenBugReport,
             onOpenAnalytics = this::onOpenAnalytics,
             onOpenAbout = this::onOpenAbout,
-            onSecureBackupClicked = this::onSecureBackupClicked,
+            onSecureBackupClick = this::onSecureBackupClick,
             onOpenDeveloperSettings = this::onOpenDeveloperSettings,
             onOpenAdvancedSettings = this::onOpenAdvancedSettings,
-            onManageAccountClicked = { onManageAccountClicked(activity, it, isDark) },
+            onManageAccountClick = { onManageAccountClick(activity, it, isDark) },
             onOpenNotificationSettings = this::onOpenNotificationSettings,
             onOpenLockScreenSettings = this::onOpenLockScreenSettings,
             onOpenUserProfile = this::onOpenUserProfile,
             onOpenBlockedUsers = this::onOpenBlockedUsers,
-            onSignOutClicked = {
+            onSignOutClick = {
                 if (state.directLogoutState.canDoDirectSignOut) {
                     state.directLogoutState.eventSink(DirectLogoutEvents.Logout(ignoreSdkError = false))
                 } else {
-                    onSignOutClicked()
+                    onSignOutClick()
                 }
             },
         )
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt
index a70f73fa6e..3ec69f25bf 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootView.kt
@@ -52,9 +52,9 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun PreferencesRootView(
     state: PreferencesRootState,
-    onBackPressed: () -> Unit,
-    onSecureBackupClicked: () -> Unit,
-    onManageAccountClicked: (url: String) -> Unit,
+    onBackClick: () -> Unit,
+    onSecureBackupClick: () -> Unit,
+    onManageAccountClick: (url: String) -> Unit,
     onOpenAnalytics: () -> Unit,
     onOpenRageShake: () -> Unit,
     onOpenLockScreenSettings: () -> Unit,
@@ -64,7 +64,7 @@ fun PreferencesRootView(
     onOpenNotificationSettings: () -> Unit,
     onOpenUserProfile: (MatrixUser) -> Unit,
     onOpenBlockedUsers: () -> Unit,
-    onSignOutClicked: () -> Unit,
+    onSignOutClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val snackbarHostState = rememberSnackbarHostState(snackbarMessage = state.snackbarMessage)
@@ -72,7 +72,7 @@ fun PreferencesRootView(
     // Include pref from other modules
     PreferencePage(
         modifier = modifier,
-        onBackPressed = onBackPressed,
+        onBackClick = onBackClick,
         title = stringResource(id = CommonStrings.common_settings),
         snackbarHost = { SnackbarHost(snackbarHostState) }
     ) {
@@ -88,13 +88,13 @@ fun PreferencesRootView(
             state = state,
             onOpenNotificationSettings = onOpenNotificationSettings,
             onOpenLockScreenSettings = onOpenLockScreenSettings,
-            onSecureBackupClicked = onSecureBackupClicked,
+            onSecureBackupClick = onSecureBackupClick,
         )
 
         // 'Account' section
         ManageAccountSection(
             state = state,
-            onManageAccountClicked = onManageAccountClicked,
+            onManageAccountClick = onManageAccountClick,
             onOpenBlockedUsers = onOpenBlockedUsers
         )
 
@@ -106,7 +106,7 @@ fun PreferencesRootView(
             onOpenRageShake = onOpenRageShake,
             onOpenAdvancedSettings = onOpenAdvancedSettings,
             onOpenDeveloperSettings = onOpenDeveloperSettings,
-            onSignOutClicked = onSignOutClicked,
+            onSignOutClick = onSignOutClick,
         )
 
         Footer(
@@ -121,7 +121,7 @@ private fun ColumnScope.ManageAppSection(
     state: PreferencesRootState,
     onOpenNotificationSettings: () -> Unit,
     onOpenLockScreenSettings: () -> Unit,
-    onSecureBackupClicked: () -> Unit,
+    onSecureBackupClick: () -> Unit,
 ) {
     if (state.showNotificationSettings) {
         ListItem(
@@ -142,7 +142,7 @@ private fun ColumnScope.ManageAppSection(
             headlineContent = { Text(stringResource(id = CommonStrings.common_chat_backup)) },
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.KeySolid())),
             trailingContent = ListItemContent.Badge.takeIf { state.showSecureBackupBadge },
-            onClick = onSecureBackupClicked,
+            onClick = onSecureBackupClick,
         )
     }
     if (state.showNotificationSettings || state.showLockScreenSettings || state.showSecureBackup) {
@@ -153,7 +153,7 @@ private fun ColumnScope.ManageAppSection(
 @Composable
 private fun ColumnScope.ManageAccountSection(
     state: PreferencesRootState,
-    onManageAccountClicked: (url: String) -> Unit,
+    onManageAccountClick: (url: String) -> Unit,
     onOpenBlockedUsers: () -> Unit,
 ) {
     state.accountManagementUrl?.let { url ->
@@ -161,7 +161,7 @@ private fun ColumnScope.ManageAccountSection(
             headlineContent = { Text(stringResource(id = CommonStrings.action_manage_account)) },
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.UserProfile())),
             trailingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.PopOut())),
-            onClick = { onManageAccountClicked(url) },
+            onClick = { onManageAccountClick(url) },
         )
     }
 
@@ -170,7 +170,7 @@ private fun ColumnScope.ManageAccountSection(
             headlineContent = { Text(stringResource(id = CommonStrings.action_manage_devices)) },
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Devices())),
             trailingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.PopOut())),
-            onClick = { onManageAccountClicked(url) },
+            onClick = { onManageAccountClick(url) },
         )
     }
 
@@ -195,7 +195,7 @@ private fun ColumnScope.GeneralSection(
     onOpenRageShake: () -> Unit,
     onOpenAdvancedSettings: () -> Unit,
     onOpenDeveloperSettings: () -> Unit,
-    onSignOutClicked: () -> Unit,
+    onSignOutClick: () -> Unit,
 ) {
     ListItem(
         headlineContent = { Text(stringResource(id = CommonStrings.common_about)) },
@@ -226,7 +226,7 @@ private fun ColumnScope.GeneralSection(
         headlineContent = { Text(stringResource(id = CommonStrings.action_signout)) },
         leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.SignOut())),
         style = ListItemStyle.Destructive,
-        onClick = onSignOutClicked,
+        onClick = onSignOutClick,
     )
 }
 
@@ -279,18 +279,18 @@ internal fun PreferencesRootViewDarkPreview(@PreviewParameter(MatrixUserProvider
 private fun ContentToPreview(matrixUser: MatrixUser) {
     PreferencesRootView(
         state = aPreferencesRootState(myUser = matrixUser),
-        onBackPressed = {},
+        onBackClick = {},
         onOpenAnalytics = {},
         onOpenRageShake = {},
         onOpenDeveloperSettings = {},
         onOpenAdvancedSettings = {},
         onOpenAbout = {},
-        onSecureBackupClicked = {},
-        onManageAccountClicked = {},
+        onSecureBackupClick = {},
+        onManageAccountClick = {},
         onOpenNotificationSettings = {},
         onOpenLockScreenSettings = {},
         onOpenUserProfile = {},
         onOpenBlockedUsers = {},
-        onSignOutClicked = {},
+        onSignOutClick = {},
     )
 }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNode.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNode.kt
index 4fcbb94cf1..46b2f8f9d3 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNode.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileNode.kt
@@ -47,8 +47,8 @@ class EditUserProfileNode @AssistedInject constructor(
         val state = presenter.present()
         EditUserProfileView(
             state = state,
-            onBackPressed = ::navigateUp,
-            onProfileEdited = ::navigateUp,
+            onBackClick = ::navigateUp,
+            onEditProfileSuccess = ::navigateUp,
             modifier = modifier
         )
     }
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileView.kt
index 389d7c5b08..167c301a35 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileView.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileView.kt
@@ -60,14 +60,14 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun EditUserProfileView(
     state: EditUserProfileState,
-    onBackPressed: () -> Unit,
-    onProfileEdited: () -> Unit,
+    onBackClick: () -> Unit,
+    onEditProfileSuccess: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val focusManager = LocalFocusManager.current
     val isAvatarActionsSheetVisible = remember { mutableStateOf(false) }
 
-    fun onAvatarClicked() {
+    fun onAvatarClick() {
         focusManager.clearFocus()
         isAvatarActionsSheetVisible.value = true
     }
@@ -82,7 +82,7 @@ fun EditUserProfileView(
                         style = ElementTheme.typography.aliasScreenTitle,
                     )
                 },
-                navigationIcon = { BackButton(onClick = onBackPressed) },
+                navigationIcon = { BackButton(onClick = onBackClick) },
                 actions = {
                     TextButton(
                         text = stringResource(CommonStrings.action_save),
@@ -110,7 +110,7 @@ fun EditUserProfileView(
                 displayName = state.displayName,
                 avatarUrl = state.userAvatarUrl,
                 avatarSize = AvatarSize.RoomHeader,
-                onAvatarClicked = { onAvatarClicked() },
+                onAvatarClick = { onAvatarClick() },
                 modifier = Modifier.align(Alignment.CenterHorizontally),
             )
             Spacer(modifier = Modifier.height(16.dp))
@@ -134,7 +134,7 @@ fun EditUserProfileView(
             actions = state.avatarActions,
             isVisible = isAvatarActionsSheetVisible.value,
             onDismiss = { isAvatarActionsSheetVisible.value = false },
-            onActionSelected = { state.eventSink(EditUserProfileEvents.HandleAvatarAction(it)) }
+            onSelectAction = { state.eventSink(EditUserProfileEvents.HandleAvatarAction(it)) }
         )
 
         AsyncActionView(
@@ -144,7 +144,7 @@ fun EditUserProfileView(
                     progressText = stringResource(R.string.screen_edit_profile_updating_details),
                 )
             },
-            onSuccess = { onProfileEdited() },
+            onSuccess = { onEditProfileSuccess() },
             errorTitle = { stringResource(R.string.screen_edit_profile_error_title) },
             errorMessage = { stringResource(R.string.screen_edit_profile_error) },
             onErrorDismiss = { state.eventSink(EditUserProfileEvents.CancelSaveChanges) },
@@ -160,8 +160,8 @@ fun EditUserProfileView(
 internal fun EditUserProfileViewPreview(@PreviewParameter(EditUserProfileStateProvider::class) state: EditUserProfileState) =
     ElementPreview {
         EditUserProfileView(
-            onBackPressed = {},
-            onProfileEdited = {},
+            onBackClick = {},
+            onEditProfileSuccess = {},
             state = state,
         )
     }
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsViewTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsViewTest.kt
index a24fb183a8..9d581f2e56 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsViewTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/advanced/AdvancedSettingsViewTest.kt
@@ -46,7 +46,7 @@ class AdvancedSettingsViewTest {
                 state = aAdvancedSettingsState(
                     eventSink = eventsRecorder
                 ),
-                onBackPressed = it
+                onBackClick = it
             )
             rule.pressBack()
         }
@@ -104,12 +104,12 @@ class AdvancedSettingsViewTest {
 
 private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setAdvancedSettingsView(
     state: AdvancedSettingsState,
-    onBackPressed: () -> Unit = EnsureNeverCalled(),
+    onBackClick: () -> Unit = EnsureNeverCalled(),
 ) {
     setContent {
         AdvancedSettingsView(
             state = state,
-            onBackPressed = onBackPressed,
+            onBackClick = onBackClick,
         )
     }
 }
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUserViewTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUserViewTest.kt
index 7fe924e7d6..353d505e50 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUserViewTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/blockedusers/BlockedUserViewTest.kt
@@ -49,7 +49,7 @@ class BlockedUserViewTest {
                 aBlockedUsersState(
                     eventSink = eventsRecorder
                 ),
-                onBackClicked = callback,
+                onBackClick = callback,
             )
             rule.pressBack()
         }
@@ -98,12 +98,12 @@ class BlockedUserViewTest {
 
 private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setLogoutView(
     state: BlockedUsersState,
-    onBackClicked: () -> Unit = EnsureNeverCalled(),
+    onBackClick: () -> Unit = EnsureNeverCalled(),
 ) {
     setContent {
         BlockedUsersView(
             state = state,
-            onBackPressed = onBackClicked,
+            onBackClick = onBackClick,
         )
     }
 }
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsViewTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsViewTest.kt
index e41d25a412..7288b76d3c 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsViewTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsViewTest.kt
@@ -48,7 +48,7 @@ class DeveloperSettingsViewTest {
                 state = aDeveloperSettingsState(
                     eventSink = eventsRecorder
                 ),
-                onBackPressed = it
+                onBackClick = it
             )
             rule.pressBack()
         }
@@ -115,14 +115,14 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setDevel
     state: DeveloperSettingsState,
     onOpenShowkase: () -> Unit = EnsureNeverCalled(),
     onOpenConfigureTracing: () -> Unit = EnsureNeverCalled(),
-    onBackPressed: () -> Unit = EnsureNeverCalled()
+    onBackClick: () -> Unit = EnsureNeverCalled()
 ) {
     setContent {
         DeveloperSettingsView(
             state = state,
             onOpenShowkase = onOpenShowkase,
             onOpenConfigureTracing = onOpenConfigureTracing,
-            onBackPressed = onBackPressed,
+            onBackClick = onBackClick,
         )
     }
 }
diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsViewTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsViewTest.kt
index 790a4c7f25..93d8422bd2 100644
--- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsViewTest.kt
+++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsViewTest.kt
@@ -52,7 +52,7 @@ class NotificationSettingsViewTest {
                 state = aValidNotificationSettingsState(
                     eventSink = eventsRecorder
                 ),
-                onBackPressed = it
+                onBackClick = it
             )
             rule.pressBack()
         }
@@ -68,7 +68,7 @@ class NotificationSettingsViewTest {
                 state = aValidNotificationSettingsState(
                     eventSink = eventsRecorder
                 ),
-                onTroubleshootNotificationsClicked = it
+                onTroubleshootNotificationsClick = it
             )
             rule.clickOn(R.string.troubleshoot_notifications_entry_point_title)
         }
@@ -292,15 +292,15 @@ class NotificationSettingsViewTest {
 private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setNotificationSettingsView(
     state: NotificationSettingsState,
     onOpenEditDefault: (isOneToOne: Boolean) -> Unit = EnsureNeverCalledWithParam(),
-    onTroubleshootNotificationsClicked: () -> Unit = EnsureNeverCalled(),
-    onBackPressed: () -> Unit = EnsureNeverCalled(),
+    onTroubleshootNotificationsClick: () -> Unit = EnsureNeverCalled(),
+    onBackClick: () -> Unit = EnsureNeverCalled(),
 ) {
     setContent {
         NotificationSettingsView(
             state = state,
             onOpenEditDefault = onOpenEditDefault,
-            onTroubleshootNotificationsClicked = onTroubleshootNotificationsClicked,
-            onBackPressed = onBackPressed,
+            onTroubleshootNotificationsClick = onTroubleshootNotificationsClick,
+            onBackClick = onBackClick,
         )
     }
 }
diff --git a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/crash/CrashDetectionView.kt b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/crash/CrashDetectionView.kt
index 5af36b5ad8..39bec346b3 100644
--- a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/crash/CrashDetectionView.kt
+++ b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/crash/CrashDetectionView.kt
@@ -36,8 +36,8 @@ fun CrashDetectionView(
     if (state.crashDetected) {
         CrashDetectionContent(
             appName = state.appName,
-            onYesClicked = onOpenBugReport,
-            onNoClicked = ::onPopupDismissed,
+            onYesClick = onOpenBugReport,
+            onNoClick = ::onPopupDismissed,
             onDismiss = ::onPopupDismissed,
         )
     }
@@ -46,8 +46,8 @@ fun CrashDetectionView(
 @Composable
 private fun CrashDetectionContent(
     appName: String,
-    onNoClicked: () -> Unit = { },
-    onYesClicked: () -> Unit = { },
+    onNoClick: () -> Unit = { },
+    onYesClick: () -> Unit = { },
     onDismiss: () -> Unit = { },
 ) {
     ConfirmationDialog(
@@ -55,8 +55,8 @@ private fun CrashDetectionContent(
         content = stringResource(id = R.string.crash_detection_dialog_content, appName),
         submitText = stringResource(id = CommonStrings.action_yes),
         cancelText = stringResource(id = CommonStrings.action_no),
-        onCancelClicked = onNoClicked,
-        onSubmitClicked = onYesClicked,
+        onCancelClick = onNoClick,
+        onSubmitClick = onYesClick,
         onDismiss = onDismiss,
     )
 }
diff --git a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/detection/RageshakeDetectionView.kt b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/detection/RageshakeDetectionView.kt
index 6121c684cd..76fcf845be 100644
--- a/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/detection/RageshakeDetectionView.kt
+++ b/features/rageshake/api/src/main/kotlin/io/element/android/features/rageshake/api/detection/RageshakeDetectionView.kt
@@ -50,16 +50,16 @@ fun RageshakeDetectionView(
     }
     when {
         state.takeScreenshot -> TakeScreenshot(
-            onScreenshotTaken = { eventSink(RageshakeDetectionEvents.ProcessScreenshot(it)) }
+            onScreenshot = { eventSink(RageshakeDetectionEvents.ProcessScreenshot(it)) }
         )
         state.showDialog -> {
             LaunchedEffect(Unit) {
                 context.vibrate()
             }
             RageshakeDialogContent(
-                onNoClicked = { eventSink(RageshakeDetectionEvents.Dismiss) },
-                onDisableClicked = { eventSink(RageshakeDetectionEvents.Disable) },
-                onYesClicked = onOpenBugReport
+                onNoClick = { eventSink(RageshakeDetectionEvents.Dismiss) },
+                onDisableClick = { eventSink(RageshakeDetectionEvents.Disable) },
+                onYesClick = onOpenBugReport
             )
         }
     }
@@ -67,22 +67,22 @@ fun RageshakeDetectionView(
 
 @Composable
 private fun TakeScreenshot(
-    onScreenshotTaken: (ImageResult) -> Unit
+    onScreenshot: (ImageResult) -> Unit
 ) {
     val view = LocalView.current
-    val latestOnScreenshotTaken by rememberUpdatedState(onScreenshotTaken)
+    val latestOnScreenshot by rememberUpdatedState(onScreenshot)
     LaunchedEffect(Unit) {
         view.screenshot {
-            latestOnScreenshotTaken(it)
+            latestOnScreenshot(it)
         }
     }
 }
 
 @Composable
 private fun RageshakeDialogContent(
-    onNoClicked: () -> Unit = { },
-    onDisableClicked: () -> Unit = { },
-    onYesClicked: () -> Unit = { },
+    onNoClick: () -> Unit = { },
+    onDisableClick: () -> Unit = { },
+    onYesClick: () -> Unit = { },
 ) {
     ConfirmationDialog(
         title = stringResource(id = CommonStrings.action_report_bug),
@@ -90,10 +90,10 @@ private fun RageshakeDialogContent(
         thirdButtonText = stringResource(id = CommonStrings.action_disable),
         submitText = stringResource(id = CommonStrings.action_yes),
         cancelText = stringResource(id = CommonStrings.action_no),
-        onCancelClicked = onNoClicked,
-        onThirdButtonClicked = onDisableClicked,
-        onSubmitClicked = onYesClicked,
-        onDismiss = onNoClicked,
+        onCancelClick = onNoClick,
+        onThirdButtonClick = onDisableClick,
+        onSubmitClick = onYesClick,
+        onDismiss = onNoClick,
     )
 }
 
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportNode.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportNode.kt
index caed077228..d3505aeefb 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportNode.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportNode.kt
@@ -51,8 +51,8 @@ class BugReportNode @AssistedInject constructor(
         BugReportView(
             state = state,
             modifier = modifier,
-            onBackPressed = { navigateUp() },
-            onDone = {
+            onBackClick = { navigateUp() },
+            onSuccess = {
                 activity?.toast(CommonStrings.common_report_submitted)
                 onDone()
             },
diff --git a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportView.kt b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportView.kt
index f5ffd62fd6..599a48025e 100644
--- a/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportView.kt
+++ b/features/rageshake/impl/src/main/kotlin/io/element/android/features/rageshake/impl/bugreport/BugReportView.kt
@@ -57,8 +57,8 @@ import io.element.android.libraries.ui.strings.CommonStrings
 fun BugReportView(
     state: BugReportState,
     onViewLogs: () -> Unit,
-    onDone: () -> Unit,
-    onBackPressed: () -> Unit,
+    onSuccess: () -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val eventSink = state.eventSink
@@ -66,7 +66,7 @@ fun BugReportView(
     Box(modifier = modifier) {
         PreferencePage(
             title = stringResource(id = CommonStrings.common_report_a_problem),
-            onBackPressed = onBackPressed
+            onBackClick = onBackClick
         ) {
             val isFormEnabled = state.sending !is AsyncAction.Loading
             var descriptionFieldState by textFieldState(
@@ -163,7 +163,7 @@ fun BugReportView(
             progressDialog = { },
             onSuccess = {
                 eventSink(BugReportEvents.ResetAll)
-                onDone()
+                onSuccess()
             },
             errorMessage = { error ->
                 when (error) {
@@ -181,8 +181,8 @@ fun BugReportView(
 internal fun BugReportViewPreview(@PreviewParameter(BugReportStateProvider::class) state: BugReportState) = ElementPreview {
     BugReportView(
         state = state,
-        onDone = {},
-        onBackPressed = {},
+        onSuccess = {},
+        onBackClick = {},
         onViewLogs = {},
     )
 }
diff --git a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverNode.kt b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverNode.kt
index d6d497e62a..38f7a01190 100644
--- a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverNode.kt
+++ b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverNode.kt
@@ -51,8 +51,8 @@ class RoomAliasResolverNode @AssistedInject constructor(
         val state = presenter.present()
         RoomAliasResolverView(
             state = state,
-            onAliasResolved = ::onAliasResolved,
-            onBackPressed = ::navigateUp,
+            onSuccess = ::onAliasResolved,
+            onBackClick = ::navigateUp,
             modifier = modifier
         )
     }
diff --git a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverView.kt b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverView.kt
index 722eb86650..933817a37a 100644
--- a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverView.kt
+++ b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverView.kt
@@ -55,14 +55,14 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun RoomAliasResolverView(
     state: RoomAliasResolverState,
-    onBackPressed: () -> Unit,
-    onAliasResolved: (ResolvedRoomAlias) -> Unit,
+    onBackClick: () -> Unit,
+    onSuccess: (ResolvedRoomAlias) -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    val latestOnAliasResolved by rememberUpdatedState(onAliasResolved)
+    val latestOnSuccess by rememberUpdatedState(onSuccess)
     LaunchedEffect(state.resolveState) {
         if (state.resolveState is AsyncData.Success) {
-            latestOnAliasResolved(state.resolveState.data)
+            latestOnSuccess(state.resolveState.data)
         }
     }
     Box(
@@ -73,7 +73,7 @@ fun RoomAliasResolverView(
             containerColor = Color.Transparent,
             paddingValues = PaddingValues(16.dp),
             topBar = {
-                RoomAliasResolverTopBar(onBackClicked = onBackPressed)
+                RoomAliasResolverTopBar(onBackClick = onBackClick)
             },
             content = {
                 RoomAliasResolverContent(state = state)
@@ -148,11 +148,11 @@ private fun RoomAliasResolverContent(
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun RoomAliasResolverTopBar(
-    onBackClicked: () -> Unit,
+    onBackClick: () -> Unit,
 ) {
     TopAppBar(
         navigationIcon = {
-            BackButton(onClick = onBackClicked)
+            BackButton(onClick = onBackClick)
         },
         title = {},
     )
@@ -163,7 +163,7 @@ private fun RoomAliasResolverTopBar(
 internal fun RoomAliasResolverViewPreview(@PreviewParameter(RoomAliasResolverStateProvider::class) state: RoomAliasResolverState) = ElementPreview {
     RoomAliasResolverView(
         state = state,
-        onAliasResolved = { },
-        onBackPressed = { }
+        onSuccess = { },
+        onBackClick = { }
     )
 }
diff --git a/features/roomaliasresolver/impl/src/test/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverViewTest.kt b/features/roomaliasresolver/impl/src/test/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverViewTest.kt
index 990bbfe46a..3dc5052011 100644
--- a/features/roomaliasresolver/impl/src/test/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverViewTest.kt
+++ b/features/roomaliasresolver/impl/src/test/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverViewTest.kt
@@ -47,7 +47,7 @@ class RoomAliasResolverViewTest {
                 aRoomAliasResolverState(
                     eventSink = eventsRecorder,
                 ),
-                onBackPressed = it
+                onBackClick = it
             )
             rule.pressBack()
         }
@@ -84,14 +84,14 @@ class RoomAliasResolverViewTest {
 
 private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRoomAliasResolverView(
     state: RoomAliasResolverState,
-    onBackPressed: () -> Unit = EnsureNeverCalled(),
+    onBackClick: () -> Unit = EnsureNeverCalled(),
     onAliasResolved: (ResolvedRoomAlias) -> Unit = EnsureNeverCalledWithParam(),
 ) {
     setContent {
         RoomAliasResolverView(
             state = state,
-            onBackPressed = onBackPressed,
-            onAliasResolved = onAliasResolved,
+            onBackClick = onBackClick,
+            onSuccess = onAliasResolved,
         )
     }
 }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsNode.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsNode.kt
index 83eb19dc37..d55966315e 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsNode.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsNode.kt
@@ -124,7 +124,7 @@ class RoomDetailsNode @AssistedInject constructor(
             lifecycleScope.onShareRoom(context)
         }
 
-        fun onActionClicked(action: RoomDetailsAction) {
+        fun onActionClick(action: RoomDetailsAction) {
             when (action) {
                 RoomDetailsAction.Edit -> onEditRoomDetails()
                 RoomDetailsAction.AddTopic -> onEditRoomDetails()
@@ -135,7 +135,7 @@ class RoomDetailsNode @AssistedInject constructor(
             state = state,
             modifier = modifier,
             goBack = this::navigateUp,
-            onActionClicked = ::onActionClicked,
+            onActionClick = ::onActionClick,
             onShareRoom = ::onShareRoom,
             openRoomMemberList = ::openRoomMemberList,
             openRoomNotificationSettings = ::openRoomNotificationSettings,
@@ -143,7 +143,7 @@ class RoomDetailsNode @AssistedInject constructor(
             openAvatarPreview = ::openAvatarPreview,
             openPollHistory = ::openPollHistory,
             openAdminSettings = this::openAdminSettings,
-            onJoinCallClicked = ::onJoinCall,
+            onJoinCallClick = ::onJoinCall,
         )
     }
 }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
index 34bb3a7a65..078e1f6def 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
@@ -89,7 +89,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
 fun RoomDetailsView(
     state: RoomDetailsState,
     goBack: () -> Unit,
-    onActionClicked: (RoomDetailsAction) -> Unit,
+    onActionClick: (RoomDetailsAction) -> Unit,
     onShareRoom: () -> Unit,
     openRoomMemberList: () -> Unit,
     openRoomNotificationSettings: () -> Unit,
@@ -97,7 +97,7 @@ fun RoomDetailsView(
     openAvatarPreview: (name: String, url: String) -> Unit,
     openPollHistory: () -> Unit,
     openAdminSettings: () -> Unit,
-    onJoinCallClicked: () -> Unit,
+    onJoinCallClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Scaffold(
@@ -106,7 +106,7 @@ fun RoomDetailsView(
             RoomDetailsTopBar(
                 goBack = goBack,
                 showEdit = state.canEdit,
-                onActionClicked = onActionClicked
+                onActionClick = onActionClick
             )
         },
     ) { padding ->
@@ -135,7 +135,7 @@ fun RoomDetailsView(
                         state = state,
                         onShareRoom = onShareRoom,
                         onInvitePeople = invitePeople,
-                        onCall = onJoinCallClicked,
+                        onCall = onJoinCallClick,
                     )
                 }
 
@@ -153,7 +153,7 @@ fun RoomDetailsView(
                         state = state,
                         onShareRoom = onShareRoom,
                         onInvitePeople = invitePeople,
-                        onCall = onJoinCallClicked,
+                        onCall = onJoinCallClick,
                     )
                 }
             }
@@ -162,7 +162,7 @@ fun RoomDetailsView(
             if (state.roomTopic !is RoomTopicState.Hidden) {
                 TopicSection(
                     roomTopic = state.roomTopic,
-                    onActionClicked = onActionClicked,
+                    onActionClick = onActionClick,
                 )
             }
 
@@ -226,7 +226,7 @@ fun RoomDetailsView(
 @Composable
 private fun RoomDetailsTopBar(
     goBack: () -> Unit,
-    onActionClicked: (RoomDetailsAction) -> Unit,
+    onActionClick: (RoomDetailsAction) -> Unit,
     showEdit: Boolean,
 ) {
     var showMenu by remember { mutableStateOf(false) }
@@ -249,7 +249,7 @@ private fun RoomDetailsTopBar(
                             // Explicitly close the menu before handling the action, as otherwise it stays open during the
                             // transition and renders really badly.
                             showMenu = false
-                            onActionClicked(RoomDetailsAction.Edit)
+                            onActionClick(RoomDetailsAction.Edit)
                         },
                     )
                 }
@@ -397,7 +397,7 @@ private fun BadgeList(
 @Composable
 private fun TopicSection(
     roomTopic: RoomTopicState,
-    onActionClicked: (RoomDetailsAction) -> Unit,
+    onActionClick: (RoomDetailsAction) -> Unit,
 ) {
     PreferenceCategory(
         title = stringResource(CommonStrings.common_topic),
@@ -407,7 +407,7 @@ private fun TopicSection(
             PreferenceText(
                 title = stringResource(R.string.screen_room_details_add_topic_title),
                 icon = Icons.Outlined.Add,
-                onClick = { onActionClicked(RoomDetailsAction.AddTopic) },
+                onClick = { onActionClick(RoomDetailsAction.AddTopic) },
             )
         } else if (roomTopic is RoomTopicState.ExistingTopic) {
             ClickableLinkText(
@@ -527,7 +527,7 @@ private fun ContentToPreview(state: RoomDetailsState) {
     RoomDetailsView(
         state = state,
         goBack = {},
-        onActionClicked = {},
+        onActionClick = {},
         onShareRoom = {},
         openRoomMemberList = {},
         openRoomNotificationSettings = {},
@@ -535,6 +535,6 @@ private fun ContentToPreview(state: RoomDetailsState) {
         openAvatarPreview = { _, _ -> },
         openPollHistory = {},
         openAdminSettings = {},
-        onJoinCallClicked = {},
+        onJoinCallClick = {},
     )
 }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditNode.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditNode.kt
index 34f6be1b7b..95f10e1859 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditNode.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditNode.kt
@@ -49,8 +49,8 @@ class RoomDetailsEditNode @AssistedInject constructor(
         val state = presenter.present()
         RoomDetailsEditView(
             state = state,
-            onBackPressed = ::navigateUp,
-            onRoomEdited = ::navigateUp,
+            onBackClick = ::navigateUp,
+            onRoomEditSuccess = ::navigateUp,
             modifier = modifier,
         )
     }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditView.kt
index e0da0d2f19..a074d1a7b2 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditView.kt
@@ -63,14 +63,14 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun RoomDetailsEditView(
     state: RoomDetailsEditState,
-    onBackPressed: () -> Unit,
-    onRoomEdited: () -> Unit,
+    onBackClick: () -> Unit,
+    onRoomEditSuccess: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val focusManager = LocalFocusManager.current
     val isAvatarActionsSheetVisible = remember { mutableStateOf(false) }
 
-    fun onAvatarClicked() {
+    fun onAvatarClick() {
         focusManager.clearFocus()
         isAvatarActionsSheetVisible.value = true
     }
@@ -85,7 +85,7 @@ fun RoomDetailsEditView(
                         style = ElementTheme.typography.aliasScreenTitle,
                     )
                 },
-                navigationIcon = { BackButton(onClick = onBackPressed) },
+                navigationIcon = { BackButton(onClick = onBackClick) },
                 actions = {
                     TextButton(
                         text = stringResource(CommonStrings.action_save),
@@ -114,7 +114,7 @@ fun RoomDetailsEditView(
                 displayName = state.roomRawName,
                 avatarUrl = state.roomAvatarUrl,
                 avatarSize = AvatarSize.EditRoomDetails,
-                onAvatarClicked = ::onAvatarClicked,
+                onAvatarClick = ::onAvatarClick,
                 modifier = Modifier.fillMaxWidth(),
             )
             Spacer(modifier = Modifier.height(60.dp))
@@ -160,7 +160,7 @@ fun RoomDetailsEditView(
         actions = state.avatarActions,
         isVisible = isAvatarActionsSheetVisible.value,
         onDismiss = { isAvatarActionsSheetVisible.value = false },
-        onActionSelected = { state.eventSink(RoomDetailsEditEvents.HandleAvatarAction(it)) }
+        onSelectAction = { state.eventSink(RoomDetailsEditEvents.HandleAvatarAction(it)) }
     )
 
     AsyncActionView(
@@ -170,7 +170,7 @@ fun RoomDetailsEditView(
                 progressText = stringResource(R.string.screen_room_details_updating_room),
             )
         },
-        onSuccess = { onRoomEdited() },
+        onSuccess = { onRoomEditSuccess() },
         errorMessage = { stringResource(R.string.screen_room_details_edition_error) },
         onErrorDismiss = { state.eventSink(RoomDetailsEditEvents.CancelSaveChanges) }
     )
@@ -209,7 +209,7 @@ private fun LabelledReadOnlyField(
 internal fun RoomDetailsEditViewPreview(@PreviewParameter(RoomDetailsEditStateProvider::class) state: RoomDetailsEditState) = ElementPreview {
     RoomDetailsEditView(
         state = state,
-        onBackPressed = {},
-        onRoomEdited = {},
+        onBackClick = {},
+        onRoomEditSuccess = {},
     )
 }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersNode.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersNode.kt
index 34fe6273e7..5de3f9b4a7 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersNode.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersNode.kt
@@ -65,8 +65,8 @@ class RoomInviteMembersNode @AssistedInject constructor(
         RoomInviteMembersView(
             state = state,
             modifier = modifier,
-            onBackPressed = { navigateUp() },
-            onSubmitPressed = { users ->
+            onBackClick = { navigateUp() },
+            onSubmitClick = { users ->
                 navigateUp()
 
                 coroutineScope.launch {
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersView.kt
index f6e8f07cce..51ab1886f9 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersView.kt
@@ -57,22 +57,22 @@ import kotlinx.collections.immutable.ImmutableList
 @Composable
 fun RoomInviteMembersView(
     state: RoomInviteMembersState,
-    onBackPressed: () -> Unit,
-    onSubmitPressed: (List<MatrixUser>) -> Unit,
+    onBackClick: () -> Unit,
+    onSubmitClick: (List<MatrixUser>) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Scaffold(
         modifier = modifier,
         topBar = {
             RoomInviteMembersTopBar(
-                onBackPressed = {
+                onBackClick = {
                     if (state.isSearchActive) {
                         state.eventSink(RoomInviteMembersEvents.OnSearchActiveChanged(false))
                     } else {
-                        onBackPressed()
+                        onBackClick()
                     }
                 },
-                onSubmitPressed = { onSubmitPressed(state.selectedUsers) },
+                onSubmitClick = { onSubmitClick(state.selectedUsers) },
                 canSend = state.canInvite,
             )
         }
@@ -91,9 +91,9 @@ fun RoomInviteMembersView(
                 selectedUsers = state.selectedUsers,
                 state = state.searchResults,
                 active = state.isSearchActive,
-                onActiveChanged = { state.eventSink(RoomInviteMembersEvents.OnSearchActiveChanged(it)) },
-                onTextChanged = { state.eventSink(RoomInviteMembersEvents.UpdateSearchQuery(it)) },
-                onUserToggled = { state.eventSink(RoomInviteMembersEvents.ToggleUser(it)) },
+                onActiveChange = { state.eventSink(RoomInviteMembersEvents.OnSearchActiveChanged(it)) },
+                onTextChange = { state.eventSink(RoomInviteMembersEvents.UpdateSearchQuery(it)) },
+                onToggleUser = { state.eventSink(RoomInviteMembersEvents.ToggleUser(it)) },
             )
 
             if (!state.isSearchActive) {
@@ -101,7 +101,7 @@ fun RoomInviteMembersView(
                     modifier = Modifier.fillMaxWidth(),
                     selectedUsers = state.selectedUsers,
                     autoScroll = true,
-                    onUserRemoved = { state.eventSink(RoomInviteMembersEvents.ToggleUser(it)) },
+                    onUserRemove = { state.eventSink(RoomInviteMembersEvents.ToggleUser(it)) },
                     contentPadding = PaddingValues(16.dp),
                 )
             }
@@ -113,8 +113,8 @@ fun RoomInviteMembersView(
 @Composable
 private fun RoomInviteMembersTopBar(
     canSend: Boolean,
-    onBackPressed: () -> Unit,
-    onSubmitPressed: () -> Unit,
+    onBackClick: () -> Unit,
+    onSubmitClick: () -> Unit,
 ) {
     TopAppBar(
         title = {
@@ -123,11 +123,11 @@ private fun RoomInviteMembersTopBar(
                 style = ElementTheme.typography.aliasScreenTitle,
             )
         },
-        navigationIcon = { BackButton(onClick = onBackPressed) },
+        navigationIcon = { BackButton(onClick = onBackClick) },
         actions = {
             TextButton(
                 text = stringResource(CommonStrings.action_invite),
-                onClick = onSubmitPressed,
+                onClick = onSubmitClick,
                 enabled = canSend,
             )
         }
@@ -142,17 +142,17 @@ private fun RoomInviteMembersSearchBar(
     showLoader: Boolean,
     selectedUsers: ImmutableList<MatrixUser>,
     active: Boolean,
-    onActiveChanged: (Boolean) -> Unit,
-    onTextChanged: (String) -> Unit,
-    onUserToggled: (MatrixUser) -> Unit,
+    onActiveChange: (Boolean) -> Unit,
+    onTextChange: (String) -> Unit,
+    onToggleUser: (MatrixUser) -> Unit,
     modifier: Modifier = Modifier,
     placeHolderTitle: String = stringResource(CommonStrings.common_search_for_someone),
 ) {
     SearchBar(
         query = query,
-        onQueryChange = onTextChanged,
+        onQueryChange = onTextChange,
         active = active,
-        onActiveChange = onActiveChanged,
+        onActiveChange = onActiveChange,
         modifier = modifier,
         placeHolderTitle = placeHolderTitle,
         contentPrefix = {
@@ -161,7 +161,7 @@ private fun RoomInviteMembersSearchBar(
                     modifier = Modifier.fillMaxWidth(),
                     selectedUsers = selectedUsers,
                     autoScroll = true,
-                    onUserRemoved = onUserToggled,
+                    onUserRemove = onToggleUser,
                     contentPadding = PaddingValues(16.dp),
                 )
             }
@@ -210,7 +210,7 @@ private fun RoomInviteMembersSearchBar(
                         checked = invitableUser.isSelected,
                         enabled = enabled,
                         data = data,
-                        onCheckedChange = { onUserToggled(invitableUser.matrixUser) },
+                        onCheckedChange = { onToggleUser(invitableUser.matrixUser) },
                         modifier = Modifier.fillMaxWidth()
                     )
 
@@ -228,7 +228,7 @@ private fun RoomInviteMembersSearchBar(
 internal fun RoomInviteMembersViewPreview(@PreviewParameter(RoomInviteMembersStateProvider::class) state: RoomInviteMembersState) = ElementPreview {
     RoomInviteMembersView(
         state = state,
-        onBackPressed = {},
-        onSubmitPressed = {},
+        onBackClick = {},
+        onSubmitClick = {},
     )
 }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt
index c111245ee0..488286ce00 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt
@@ -85,7 +85,7 @@ fun RoomMemberListView(
     modifier: Modifier = Modifier,
     initialSelectedSectionIndex: Int = 0,
 ) {
-    fun onUserSelected(roomMember: RoomMember) {
+    fun onSelectUser(roomMember: RoomMember) {
         state.eventSink(RoomMemberListEvents.RoomMemberSelected(roomMember))
     }
 
@@ -95,8 +95,8 @@ fun RoomMemberListView(
             if (!state.isSearchActive) {
                 RoomMemberListTopBar(
                     canInvite = state.canInvite,
-                    onBackPressed = navigator::exitRoomMemberList,
-                    onInvitePressed = navigator::openInviteMembers,
+                    onBackClick = navigator::exitRoomMemberList,
+                    onInviteClick = navigator::openInviteMembers,
                 )
             }
         }
@@ -119,9 +119,9 @@ fun RoomMemberListView(
                 state = state.searchResults,
                 active = state.isSearchActive,
                 placeHolderTitle = stringResource(CommonStrings.common_search_for_someone),
-                onActiveChanged = { state.eventSink(RoomMemberListEvents.OnSearchActiveChanged(it)) },
-                onTextChanged = { state.eventSink(RoomMemberListEvents.UpdateSearchQuery(it)) },
-                onUserSelected = ::onUserSelected,
+                onActiveChange = { state.eventSink(RoomMemberListEvents.OnSearchActiveChanged(it)) },
+                onTextChange = { state.eventSink(RoomMemberListEvents.UpdateSearchQuery(it)) },
+                onSelectUser = ::onSelectUser,
                 selectedSection = selectedSection,
                 modifier = Modifier.fillMaxWidth(),
             )
@@ -133,8 +133,8 @@ fun RoomMemberListView(
                     showMembersCount = true,
                     canDisplayBannedUsersControls = state.moderationState.canDisplayBannedUsers,
                     selectedSection = selectedSection,
-                    onSelectedSectionChanged = { selectedSection = it },
-                    onUserSelected = ::onUserSelected,
+                    onSelectedSectionChange = { selectedSection = it },
+                    onSelectUser = ::onSelectUser,
                 )
             }
         }
@@ -153,9 +153,9 @@ private fun RoomMemberList(
     roomMembers: RoomMembers,
     showMembersCount: Boolean,
     selectedSection: SelectedSection,
-    onSelectedSectionChanged: (SelectedSection) -> Unit,
+    onSelectedSectionChange: (SelectedSection) -> Unit,
     canDisplayBannedUsersControls: Boolean,
-    onUserSelected: (RoomMember) -> Unit,
+    onSelectUser: (RoomMember) -> Unit,
 ) {
     LazyColumn(modifier = Modifier.fillMaxWidth(), state = rememberLazyListState()) {
         stickyHeader {
@@ -176,7 +176,7 @@ private fun RoomMemberList(
                                 index = index,
                                 count = segmentedButtonTitles.size,
                                 selected = selectedSection.ordinal == index,
-                                onClick = { onSelectedSectionChanged(SelectedSection.entries[index]) },
+                                onClick = { onSelectedSectionChange(SelectedSection.entries[index]) },
                                 text = title,
                             )
                         }
@@ -197,7 +197,7 @@ private fun RoomMemberList(
                     roomMemberListSection(
                         headerText = { stringResource(id = R.string.screen_room_member_list_pending_header_title) },
                         members = roomMembers.invited,
-                        onMemberSelected = { onUserSelected(it) }
+                        onMemberSelected = { onSelectUser(it) }
                     )
                 }
                 if (roomMembers.joined.isNotEmpty()) {
@@ -211,7 +211,7 @@ private fun RoomMemberList(
                             }
                         },
                         members = roomMembers.joined,
-                        onMemberSelected = { onUserSelected(it) }
+                        onMemberSelected = { onSelectUser(it) }
                     )
                 }
             }
@@ -220,7 +220,7 @@ private fun RoomMemberList(
                     roomMemberListSection(
                         headerText = null,
                         members = roomMembers.banned,
-                        onMemberSelected = { onUserSelected(it) }
+                        onMemberSelected = { onSelectUser(it) }
                     )
                 } else {
                     item {
@@ -298,8 +298,8 @@ private fun RoomMemberListItem(
 @Composable
 private fun RoomMemberListTopBar(
     canInvite: Boolean,
-    onBackPressed: () -> Unit,
-    onInvitePressed: () -> Unit,
+    onBackClick: () -> Unit,
+    onInviteClick: () -> Unit,
 ) {
     TopAppBar(
         title = {
@@ -308,12 +308,12 @@ private fun RoomMemberListTopBar(
                 style = ElementTheme.typography.aliasScreenTitle,
             )
         },
-        navigationIcon = { BackButton(onClick = onBackPressed) },
+        navigationIcon = { BackButton(onClick = onBackClick) },
         actions = {
             if (canInvite) {
                 TextButton(
                     text = stringResource(CommonStrings.action_invite),
-                    onClick = onInvitePressed,
+                    onClick = onInviteClick,
                 )
             }
         }
@@ -327,17 +327,17 @@ private fun RoomMemberSearchBar(
     state: SearchBarResultState<RoomMembers>,
     active: Boolean,
     placeHolderTitle: String,
-    onActiveChanged: (Boolean) -> Unit,
-    onTextChanged: (String) -> Unit,
-    onUserSelected: (RoomMember) -> Unit,
+    onActiveChange: (Boolean) -> Unit,
+    onTextChange: (String) -> Unit,
+    onSelectUser: (RoomMember) -> Unit,
     selectedSection: SelectedSection,
     modifier: Modifier = Modifier,
 ) {
     SearchBar(
         query = query,
-        onQueryChange = onTextChanged,
+        onQueryChange = onTextChange,
         active = active,
-        onActiveChange = onActiveChanged,
+        onActiveChange = onActiveChange,
         modifier = modifier,
         placeHolderTitle = placeHolderTitle,
         resultState = state,
@@ -346,10 +346,10 @@ private fun RoomMemberSearchBar(
                 isLoading = false,
                 roomMembers = results,
                 showMembersCount = false,
-                onUserSelected = { onUserSelected(it) },
+                onSelectUser = { onSelectUser(it) },
                 canDisplayBannedUsersControls = false,
                 selectedSection = selectedSection,
-                onSelectedSectionChanged = {},
+                onSelectedSectionChange = {},
             )
         },
     )
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsNode.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsNode.kt
index caccbc97be..eebfec967f 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsNode.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberDetailsNode.kt
@@ -93,7 +93,7 @@ class RoomMemberDetailsNode @AssistedInject constructor(
             modifier = modifier,
             goBack = this::navigateUp,
             onShareUser = ::onShareUser,
-            onDmStarted = ::onStartDM,
+            onOpenDm = ::onStartDM,
             onStartCall = ::onStartCall,
             openAvatarPreview = callback::openAvatarPreview,
         )
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/moderation/RoomMembersModerationView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/moderation/RoomMembersModerationView.kt
index 54060b959d..03c602fdd4 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/moderation/RoomMembersModerationView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/moderation/RoomMembersModerationView.kt
@@ -75,7 +75,7 @@ fun RoomMembersModerationView(
             RoomMemberActionsBottomSheet(
                 roomMember = state.selectedRoomMember,
                 actions = state.actions,
-                onActionSelected = { action ->
+                onSelectAction = { action ->
                     when (action) {
                         is ModerationAction.DisplayProfile -> {
                             onDisplayMemberProfile(action.userId)
@@ -126,7 +126,7 @@ fun RoomMembersModerationView(
                     title = stringResource(R.string.screen_room_member_list_ban_member_confirmation_title),
                     content = stringResource(R.string.screen_room_member_list_ban_member_confirmation_description),
                     submitText = stringResource(R.string.screen_room_member_list_ban_member_confirmation_action),
-                    onSubmitClicked = { state.selectedRoomMember?.userId?.let { state.eventSink(RoomMembersModerationEvents.BanUser) } },
+                    onSubmitClick = { state.selectedRoomMember?.userId?.let { state.eventSink(RoomMembersModerationEvents.BanUser) } },
                     onDismiss = { state.eventSink(RoomMembersModerationEvents.Reset) }
                 )
             }
@@ -161,7 +161,7 @@ fun RoomMembersModerationView(
                         title = stringResource(R.string.screen_room_member_list_manage_member_unban_title),
                         content = stringResource(R.string.screen_room_member_list_manage_member_unban_message),
                         submitText = stringResource(R.string.screen_room_member_list_manage_member_unban_action),
-                        onSubmitClicked = { state.eventSink(RoomMembersModerationEvents.UnbanUser) },
+                        onSubmitClick = { state.eventSink(RoomMembersModerationEvents.UnbanUser) },
                         onDismiss = { state.eventSink(RoomMembersModerationEvents.Reset) },
                     )
                 }
@@ -197,7 +197,7 @@ fun RoomMembersModerationView(
 private fun RoomMemberActionsBottomSheet(
     roomMember: RoomMember?,
     actions: ImmutableList<ModerationAction>,
-    onActionSelected: (ModerationAction) -> Unit,
+    onSelectAction: (ModerationAction) -> Unit,
     onDismiss: () -> Unit,
 ) {
     val coroutineScope = rememberCoroutineScope()
@@ -260,7 +260,7 @@ private fun RoomMemberActionsBottomSheet(
                                 leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Info())),
                                 onClick = {
                                     coroutineScope.launch {
-                                        onActionSelected(action)
+                                        onSelectAction(action)
                                         bottomSheetState.hide()
                                     }
                                 }
@@ -273,7 +273,7 @@ private fun RoomMemberActionsBottomSheet(
                                 onClick = {
                                     coroutineScope.launch {
                                         bottomSheetState.hide()
-                                        onActionSelected(action)
+                                        onSelectAction(action)
                                     }
                                 }
                             )
@@ -286,7 +286,7 @@ private fun RoomMemberActionsBottomSheet(
                                 onClick = {
                                     coroutineScope.launch {
                                         bottomSheetState.hide()
-                                        onActionSelected(action)
+                                        onSelectAction(action)
                                     }
                                 }
                             )
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsNode.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsNode.kt
index 3b65bdf2fd..1b76daf431 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsNode.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsNode.kt
@@ -68,7 +68,7 @@ class RoomNotificationSettingsNode @AssistedInject constructor(
             state = state,
             modifier = modifier,
             onShowGlobalNotifications = this::openGlobalNotificationSettings,
-            onBackPressed = this::navigateUp,
+            onBackClick = this::navigateUp,
         )
     }
 }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsOption.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsOption.kt
index 15e450502a..25d9fd929c 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsOption.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsOption.kt
@@ -31,7 +31,7 @@ import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 @Composable
 fun RoomNotificationSettingsOption(
     roomNotificationSettingsItem: RoomNotificationSettingsItem,
-    onOptionSelected: (RoomNotificationSettingsItem) -> Unit,
+    onSelectOption: (RoomNotificationSettingsItem) -> Unit,
     displayMentionsOnlyDisclaimer: Boolean,
     modifier: Modifier = Modifier,
     enabled: Boolean = true,
@@ -51,7 +51,7 @@ fun RoomNotificationSettingsOption(
         headlineContent = { Text(title) },
         supportingContent = subtitle?.let { { Text(it) } },
         trailingContent = ListItemContent.RadioButton(selected = isSelected),
-        onClick = { onOptionSelected(roomNotificationSettingsItem) },
+        onClick = { onSelectOption(roomNotificationSettingsItem) },
     )
 }
 
@@ -62,7 +62,7 @@ internal fun RoomNotificationSettingsOptionPreview() = ElementPreview {
         for ((index, item) in roomNotificationSettingsItems().withIndex()) {
             RoomNotificationSettingsOption(
                 roomNotificationSettingsItem = item,
-                onOptionSelected = {},
+                onSelectOption = {},
                 isSelected = index == 0,
                 enabled = index != 2,
                 displayMentionsOnlyDisclaimer = index == 1,
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsOptions.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsOptions.kt
index 37bff2ab88..f84e19b2e9 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsOptions.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsOptions.kt
@@ -26,7 +26,7 @@ import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 fun RoomNotificationSettingsOptions(
     selected: RoomNotificationMode?,
     enabled: Boolean,
-    onOptionSelected: (RoomNotificationSettingsItem) -> Unit,
+    onSelectOption: (RoomNotificationSettingsItem) -> Unit,
     displayMentionsOnlyDisclaimer: Boolean,
     modifier: Modifier = Modifier,
 ) {
@@ -36,7 +36,7 @@ fun RoomNotificationSettingsOptions(
             RoomNotificationSettingsOption(
                 roomNotificationSettingsItem = item,
                 isSelected = selected == item.mode,
-                onOptionSelected = onOptionSelected,
+                onSelectOption = onSelectOption,
                 displayMentionsOnlyDisclaimer = displayMentionsOnlyDisclaimer,
                 enabled = enabled
             )
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsView.kt
index ec3d436752..2022c87de0 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/RoomNotificationSettingsView.kt
@@ -51,21 +51,21 @@ import io.element.android.libraries.ui.strings.CommonStrings
 fun RoomNotificationSettingsView(
     state: RoomNotificationSettingsState,
     onShowGlobalNotifications: () -> Unit,
-    onBackPressed: () -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     if (state.showUserDefinedSettingStyle) {
         UserDefinedRoomNotificationSettingsView(
             state = state,
             modifier = modifier,
-            onBackPressed = onBackPressed,
+            onBackClick = onBackClick,
         )
     } else {
         RoomSpecificNotificationSettingsView(
             state = state,
             modifier = modifier,
             onShowGlobalNotifications = onShowGlobalNotifications,
-            onBackPressed = onBackPressed,
+            onBackClick = onBackClick,
         )
     }
 }
@@ -74,14 +74,14 @@ fun RoomNotificationSettingsView(
 private fun RoomSpecificNotificationSettingsView(
     state: RoomNotificationSettingsState,
     onShowGlobalNotifications: () -> Unit,
-    onBackPressed: () -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Scaffold(
         modifier = modifier,
         topBar = {
             RoomNotificationSettingsTopBar(
-                onBackPressed = { onBackPressed() }
+                onBackClick = { onBackClick() }
             )
         }
     ) { padding ->
@@ -136,7 +136,7 @@ private fun RoomSpecificNotificationSettingsView(
                         RoomNotificationSettingsOption(
                             roomNotificationSettingsItem = RoomNotificationSettingsItem(state.defaultRoomNotificationMode, defaultModeTitle),
                             isSelected = true,
-                            onOptionSelected = { },
+                            onSelectOption = { },
                             displayMentionsOnlyDisclaimer = displayMentionsOnlyDisclaimer,
                             enabled = true
                         )
@@ -148,7 +148,7 @@ private fun RoomSpecificNotificationSettingsView(
                         selected = state.displayNotificationMode,
                         enabled = !state.displayIsDefault.orTrue(),
                         displayMentionsOnlyDisclaimer = state.displayMentionsOnlyDisclaimer,
-                        onOptionSelected = {
+                        onSelectOption = {
                             state.eventSink(RoomNotificationSettingsEvents.RoomNotificationModeChanged(it.mode))
                         },
                     )
@@ -175,7 +175,7 @@ private fun RoomSpecificNotificationSettingsView(
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun RoomNotificationSettingsTopBar(
-    onBackPressed: () -> Unit,
+    onBackClick: () -> Unit,
 ) {
     TopAppBar(
         title = {
@@ -184,7 +184,7 @@ private fun RoomNotificationSettingsTopBar(
                 style = ElementTheme.typography.aliasScreenTitle,
             )
         },
-        navigationIcon = { BackButton(onClick = onBackPressed) },
+        navigationIcon = { BackButton(onClick = onBackClick) },
     )
 }
 
@@ -196,6 +196,6 @@ internal fun RoomNotificationSettingsViewPreview(
     RoomNotificationSettingsView(
         state = state,
         onShowGlobalNotifications = {},
-        onBackPressed = {},
+        onBackClick = {},
     )
 }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/UserDefinedRoomNotificationSettingsView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/UserDefinedRoomNotificationSettingsView.kt
index 925ea23401..81f0c5f9d9 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/UserDefinedRoomNotificationSettingsView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/notificationsettings/UserDefinedRoomNotificationSettingsView.kt
@@ -42,7 +42,7 @@ import io.element.android.libraries.designsystem.theme.components.TopAppBar
 @Composable
 fun UserDefinedRoomNotificationSettingsView(
     state: RoomNotificationSettingsState,
-    onBackPressed: () -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Scaffold(
@@ -50,7 +50,7 @@ fun UserDefinedRoomNotificationSettingsView(
         topBar = {
             UserDefinedRoomNotificationSettingsTopBar(
                 roomName = state.roomName,
-                onBackPressed = { onBackPressed() }
+                onBackClick = { onBackClick() }
             )
         }
     ) { padding ->
@@ -67,7 +67,7 @@ fun UserDefinedRoomNotificationSettingsView(
                     selected = state.displayNotificationMode,
                     enabled = !state.displayIsDefault.orTrue(),
                     displayMentionsOnlyDisclaimer = state.displayMentionsOnlyDisclaimer,
-                    onOptionSelected = {
+                    onSelectOption = {
                         state.eventSink(RoomNotificationSettingsEvents.RoomNotificationModeChanged(it.mode))
                     },
                 )
@@ -90,7 +90,7 @@ fun UserDefinedRoomNotificationSettingsView(
 
             AsyncActionView(
                 async = state.restoreDefaultAction,
-                onSuccess = { onBackPressed() },
+                onSuccess = { onBackClick() },
                 errorMessage = { stringResource(R.string.screen_notification_settings_edit_failed_updating_default_mode) },
                 onErrorDismiss = { state.eventSink(RoomNotificationSettingsEvents.ClearRestoreDefaultError) },
             )
@@ -102,7 +102,7 @@ fun UserDefinedRoomNotificationSettingsView(
 @Composable
 private fun UserDefinedRoomNotificationSettingsTopBar(
     roomName: String,
-    onBackPressed: () -> Unit,
+    onBackClick: () -> Unit,
 ) {
     TopAppBar(
         title = {
@@ -110,7 +110,7 @@ private fun UserDefinedRoomNotificationSettingsTopBar(
                 text = roomName,
             )
         },
-        navigationIcon = { BackButton(onClick = onBackPressed) },
+        navigationIcon = { BackButton(onClick = onBackClick) },
     )
 }
 
@@ -121,6 +121,6 @@ internal fun UserDefinedRoomNotificationSettingsViewPreview(
 ) = ElementPreview {
     UserDefinedRoomNotificationSettingsView(
         state = state,
-        onBackPressed = {},
+        onBackClick = {},
     )
 }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsNode.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsNode.kt
index af04465c9f..52b77f6ac6 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsNode.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsNode.kt
@@ -49,14 +49,14 @@ class RolesAndPermissionsNode @AssistedInject constructor(
         override fun openEditRoomDetailsPermissions()
         override fun openMessagesAndContentPermissions()
         override fun openModerationPermissions()
-        override fun onBackPressed() {}
+        override fun onBackClick() {}
     }
 
     private val callback = plugins<Callback>().first()
 
     @Stable
     private val navigator = object : RolesAndPermissionsNavigator by callback {
-        override fun onBackPressed() {
+        override fun onBackClick() {
             navigateUp()
         }
     }
@@ -88,7 +88,7 @@ class RolesAndPermissionsNode @AssistedInject constructor(
 }
 
 interface RolesAndPermissionsNavigator {
-    fun onBackPressed() {}
+    fun onBackClick() {}
     fun openAdminList() {}
     fun openModeratorList() {}
     fun openEditRoomDetailsPermissions() {}
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsView.kt
index 268e7ca478..0732c5c845 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsView.kt
@@ -61,7 +61,7 @@ fun RolesAndPermissionsView(
     PreferencePage(
         modifier = modifier,
         title = stringResource(R.string.screen_room_roles_and_permissions_title),
-        onBackPressed = rolesAndPermissionsNavigator::onBackPressed,
+        onBackClick = rolesAndPermissionsNavigator::onBackClick,
     ) {
         ListSectionHeader(title = stringResource(R.string.screen_room_roles_and_permissions_roles_header), hasDivider = false)
         ListItem(
@@ -113,7 +113,7 @@ fun RolesAndPermissionsView(
                 content = stringResource(R.string.screen_room_roles_and_permissions_reset_confirm_description),
                 submitText = stringResource(CommonStrings.action_reset),
                 destructiveSubmit = true,
-                onSubmitClicked = { state.eventSink(RolesAndPermissionsEvents.ResetPermissions) },
+                onSubmitClick = { state.eventSink(RolesAndPermissionsEvents.ResetPermissions) },
                 onDismiss = { state.eventSink(RolesAndPermissionsEvents.CancelPendingAction) },
             )
         },
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/changeroles/ChangeRolesView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/changeroles/ChangeRolesView.kt
index 450005ae4a..f5b1873717 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/changeroles/ChangeRolesView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/changeroles/ChangeRolesView.kt
@@ -91,7 +91,7 @@ fun ChangeRolesView(
     navigateUp: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    val updatedNavigateUp by rememberUpdatedState(newValue = navigateUp)
+    val latestNavigateUp by rememberUpdatedState(newValue = navigateUp)
     BackHandler(enabled = !state.isSearchActive) {
         state.eventSink(ChangeRolesEvent.Exit)
     }
@@ -150,7 +150,7 @@ fun ChangeRolesView(
                         searchResults = members,
                         selectedUsers = state.selectedUsers,
                         canRemoveMember = state.canChangeMemberRole,
-                        onSelectionToggled = { state.eventSink(ChangeRolesEvent.UserSelectionToggled(it.toMatrixUser())) },
+                        onToggleSelection = { state.eventSink(ChangeRolesEvent.UserSelectionToggled(it.toMatrixUser())) },
                         selectedUsersList = {},
                     )
                 }
@@ -166,12 +166,12 @@ fun ChangeRolesView(
                             searchResults = (state.searchResults as? SearchBarResultState.Results)?.results ?: MembersByRole(emptyList()),
                             selectedUsers = state.selectedUsers,
                             canRemoveMember = state.canChangeMemberRole,
-                            onSelectionToggled = { state.eventSink(ChangeRolesEvent.UserSelectionToggled(it.toMatrixUser())) },
+                            onToggleSelection = { state.eventSink(ChangeRolesEvent.UserSelectionToggled(it.toMatrixUser())) },
                             selectedUsersList = { users ->
                                 SelectedUsersRowList(
                                     contentPadding = PaddingValues(start = 16.dp, end = 16.dp, bottom = 16.dp),
                                     selectedUsers = users,
-                                    onUserRemoved = {
+                                    onUserRemove = {
                                         state.eventSink(ChangeRolesEvent.UserSelectionToggled(it))
                                     },
                                     canDeselect = { state.canChangeMemberRole(it.userId) },
@@ -188,12 +188,12 @@ fun ChangeRolesView(
 
         AsyncActionView(
             async = state.exitState,
-            onSuccess = { updatedNavigateUp() },
+            onSuccess = { latestNavigateUp() },
             confirmationDialog = {
                 ConfirmationDialog(
                     title = stringResource(CommonStrings.dialog_unsaved_changes_title),
                     content = stringResource(CommonStrings.dialog_unsaved_changes_description_android),
-                    onSubmitClicked = { state.eventSink(ChangeRolesEvent.Exit) },
+                    onSubmitClick = { state.eventSink(ChangeRolesEvent.Exit) },
                     onDismiss = { state.eventSink(ChangeRolesEvent.CancelExit) }
                 )
             },
@@ -207,7 +207,7 @@ fun ChangeRolesView(
                     ConfirmationDialog(
                         title = stringResource(R.string.screen_room_change_role_confirm_add_admin_title),
                         content = stringResource(R.string.screen_room_change_role_confirm_add_admin_description),
-                        onSubmitClicked = { state.eventSink(ChangeRolesEvent.Save) },
+                        onSubmitClick = { state.eventSink(ChangeRolesEvent.Save) },
                         onDismiss = { state.eventSink(ChangeRolesEvent.ClearError) }
                     )
                 }
@@ -240,7 +240,7 @@ private fun SearchResultsList(
     searchResults: MembersByRole,
     selectedUsers: ImmutableList<MatrixUser>,
     canRemoveMember: (UserId) -> Boolean,
-    onSelectionToggled: (RoomMember) -> Unit,
+    onToggleSelection: (RoomMember) -> Unit,
     lazyListState: LazyListState,
     selectedUsersList: @Composable (ImmutableList<MatrixUser>) -> Unit,
 ) {
@@ -268,7 +268,7 @@ private fun SearchResultsList(
                 ListMemberItem(
                     roomMember = roomMember,
                     canRemoveMember = canRemoveMember,
-                    onSelectionToggled = onSelectionToggled,
+                    onToggleSelection = onToggleSelection,
                     selectedUsers = selectedUsers
                 )
             }
@@ -279,7 +279,7 @@ private fun SearchResultsList(
                 ListMemberItem(
                     roomMember = roomMember,
                     canRemoveMember = canRemoveMember,
-                    onSelectionToggled = onSelectionToggled,
+                    onToggleSelection = onToggleSelection,
                     selectedUsers = selectedUsers
                 )
             }
@@ -290,7 +290,7 @@ private fun SearchResultsList(
                 ListMemberItem(
                     roomMember = roomMember,
                     canRemoveMember = canRemoveMember,
-                    onSelectionToggled = onSelectionToggled,
+                    onToggleSelection = onToggleSelection,
                     selectedUsers = selectedUsers
                 )
             }
@@ -314,19 +314,19 @@ private fun ListSectionHeader(text: String) {
 private fun ListMemberItem(
     roomMember: RoomMember,
     canRemoveMember: (UserId) -> Boolean,
-    onSelectionToggled: (RoomMember) -> Unit,
+    onToggleSelection: (RoomMember) -> Unit,
     selectedUsers: ImmutableList<MatrixUser>,
 ) {
     val canToggle = canRemoveMember(roomMember.userId)
     val trailingContent: @Composable (() -> Unit) = {
         Checkbox(
             checked = selectedUsers.any { it.userId == roomMember.userId },
-            onCheckedChange = { onSelectionToggled(roomMember) },
+            onCheckedChange = { onToggleSelection(roomMember) },
             enabled = canToggle,
         )
     }
     MemberRow(
-        modifier = Modifier.clickable(enabled = canToggle, onClick = { onSelectionToggled(roomMember) }),
+        modifier = Modifier.clickable(enabled = canToggle, onClick = { onToggleSelection(roomMember) }),
         avatarData = AvatarData(roomMember.userId.value, roomMember.displayName, roomMember.avatarUrl, AvatarSize.UserListItem),
         name = roomMember.getBestName(),
         userId = roomMember.userId.value.takeIf { roomMember.displayName?.isNotBlank() == true },
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsNode.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsNode.kt
index 18b369a38b..3ab9ca3e5a 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsNode.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsNode.kt
@@ -53,7 +53,7 @@ class ChangeRoomPermissionsNode @AssistedInject constructor(
         ChangeRoomPermissionsView(
             modifier = modifier,
             state = state,
-            onBackPressed = this::navigateUp,
+            onBackClick = this::navigateUp,
         )
     }
 }
diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsView.kt
index c9e09c7c68..f997561218 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/permissions/ChangeRoomPermissionsView.kt
@@ -52,7 +52,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun ChangeRoomPermissionsView(
     state: ChangeRoomPermissionsState,
-    onBackPressed: () -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     BackHandler {
@@ -117,20 +117,20 @@ fun ChangeRoomPermissionsView(
 
     AsyncActionView(
         async = state.saveAction,
-        onSuccess = { onBackPressed() },
+        onSuccess = { onBackClick() },
         onErrorDismiss = { state.eventSink(ChangeRoomPermissionsEvent.ResetPendingActions) }
     )
 
     AsyncActionView(
         async = state.confirmExitAction,
-        onSuccess = { onBackPressed() },
+        onSuccess = { onBackClick() },
         confirmationDialog = {
             ConfirmationDialog(
                 title = stringResource(R.string.screen_room_change_role_unsaved_changes_title),
                 content = stringResource(R.string.screen_room_change_role_unsaved_changes_description),
                 submitText = stringResource(CommonStrings.action_save),
                 cancelText = stringResource(CommonStrings.action_discard),
-                onSubmitClicked = { state.eventSink(ChangeRoomPermissionsEvent.Save) },
+                onSubmitClick = { state.eventSink(ChangeRoomPermissionsEvent.Save) },
                 onDismiss = { state.eventSink(ChangeRoomPermissionsEvent.Exit) }
             )
         },
@@ -193,7 +193,7 @@ internal fun ChangeRoomPermissionsViewPreview(@PreviewParameter(ChangeRoomPermis
     ElementPreview {
         ChangeRoomPermissionsView(
             state = state,
-            onBackPressed = {},
+            onBackClick = {},
         )
     }
 }
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/edit/RoomDetailsEditViewTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/edit/RoomDetailsEditViewTest.kt
index 4db2d9bb02..13fefa144d 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/edit/RoomDetailsEditViewTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/edit/RoomDetailsEditViewTest.kt
@@ -58,7 +58,7 @@ class RoomDetailsEditViewTest {
                 aRoomDetailsEditState(
                     eventSink = eventsRecorder
                 ),
-                onBackPressed = callback,
+                onBackClick = callback,
             )
             rule.pressBack()
         }
@@ -230,14 +230,14 @@ class RoomDetailsEditViewTest {
 
 private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRoomDetailsEditView(
     state: RoomDetailsEditState,
-    onBackPressed: () -> Unit = EnsureNeverCalled(),
+    onBackClick: () -> Unit = EnsureNeverCalled(),
     onRoomEdited: () -> Unit = EnsureNeverCalled(),
 ) {
     setContent {
         RoomDetailsEditView(
             state = state,
-            onBackPressed = onBackPressed,
-            onRoomEdited = onRoomEdited,
+            onBackClick = onBackClick,
+            onRoomEditSuccess = onRoomEdited,
         )
     }
 }
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsViewTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsViewTest.kt
index febd213e0c..62dbac449c 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsViewTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsViewTest.kt
@@ -120,7 +120,7 @@ class RoomDetailsViewTest {
                     eventSink = EventsRecorder(expectEvents = false),
                     canInvite = true,
                 ),
-                onJoinCallClicked = callback,
+                onJoinCallClick = callback,
             )
             rule.clickOn(CommonStrings.action_call)
         }
@@ -134,7 +134,7 @@ class RoomDetailsViewTest {
                     eventSink = EventsRecorder(expectEvents = false),
                     roomTopic = RoomTopicState.CanAddTopic,
                 ),
-                onActionClicked = callback,
+                onActionClick = callback,
             )
             rule.clickOn(R.string.screen_room_details_add_topic_title)
         }
@@ -148,7 +148,7 @@ class RoomDetailsViewTest {
                     eventSink = EventsRecorder(expectEvents = false),
                     canEdit = true,
                 ),
-                onActionClicked = callback,
+                onActionClick = callback,
             )
             val menuContentDescription = rule.activity.getString(CommonStrings.a11y_user_menu)
             rule.onNodeWithContentDescription(menuContentDescription).performClick()
@@ -248,7 +248,7 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRoomD
         eventSink = EventsRecorder(expectEvents = false),
     ),
     goBack: () -> Unit = EnsureNeverCalled(),
-    onActionClicked: (RoomDetailsAction) -> Unit = EnsureNeverCalledWithParam(),
+    onActionClick: (RoomDetailsAction) -> Unit = EnsureNeverCalledWithParam(),
     onShareRoom: () -> Unit = EnsureNeverCalled(),
     openRoomMemberList: () -> Unit = EnsureNeverCalled(),
     openRoomNotificationSettings: () -> Unit = EnsureNeverCalled(),
@@ -256,13 +256,13 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRoomD
     openAvatarPreview: (name: String, url: String) -> Unit = EnsureNeverCalledWithTwoParams(),
     openPollHistory: () -> Unit = EnsureNeverCalled(),
     openAdminSettings: () -> Unit = EnsureNeverCalled(),
-    onJoinCallClicked: () -> Unit = EnsureNeverCalled(),
+    onJoinCallClick: () -> Unit = EnsureNeverCalled(),
 ) {
     setContent {
         RoomDetailsView(
             state = state,
             goBack = goBack,
-            onActionClicked = onActionClicked,
+            onActionClick = onActionClick,
             onShareRoom = onShareRoom,
             openRoomMemberList = openRoomMemberList,
             openRoomNotificationSettings = openRoomNotificationSettings,
@@ -270,7 +270,7 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRoomD
             openAvatarPreview = openAvatarPreview,
             openPollHistory = openPollHistory,
             openAdminSettings = openAdminSettings,
-            onJoinCallClicked = onJoinCallClicked,
+            onJoinCallClick = onJoinCallClick,
         )
     }
 }
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/rolesandpermissions/RolesAndPermissionsViewTests.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/rolesandpermissions/RolesAndPermissionsViewTests.kt
index be6411b373..bc4e5cc74b 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/rolesandpermissions/RolesAndPermissionsViewTests.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/rolesandpermissions/RolesAndPermissionsViewTests.kt
@@ -184,7 +184,7 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRoles
         RolesAndPermissionsView(
             state = state,
             rolesAndPermissionsNavigator = object : RolesAndPermissionsNavigator {
-                override fun onBackPressed() = goBack()
+                override fun onBackClick() = goBack()
                 override fun openAdminList() = openAdminList()
                 override fun openModeratorList() = openModeratorList()
                 override fun openEditRoomDetailsPermissions() = openPermissionScreens()
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/rolesandpermissions/changeroles/ChangeRolesViewTest.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/rolesandpermissions/changeroles/ChangeRolesViewTest.kt
index 93cbad4d58..79c1cdb433 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/rolesandpermissions/changeroles/ChangeRolesViewTest.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/rolesandpermissions/changeroles/ChangeRolesViewTest.kt
@@ -297,12 +297,12 @@ class ChangeRolesViewTest {
 
     private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setChangeRolesContent(
         state: ChangeRolesState,
-        onBackPressed: () -> Unit = EnsureNeverCalled(),
+        onBackClick: () -> Unit = EnsureNeverCalled(),
     ) {
         setContent {
             ChangeRolesView(
                 state = state,
-                navigateUp = onBackPressed,
+                navigateUp = onBackClick,
             )
         }
     }
diff --git a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/rolesandpermissions/permissions/ChangeRoomPermissionsViewTests.kt b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/rolesandpermissions/permissions/ChangeRoomPermissionsViewTests.kt
index 942b40ff7a..be4bf49872 100644
--- a/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/rolesandpermissions/permissions/ChangeRoomPermissionsViewTests.kt
+++ b/features/roomdetails/impl/src/test/kotlin/io/element/android/features/roomdetails/rolesandpermissions/permissions/ChangeRoomPermissionsViewTests.kt
@@ -161,7 +161,7 @@ class ChangeRoomPermissionsViewTests {
                     hasChanges = true,
                     saveAction = AsyncAction.Success(Unit),
                 ),
-                onBackPressed = callback
+                onBackClick = callback
             )
             rule.clickOn(CommonStrings.action_save)
         }
@@ -190,12 +190,12 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setChang
         section = ChangeRoomPermissionsSection.RoomDetails,
         eventSink = eventsRecorder,
     ),
-    onBackPressed: () -> Unit = EnsureNeverCalled(),
+    onBackClick: () -> Unit = EnsureNeverCalled(),
 ) {
     setContent {
         ChangeRoomPermissionsView(
             state = state,
-            onBackPressed = onBackPressed,
+            onBackClick = onBackClick,
         )
     }
 }
diff --git a/features/roomdirectory/api/src/main/kotlin/io/element/android/features/roomdirectory/api/RoomDirectoryEntryPoint.kt b/features/roomdirectory/api/src/main/kotlin/io/element/android/features/roomdirectory/api/RoomDirectoryEntryPoint.kt
index d72a7cbe17..a811717946 100644
--- a/features/roomdirectory/api/src/main/kotlin/io/element/android/features/roomdirectory/api/RoomDirectoryEntryPoint.kt
+++ b/features/roomdirectory/api/src/main/kotlin/io/element/android/features/roomdirectory/api/RoomDirectoryEntryPoint.kt
@@ -30,6 +30,6 @@ interface RoomDirectoryEntryPoint : FeatureEntryPoint {
     }
 
     interface Callback : Plugin {
-        fun onResultClicked(roomDescription: RoomDescription)
+        fun onResultClick(roomDescription: RoomDescription)
     }
 }
diff --git a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryNode.kt b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryNode.kt
index 694febe571..3b6b4ddf46 100644
--- a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryNode.kt
+++ b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryNode.kt
@@ -35,9 +35,9 @@ class RoomDirectoryNode @AssistedInject constructor(
     @Assisted plugins: List<Plugin>,
     private val presenter: RoomDirectoryPresenter,
 ) : Node(buildContext, plugins = plugins) {
-    private fun onResultClicked(roomDescription: RoomDescription) {
+    private fun onResultClick(roomDescription: RoomDescription) {
         plugins<RoomDirectoryEntryPoint.Callback>().forEach {
-            it.onResultClicked(roomDescription)
+            it.onResultClick(roomDescription)
         }
     }
 
@@ -46,8 +46,8 @@ class RoomDirectoryNode @AssistedInject constructor(
         val state = presenter.present()
         RoomDirectoryView(
             state = state,
-            onResultClicked = ::onResultClicked,
-            onBackPressed = ::navigateUp,
+            onResultClick = ::onResultClick,
+            onBackClick = ::navigateUp,
             modifier = modifier
         )
     }
diff --git a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryView.kt b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryView.kt
index 6cecb61368..838b83e9f6 100644
--- a/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryView.kt
+++ b/features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryView.kt
@@ -67,19 +67,19 @@ import kotlinx.collections.immutable.ImmutableList
 @Composable
 fun RoomDirectoryView(
     state: RoomDirectoryState,
-    onResultClicked: (RoomDescription) -> Unit,
-    onBackPressed: () -> Unit,
+    onResultClick: (RoomDescription) -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Scaffold(
         modifier = modifier,
         topBar = {
-            RoomDirectoryTopBar(onBackPressed = onBackPressed)
+            RoomDirectoryTopBar(onBackClick = onBackClick)
         },
         content = { padding ->
             RoomDirectoryContent(
                 state = state,
-                onResultClicked = onResultClicked,
+                onResultClick = onResultClick,
                 modifier = Modifier
                     .padding(padding)
                     .consumeWindowInsets(padding)
@@ -91,13 +91,13 @@ fun RoomDirectoryView(
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 private fun RoomDirectoryTopBar(
-    onBackPressed: () -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     TopAppBar(
         modifier = modifier,
         navigationIcon = {
-            BackButton(onClick = onBackPressed)
+            BackButton(onClick = onBackClick)
         },
         title = {
             Text(
@@ -111,7 +111,7 @@ private fun RoomDirectoryTopBar(
 @Composable
 private fun RoomDirectoryContent(
     state: RoomDirectoryState,
-    onResultClicked: (RoomDescription) -> Unit,
+    onResultClick: (RoomDescription) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Column(modifier = modifier) {
@@ -125,7 +125,7 @@ private fun RoomDirectoryContent(
             roomDescriptions = state.roomDescriptions,
             displayLoadMoreIndicator = state.displayLoadMoreIndicator,
             displayEmptyState = state.displayEmptyState,
-            onResultClicked = onResultClicked,
+            onResultClick = onResultClick,
             onReachedLoadMore = { state.eventSink(RoomDirectoryEvents.LoadMore) },
         )
     }
@@ -136,7 +136,7 @@ private fun RoomDirectoryRoomList(
     roomDescriptions: ImmutableList<RoomDescription>,
     displayLoadMoreIndicator: Boolean,
     displayEmptyState: Boolean,
-    onResultClicked: (RoomDescription) -> Unit,
+    onResultClick: (RoomDescription) -> Unit,
     onReachedLoadMore: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -145,7 +145,7 @@ private fun RoomDirectoryRoomList(
             RoomDirectoryRoomRow(
                 roomDescription = roomDescription,
                 onClick = {
-                    onResultClicked(roomDescription)
+                    onResultClick(roomDescription)
                 },
             )
         }
@@ -287,7 +287,7 @@ private fun RoomDirectoryRoomRow(
 internal fun RoomDirectoryViewPreview(@PreviewParameter(RoomDirectoryStateProvider::class) state: RoomDirectoryState) = ElementPreview {
     RoomDirectoryView(
         state = state,
-        onResultClicked = {},
-        onBackPressed = {},
+        onResultClick = {},
+        onBackClick = {},
     )
 }
diff --git a/features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryViewTest.kt b/features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryViewTest.kt
index 7fc9e7bb55..c971e84118 100644
--- a/features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryViewTest.kt
+++ b/features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryViewTest.kt
@@ -54,7 +54,7 @@ class RoomDirectoryViewTest {
     }
 
     @Test
-    fun `clicking on room item then onResultClicked lambda is called once`() {
+    fun `clicking on room item then onResultClick lambda is called once`() {
         val eventsRecorder = EventsRecorder<RoomDirectoryEvents>()
         val state = aRoomDirectoryState(
             roomDescriptions = aRoomDescriptionList(),
@@ -64,7 +64,7 @@ class RoomDirectoryViewTest {
         ensureCalledOnceWithParam(clickedRoom) { callback ->
             rule.setRoomDirectoryView(
                 state = state,
-                onResultClicked = callback,
+                onResultClick = callback,
             )
             rule.onNodeWithText(clickedRoom.computedName).performClick()
         }
@@ -84,14 +84,14 @@ class RoomDirectoryViewTest {
 
 private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRoomDirectoryView(
     state: RoomDirectoryState,
-    onBackPressed: () -> Unit = EnsureNeverCalled(),
-    onResultClicked: (RoomDescription) -> Unit = EnsureNeverCalledWithParam(),
+    onBackClick: () -> Unit = EnsureNeverCalled(),
+    onResultClick: (RoomDescription) -> Unit = EnsureNeverCalledWithParam(),
 ) {
     setContent {
         RoomDirectoryView(
             state = state,
-            onResultClicked = onResultClicked,
-            onBackPressed = onBackPressed,
+            onResultClick = onResultClick,
+            onBackClick = onBackClick,
         )
     }
 }
diff --git a/features/roomlist/api/src/main/kotlin/io/element/android/features/roomlist/api/RoomListEntryPoint.kt b/features/roomlist/api/src/main/kotlin/io/element/android/features/roomlist/api/RoomListEntryPoint.kt
index f4e2ca7b01..86d3e7cd1a 100644
--- a/features/roomlist/api/src/main/kotlin/io/element/android/features/roomlist/api/RoomListEntryPoint.kt
+++ b/features/roomlist/api/src/main/kotlin/io/element/android/features/roomlist/api/RoomListEntryPoint.kt
@@ -30,12 +30,12 @@ interface RoomListEntryPoint : FeatureEntryPoint {
     }
 
     interface Callback : Plugin {
-        fun onRoomClicked(roomId: RoomId)
-        fun onCreateRoomClicked()
-        fun onSettingsClicked()
-        fun onSessionConfirmRecoveryKeyClicked()
-        fun onRoomSettingsClicked(roomId: RoomId)
-        fun onReportBugClicked()
-        fun onRoomDirectorySearchClicked()
+        fun onRoomClick(roomId: RoomId)
+        fun onCreateRoomClick()
+        fun onSettingsClick()
+        fun onSessionConfirmRecoveryKeyClick()
+        fun onRoomSettingsClick(roomId: RoomId)
+        fun onReportBugClick()
+        fun onRoomDirectorySearchClick()
     }
 }
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenu.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenu.kt
index 4d7a6b3855..582c5e083b 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenu.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenu.kt
@@ -44,30 +44,30 @@ import io.element.android.libraries.ui.strings.CommonStrings
 fun RoomListContextMenu(
     contextMenu: RoomListState.ContextMenu.Shown,
     eventSink: (RoomListEvents.ContextMenuEvents) -> Unit,
-    onRoomSettingsClicked: (roomId: RoomId) -> Unit,
+    onRoomSettingsClick: (roomId: RoomId) -> Unit,
 ) {
     ModalBottomSheet(
         onDismissRequest = { eventSink(RoomListEvents.HideContextMenu) },
     ) {
         RoomListModalBottomSheetContent(
             contextMenu = contextMenu,
-            onRoomMarkReadClicked = {
+            onRoomMarkReadClick = {
                 eventSink(RoomListEvents.HideContextMenu)
                 eventSink(RoomListEvents.MarkAsRead(contextMenu.roomId))
             },
-            onRoomMarkUnreadClicked = {
+            onRoomMarkUnreadClick = {
                 eventSink(RoomListEvents.HideContextMenu)
                 eventSink(RoomListEvents.MarkAsUnread(contextMenu.roomId))
             },
-            onRoomSettingsClicked = {
+            onRoomSettingsClick = {
                 eventSink(RoomListEvents.HideContextMenu)
-                onRoomSettingsClicked(contextMenu.roomId)
+                onRoomSettingsClick(contextMenu.roomId)
             },
-            onLeaveRoomClicked = {
+            onLeaveRoomClick = {
                 eventSink(RoomListEvents.HideContextMenu)
                 eventSink(RoomListEvents.LeaveRoom(contextMenu.roomId))
             },
-            onFavoriteChanged = { isFavorite ->
+            onFavoriteChange = { isFavorite ->
                 eventSink(RoomListEvents.SetRoomIsFavorite(contextMenu.roomId, isFavorite))
             },
         )
@@ -77,11 +77,11 @@ fun RoomListContextMenu(
 @Composable
 private fun RoomListModalBottomSheetContent(
     contextMenu: RoomListState.ContextMenu.Shown,
-    onRoomSettingsClicked: () -> Unit,
-    onLeaveRoomClicked: () -> Unit,
-    onFavoriteChanged: (isFavorite: Boolean) -> Unit,
-    onRoomMarkReadClicked: () -> Unit,
-    onRoomMarkUnreadClicked: () -> Unit,
+    onRoomSettingsClick: () -> Unit,
+    onLeaveRoomClick: () -> Unit,
+    onFavoriteChange: (isFavorite: Boolean) -> Unit,
+    onRoomMarkReadClick: () -> Unit,
+    onRoomMarkUnreadClick: () -> Unit,
 ) {
     Column(
         modifier = Modifier.fillMaxWidth()
@@ -111,9 +111,9 @@ private fun RoomListModalBottomSheetContent(
                 },
                 modifier = Modifier.clickable {
                     if (contextMenu.hasNewContent) {
-                        onRoomMarkReadClicked()
+                        onRoomMarkReadClick()
                     } else {
-                        onRoomMarkUnreadClicked()
+                        onRoomMarkUnreadClick()
                     }
                 },
                 /* TODO Design
@@ -143,11 +143,11 @@ private fun RoomListModalBottomSheetContent(
             trailingContent = ListItemContent.Switch(
                 checked = contextMenu.isFavorite,
                 onChange = { isFavorite ->
-                    onFavoriteChanged(isFavorite)
+                    onFavoriteChange(isFavorite)
                 },
             ),
             onClick = {
-                onFavoriteChanged(!contextMenu.isFavorite)
+                onFavoriteChange(!contextMenu.isFavorite)
             },
             style = ListItemStyle.Primary,
         )
@@ -158,7 +158,7 @@ private fun RoomListModalBottomSheetContent(
                     style = MaterialTheme.typography.bodyLarge,
                 )
             },
-            modifier = Modifier.clickable { onRoomSettingsClicked() },
+            modifier = Modifier.clickable { onRoomSettingsClick() },
             leadingContent = ListItemContent.Icon(
                 iconSource = IconSource.Vector(
                     CompoundIcons.Settings(),
@@ -178,7 +178,7 @@ private fun RoomListModalBottomSheetContent(
                 )
                 Text(text = leaveText)
             },
-            modifier = Modifier.clickable { onLeaveRoomClicked() },
+            modifier = Modifier.clickable { onLeaveRoomClick() },
             leadingContent = ListItemContent.Icon(
                 iconSource = IconSource.Vector(
                     CompoundIcons.Leave(),
@@ -200,10 +200,10 @@ internal fun RoomListModalBottomSheetContentPreview(
 ) = ElementPreview {
     RoomListModalBottomSheetContent(
         contextMenu = contextMenu,
-        onRoomMarkReadClicked = {},
-        onRoomMarkUnreadClicked = {},
-        onRoomSettingsClicked = {},
-        onLeaveRoomClicked = {},
-        onFavoriteChanged = {},
+        onRoomMarkReadClick = {},
+        onRoomMarkUnreadClick = {},
+        onRoomSettingsClick = {},
+        onLeaveRoomClick = {},
+        onFavoriteChange = {},
     )
 }
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListNode.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListNode.kt
index 912c45eb30..d77fd1f440 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListNode.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListNode.kt
@@ -54,39 +54,39 @@ class RoomListNode @AssistedInject constructor(
         )
     }
 
-    private fun onRoomClicked(roomId: RoomId) {
-        plugins<RoomListEntryPoint.Callback>().forEach { it.onRoomClicked(roomId) }
+    private fun onRoomClick(roomId: RoomId) {
+        plugins<RoomListEntryPoint.Callback>().forEach { it.onRoomClick(roomId) }
     }
 
     private fun onOpenSettings() {
-        plugins<RoomListEntryPoint.Callback>().forEach { it.onSettingsClicked() }
+        plugins<RoomListEntryPoint.Callback>().forEach { it.onSettingsClick() }
     }
 
-    private fun onCreateRoomClicked() {
-        plugins<RoomListEntryPoint.Callback>().forEach { it.onCreateRoomClicked() }
+    private fun onCreateRoomClick() {
+        plugins<RoomListEntryPoint.Callback>().forEach { it.onCreateRoomClick() }
     }
 
-    private fun onSessionConfirmRecoveryKeyClicked() {
-        plugins<RoomListEntryPoint.Callback>().forEach { it.onSessionConfirmRecoveryKeyClicked() }
+    private fun onSessionConfirmRecoveryKeyClick() {
+        plugins<RoomListEntryPoint.Callback>().forEach { it.onSessionConfirmRecoveryKeyClick() }
     }
 
-    private fun onRoomSettingsClicked(roomId: RoomId) {
-        plugins<RoomListEntryPoint.Callback>().forEach { it.onRoomSettingsClicked(roomId) }
+    private fun onRoomSettingsClick(roomId: RoomId) {
+        plugins<RoomListEntryPoint.Callback>().forEach { it.onRoomSettingsClick(roomId) }
     }
 
-    private fun onMenuActionClicked(activity: Activity, roomListMenuAction: RoomListMenuAction) {
+    private fun onMenuActionClick(activity: Activity, roomListMenuAction: RoomListMenuAction) {
         when (roomListMenuAction) {
             RoomListMenuAction.InviteFriends -> {
                 inviteFriendsUseCase.execute(activity)
             }
             RoomListMenuAction.ReportBug -> {
-                plugins<RoomListEntryPoint.Callback>().forEach { it.onReportBugClicked() }
+                plugins<RoomListEntryPoint.Callback>().forEach { it.onReportBugClick() }
             }
         }
     }
 
-    private fun onRoomDirectorySearchClicked() {
-        plugins<RoomListEntryPoint.Callback>().forEach { it.onRoomDirectorySearchClicked() }
+    private fun onRoomDirectorySearchClick() {
+        plugins<RoomListEntryPoint.Callback>().forEach { it.onRoomDirectorySearchClick() }
     }
 
     @Composable
@@ -95,19 +95,19 @@ class RoomListNode @AssistedInject constructor(
         val activity = LocalContext.current as Activity
         RoomListView(
             state = state,
-            onRoomClicked = this::onRoomClicked,
-            onSettingsClicked = this::onOpenSettings,
-            onCreateRoomClicked = this::onCreateRoomClicked,
-            onConfirmRecoveryKeyClicked = this::onSessionConfirmRecoveryKeyClicked,
-            onRoomSettingsClicked = this::onRoomSettingsClicked,
-            onMenuActionClicked = { onMenuActionClicked(activity, it) },
-            onRoomDirectorySearchClicked = this::onRoomDirectorySearchClicked,
+            onRoomClick = this::onRoomClick,
+            onSettingsClick = this::onOpenSettings,
+            onCreateRoomClick = this::onCreateRoomClick,
+            onConfirmRecoveryKeyClick = this::onSessionConfirmRecoveryKeyClick,
+            onRoomSettingsClick = this::onRoomSettingsClick,
+            onMenuActionClick = { onMenuActionClick(activity, it) },
+            onRoomDirectorySearchClick = this::onRoomDirectorySearchClick,
             modifier = modifier,
         ) {
             acceptDeclineInviteView.Render(
                 state = state.acceptDeclineInviteState,
-                onInviteAccepted = this::onRoomClicked,
-                onInviteDeclined = { },
+                onAcceptInvite = this::onRoomClick,
+                onDeclineInvite = { },
                 modifier = Modifier
             )
         }
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt
index 22506fe49b..03fdfbdc3b 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt
@@ -51,13 +51,13 @@ import io.element.android.libraries.matrix.api.core.RoomId
 @Composable
 fun RoomListView(
     state: RoomListState,
-    onRoomClicked: (RoomId) -> Unit,
-    onSettingsClicked: () -> Unit,
-    onConfirmRecoveryKeyClicked: () -> Unit,
-    onCreateRoomClicked: () -> Unit,
-    onRoomSettingsClicked: (roomId: RoomId) -> Unit,
-    onMenuActionClicked: (RoomListMenuAction) -> Unit,
-    onRoomDirectorySearchClicked: () -> Unit,
+    onRoomClick: (RoomId) -> Unit,
+    onSettingsClick: () -> Unit,
+    onConfirmRecoveryKeyClick: () -> Unit,
+    onCreateRoomClick: () -> Unit,
+    onRoomSettingsClick: (roomId: RoomId) -> Unit,
+    onMenuActionClick: (RoomListMenuAction) -> Unit,
+    onRoomDirectorySearchClick: () -> Unit,
     modifier: Modifier = Modifier,
     acceptDeclineInviteView: @Composable () -> Unit,
 ) {
@@ -70,7 +70,7 @@ fun RoomListView(
                 RoomListContextMenu(
                     contextMenu = state.contextMenu,
                     eventSink = state.eventSink,
-                    onRoomSettingsClicked = onRoomSettingsClicked,
+                    onRoomSettingsClick = onRoomSettingsClick,
                 )
             }
 
@@ -78,19 +78,19 @@ fun RoomListView(
 
             RoomListScaffold(
                 state = state,
-                onConfirmRecoveryKeyClicked = onConfirmRecoveryKeyClicked,
-                onRoomClicked = onRoomClicked,
-                onOpenSettings = onSettingsClicked,
-                onCreateRoomClicked = onCreateRoomClicked,
-                onMenuActionClicked = onMenuActionClicked,
+                onConfirmRecoveryKeyClick = onConfirmRecoveryKeyClick,
+                onRoomClick = onRoomClick,
+                onOpenSettings = onSettingsClick,
+                onCreateRoomClick = onCreateRoomClick,
+                onMenuActionClick = onMenuActionClick,
                 modifier = Modifier.padding(top = topPadding),
             )
             // This overlaid view will only be visible when state.displaySearchResults is true
             RoomListSearchView(
                 state = state.searchState,
                 eventSink = state.eventSink,
-                onRoomClicked = onRoomClicked,
-                onRoomDirectorySearchClicked = onRoomDirectorySearchClicked,
+                onRoomClick = onRoomClick,
+                onRoomDirectorySearchClick = onRoomDirectorySearchClick,
                 modifier = Modifier
                     .statusBarsPadding()
                     .padding(top = topPadding)
@@ -106,15 +106,15 @@ fun RoomListView(
 @Composable
 private fun RoomListScaffold(
     state: RoomListState,
-    onConfirmRecoveryKeyClicked: () -> Unit,
-    onRoomClicked: (RoomId) -> Unit,
+    onConfirmRecoveryKeyClick: () -> Unit,
+    onRoomClick: (RoomId) -> Unit,
     onOpenSettings: () -> Unit,
-    onCreateRoomClicked: () -> Unit,
-    onMenuActionClicked: (RoomListMenuAction) -> Unit,
+    onCreateRoomClick: () -> Unit,
+    onMenuActionClick: (RoomListMenuAction) -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    fun onRoomClicked(room: RoomListRoomSummary) {
-        onRoomClicked(room.roomId)
+    fun onRoomClick(room: RoomListRoomSummary) {
+        onRoomClick(room.roomId)
     }
 
     val appBarState = rememberTopAppBarState()
@@ -129,7 +129,7 @@ private fun RoomListScaffold(
                 showAvatarIndicator = state.showAvatarIndicator,
                 areSearchResultsDisplayed = state.searchState.isSearchActive,
                 onToggleSearch = { state.eventSink(RoomListEvents.ToggleSearchResults) },
-                onMenuActionClicked = onMenuActionClicked,
+                onMenuActionClick = onMenuActionClick,
                 onOpenSettings = onOpenSettings,
                 scrollBehavior = scrollBehavior,
                 displayMenuItems = state.displayActions,
@@ -142,9 +142,9 @@ private fun RoomListScaffold(
                 contentState = state.contentState,
                 filtersState = state.filtersState,
                 eventSink = state.eventSink,
-                onConfirmRecoveryKeyClicked = onConfirmRecoveryKeyClicked,
-                onRoomClicked = ::onRoomClicked,
-                onCreateRoomClicked = onCreateRoomClicked,
+                onConfirmRecoveryKeyClick = onConfirmRecoveryKeyClick,
+                onRoomClick = ::onRoomClick,
+                onCreateRoomClick = onCreateRoomClick,
                 modifier = Modifier
                     .padding(padding)
                     .consumeWindowInsets(padding)
@@ -155,7 +155,7 @@ private fun RoomListScaffold(
                 FloatingActionButton(
                     // FIXME align on Design system theme
                     containerColor = MaterialTheme.colorScheme.primary,
-                    onClick = onCreateRoomClicked
+                    onClick = onCreateRoomClick
                 ) {
                     Icon(
                         // Note cannot use Icons.Outlined.EditSquare, it does not exist :/
@@ -176,13 +176,13 @@ internal fun RoomListRoomSummary.contentType() = displayType.ordinal
 internal fun RoomListViewPreview(@PreviewParameter(RoomListStateProvider::class) state: RoomListState) = ElementPreview {
     RoomListView(
         state = state,
-        onRoomClicked = {},
-        onSettingsClicked = {},
-        onConfirmRecoveryKeyClicked = {},
-        onCreateRoomClicked = {},
-        onRoomSettingsClicked = {},
-        onMenuActionClicked = {},
-        onRoomDirectorySearchClicked = {},
+        onRoomClick = {},
+        onSettingsClick = {},
+        onConfirmRecoveryKeyClick = {},
+        onCreateRoomClick = {},
+        onRoomSettingsClick = {},
+        onMenuActionClick = {},
+        onRoomDirectorySearchClick = {},
         acceptDeclineInviteView = {},
     )
 }
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/ConfirmRecoveryKeyBanner.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/ConfirmRecoveryKeyBanner.kt
index 71f9c78530..1e987c2a27 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/ConfirmRecoveryKeyBanner.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/ConfirmRecoveryKeyBanner.kt
@@ -26,16 +26,16 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 
 @Composable
 internal fun ConfirmRecoveryKeyBanner(
-    onContinueClicked: () -> Unit,
-    onDismissClicked: () -> Unit,
+    onContinueClick: () -> Unit,
+    onDismissClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     DialogLikeBannerMolecule(
         modifier = modifier,
         title = stringResource(R.string.confirm_recovery_key_banner_title),
         content = stringResource(R.string.confirm_recovery_key_banner_message),
-        onSubmitClicked = onContinueClicked,
-        onDismissClicked = onDismissClicked,
+        onSubmitClick = onContinueClick,
+        onDismissClick = onDismissClick,
     )
 }
 
@@ -43,7 +43,7 @@ internal fun ConfirmRecoveryKeyBanner(
 @Composable
 internal fun ConfirmRecoveryKeyBannerPreview() = ElementPreview {
     ConfirmRecoveryKeyBanner(
-        onContinueClicked = {},
-        onDismissClicked = {},
+        onContinueClick = {},
+        onDismissClick = {},
     )
 }
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListContentView.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListContentView.kt
index 1b1c760889..afe01ce892 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListContentView.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListContentView.kt
@@ -71,9 +71,9 @@ fun RoomListContentView(
     contentState: RoomListContentState,
     filtersState: RoomListFiltersState,
     eventSink: (RoomListEvents) -> Unit,
-    onConfirmRecoveryKeyClicked: () -> Unit,
-    onRoomClicked: (RoomListRoomSummary) -> Unit,
-    onCreateRoomClicked: () -> Unit,
+    onConfirmRecoveryKeyClick: () -> Unit,
+    onRoomClick: (RoomListRoomSummary) -> Unit,
+    onCreateRoomClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Box(modifier = modifier) {
@@ -88,7 +88,7 @@ fun RoomListContentView(
             }
             is RoomListContentState.Empty -> {
                 EmptyView(
-                    onCreateRoomClicked = onCreateRoomClicked,
+                    onCreateRoomClick = onCreateRoomClick,
                 )
             }
             is RoomListContentState.Rooms -> {
@@ -96,8 +96,8 @@ fun RoomListContentView(
                     state = contentState,
                     filtersState = filtersState,
                     eventSink = eventSink,
-                    onConfirmRecoveryKeyClicked = onConfirmRecoveryKeyClicked,
-                    onRoomClicked = onRoomClicked,
+                    onConfirmRecoveryKeyClick = onConfirmRecoveryKeyClick,
+                    onRoomClick = onRoomClick,
                 )
             }
         }
@@ -120,7 +120,7 @@ private fun SkeletonView(count: Int, modifier: Modifier = Modifier) {
 
 @Composable
 private fun EmptyView(
-    onCreateRoomClicked: () -> Unit,
+    onCreateRoomClick: () -> Unit,
     modifier: Modifier = Modifier
 ) {
     EmptyScaffold(
@@ -130,7 +130,7 @@ private fun EmptyView(
             Button(
                 text = stringResource(CommonStrings.action_start_chat),
                 leadingIcon = IconSource.Vector(CompoundIcons.Compose()),
-                onClick = onCreateRoomClicked,
+                onClick = onCreateRoomClick,
             )
         },
         modifier = modifier.fillMaxSize(),
@@ -142,8 +142,8 @@ private fun RoomsView(
     state: RoomListContentState.Rooms,
     filtersState: RoomListFiltersState,
     eventSink: (RoomListEvents) -> Unit,
-    onConfirmRecoveryKeyClicked: () -> Unit,
-    onRoomClicked: (RoomListRoomSummary) -> Unit,
+    onConfirmRecoveryKeyClick: () -> Unit,
+    onRoomClick: (RoomListRoomSummary) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     if (state.summaries.isEmpty() && filtersState.hasAnyFilterSelected) {
@@ -155,8 +155,8 @@ private fun RoomsView(
         RoomsViewList(
             state = state,
             eventSink = eventSink,
-            onConfirmRecoveryKeyClicked = onConfirmRecoveryKeyClicked,
-            onRoomClicked = onRoomClicked,
+            onConfirmRecoveryKeyClick = onConfirmRecoveryKeyClick,
+            onRoomClick = onRoomClick,
             modifier = modifier.fillMaxSize(),
         )
     }
@@ -166,8 +166,8 @@ private fun RoomsView(
 private fun RoomsViewList(
     state: RoomListContentState.Rooms,
     eventSink: (RoomListEvents) -> Unit,
-    onConfirmRecoveryKeyClicked: () -> Unit,
-    onRoomClicked: (RoomListRoomSummary) -> Unit,
+    onConfirmRecoveryKeyClick: () -> Unit,
+    onRoomClick: (RoomListRoomSummary) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val lazyListState = rememberLazyListState()
@@ -197,8 +197,8 @@ private fun RoomsViewList(
             SecurityBannerState.RecoveryKeyConfirmation -> {
                 item {
                     ConfirmRecoveryKeyBanner(
-                        onContinueClicked = onConfirmRecoveryKeyClicked,
-                        onDismissClicked = { eventSink(RoomListEvents.DismissRecoveryKeyPrompt) }
+                        onContinueClick = onConfirmRecoveryKeyClick,
+                        onDismissClick = { eventSink(RoomListEvents.DismissRecoveryKeyPrompt) }
                     )
                 }
             }
@@ -213,7 +213,7 @@ private fun RoomsViewList(
         ) { index, room ->
             RoomSummaryRow(
                 room = room,
-                onClick = onRoomClicked,
+                onClick = onRoomClick,
                 eventSink = eventSink,
             )
             if (index != state.summaries.lastIndex) {
@@ -275,8 +275,8 @@ internal fun RoomListContentViewPreview(@PreviewParameter(RoomListContentStatePr
             filterSelectionStates = RoomListFilter.entries.map { FilterSelectionState(it, isSelected = true) }
         ),
         eventSink = {},
-        onConfirmRecoveryKeyClicked = {},
-        onRoomClicked = {},
-        onCreateRoomClicked = {},
+        onConfirmRecoveryKeyClick = {},
+        onRoomClick = {},
+        onCreateRoomClick = {},
     )
 }
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListTopBar.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListTopBar.kt
index 301a32a26c..2cab0ab7ec 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListTopBar.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListTopBar.kt
@@ -88,7 +88,7 @@ fun RoomListTopBar(
     showAvatarIndicator: Boolean,
     areSearchResultsDisplayed: Boolean,
     onToggleSearch: () -> Unit,
-    onMenuActionClicked: (RoomListMenuAction) -> Unit,
+    onMenuActionClick: (RoomListMenuAction) -> Unit,
     onOpenSettings: () -> Unit,
     scrollBehavior: TopAppBarScrollBehavior,
     displayMenuItems: Boolean,
@@ -101,8 +101,8 @@ fun RoomListTopBar(
         showAvatarIndicator = showAvatarIndicator,
         areSearchResultsDisplayed = areSearchResultsDisplayed,
         onOpenSettings = onOpenSettings,
-        onSearchClicked = onToggleSearch,
-        onMenuActionClicked = onMenuActionClicked,
+        onSearchClick = onToggleSearch,
+        onMenuActionClick = onMenuActionClick,
         scrollBehavior = scrollBehavior,
         displayMenuItems = displayMenuItems,
         displayFilters = displayFilters,
@@ -119,8 +119,8 @@ private fun DefaultRoomListTopBar(
     areSearchResultsDisplayed: Boolean,
     scrollBehavior: TopAppBarScrollBehavior,
     onOpenSettings: () -> Unit,
-    onSearchClicked: () -> Unit,
-    onMenuActionClicked: (RoomListMenuAction) -> Unit,
+    onSearchClick: () -> Unit,
+    onMenuActionClick: (RoomListMenuAction) -> Unit,
     displayMenuItems: Boolean,
     displayFilters: Boolean,
     filtersState: RoomListFiltersState,
@@ -211,7 +211,7 @@ private fun DefaultRoomListTopBar(
                     actions = {
                         if (displayMenuItems) {
                             IconButton(
-                                onClick = onSearchClicked,
+                                onClick = onSearchClick,
                             ) {
                                 Icon(
                                     imageVector = CompoundIcons.Search(),
@@ -236,7 +236,7 @@ private fun DefaultRoomListTopBar(
                                         DropdownMenuItem(
                                             onClick = {
                                                 showMenu = false
-                                                onMenuActionClicked(RoomListMenuAction.InviteFriends)
+                                                onMenuActionClick(RoomListMenuAction.InviteFriends)
                                             },
                                             text = { Text(stringResource(id = CommonStrings.action_invite)) },
                                             leadingIcon = {
@@ -252,7 +252,7 @@ private fun DefaultRoomListTopBar(
                                         DropdownMenuItem(
                                             onClick = {
                                                 showMenu = false
-                                                onMenuActionClicked(RoomListMenuAction.ReportBug)
+                                                onMenuActionClick(RoomListMenuAction.ReportBug)
                                             },
                                             text = { Text(stringResource(id = CommonStrings.common_report_a_problem)) },
                                             leadingIcon = {
@@ -324,11 +324,11 @@ internal fun DefaultRoomListTopBarPreview() = ElementPreview {
         areSearchResultsDisplayed = false,
         scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior(rememberTopAppBarState()),
         onOpenSettings = {},
-        onSearchClicked = {},
+        onSearchClick = {},
         displayMenuItems = true,
         displayFilters = true,
         filtersState = aRoomListFiltersState(),
-        onMenuActionClicked = {},
+        onMenuActionClick = {},
     )
 }
 
@@ -342,10 +342,10 @@ internal fun DefaultRoomListTopBarWithIndicatorPreview() = ElementPreview {
         areSearchResultsDisplayed = false,
         scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior(rememberTopAppBarState()),
         onOpenSettings = {},
-        onSearchClicked = {},
+        onSearchClick = {},
         displayMenuItems = true,
         displayFilters = true,
         filtersState = aRoomListFiltersState(),
-        onMenuActionClicked = {},
+        onMenuActionClick = {},
     )
 }
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt
index a14140297c..d90faef985 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt
@@ -105,10 +105,10 @@ internal fun RoomSummaryRow(
                 }
                 Spacer(modifier = Modifier.height(12.dp))
                 InviteButtonsRow(
-                    onAcceptClicked = {
+                    onAcceptClick = {
                         eventSink(RoomListEvents.AcceptInvite(room))
                     },
-                    onDeclineClicked = {
+                    onDeclineClick = {
                         eventSink(RoomListEvents.DeclineInvite(room))
                     }
                 )
@@ -299,8 +299,8 @@ private fun InviteNameAndIndicatorRow(
 
 @Composable
 private fun InviteButtonsRow(
-    onAcceptClicked: () -> Unit,
-    onDeclineClicked: () -> Unit,
+    onAcceptClick: () -> Unit,
+    onDeclineClick: () -> Unit,
     modifier: Modifier = Modifier
 ) {
     Row(
@@ -309,13 +309,13 @@ private fun InviteButtonsRow(
     ) {
         OutlinedButton(
             text = stringResource(CommonStrings.action_decline),
-            onClick = onDeclineClicked,
+            onClick = onDeclineClick,
             size = ButtonSize.Medium,
             modifier = Modifier.weight(1f),
         )
         Button(
             text = stringResource(CommonStrings.action_accept),
-            onClick = onAcceptClicked,
+            onClick = onAcceptClick,
             size = ButtonSize.Medium,
             modifier = Modifier.weight(1f),
         )
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersView.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersView.kt
index 7a1cb2039a..545884c875 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersView.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/filters/RoomListFiltersView.kt
@@ -58,7 +58,7 @@ fun RoomListFiltersView(
     state: RoomListFiltersState,
     modifier: Modifier = Modifier
 ) {
-    fun onClearFiltersClicked() {
+    fun onClearFiltersClick() {
         state.eventSink(RoomListFiltersEvents.ClearSelectedFilters)
     }
 
@@ -83,7 +83,7 @@ fun RoomListFiltersView(
                         .testTag(TestTags.homeScreenClearFilters),
                     onClick = {
                         previousFilters.value = state.selectedFilters()
-                        onClearFiltersClicked()
+                        onClearFiltersClick()
                     }
                 )
             }
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchView.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchView.kt
index 8190c8078e..b8af9e16f1 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchView.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchView.kt
@@ -72,8 +72,8 @@ import io.element.android.libraries.ui.strings.CommonStrings
 internal fun RoomListSearchView(
     state: RoomListSearchState,
     eventSink: (RoomListEvents) -> Unit,
-    onRoomClicked: (RoomId) -> Unit,
-    onRoomDirectorySearchClicked: () -> Unit,
+    onRoomClick: (RoomId) -> Unit,
+    onRoomDirectorySearchClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     BackHandler(enabled = state.isSearchActive) {
@@ -98,9 +98,9 @@ internal fun RoomListSearchView(
             if (state.isSearchActive) {
                 RoomListSearchContent(
                     state = state,
-                    onRoomClicked = onRoomClicked,
+                    onRoomClick = onRoomClick,
                     eventSink = eventSink,
-                    onRoomDirectorySearchClicked = onRoomDirectorySearchClicked,
+                    onRoomDirectorySearchClick = onRoomDirectorySearchClick,
                 )
             }
         }
@@ -112,17 +112,17 @@ internal fun RoomListSearchView(
 private fun RoomListSearchContent(
     state: RoomListSearchState,
     eventSink: (RoomListEvents) -> Unit,
-    onRoomClicked: (RoomId) -> Unit,
-    onRoomDirectorySearchClicked: () -> Unit,
+    onRoomClick: (RoomId) -> Unit,
+    onRoomDirectorySearchClick: () -> Unit,
 ) {
     val borderColor = MaterialTheme.colorScheme.tertiary
     val strokeWidth = 1.dp
-    fun onBackButtonPressed() {
+    fun onBackButtonClick() {
         state.eventSink(RoomListSearchEvents.ToggleSearchVisibility)
     }
 
-    fun onRoomClicked(room: RoomListRoomSummary) {
-        onRoomClicked(room.roomId)
+    fun onRoomClick(room: RoomListRoomSummary) {
+        onRoomClick(room.roomId)
     }
     Scaffold(
         topBar = {
@@ -135,7 +135,7 @@ private fun RoomListSearchContent(
                         strokeWidth = strokeWidth.value
                     )
                 },
-                navigationIcon = { BackButton(onClick = ::onBackButtonPressed) },
+                navigationIcon = { BackButton(onClick = ::onBackButtonClick) },
                 title = {
                     val filter = state.query
                     val focusRequester = FocusRequester()
@@ -189,7 +189,7 @@ private fun RoomListSearchContent(
                     modifier = Modifier
                         .fillMaxWidth()
                         .padding(vertical = 24.dp, horizontal = 16.dp),
-                    onClick = onRoomDirectorySearchClicked
+                    onClick = onRoomDirectorySearchClick
                 )
             }
             LazyColumn(
@@ -201,7 +201,7 @@ private fun RoomListSearchContent(
                 ) { room ->
                     RoomSummaryRow(
                         room = room,
-                        onClick = ::onRoomClicked,
+                        onClick = ::onRoomClick,
                         eventSink = eventSink,
                     )
                 }
@@ -240,8 +240,8 @@ private fun RoomDirectorySearchButton(
 internal fun RoomListSearchContentPreview(@PreviewParameter(RoomListSearchStateProvider::class) state: RoomListSearchState) = ElementPreview {
     RoomListSearchContent(
         state = state,
-        onRoomClicked = {},
+        onRoomClick = {},
         eventSink = {},
-        onRoomDirectorySearchClicked = {},
+        onRoomDirectorySearchClick = {},
     )
 }
diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenuTest.kt b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenuTest.kt
index a1c98c6874..d9ebec849d 100644
--- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenuTest.kt
+++ b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListContextMenuTest.kt
@@ -41,7 +41,7 @@ class RoomListContextMenuTest {
             RoomListContextMenu(
                 contextMenu = contextMenu,
                 eventSink = eventsRecorder,
-                onRoomSettingsClicked = EnsureNeverCalledWithParam(),
+                onRoomSettingsClick = EnsureNeverCalledWithParam(),
             )
         }
         rule.clickOn(R.string.screen_roomlist_mark_as_read)
@@ -61,7 +61,7 @@ class RoomListContextMenuTest {
             RoomListContextMenu(
                 contextMenu = contextMenu,
                 eventSink = eventsRecorder,
-                onRoomSettingsClicked = EnsureNeverCalledWithParam(),
+                onRoomSettingsClick = EnsureNeverCalledWithParam(),
             )
         }
         rule.clickOn(R.string.screen_roomlist_mark_as_unread)
@@ -81,7 +81,7 @@ class RoomListContextMenuTest {
             RoomListContextMenu(
                 contextMenu = contextMenu,
                 eventSink = eventsRecorder,
-                onRoomSettingsClicked = EnsureNeverCalledWithParam(),
+                onRoomSettingsClick = EnsureNeverCalledWithParam(),
             )
         }
         rule.clickOn(CommonStrings.action_leave_conversation)
@@ -101,7 +101,7 @@ class RoomListContextMenuTest {
             RoomListContextMenu(
                 contextMenu = contextMenu,
                 eventSink = eventsRecorder,
-                onRoomSettingsClicked = EnsureNeverCalledWithParam(),
+                onRoomSettingsClick = EnsureNeverCalledWithParam(),
             )
         }
         rule.clickOn(CommonStrings.action_leave_room)
@@ -122,7 +122,7 @@ class RoomListContextMenuTest {
             RoomListContextMenu(
                 contextMenu = contextMenu,
                 eventSink = eventsRecorder,
-                onRoomSettingsClicked = callback,
+                onRoomSettingsClick = callback,
             )
         }
         rule.clickOn(CommonStrings.common_settings)
@@ -139,7 +139,7 @@ class RoomListContextMenuTest {
             RoomListContextMenu(
                 contextMenu = contextMenu,
                 eventSink = eventsRecorder,
-                onRoomSettingsClicked = callback,
+                onRoomSettingsClick = callback,
             )
         }
         rule.clickOn(CommonStrings.common_favourite)
diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListViewTest.kt b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListViewTest.kt
index 7507ab466b..99045cd783 100644
--- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListViewTest.kt
+++ b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListViewTest.kt
@@ -67,7 +67,7 @@ class RoomListViewTest {
                     contentState = aRoomsContentState(securityBannerState = SecurityBannerState.RecoveryKeyConfirmation),
                     eventSink = eventsRecorder,
                 ),
-                onConfirmRecoveryKeyClicked = callback,
+                onConfirmRecoveryKeyClick = callback,
             )
             rule.clickOn(CommonStrings.action_continue)
         }
@@ -82,7 +82,7 @@ class RoomListViewTest {
                     eventSink = eventsRecorder,
                     contentState = anEmptyContentState(),
                 ),
-                onCreateRoomClicked = callback,
+                onCreateRoomClick = callback,
             )
             rule.clickOn(CommonStrings.action_start_chat)
         }
@@ -100,7 +100,7 @@ class RoomListViewTest {
         ensureCalledOnceWithParam(room0.roomId) { callback ->
             rule.setRoomListView(
                 state = state,
-                onRoomClicked = callback,
+                onRoomClick = callback,
             )
             rule.onNodeWithText(room0.lastMessage!!.toString()).performClick()
         }
@@ -133,7 +133,7 @@ class RoomListViewTest {
         ensureCalledOnceWithParam(room0) { callback ->
             rule.setRoomListView(
                 state = state,
-                onRoomSettingsClicked = callback,
+                onRoomSettingsClick = callback,
             )
             rule.clickOn(CommonStrings.common_settings)
         }
@@ -160,24 +160,24 @@ class RoomListViewTest {
 
 private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRoomListView(
     state: RoomListState,
-    onRoomClicked: (RoomId) -> Unit = EnsureNeverCalledWithParam(),
-    onSettingsClicked: () -> Unit = EnsureNeverCalled(),
-    onConfirmRecoveryKeyClicked: () -> Unit = EnsureNeverCalled(),
-    onCreateRoomClicked: () -> Unit = EnsureNeverCalled(),
-    onRoomSettingsClicked: (RoomId) -> Unit = EnsureNeverCalledWithParam(),
-    onMenuActionClicked: (RoomListMenuAction) -> Unit = EnsureNeverCalledWithParam(),
-    onRoomDirectorySearchClicked: () -> Unit = EnsureNeverCalled(),
+    onRoomClick: (RoomId) -> Unit = EnsureNeverCalledWithParam(),
+    onSettingsClick: () -> Unit = EnsureNeverCalled(),
+    onConfirmRecoveryKeyClick: () -> Unit = EnsureNeverCalled(),
+    onCreateRoomClick: () -> Unit = EnsureNeverCalled(),
+    onRoomSettingsClick: (RoomId) -> Unit = EnsureNeverCalledWithParam(),
+    onMenuActionClick: (RoomListMenuAction) -> Unit = EnsureNeverCalledWithParam(),
+    onRoomDirectorySearchClick: () -> Unit = EnsureNeverCalled(),
 ) {
     setContent {
         RoomListView(
             state = state,
-            onRoomClicked = onRoomClicked,
-            onSettingsClicked = onSettingsClicked,
-            onConfirmRecoveryKeyClicked = onConfirmRecoveryKeyClicked,
-            onCreateRoomClicked = onCreateRoomClicked,
-            onRoomSettingsClicked = onRoomSettingsClicked,
-            onMenuActionClicked = onMenuActionClicked,
-            onRoomDirectorySearchClicked = onRoomDirectorySearchClicked,
+            onRoomClick = onRoomClick,
+            onSettingsClick = onSettingsClick,
+            onConfirmRecoveryKeyClick = onConfirmRecoveryKeyClick,
+            onCreateRoomClick = onCreateRoomClick,
+            onRoomSettingsClick = onRoomSettingsClick,
+            onMenuActionClick = onMenuActionClick,
+            onRoomDirectorySearchClick = onRoomDirectorySearchClick,
             acceptDeclineInviteView = { },
         )
     }
diff --git a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchViewTest.kt b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchViewTest.kt
index b3f0755f11..a50ba4fc26 100644
--- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchViewTest.kt
+++ b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchViewTest.kt
@@ -47,7 +47,7 @@ class RoomListSearchViewTest {
                     isRoomDirectorySearchEnabled = true,
                     eventSink = eventsRecorder,
                 ),
-                onRoomDirectorySearchClicked = it,
+                onRoomDirectorySearchClick = it,
             )
             rule.clickOn(R.string.screen_roomlist_room_directory_button_title)
         }
@@ -57,15 +57,15 @@ class RoomListSearchViewTest {
 private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setRoomListSearchView(
     state: RoomListSearchState,
     eventSink: (RoomListEvents) -> Unit = EventsRecorder(expectEvents = false),
-    onRoomClicked: (RoomId) -> Unit = EnsureNeverCalledWithParam(),
-    onRoomDirectorySearchClicked: () -> Unit = EnsureNeverCalled(),
+    onRoomClick: (RoomId) -> Unit = EnsureNeverCalledWithParam(),
+    onRoomDirectorySearchClick: () -> Unit = EnsureNeverCalled(),
 ) {
     setContent {
         RoomListSearchView(
             state = state,
             eventSink = eventSink,
-            onRoomClicked = onRoomClicked,
-            onRoomDirectorySearchClicked = onRoomDirectorySearchClicked,
+            onRoomClick = onRoomClick,
+            onRoomDirectorySearchClick = onRoomDirectorySearchClick,
         )
     }
 }
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/SecureBackupFlowNode.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/SecureBackupFlowNode.kt
index f696066181..e03aecad43 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/SecureBackupFlowNode.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/SecureBackupFlowNode.kt
@@ -87,23 +87,23 @@ class SecureBackupFlowNode @AssistedInject constructor(
         return when (navTarget) {
             NavTarget.Root -> {
                 val callback = object : SecureBackupRootNode.Callback {
-                    override fun onSetupClicked() {
+                    override fun onSetupClick() {
                         backstack.push(NavTarget.Setup)
                     }
 
-                    override fun onChangeClicked() {
+                    override fun onChangeClick() {
                         backstack.push(NavTarget.Change)
                     }
 
-                    override fun onDisableClicked() {
+                    override fun onDisableClick() {
                         backstack.push(NavTarget.Disable)
                     }
 
-                    override fun onEnableClicked() {
+                    override fun onEnableClick() {
                         backstack.push(NavTarget.Enable)
                     }
 
-                    override fun onConfirmRecoveryKeyClicked() {
+                    override fun onConfirmRecoveryKeyClick() {
                         backstack.push(NavTarget.EnterRecoveryKey)
                     }
                 }
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/createkey/CreateNewRecoveryKeyNode.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/createkey/CreateNewRecoveryKeyNode.kt
index 33b52a4497..f1fbc6fe7e 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/createkey/CreateNewRecoveryKeyNode.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/createkey/CreateNewRecoveryKeyNode.kt
@@ -38,7 +38,7 @@ class CreateNewRecoveryKeyNode @AssistedInject constructor(
         CreateNewRecoveryKeyView(
             desktopApplicationName = buildMeta.desktopApplicationName,
             modifier = modifier,
-            onBackClicked = ::navigateUp,
+            onBackClick = ::navigateUp,
         )
     }
 }
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/createkey/CreateNewRecoveryKeyView.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/createkey/CreateNewRecoveryKeyView.kt
index 8974d1faa2..420c6f5675 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/createkey/CreateNewRecoveryKeyView.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/createkey/CreateNewRecoveryKeyView.kt
@@ -50,13 +50,13 @@ import io.element.android.libraries.designsystem.theme.components.TopAppBar
 @Composable
 fun CreateNewRecoveryKeyView(
     desktopApplicationName: String,
-    onBackClicked: () -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Scaffold(
         modifier = modifier,
         topBar = {
-            TopAppBar(title = {}, navigationIcon = { BackButton(onClick = onBackClicked) })
+            TopAppBar(title = {}, navigationIcon = { BackButton(onClick = onBackClick) })
         }
     ) { padding ->
         Column(
@@ -131,7 +131,7 @@ internal fun CreateNewRecoveryKeyViewPreview() {
     ElementPreview {
         CreateNewRecoveryKeyView(
             desktopApplicationName = "Element",
-            onBackClicked = {},
+            onBackClick = {},
         )
     }
 }
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableNode.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableNode.kt
index 3fd6559858..795f4d313e 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableNode.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableNode.kt
@@ -38,8 +38,8 @@ class SecureBackupDisableNode @AssistedInject constructor(
         SecureBackupDisableView(
             state = state,
             modifier = modifier,
-            onDone = ::navigateUp,
-            onBackClicked = ::navigateUp,
+            onSuccess = ::navigateUp,
+            onBackClick = ::navigateUp,
         )
     }
 }
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableView.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableView.kt
index 37fc3eb2be..ec7076a7c3 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableView.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/disable/SecureBackupDisableView.kt
@@ -43,13 +43,13 @@ import io.element.android.libraries.designsystem.theme.components.Text
 @Composable
 fun SecureBackupDisableView(
     state: SecureBackupDisableState,
-    onDone: () -> Unit,
-    onBackClicked: () -> Unit,
+    onSuccess: () -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     FlowStepPage(
         modifier = modifier,
-        onBackClicked = onBackClicked,
+        onBackClick = onBackClick,
         title = stringResource(id = R.string.screen_key_backup_disable_title),
         subTitle = stringResource(id = R.string.screen_key_backup_disable_description),
         iconVector = CompoundIcons.KeyOffSolid(),
@@ -68,7 +68,7 @@ fun SecureBackupDisableView(
         progressDialog = {},
         errorMessage = { it.message ?: it.toString() },
         onErrorDismiss = { state.eventSink.invoke(SecureBackupDisableEvents.DismissDialogs) },
-        onSuccess = { onDone() },
+        onSuccess = { onSuccess() },
     )
 }
 
@@ -79,7 +79,7 @@ private fun SecureBackupDisableConfirmationDialog(onConfirm: () -> Unit, onDismi
         content = stringResource(id = R.string.screen_key_backup_disable_confirmation_description),
         submitText = stringResource(id = R.string.screen_key_backup_disable_confirmation_action_turn_off),
         destructiveSubmit = true,
-        onSubmitClicked = onConfirm,
+        onSubmitClick = onConfirm,
         onDismiss = onDismiss,
     )
 }
@@ -135,7 +135,7 @@ internal fun SecureBackupDisableViewPreview(
 ) = ElementPreview {
     SecureBackupDisableView(
         state = state,
-        onDone = {},
-        onBackClicked = {},
+        onSuccess = {},
+        onBackClick = {},
     )
 }
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enable/SecureBackupEnableNode.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enable/SecureBackupEnableNode.kt
index 804af27493..11e1b7a83a 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enable/SecureBackupEnableNode.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enable/SecureBackupEnableNode.kt
@@ -38,8 +38,8 @@ class SecureBackupEnableNode @AssistedInject constructor(
         SecureBackupEnableView(
             state = state,
             modifier = modifier,
-            onDone = ::navigateUp,
-            onBackClicked = ::navigateUp,
+            onSuccess = ::navigateUp,
+            onBackClick = ::navigateUp,
         )
     }
 }
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enable/SecureBackupEnableView.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enable/SecureBackupEnableView.kt
index 53748d3879..b2b1e2a396 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enable/SecureBackupEnableView.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enable/SecureBackupEnableView.kt
@@ -33,13 +33,13 @@ import io.element.android.libraries.designsystem.theme.components.Button
 @Composable
 fun SecureBackupEnableView(
     state: SecureBackupEnableState,
-    onDone: () -> Unit,
-    onBackClicked: () -> Unit,
+    onSuccess: () -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     FlowStepPage(
         modifier = modifier,
-        onBackClicked = onBackClicked,
+        onBackClick = onBackClick,
         title = stringResource(id = R.string.screen_chat_backup_key_backup_action_enable),
         iconVector = CompoundIcons.KeySolid(),
         buttons = { Buttons(state = state) }
@@ -47,7 +47,7 @@ fun SecureBackupEnableView(
     AsyncActionView(
         async = state.enableAction,
         progressDialog = { },
-        onSuccess = { onDone() },
+        onSuccess = { onSuccess() },
         onErrorDismiss = { state.eventSink.invoke(SecureBackupEnableEvents.DismissDialog) }
     )
 }
@@ -71,7 +71,7 @@ internal fun SecureBackupEnableViewPreview(
 ) = ElementPreview {
     SecureBackupEnableView(
         state = state,
-        onDone = {},
-        onBackClicked = {},
+        onSuccess = {},
+        onBackClick = {},
     )
 }
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyNode.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyNode.kt
index c80becb88a..2fd9067f78 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyNode.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyNode.kt
@@ -46,8 +46,8 @@ class SecureBackupEnterRecoveryKeyNode @AssistedInject constructor(
         SecureBackupEnterRecoveryKeyView(
             state = state,
             modifier = modifier,
-            onDone = callback::onEnterRecoveryKeySuccess,
-            onBackClicked = ::navigateUp,
+            onSuccess = callback::onEnterRecoveryKeySuccess,
+            onBackClick = ::navigateUp,
             onCreateNewRecoveryKey = callback::onCreateNewRecoveryKey
         )
     }
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyView.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyView.kt
index db23018c6f..1f93b55735 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyView.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyView.kt
@@ -38,14 +38,14 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun SecureBackupEnterRecoveryKeyView(
     state: SecureBackupEnterRecoveryKeyState,
-    onDone: () -> Unit,
-    onBackClicked: () -> Unit,
+    onSuccess: () -> Unit,
+    onBackClick: () -> Unit,
     onCreateNewRecoveryKey: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     AsyncActionView(
         async = state.submitAction,
-        onSuccess = { onDone() },
+        onSuccess = { onSuccess() },
         progressDialog = { },
         errorTitle = { stringResource(id = R.string.screen_recovery_key_confirm_error_title) },
         errorMessage = { stringResource(id = R.string.screen_recovery_key_confirm_error_content) },
@@ -54,7 +54,7 @@ fun SecureBackupEnterRecoveryKeyView(
 
     FlowStepPage(
         modifier = modifier,
-        onBackClicked = onBackClicked,
+        onBackClick = onBackClick,
         iconVector = CompoundIcons.KeySolid(),
         title = stringResource(id = R.string.screen_recovery_key_confirm_title),
         subTitle = stringResource(id = R.string.screen_recovery_key_confirm_description),
@@ -109,8 +109,8 @@ internal fun SecureBackupEnterRecoveryKeyViewPreview(
 ) = ElementPreview {
     SecureBackupEnterRecoveryKeyView(
         state = state,
-        onDone = {},
-        onBackClicked = {},
+        onSuccess = {},
+        onBackClick = {},
         onCreateNewRecoveryKey = {},
     )
 }
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootNode.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootNode.kt
index 2fa037860e..22a78f89b4 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootNode.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootNode.kt
@@ -40,34 +40,34 @@ class SecureBackupRootNode @AssistedInject constructor(
     plugins = plugins
 ) {
     interface Callback : Plugin {
-        fun onSetupClicked()
-        fun onChangeClicked()
-        fun onDisableClicked()
-        fun onEnableClicked()
-        fun onConfirmRecoveryKeyClicked()
+        fun onSetupClick()
+        fun onChangeClick()
+        fun onDisableClick()
+        fun onEnableClick()
+        fun onConfirmRecoveryKeyClick()
     }
 
-    private fun onSetupClicked() {
-        plugins<Callback>().forEach { it.onSetupClicked() }
+    private fun onSetupClick() {
+        plugins<Callback>().forEach { it.onSetupClick() }
     }
 
-    private fun onChangeClicked() {
-        plugins<Callback>().forEach { it.onChangeClicked() }
+    private fun onChangeClick() {
+        plugins<Callback>().forEach { it.onChangeClick() }
     }
 
-    private fun onDisableClicked() {
-        plugins<Callback>().forEach { it.onDisableClicked() }
+    private fun onDisableClick() {
+        plugins<Callback>().forEach { it.onDisableClick() }
     }
 
-    private fun onEnableClicked() {
-        plugins<Callback>().forEach { it.onEnableClicked() }
+    private fun onEnableClick() {
+        plugins<Callback>().forEach { it.onEnableClick() }
     }
 
-    private fun onConfirmRecoveryKeyClicked() {
-        plugins<Callback>().forEach { it.onConfirmRecoveryKeyClicked() }
+    private fun onConfirmRecoveryKeyClick() {
+        plugins<Callback>().forEach { it.onConfirmRecoveryKeyClick() }
     }
 
-    private fun onLearnMoreClicked(uriHandler: UriHandler) {
+    private fun onLearnMoreClick(uriHandler: UriHandler) {
         uriHandler.openUri(SecureBackupConfig.LEARN_MORE_URL)
     }
 
@@ -77,13 +77,13 @@ class SecureBackupRootNode @AssistedInject constructor(
         val uriHandler = LocalUriHandler.current
         SecureBackupRootView(
             state = state,
-            onBackPressed = ::navigateUp,
-            onSetupClicked = ::onSetupClicked,
-            onChangeClicked = ::onChangeClicked,
-            onEnableClicked = ::onEnableClicked,
-            onDisableClicked = ::onDisableClicked,
-            onConfirmRecoveryKeyClicked = ::onConfirmRecoveryKeyClicked,
-            onLearnMoreClicked = { onLearnMoreClicked(uriHandler) },
+            onBackClick = ::navigateUp,
+            onSetupClick = ::onSetupClick,
+            onChangeClick = ::onChangeClick,
+            onEnableClick = ::onEnableClick,
+            onDisableClick = ::onDisableClick,
+            onConfirmRecoveryKeyClick = ::onConfirmRecoveryKeyClick,
+            onLearnMoreClick = { onLearnMoreClick(uriHandler) },
             modifier = modifier,
         )
     }
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootView.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootView.kt
index 754beb6d5f..a566fe15a7 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootView.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/root/SecureBackupRootView.kt
@@ -47,20 +47,20 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun SecureBackupRootView(
     state: SecureBackupRootState,
-    onBackPressed: () -> Unit,
-    onSetupClicked: () -> Unit,
-    onChangeClicked: () -> Unit,
-    onEnableClicked: () -> Unit,
-    onDisableClicked: () -> Unit,
-    onConfirmRecoveryKeyClicked: () -> Unit,
-    onLearnMoreClicked: () -> Unit,
+    onBackClick: () -> Unit,
+    onSetupClick: () -> Unit,
+    onChangeClick: () -> Unit,
+    onEnableClick: () -> Unit,
+    onDisableClick: () -> Unit,
+    onConfirmRecoveryKeyClick: () -> Unit,
+    onLearnMoreClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val snackbarHostState = rememberSnackbarHostState(snackbarMessage = state.snackbarMessage)
 
     PreferencePage(
         modifier = modifier,
-        onBackPressed = onBackPressed,
+        onBackClick = onBackClick,
         title = stringResource(id = CommonStrings.common_chat_backup),
         snackbarHost = { SnackbarHost(snackbarHostState) },
     ) {
@@ -74,7 +74,7 @@ fun SecureBackupRootView(
         PreferenceText(
             title = stringResource(id = R.string.screen_chat_backup_key_backup_title),
             subtitleAnnotated = text,
-            onClick = onLearnMoreClicked,
+            onClick = onLearnMoreClick,
         )
 
         // Disable / Enable backup
@@ -87,13 +87,13 @@ fun SecureBackupRootView(
                             PreferenceText(
                                 title = stringResource(id = R.string.screen_chat_backup_key_backup_action_disable),
                                 tintColor = ElementTheme.colors.textCriticalPrimary,
-                                onClick = onDisableClicked,
+                                onClick = onDisableClick,
                             )
                         }
                         false -> {
                             PreferenceText(
                                 title = stringResource(id = R.string.screen_chat_backup_key_backup_action_enable),
-                                onClick = onEnableClicked,
+                                onClick = onEnableClick,
                             )
                         }
                     }
@@ -127,7 +127,7 @@ fun SecureBackupRootView(
 
                         PreferenceText(
                             title = stringResource(id = R.string.screen_chat_backup_key_backup_action_enable),
-                            onClick = onEnableClicked,
+                            onClick = onEnableClick,
                         )
                     }
                 }
@@ -140,7 +140,7 @@ fun SecureBackupRootView(
                 PreferenceText(
                     title = stringResource(id = R.string.screen_chat_backup_key_backup_action_disable),
                     tintColor = ElementTheme.colors.textCriticalPrimary,
-                    onClick = onDisableClicked,
+                    onClick = onDisableClick,
                 )
             }
             BackupState.DISABLING -> {
@@ -158,14 +158,14 @@ fun SecureBackupRootView(
                 PreferenceText(
                     title = stringResource(id = R.string.screen_chat_backup_recovery_action_setup),
                     subtitle = stringResource(id = R.string.screen_chat_backup_recovery_action_setup_description, state.appName),
-                    onClick = onSetupClicked,
+                    onClick = onSetupClick,
                     showEndBadge = true,
                 )
             }
             RecoveryState.ENABLED -> {
                 PreferenceText(
                     title = stringResource(id = R.string.screen_chat_backup_recovery_action_change),
-                    onClick = onChangeClicked,
+                    onClick = onChangeClick,
                 )
             }
             RecoveryState.INCOMPLETE ->
@@ -173,7 +173,7 @@ fun SecureBackupRootView(
                     title = stringResource(id = R.string.screen_chat_backup_recovery_action_confirm),
                     subtitle = stringResource(id = R.string.screen_chat_backup_recovery_action_confirm_description),
                     showEndBadge = true,
-                    onClick = onConfirmRecoveryKeyClicked,
+                    onClick = onConfirmRecoveryKeyClick,
                 )
         }
     }
@@ -186,12 +186,12 @@ internal fun SecureBackupRootViewPreview(
 ) = ElementPreview {
     SecureBackupRootView(
         state = state,
-        onBackPressed = {},
-        onSetupClicked = {},
-        onChangeClicked = {},
-        onEnableClicked = {},
-        onDisableClicked = {},
-        onConfirmRecoveryKeyClicked = {},
-        onLearnMoreClicked = {},
+        onBackClick = {},
+        onSetupClick = {},
+        onChangeClick = {},
+        onEnableClick = {},
+        onDisableClick = {},
+        onConfirmRecoveryKeyClick = {},
+        onLearnMoreClick = {},
     )
 }
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupNode.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupNode.kt
index 495b4a38c1..a01d638055 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupNode.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupNode.kt
@@ -55,11 +55,11 @@ class SecureBackupSetupNode @AssistedInject constructor(
         val state = presenter.present()
         SecureBackupSetupView(
             state = state,
-            onDone = {
+            onSuccess = {
                 coroutineScope.postSuccessSnackbar()
                 navigateUp()
             },
-            onBackClicked = ::navigateUp,
+            onBackClick = ::navigateUp,
             modifier = modifier,
         )
     }
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupView.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupView.kt
index 03d4f80b97..d4129a3259 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupView.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupView.kt
@@ -42,18 +42,18 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun SecureBackupSetupView(
     state: SecureBackupSetupState,
-    onDone: () -> Unit,
-    onBackClicked: () -> Unit,
+    onSuccess: () -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     FlowStepPage(
         modifier = modifier,
-        onBackClicked = onBackClicked.takeIf { state.canGoBack() },
+        onBackClick = onBackClick.takeIf { state.canGoBack() },
         title = title(state),
         subTitle = subtitle(state),
         iconVector = CompoundIcons.KeySolid(),
         content = { Content(state) },
-        buttons = { Buttons(state, onDone = onDone) },
+        buttons = { Buttons(state, onFinish = onSuccess) },
     )
 
     if (state.showSaveConfirmationDialog) {
@@ -61,7 +61,7 @@ fun SecureBackupSetupView(
             title = stringResource(id = R.string.screen_recovery_key_setup_confirmation_title),
             content = stringResource(id = R.string.screen_recovery_key_setup_confirmation_description),
             submitText = stringResource(id = CommonStrings.action_continue),
-            onSubmitClicked = onDone,
+            onSubmitClick = onSuccess,
             onDismiss = {
                 state.eventSink.invoke(SecureBackupSetupEvents.DismissDialog)
             }
@@ -138,7 +138,7 @@ private fun Content(
 @Composable
 private fun ColumnScope.Buttons(
     state: SecureBackupSetupState,
-    onDone: () -> Unit,
+    onFinish: () -> Unit,
 ) {
     val context = LocalContext.current
     val chooserTitle = stringResource(id = R.string.screen_recovery_key_save_action)
@@ -149,7 +149,7 @@ private fun ColumnScope.Buttons(
                 text = stringResource(id = CommonStrings.action_done),
                 enabled = false,
                 modifier = Modifier.fillMaxWidth(),
-                onClick = onDone
+                onClick = onFinish
             )
         }
         is SetupState.Created,
@@ -172,7 +172,7 @@ private fun ColumnScope.Buttons(
                 modifier = Modifier.fillMaxWidth(),
                 onClick = {
                     if (state.setupState is SetupState.CreatedAndSaved) {
-                        onDone()
+                        onFinish()
                     } else {
                         state.eventSink.invoke(SecureBackupSetupEvents.Done)
                     }
@@ -189,7 +189,7 @@ internal fun SecureBackupSetupViewPreview(
 ) = ElementPreview {
     SecureBackupSetupView(
         state = state,
-        onDone = {},
-        onBackClicked = {},
+        onSuccess = {},
+        onBackClick = {},
     )
 }
diff --git a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupViewChangePreview.kt b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupViewChangePreview.kt
index 31efdfa3a1..cff8cb4347 100644
--- a/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupViewChangePreview.kt
+++ b/features/securebackup/impl/src/main/kotlin/io/element/android/features/securebackup/impl/setup/SecureBackupSetupViewChangePreview.kt
@@ -32,7 +32,7 @@ internal fun SecureBackupSetupViewChangePreview(
             isChangeRecoveryKeyUserStory = true,
             recoveryKeyViewState = state.recoveryKeyViewState.copy(recoveryKeyUserStory = RecoveryKeyUserStory.Change),
         ),
-        onDone = {},
-        onBackClicked = {},
+        onSuccess = {},
+        onBackClick = {},
     )
 }
diff --git a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyViewTest.kt b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyViewTest.kt
index f074116af1..c42847a323 100644
--- a/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyViewTest.kt
+++ b/features/securebackup/impl/src/test/kotlin/io/element/android/features/securebackup/impl/enter/SecureBackupEnterRecoveryKeyViewTest.kt
@@ -39,22 +39,22 @@ class SecureBackupEnterRecoveryKeyViewTest {
     @get:Rule val rule = createAndroidComposeRule<ComponentActivity>()
 
     @Test
-    fun `back key pressed - calls onBackClicked`() {
+    fun `back key pressed - calls onBackClick`() {
         ensureCalledOnce { callback ->
             rule.setSecureBackupEnterRecoveryKeyView(
                 aSecureBackupEnterRecoveryKeyState(),
-                onBackClicked = callback,
+                onBackClick = callback,
             )
             rule.pressBackKey()
         }
     }
 
     @Test
-    fun `back button clicked - calls onBackClicked`() {
+    fun `back button clicked - calls onBackClick`() {
         ensureCalledOnce { callback ->
             rule.setSecureBackupEnterRecoveryKeyView(
                 aSecureBackupEnterRecoveryKeyState(),
-                onBackClicked = callback,
+                onBackClick = callback,
             )
             rule.pressBack()
         }
@@ -95,14 +95,14 @@ class SecureBackupEnterRecoveryKeyViewTest {
     private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setSecureBackupEnterRecoveryKeyView(
         state: SecureBackupEnterRecoveryKeyState,
         onDone: () -> Unit = EnsureNeverCalled(),
-        onBackClicked: () -> Unit = EnsureNeverCalled(),
+        onBackClick: () -> Unit = EnsureNeverCalled(),
         onCreateNewRecoveryKey: () -> Unit = EnsureNeverCalled(),
     ) {
         rule.setContent {
             SecureBackupEnterRecoveryKeyView(
                 state = state,
-                onDone = onDone,
-                onBackClicked = onBackClicked,
+                onSuccess = onDone,
+                onBackClick = onBackClick,
                 onCreateNewRecoveryKey = onCreateNewRecoveryKey
             )
         }
diff --git a/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/root/UserProfileNode.kt b/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/root/UserProfileNode.kt
index 4d4ea993c4..d2fa42183b 100644
--- a/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/root/UserProfileNode.kt
+++ b/features/userprofile/impl/src/main/kotlin/io/element/android/features/userprofile/impl/root/UserProfileNode.kt
@@ -89,7 +89,7 @@ class UserProfileNode @AssistedInject constructor(
             modifier = modifier,
             goBack = this::navigateUp,
             onShareUser = ::onShareUser,
-            onDmStarted = ::onStartDM,
+            onOpenDm = ::onStartDM,
             onStartCall = callback::onStartCall,
             openAvatarPreview = callback::openAvatarPreview,
         )
diff --git a/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/UserProfileView.kt b/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/UserProfileView.kt
index 3d5ae4a66c..f147798b19 100644
--- a/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/UserProfileView.kt
+++ b/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/UserProfileView.kt
@@ -47,7 +47,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
 fun UserProfileView(
     state: UserProfileState,
     onShareUser: () -> Unit,
-    onDmStarted: (RoomId) -> Unit,
+    onOpenDm: (RoomId) -> Unit,
     onStartCall: (RoomId) -> Unit,
     goBack: () -> Unit,
     openAvatarPreview: (username: String, url: String) -> Unit,
@@ -96,7 +96,7 @@ fun UserProfileView(
                         progressText = stringResource(CommonStrings.common_starting_chat),
                     )
                 },
-                onSuccess = onDmStarted,
+                onSuccess = onOpenDm,
                 errorMessage = { stringResource(R.string.screen_start_chat_error_starting_chat) },
                 onRetry = { state.eventSink(UserProfileEvents.StartDM) },
                 onErrorDismiss = { state.eventSink(UserProfileEvents.ClearStartDMState) },
@@ -114,7 +114,7 @@ internal fun UserProfileViewPreview(
         state = state,
         onShareUser = {},
         goBack = {},
-        onDmStarted = {},
+        onOpenDm = {},
         onStartCall = {},
         openAvatarPreview = { _, _ -> }
     )
diff --git a/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/blockuser/BlockUserDialogs.kt b/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/blockuser/BlockUserDialogs.kt
index 3e7aeff512..7f671c397d 100644
--- a/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/blockuser/BlockUserDialogs.kt
+++ b/features/userprofile/shared/src/main/kotlin/io/element/android/features/userprofile/shared/blockuser/BlockUserDialogs.kt
@@ -63,7 +63,7 @@ private fun BlockConfirmationDialog(
         title = stringResource(R.string.screen_dm_details_block_user),
         content = stringResource(R.string.screen_dm_details_block_alert_description),
         submitText = stringResource(R.string.screen_dm_details_block_alert_action),
-        onSubmitClicked = onBlockAction,
+        onSubmitClick = onBlockAction,
         onDismiss = onDismiss
     )
 }
@@ -77,7 +77,7 @@ private fun UnblockConfirmationDialog(
         title = stringResource(R.string.screen_dm_details_unblock_user),
         content = stringResource(R.string.screen_dm_details_unblock_alert_description),
         submitText = stringResource(R.string.screen_dm_details_unblock_alert_action),
-        onSubmitClicked = onUnblockAction,
+        onSubmitClick = onUnblockAction,
         onDismiss = onDismiss
     )
 }
diff --git a/features/userprofile/shared/src/test/kotlin/io/element/android/features/userprofile/UserProfileViewTest.kt b/features/userprofile/shared/src/test/kotlin/io/element/android/features/userprofile/UserProfileViewTest.kt
index 6cc5e229e5..04fc36da48 100644
--- a/features/userprofile/shared/src/test/kotlin/io/element/android/features/userprofile/UserProfileViewTest.kt
+++ b/features/userprofile/shared/src/test/kotlin/io/element/android/features/userprofile/UserProfileViewTest.kt
@@ -226,7 +226,7 @@ private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setUserP
         UserProfileView(
             state = state,
             onShareUser = onShareUser,
-            onDmStarted = onDmStarted,
+            onOpenDm = onDmStarted,
             onStartCall = onStartCall,
             goBack = goBack,
             openAvatarPreview = openAvatarPreview,
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionNode.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionNode.kt
index 6fbde66faf..9ce1358683 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionNode.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionNode.kt
@@ -43,7 +43,7 @@ class VerifySelfSessionNode @AssistedInject constructor(
             state = state,
             modifier = modifier,
             onEnterRecoveryKey = callback::onEnterRecoveryKey,
-            onFinished = callback::onDone,
+            onFinish = callback::onDone,
         )
     }
 }
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionView.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionView.kt
index 42d752d8f5..6b908e3ebd 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionView.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionView.kt
@@ -66,16 +66,16 @@ import io.element.android.features.verifysession.impl.VerifySelfSessionState.Ver
 fun VerifySelfSessionView(
     state: VerifySelfSessionState,
     onEnterRecoveryKey: () -> Unit,
-    onFinished: () -> Unit,
+    onFinish: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     fun resetFlow() {
         state.eventSink(VerifySelfSessionViewEvents.Reset)
     }
-    val updatedOnFinished by rememberUpdatedState(newValue = onFinished)
-    LaunchedEffect(state.verificationFlowStep, updatedOnFinished) {
+    val latestOnFinish by rememberUpdatedState(newValue = onFinish)
+    LaunchedEffect(state.verificationFlowStep, latestOnFinish) {
         if (state.verificationFlowStep is FlowStep.Skipped) {
-            updatedOnFinished()
+            latestOnFinish()
         }
     }
     BackHandler {
@@ -114,7 +114,7 @@ fun VerifySelfSessionView(
                 screenState = state,
                 goBack = ::resetFlow,
                 onEnterRecoveryKey = onEnterRecoveryKey,
-                onFinished = onFinished,
+                onFinish = onFinish,
             )
         }
     ) {
@@ -227,7 +227,7 @@ private fun BottomMenu(
     screenState: VerifySelfSessionState,
     onEnterRecoveryKey: () -> Unit,
     goBack: () -> Unit,
-    onFinished: () -> Unit,
+    onFinish: () -> Unit,
 ) {
     val verificationViewState = screenState.verificationFlowStep
     val eventSink = screenState.eventSink
@@ -239,37 +239,37 @@ private fun BottomMenu(
             if (verificationViewState.isLastDevice) {
                 BottomMenu(
                     positiveButtonTitle = stringResource(R.string.screen_session_verification_enter_recovery_key),
-                    onPositiveButtonClicked = onEnterRecoveryKey,
+                    onPositiveButtonClick = onEnterRecoveryKey,
                 )
             } else {
                 BottomMenu(
                     positiveButtonTitle = stringResource(R.string.screen_identity_use_another_device),
-                    onPositiveButtonClicked = { eventSink(VerifySelfSessionViewEvents.RequestVerification) },
+                    onPositiveButtonClick = { eventSink(VerifySelfSessionViewEvents.RequestVerification) },
                     negativeButtonTitle = stringResource(R.string.screen_session_verification_enter_recovery_key),
-                    onNegativeButtonClicked = onEnterRecoveryKey,
+                    onNegativeButtonClick = onEnterRecoveryKey,
                 )
             }
         }
         is FlowStep.Canceled -> {
             BottomMenu(
                 positiveButtonTitle = stringResource(R.string.screen_session_verification_positive_button_canceled),
-                onPositiveButtonClicked = { eventSink(VerifySelfSessionViewEvents.RequestVerification) },
+                onPositiveButtonClick = { eventSink(VerifySelfSessionViewEvents.RequestVerification) },
                 negativeButtonTitle = stringResource(CommonStrings.action_cancel),
-                onNegativeButtonClicked = goBack,
+                onNegativeButtonClick = goBack,
             )
         }
         is FlowStep.Ready -> {
             BottomMenu(
                 positiveButtonTitle = stringResource(CommonStrings.action_start),
-                onPositiveButtonClicked = { eventSink(VerifySelfSessionViewEvents.StartSasVerification) },
+                onPositiveButtonClick = { eventSink(VerifySelfSessionViewEvents.StartSasVerification) },
                 negativeButtonTitle = stringResource(CommonStrings.action_cancel),
-                onNegativeButtonClicked = goBack,
+                onNegativeButtonClick = goBack,
             )
         }
         is FlowStep.AwaitingOtherDeviceResponse -> {
             BottomMenu(
                 positiveButtonTitle = stringResource(R.string.screen_identity_waiting_on_other_device),
-                onPositiveButtonClicked = {},
+                onPositiveButtonClick = {},
                 isLoading = true,
             )
         }
@@ -281,20 +281,20 @@ private fun BottomMenu(
             }
             BottomMenu(
                 positiveButtonTitle = positiveButtonTitle,
-                onPositiveButtonClicked = {
+                onPositiveButtonClick = {
                     if (!isVerifying) {
                         eventSink(VerifySelfSessionViewEvents.ConfirmVerification)
                     }
                 },
                 negativeButtonTitle = stringResource(R.string.screen_session_verification_they_dont_match),
-                onNegativeButtonClicked = { eventSink(VerifySelfSessionViewEvents.DeclineVerification) },
+                onNegativeButtonClick = { eventSink(VerifySelfSessionViewEvents.DeclineVerification) },
                 isLoading = isVerifying,
             )
         }
         is FlowStep.Completed -> {
             BottomMenu(
                 positiveButtonTitle = stringResource(CommonStrings.action_continue),
-                onPositiveButtonClicked = onFinished,
+                onPositiveButtonClick = onFinish,
             )
         }
         is FlowStep.Skipped -> return
@@ -304,11 +304,11 @@ private fun BottomMenu(
 @Composable
 private fun BottomMenu(
     positiveButtonTitle: String?,
-    onPositiveButtonClicked: () -> Unit,
+    onPositiveButtonClick: () -> Unit,
     modifier: Modifier = Modifier,
     negativeButtonTitle: String? = null,
     negativeButtonEnabled: Boolean = negativeButtonTitle != null,
-    onNegativeButtonClicked: () -> Unit = {},
+    onNegativeButtonClick: () -> Unit = {},
     isLoading: Boolean = false,
 ) {
     ButtonColumnMolecule(
@@ -319,14 +319,14 @@ private fun BottomMenu(
                 text = positiveButtonTitle,
                 showProgress = isLoading,
                 modifier = Modifier.fillMaxWidth(),
-                onClick = onPositiveButtonClicked,
+                onClick = onPositiveButtonClick,
             )
         }
         if (negativeButtonTitle != null) {
             TextButton(
                 text = negativeButtonTitle,
                 modifier = Modifier.fillMaxWidth(),
-                onClick = onNegativeButtonClicked,
+                onClick = onNegativeButtonClick,
                 enabled = negativeButtonEnabled,
             )
         } else {
@@ -341,6 +341,6 @@ internal fun VerifySelfSessionViewPreview(@PreviewParameter(VerifySelfSessionSta
     VerifySelfSessionView(
         state = state,
         onEnterRecoveryKey = {},
-        onFinished = {},
+        onFinish = {},
     )
 }
diff --git a/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionViewTest.kt b/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionViewTest.kt
index 52158c2d7f..15a1ffedac 100644
--- a/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionViewTest.kt
+++ b/features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/VerifySelfSessionViewTest.kt
@@ -222,7 +222,7 @@ class VerifySelfSessionViewTest {
             VerifySelfSessionView(
                 state = state,
                 onEnterRecoveryKey = onEnterRecoveryKey,
-                onFinished = onFinished,
+                onFinish = onFinished,
             )
         }
     }
diff --git a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileNode.kt b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileNode.kt
index 3d4ad727fe..2c063f5e16 100644
--- a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileNode.kt
+++ b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileNode.kt
@@ -41,7 +41,7 @@ class ViewFileNode @AssistedInject constructor(
     ) : NodeInputs
 
     interface Callback : Plugin {
-        fun onBackPressed()
+        fun onBackClick()
     }
 
     private val inputs: Inputs = inputs()
@@ -51,8 +51,8 @@ class ViewFileNode @AssistedInject constructor(
         name = inputs.name,
     )
 
-    private fun onBackPressed() {
-        plugins<Callback>().forEach { it.onBackPressed() }
+    private fun onBackClick() {
+        plugins<Callback>().forEach { it.onBackClick() }
     }
 
     @Composable
@@ -61,7 +61,7 @@ class ViewFileNode @AssistedInject constructor(
         ViewFileView(
             state = state,
             modifier = modifier,
-            onBackPressed = ::onBackPressed,
+            onBackClick = ::onBackClick,
         )
     }
 }
diff --git a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileView.kt b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileView.kt
index f832617280..351b032e32 100644
--- a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileView.kt
+++ b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFileView.kt
@@ -62,7 +62,7 @@ import kotlinx.collections.immutable.toImmutableList
 @Composable
 fun ViewFileView(
     state: ViewFileState,
-    onBackPressed: () -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Scaffold(
@@ -70,7 +70,7 @@ fun ViewFileView(
         topBar = {
             TopAppBar(
                 navigationIcon = {
-                    BackButton(onClick = onBackPressed)
+                    BackButton(onClick = onBackClick)
                 },
                 title = {
                     Text(
@@ -247,6 +247,6 @@ private val colorError = Color(0xFFFF6B68)
 internal fun ViewFileViewPreview(@PreviewParameter(ViewFileStateProvider::class) state: ViewFileState) = ElementPreview {
     ViewFileView(
         state = state,
-        onBackPressed = {},
+        onBackClick = {},
     )
 }
diff --git a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/ViewFolderNode.kt b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/ViewFolderNode.kt
index 23dac7bc4e..6e6c2a2415 100644
--- a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/ViewFolderNode.kt
+++ b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/ViewFolderNode.kt
@@ -42,7 +42,7 @@ class ViewFolderNode @AssistedInject constructor(
     ) : NodeInputs
 
     interface Callback : Plugin {
-        fun onBackPressed()
+        fun onBackClick()
         fun onNavigateTo(item: Item)
     }
 
@@ -53,8 +53,8 @@ class ViewFolderNode @AssistedInject constructor(
         path = inputs.path,
     )
 
-    private fun onBackPressed() {
-        plugins<Callback>().forEach { it.onBackPressed() }
+    private fun onBackClick() {
+        plugins<Callback>().forEach { it.onBackClick() }
     }
 
     private fun onNavigateTo(item: Item) {
@@ -68,7 +68,7 @@ class ViewFolderNode @AssistedInject constructor(
             state = state,
             modifier = modifier,
             onNavigateTo = ::onNavigateTo,
-            onBackPressed = ::onBackPressed,
+            onBackClick = ::onBackClick,
         )
     }
 }
diff --git a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/ViewFolderView.kt b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/ViewFolderView.kt
index 44453c253e..b8198cff21 100644
--- a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/ViewFolderView.kt
+++ b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/folder/ViewFolderView.kt
@@ -53,7 +53,7 @@ import io.element.android.libraries.designsystem.theme.components.TopAppBar
 fun ViewFolderView(
     state: ViewFolderState,
     onNavigateTo: (Item) -> Unit,
-    onBackPressed: () -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Scaffold(
@@ -61,7 +61,7 @@ fun ViewFolderView(
         topBar = {
             TopAppBar(
                 navigationIcon = {
-                    BackButton(onClick = onBackPressed)
+                    BackButton(onClick = onBackClick)
                 },
                 title = {
                     Text(
@@ -85,7 +85,7 @@ fun ViewFolderView(
                     ) { item ->
                         ItemRow(
                             item = item,
-                            onItemClicked = { onNavigateTo(item) },
+                            onItemClick = { onNavigateTo(item) },
                         )
                     }
                     if (state.content.none { it !is Item.Parent }) {
@@ -108,7 +108,7 @@ fun ViewFolderView(
 @Composable
 private fun ItemRow(
     item: Item,
-    onItemClicked: () -> Unit,
+    onItemClick: () -> Unit,
 ) {
     when (item) {
         Item.Parent -> {
@@ -121,7 +121,7 @@ private fun ItemRow(
                         style = ElementTheme.typography.fontBodyMdMedium,
                     )
                 },
-                onClick = onItemClicked,
+                onClick = onItemClick,
             )
         }
         is Item.Folder -> {
@@ -134,7 +134,7 @@ private fun ItemRow(
                         style = ElementTheme.typography.fontBodyMdMedium,
                     )
                 },
-                onClick = onItemClicked,
+                onClick = onItemClick,
             )
         }
         is Item.File -> {
@@ -148,7 +148,7 @@ private fun ItemRow(
                     )
                 },
                 trailingContent = ListItemContent.Text(item.formattedSize),
-                onClick = onItemClicked,
+                onClick = onItemClick,
             )
         }
     }
@@ -160,6 +160,6 @@ internal fun ViewFolderViewPreview(@PreviewParameter(ViewFolderStateProvider::cl
     ViewFolderView(
         state = state,
         onNavigateTo = {},
-        onBackPressed = {},
+        onBackClick = {},
     )
 }
diff --git a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/root/ViewFolderRootNode.kt b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/root/ViewFolderRootNode.kt
index 697bd76d13..9379d86f26 100644
--- a/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/root/ViewFolderRootNode.kt
+++ b/features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/root/ViewFolderRootNode.kt
@@ -97,7 +97,7 @@ class ViewFolderRootNode @AssistedInject constructor(
             }
             is NavTarget.File -> {
                 val callback: ViewFileNode.Callback = object : ViewFileNode.Callback {
-                    override fun onBackPressed() {
+                    override fun onBackClick() {
                         backstack.pop()
                     }
                 }
@@ -115,7 +115,7 @@ class ViewFolderRootNode @AssistedInject constructor(
         inputs: ViewFolderNode.Inputs,
     ): Node {
         val callback: ViewFolderNode.Callback = object : ViewFolderNode.Callback {
-            override fun onBackPressed() {
+            override fun onBackClick() {
                 onDone()
             }
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/DialogLikeBannerMolecule.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/DialogLikeBannerMolecule.kt
index 54261bfebe..1474899273 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/DialogLikeBannerMolecule.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/molecules/DialogLikeBannerMolecule.kt
@@ -45,8 +45,8 @@ import io.element.android.libraries.ui.strings.CommonStrings
 fun DialogLikeBannerMolecule(
     title: String,
     content: String,
-    onSubmitClicked: () -> Unit,
-    onDismissClicked: (() -> Unit)?,
+    onSubmitClick: () -> Unit,
+    onDismissClick: (() -> Unit)?,
     modifier: Modifier = Modifier,
 ) {
     Box(modifier = modifier.padding(horizontal = 16.dp, vertical = 8.dp)) {
@@ -68,9 +68,9 @@ fun DialogLikeBannerMolecule(
                         color = MaterialTheme.colorScheme.primary,
                         textAlign = TextAlign.Start,
                     )
-                    if (onDismissClicked != null) {
+                    if (onDismissClick != null) {
                         Icon(
-                            modifier = Modifier.clickable(onClick = onDismissClicked),
+                            modifier = Modifier.clickable(onClick = onDismissClick),
                             imageVector = CompoundIcons.Close(),
                             contentDescription = stringResource(CommonStrings.action_close)
                         )
@@ -86,7 +86,7 @@ fun DialogLikeBannerMolecule(
                     text = stringResource(CommonStrings.action_continue),
                     size = ButtonSize.Medium,
                     modifier = Modifier.fillMaxWidth(),
-                    onClick = onSubmitClicked,
+                    onClick = onSubmitClick,
                 )
             }
         }
@@ -99,7 +99,7 @@ internal fun DialogLikeBannerMoleculePreview() = ElementPreview {
     DialogLikeBannerMolecule(
         title = "Title",
         content = "Content",
-        onSubmitClicked = {},
-        onDismissClicked = {}
+        onSubmitClick = {},
+        onDismissClick = {}
     )
 }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/FlowStepPage.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/FlowStepPage.kt
index 7eb4b6d413..6d06d37e56 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/FlowStepPage.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/FlowStepPage.kt
@@ -41,7 +41,7 @@ import io.element.android.libraries.designsystem.theme.components.TopAppBar
 
 /**
  * A Page with:
- * - a top bar as TobAppBar with optional back button (displayed if [onBackClicked] is not null)
+ * - a top bar as TobAppBar with optional back button (displayed if [onBackClick] is not null)
  * - a header, as IconTitleSubtitleMolecule
  * - a content.
  * - a footer, as ButtonColumnMolecule
@@ -52,21 +52,21 @@ fun FlowStepPage(
     iconVector: ImageVector?,
     title: String,
     modifier: Modifier = Modifier,
-    onBackClicked: (() -> Unit)? = null,
+    onBackClick: (() -> Unit)? = null,
     subTitle: String? = null,
     content: @Composable () -> Unit = {},
     buttons: @Composable ColumnScope.() -> Unit = {},
 ) {
-    BackHandler(enabled = onBackClicked != null) {
-        onBackClicked?.invoke()
+    BackHandler(enabled = onBackClick != null) {
+        onBackClick?.invoke()
     }
     HeaderFooterPage(
         modifier = modifier,
         topBar = {
             TopAppBar(
                 navigationIcon = {
-                    if (onBackClicked != null) {
-                        BackButton(onClick = onBackClicked)
+                    if (onBackClick != null) {
+                        BackButton(onClick = onBackClick)
                     }
                 },
                 title = {},
@@ -94,7 +94,7 @@ fun FlowStepPage(
 @Composable
 internal fun FlowStepPagePreview() = ElementPreview {
     FlowStepPage(
-        onBackClicked = {},
+        onBackClick = {},
         title = "Title",
         subTitle = "Subtitle",
         iconVector = CompoundIcons.Computer(),
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ProgressDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ProgressDialog.kt
index 37429c9d36..e1872b0a98 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ProgressDialog.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/ProgressDialog.kt
@@ -67,7 +67,7 @@ fun ProgressDialog(
             modifier = modifier,
             text = text,
             isCancellable = isCancellable,
-            onCancelClicked = onDismissRequest,
+            onCancelClick = onDismissRequest,
             progressIndicator = {
                 when (type) {
                     is ProgressDialogType.Indeterminate -> {
@@ -98,7 +98,7 @@ private fun ProgressDialogContent(
     modifier: Modifier = Modifier,
     text: String? = null,
     isCancellable: Boolean = false,
-    onCancelClicked: () -> Unit = {},
+    onCancelClick: () -> Unit = {},
     progressIndicator: @Composable () -> Unit = {
         CircularProgressIndicator(
             color = MaterialTheme.colorScheme.primary
@@ -133,7 +133,7 @@ private fun ProgressDialogContent(
                 ) {
                     TextButton(
                         text = stringResource(id = CommonStrings.action_cancel),
-                        onClick = onCancelClicked,
+                        onClick = onCancelClick,
                     )
                 }
             }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncActionView.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncActionView.kt
index f82553d731..5bd3c045cf 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncActionView.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncActionView.kt
@@ -99,7 +99,7 @@ internal fun AsyncActionViewPreview(
             ConfirmationDialog(
                 title = "Confirmation",
                 content = "Are you sure?",
-                onSubmitClicked = {},
+                onSubmitClick = {},
                 onDismiss = {},
             )
         },
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ConfirmationDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ConfirmationDialog.kt
index 49d3c98b4f..20f2396b7a 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ConfirmationDialog.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ConfirmationDialog.kt
@@ -34,7 +34,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun ConfirmationDialog(
     content: String,
-    onSubmitClicked: () -> Unit,
+    onSubmitClick: () -> Unit,
     onDismiss: () -> Unit,
     modifier: Modifier = Modifier,
     title: String? = null,
@@ -42,8 +42,8 @@ fun ConfirmationDialog(
     cancelText: String = stringResource(id = CommonStrings.action_cancel),
     destructiveSubmit: Boolean = false,
     thirdButtonText: String? = null,
-    onCancelClicked: () -> Unit = onDismiss,
-    onThirdButtonClicked: () -> Unit = {},
+    onCancelClick: () -> Unit = onDismiss,
+    onThirdButtonClick: () -> Unit = {},
 ) {
     BasicAlertDialog(modifier = modifier, onDismissRequest = onDismiss) {
         ConfirmationDialogContent(
@@ -53,9 +53,9 @@ fun ConfirmationDialog(
             cancelText = cancelText,
             thirdButtonText = thirdButtonText,
             destructiveSubmit = destructiveSubmit,
-            onSubmitClicked = onSubmitClicked,
-            onCancelClicked = onCancelClicked,
-            onThirdButtonClicked = onThirdButtonClicked,
+            onSubmitClick = onSubmitClick,
+            onCancelClick = onCancelClick,
+            onThirdButtonClick = onThirdButtonClick,
         )
     }
 }
@@ -65,11 +65,11 @@ private fun ConfirmationDialogContent(
     content: String,
     submitText: String,
     cancelText: String,
-    onSubmitClicked: () -> Unit,
-    onCancelClicked: () -> Unit,
+    onSubmitClick: () -> Unit,
+    onCancelClick: () -> Unit,
     title: String? = null,
     thirdButtonText: String? = null,
-    onThirdButtonClicked: () -> Unit = {},
+    onThirdButtonClick: () -> Unit = {},
     destructiveSubmit: Boolean = false,
     icon: @Composable (() -> Unit)? = null,
 ) {
@@ -77,11 +77,11 @@ private fun ConfirmationDialogContent(
         title = title,
         content = content,
         submitText = submitText,
-        onSubmitClicked = onSubmitClicked,
+        onSubmitClick = onSubmitClick,
         cancelText = cancelText,
-        onCancelClicked = onCancelClicked,
+        onCancelClick = onCancelClick,
         thirdButtonText = thirdButtonText,
-        onThirdButtonClicked = onThirdButtonClicked,
+        onThirdButtonClick = onThirdButtonClick,
         destructiveSubmit = destructiveSubmit,
         icon = icon,
     )
@@ -98,9 +98,9 @@ internal fun ConfirmationDialogContentPreview() =
                 submitText = "OK",
                 cancelText = "Cancel",
                 thirdButtonText = "Disable",
-                onSubmitClicked = {},
-                onCancelClicked = {},
-                onThirdButtonClicked = {},
+                onSubmitClick = {},
+                onCancelClick = {},
+                onThirdButtonClick = {},
             )
         }
     }
@@ -114,7 +114,7 @@ internal fun ConfirmationDialogPreview() = ElementPreview {
         submitText = "OK",
         cancelText = "Cancel",
         thirdButtonText = "Disable",
-        onSubmitClicked = {},
+        onSubmitClick = {},
         onDismiss = {}
     )
 }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialog.kt
index d8e9cbe1da..977246d9df 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialog.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ErrorDialog.kt
@@ -44,7 +44,7 @@ fun ErrorDialog(
             title = title,
             content = content,
             submitText = submitText,
-            onSubmitClicked = onDismiss,
+            onSubmitClick = onDismiss,
         )
     }
 }
@@ -52,7 +52,7 @@ fun ErrorDialog(
 @Composable
 private fun ErrorDialogContent(
     content: String,
-    onSubmitClicked: () -> Unit,
+    onSubmitClick: () -> Unit,
     title: String = ErrorDialogDefaults.title,
     submitText: String = ErrorDialogDefaults.submitText,
 ) {
@@ -60,7 +60,7 @@ private fun ErrorDialogContent(
         title = title,
         content = content,
         submitText = submitText,
-        onSubmitClicked = onSubmitClicked,
+        onSubmitClick = onSubmitClick,
     )
 }
 
@@ -76,7 +76,7 @@ internal fun ErrorDialogContentPreview() {
         DialogPreview {
             ErrorDialogContent(
                 content = "Content",
-                onSubmitClicked = {},
+                onSubmitClick = {},
             )
         }
     }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ListDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ListDialog.kt
index 4e44ce805d..1d06e6409c 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ListDialog.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/ListDialog.kt
@@ -67,7 +67,7 @@ fun ListDialog(
             cancelText = cancelText,
             submitText = submitText,
             onDismissRequest = onDismissRequest,
-            onSubmitClicked = onSubmit,
+            onSubmitClick = onSubmit,
             enabled = enabled,
             listItems = listItems,
         )
@@ -78,7 +78,7 @@ fun ListDialog(
 private fun ListDialogContent(
     listItems: LazyListScope.() -> Unit,
     onDismissRequest: () -> Unit,
-    onSubmitClicked: () -> Unit,
+    onSubmitClick: () -> Unit,
     cancelText: String,
     submitText: String,
     title: String? = null,
@@ -90,8 +90,8 @@ private fun ListDialogContent(
         subtitle = subtitle,
         cancelText = cancelText,
         submitText = submitText,
-        onCancelClicked = onDismissRequest,
-        onSubmitClicked = onSubmitClicked,
+        onCancelClick = onDismissRequest,
+        onSubmitClick = onSubmitClick,
         enabled = enabled,
         applyPaddingToContents = false,
     ) {
@@ -109,15 +109,15 @@ internal fun ListDialogContentPreview() {
             ListDialogContent(
                 listItems = {
                     item {
-                        TextFieldListItem(placeholder = "Text input", text = "", onTextChanged = {})
+                        TextFieldListItem(placeholder = "Text input", text = "", onTextChange = {})
                     }
                     item {
-                        TextFieldListItem(placeholder = "Another text input", text = "", onTextChanged = {})
+                        TextFieldListItem(placeholder = "Another text input", text = "", onTextChange = {})
                     }
                 },
                 title = "Dialog title",
                 onDismissRequest = {},
-                onSubmitClicked = {},
+                onSubmitClick = {},
                 cancelText = "Cancel",
                 submitText = "Save",
             )
@@ -131,10 +131,10 @@ internal fun ListDialogPreview() = ElementPreview {
     ListDialog(
         listItems = {
             item {
-                TextFieldListItem(placeholder = "Text input", text = "", onTextChanged = {})
+                TextFieldListItem(placeholder = "Text input", text = "", onTextChange = {})
             }
             item {
-                TextFieldListItem(placeholder = "Another text input", text = "", onTextChanged = {})
+                TextFieldListItem(placeholder = "Another text input", text = "", onTextChange = {})
             }
         },
         title = "Dialog title",
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/MultipleSelectionDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/MultipleSelectionDialog.kt
index 183ab92522..74d38f99bc 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/MultipleSelectionDialog.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/MultipleSelectionDialog.kt
@@ -44,7 +44,7 @@ import kotlinx.collections.immutable.persistentListOf
 @Composable
 fun MultipleSelectionDialog(
     options: ImmutableList<ListOption>,
-    onConfirmClicked: (List<Int>) -> Unit,
+    onConfirmClick: (List<Int>) -> Unit,
     onDismissRequest: () -> Unit,
     modifier: Modifier = Modifier,
     confirmButtonTitle: String = stringResource(CommonStrings.action_confirm),
@@ -70,7 +70,7 @@ fun MultipleSelectionDialog(
             subtitle = decoratedSubtitle,
             options = options,
             confirmButtonTitle = confirmButtonTitle,
-            onConfirmClicked = onConfirmClicked,
+            onConfirmClick = onConfirmClick,
             dismissButtonTitle = dismissButtonTitle,
             onDismissRequest = onDismissRequest,
             initialSelected = initialSelection,
@@ -82,7 +82,7 @@ fun MultipleSelectionDialog(
 private fun MultipleSelectionDialogContent(
     options: ImmutableList<ListOption>,
     confirmButtonTitle: String,
-    onConfirmClicked: (List<Int>) -> Unit,
+    onConfirmClick: (List<Int>) -> Unit,
     dismissButtonTitle: String,
     onDismissRequest: () -> Unit,
     title: String? = null,
@@ -97,11 +97,11 @@ private fun MultipleSelectionDialogContent(
         title = title,
         subtitle = subtitle,
         submitText = confirmButtonTitle,
-        onSubmitClicked = {
-            onConfirmClicked(selectedOptionIndexes.toList())
+        onSubmitClick = {
+            onConfirmClick(selectedOptionIndexes.toList())
         },
         cancelText = dismissButtonTitle,
-        onCancelClicked = onDismissRequest,
+        onCancelClick = onDismissRequest,
         applyPaddingToContents = false,
     ) {
         LazyColumn {
@@ -138,7 +138,7 @@ internal fun MultipleSelectionDialogContentPreview() {
             MultipleSelectionDialogContent(
                 title = "Dialog title",
                 options = options,
-                onConfirmClicked = {},
+                onConfirmClick = {},
                 onDismissRequest = {},
                 confirmButtonTitle = "Save",
                 dismissButtonTitle = "Cancel",
@@ -159,7 +159,7 @@ internal fun MultipleSelectionDialogPreview() = ElementPreview {
     MultipleSelectionDialog(
         title = "Dialog title",
         options = options,
-        onConfirmClicked = {},
+        onConfirmClick = {},
         onDismissRequest = {},
         confirmButtonTitle = "Save",
         dismissButtonTitle = "Cancel",
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/RetryDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/RetryDialog.kt
index e3884c58dc..d46b2c932b 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/RetryDialog.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/RetryDialog.kt
@@ -66,9 +66,9 @@ private fun RetryDialogContent(
         title = title,
         content = content,
         submitText = retryText,
-        onSubmitClicked = onRetry,
+        onSubmitClick = onRetry,
         cancelText = dismissText,
-        onCancelClicked = onDismiss,
+        onCancelClick = onDismiss,
     )
 }
 
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/SingleSelectionDialog.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/SingleSelectionDialog.kt
index a23a8068a9..813e4d92b9 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/SingleSelectionDialog.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/dialogs/SingleSelectionDialog.kt
@@ -41,7 +41,7 @@ import kotlinx.collections.immutable.persistentListOf
 @Composable
 fun SingleSelectionDialog(
     options: ImmutableList<ListOption>,
-    onOptionSelected: (Int) -> Unit,
+    onSelectOption: (Int) -> Unit,
     onDismissRequest: () -> Unit,
     modifier: Modifier = Modifier,
     title: String? = null,
@@ -65,7 +65,7 @@ fun SingleSelectionDialog(
             title = title,
             subtitle = decoratedSubtitle,
             options = options,
-            onOptionSelected = onOptionSelected,
+            onOptionClick = onSelectOption,
             dismissButtonTitle = dismissButtonTitle,
             onDismissRequest = onDismissRequest,
             initialSelection = initialSelection,
@@ -76,7 +76,7 @@ fun SingleSelectionDialog(
 @Composable
 private fun SingleSelectionDialogContent(
     options: ImmutableList<ListOption>,
-    onOptionSelected: (Int) -> Unit,
+    onOptionClick: (Int) -> Unit,
     dismissButtonTitle: String,
     onDismissRequest: () -> Unit,
     title: String? = null,
@@ -87,7 +87,7 @@ private fun SingleSelectionDialogContent(
         title = title,
         subtitle = subtitle,
         submitText = dismissButtonTitle,
-        onSubmitClicked = onDismissRequest,
+        onSubmitClick = onDismissRequest,
         applyPaddingToContents = false,
     ) {
         LazyColumn {
@@ -96,7 +96,7 @@ private fun SingleSelectionDialogContent(
                     headline = option.title,
                     supportingText = option.subtitle,
                     selected = index == initialSelection,
-                    onSelected = { onOptionSelected(index) },
+                    onSelect = { onOptionClick(index) },
                     compactLayout = true,
                     modifier = Modifier.padding(start = 8.dp)
                 )
@@ -118,7 +118,7 @@ internal fun SingleSelectionDialogContentPreview() {
             SingleSelectionDialogContent(
                 title = "Dialog title",
                 options = options,
-                onOptionSelected = {},
+                onOptionClick = {},
                 onDismissRequest = {},
                 dismissButtonTitle = "Cancel",
                 initialSelection = 0
@@ -138,7 +138,7 @@ internal fun SingleSelectionDialogPreview() = ElementPreview {
     SingleSelectionDialog(
         title = "Dialog title",
         options = options,
-        onOptionSelected = {},
+        onSelectOption = {},
         onDismissRequest = {},
         dismissButtonTitle = "Cancel",
         initialSelection = 0
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/MultipleSelectionListItem.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/MultipleSelectionListItem.kt
index 8a0bc1b4a9..638930ab24 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/MultipleSelectionListItem.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/MultipleSelectionListItem.kt
@@ -41,7 +41,7 @@ import kotlinx.collections.immutable.toImmutableList
 fun MultipleSelectionListItem(
     headline: String,
     options: ImmutableList<ListOption>,
-    onSelectionChanged: (List<Int>) -> Unit,
+    onSelectionChange: (List<Int>) -> Unit,
     resultFormatter: (List<Int>) -> String?,
     modifier: Modifier = Modifier,
     supportingText: String? = null,
@@ -87,9 +87,9 @@ fun MultipleSelectionListItem(
         MultipleSelectionDialog(
             title = headline,
             options = options,
-            onConfirmClicked = { newSelectedIndexes ->
+            onConfirmClick = { newSelectedIndexes ->
                 if (newSelectedIndexes != selectedIndexes.toList()) {
-                    onSelectionChanged(newSelectedIndexes)
+                    onSelectionChange(newSelectedIndexes)
                     selectedIndexes.clear()
                     selectedIndexes.addAll(newSelectedIndexes)
                 }
@@ -109,7 +109,7 @@ internal fun MutipleSelectionListItemPreview() {
         MultipleSelectionListItem(
             headline = "Headline",
             options = options,
-            onSelectionChanged = {},
+            onSelectionChange = {},
             supportingText = "Supporting text",
             resultFormatter = { result -> formatResult(result, options) },
         )
@@ -125,7 +125,7 @@ internal fun MutipleSelectionListItemSelectedPreview() {
         MultipleSelectionListItem(
             headline = "Headline",
             options = options,
-            onSelectionChanged = {},
+            onSelectionChange = {},
             supportingText = "Supporting text",
             resultFormatter = {
                 val selectedValues = formatResult(it, options)
@@ -145,7 +145,7 @@ internal fun MutipleSelectionListItemSelectedTrailingContentPreview() {
         MultipleSelectionListItem(
             headline = "Headline",
             options = options,
-            onSelectionChanged = {},
+            onSelectionChange = {},
             supportingText = "Supporting text",
             resultFormatter = { selected.size.toString() },
             displayResultInTrailingContent = true,
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/RadioButtonListItem.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/RadioButtonListItem.kt
index fff038121e..fcef47734b 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/RadioButtonListItem.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/RadioButtonListItem.kt
@@ -26,7 +26,7 @@ import io.element.android.libraries.designsystem.theme.components.Text
 fun RadioButtonListItem(
     headline: String,
     selected: Boolean,
-    onSelected: () -> Unit,
+    onSelect: () -> Unit,
     modifier: Modifier = Modifier,
     supportingText: String? = null,
     trailingContent: ListItemContent? = null,
@@ -42,6 +42,6 @@ fun RadioButtonListItem(
         trailingContent = trailingContent,
         style = style,
         enabled = enabled,
-        onClick = onSelected,
+        onClick = onSelect,
     )
 }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/SingleSelectionListItem.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/SingleSelectionListItem.kt
index d119025b9b..82887a2430 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/SingleSelectionListItem.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/SingleSelectionListItem.kt
@@ -42,7 +42,7 @@ import kotlin.time.Duration.Companion.seconds
 fun SingleSelectionListItem(
     headline: String,
     options: ImmutableList<ListOption>,
-    onSelectionChanged: (Int) -> Unit,
+    onSelectionChange: (Int) -> Unit,
     modifier: Modifier = Modifier,
     supportingText: String? = null,
     leadingContent: ListItemContent? = null,
@@ -86,9 +86,9 @@ fun SingleSelectionListItem(
         SingleSelectionDialog(
             title = headline,
             options = options,
-            onOptionSelected = { index ->
+            onSelectOption = { index ->
                 if (index != selectedIndex) {
-                    onSelectionChanged(index)
+                    onSelectionChange(index)
                     selectedIndex = index
                 }
                 // Delay hiding the dialog for a bit so the new state is displayed in it before being dismissed
@@ -110,7 +110,7 @@ internal fun SingleSelectionListItemPreview() {
         SingleSelectionListItem(
             headline = "Headline",
             options = listOptionOf("Option 1", "Option 2", "Option 3"),
-            onSelectionChanged = {},
+            onSelectionChange = {},
         )
     }
 }
@@ -123,7 +123,7 @@ internal fun SingleSelectionListItemUnselectedWithSupportingTextPreview() {
             headline = "Headline",
             options = listOptionOf("Option 1", "Option 2", "Option 3"),
             supportingText = "Supporting text",
-            onSelectionChanged = {},
+            onSelectionChange = {},
         )
     }
 }
@@ -136,7 +136,7 @@ internal fun SingleSelectionListItemSelectedInSupportingTextPreview() {
             headline = "Headline",
             options = listOptionOf("Option 1", "Option 2", "Option 3"),
             supportingText = "Supporting text",
-            onSelectionChanged = {},
+            onSelectionChange = {},
             selected = 1,
         )
     }
@@ -150,7 +150,7 @@ internal fun SingleSelectionListItemSelectedInTrailingContentPreview() {
             headline = "Headline",
             options = listOptionOf("Option 1", "Option 2", "Option 3"),
             supportingText = "Supporting text",
-            onSelectionChanged = {},
+            onSelectionChange = {},
             selected = 1,
             displayResultInTrailingContent = true,
         )
@@ -165,7 +165,7 @@ internal fun SingleSelectionListItemCustomFormattertPreview() {
             headline = "Headline",
             options = listOptionOf("Option 1", "Option 2", "Option 3"),
             supportingText = "Supporting text",
-            onSelectionChanged = {},
+            onSelectionChange = {},
             resultFormatter = { "Selected index: $it" },
             selected = 1,
             displayResultInTrailingContent = true,
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/TextFieldListItem.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/TextFieldListItem.kt
index f0e9458a02..770d745b77 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/TextFieldListItem.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/list/TextFieldListItem.kt
@@ -34,7 +34,7 @@ import io.element.android.libraries.designsystem.theme.components.Text
 fun TextFieldListItem(
     placeholder: String?,
     text: String,
-    onTextChanged: (String) -> Unit,
+    onTextChange: (String) -> Unit,
     modifier: Modifier = Modifier,
     error: String? = null,
     maxLines: Int = 1,
@@ -45,7 +45,7 @@ fun TextFieldListItem(
 
     OutlinedTextField(
         value = text,
-        onValueChange = { onTextChanged(it) },
+        onValueChange = { onTextChange(it) },
         placeholder = placeholder?.let { @Composable { Text(it) } },
         colors = OutlinedTextFieldDefaults.colors(
             disabledBorderColor = Color.Transparent,
@@ -68,7 +68,7 @@ fun TextFieldListItem(
 fun TextFieldListItem(
     placeholder: String?,
     text: TextFieldValue,
-    onTextChanged: (TextFieldValue) -> Unit,
+    onTextChange: (TextFieldValue) -> Unit,
     modifier: Modifier = Modifier,
     error: String? = null,
     maxLines: Int = 1,
@@ -79,7 +79,7 @@ fun TextFieldListItem(
 
     OutlinedTextField(
         value = text,
-        onValueChange = { onTextChanged(it) },
+        onValueChange = { onTextChange(it) },
         placeholder = placeholder?.let { @Composable { Text(it) } },
         colors = OutlinedTextFieldDefaults.colors(
             disabledBorderColor = Color.Transparent,
@@ -105,7 +105,7 @@ internal fun TextFieldListItemEmptyPreview() {
         TextFieldListItem(
             placeholder = "Placeholder",
             text = "",
-            onTextChanged = {},
+            onTextChange = {},
         )
     }
 }
@@ -117,7 +117,7 @@ internal fun TextFieldListItemPreview() {
         TextFieldListItem(
             placeholder = "Placeholder",
             text = "Text",
-            onTextChanged = {},
+            onTextChange = {},
         )
     }
 }
@@ -129,7 +129,7 @@ internal fun TextFieldListItemTextFieldValuePreview() {
         TextFieldListItem(
             placeholder = "Placeholder",
             text = TextFieldValue("Text field value"),
-            onTextChanged = {},
+            onTextChange = {},
         )
     }
 }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferencePage.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferencePage.kt
index b02cf157d8..e2dca9641d 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferencePage.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferencePage.kt
@@ -44,7 +44,7 @@ import io.element.android.libraries.designsystem.theme.components.TopAppBar
 @Composable
 fun PreferencePage(
     title: String,
-    onBackPressed: () -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
     snackbarHost: @Composable () -> Unit = {},
     content: @Composable ColumnScope.() -> Unit,
@@ -58,7 +58,7 @@ fun PreferencePage(
         topBar = {
             PreferenceTopAppBar(
                 title = title,
-                onBackPressed = onBackPressed,
+                onBackClick = onBackClick,
             )
         },
         snackbarHost = snackbarHost,
@@ -79,11 +79,11 @@ fun PreferencePage(
 @Composable
 private fun PreferenceTopAppBar(
     title: String,
-    onBackPressed: () -> Unit,
+    onBackClick: () -> Unit,
 ) {
     TopAppBar(
         navigationIcon = {
-            BackButton(onClick = onBackPressed)
+            BackButton(onClick = onBackClick)
         },
         title = {
             Text(
@@ -101,7 +101,7 @@ private fun PreferenceTopAppBar(
 internal fun PreferencePagePreview() = ElementPreview {
     PreferencePage(
         title = "Preference screen",
-        onBackPressed = {},
+        onBackClick = {},
     ) {
         PreferenceCategory(
             title = "Category title",
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceTextField.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceTextField.kt
index 5b319e41d8..78cf40030e 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceTextField.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/preferences/PreferenceTextField.kt
@@ -114,7 +114,7 @@ private fun TextFieldDialog(
             TextFieldListItem(
                 placeholder = placeholder.orEmpty(),
                 text = textFieldContents,
-                onTextChanged = {
+                onTextChange = {
                     error = if (!validation(it.text)) onValidationErrorMessage else null
                     textFieldContents = it
                 },
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/AlertDialogContent.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/AlertDialogContent.kt
index 4927a195e0..88d902f579 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/AlertDialogContent.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/AlertDialogContent.kt
@@ -54,14 +54,14 @@ import kotlin.math.max
 internal fun SimpleAlertDialogContent(
     content: String,
     submitText: String,
-    onSubmitClicked: () -> Unit,
+    onSubmitClick: () -> Unit,
     title: String? = null,
     subtitle: @Composable (() -> Unit)? = null,
     destructiveSubmit: Boolean = false,
     cancelText: String? = null,
-    onCancelClicked: () -> Unit = {},
+    onCancelClick: () -> Unit = {},
     thirdButtonText: String? = null,
-    onThirdButtonClicked: () -> Unit = {},
+    onThirdButtonClick: () -> Unit = {},
     applyPaddingToContents: Boolean = true,
     icon: @Composable (() -> Unit)? = null,
 ) {
@@ -77,11 +77,11 @@ internal fun SimpleAlertDialogContent(
         },
         submitText = submitText,
         destructiveSubmit = destructiveSubmit,
-        onSubmitClicked = onSubmitClicked,
+        onSubmitClick = onSubmitClick,
         cancelText = cancelText,
-        onCancelClicked = onCancelClicked,
+        onCancelClick = onCancelClick,
         thirdButtonText = thirdButtonText,
-        onThirdButtonClicked = onThirdButtonClicked,
+        onThirdButtonClick = onThirdButtonClick,
         applyPaddingToContents = applyPaddingToContents,
     )
 }
@@ -89,14 +89,14 @@ internal fun SimpleAlertDialogContent(
 @Composable
 internal fun SimpleAlertDialogContent(
     submitText: String,
-    onSubmitClicked: () -> Unit,
+    onSubmitClick: () -> Unit,
     title: String? = null,
     subtitle: @Composable (() -> Unit)? = null,
     destructiveSubmit: Boolean = false,
     cancelText: String? = null,
-    onCancelClicked: () -> Unit = {},
+    onCancelClick: () -> Unit = {},
     thirdButtonText: String? = null,
-    onThirdButtonClicked: () -> Unit = {},
+    onThirdButtonClick: () -> Unit = {},
     applyPaddingToContents: Boolean = true,
     enabled: Boolean = true,
     icon: @Composable (() -> Unit)? = null,
@@ -115,7 +115,7 @@ internal fun SimpleAlertDialogContent(
                         modifier = Modifier.testTag(TestTags.dialogNeutral),
                         text = thirdButtonText,
                         size = ButtonSize.Medium,
-                        onClick = onThirdButtonClicked,
+                        onClick = onThirdButtonClick,
                     )
                 }
                 if (cancelText != null) {
@@ -123,14 +123,14 @@ internal fun SimpleAlertDialogContent(
                         modifier = Modifier.testTag(TestTags.dialogNegative),
                         text = cancelText,
                         size = ButtonSize.Medium,
-                        onClick = onCancelClicked,
+                        onClick = onCancelClick,
                     )
                     Button(
                         modifier = Modifier.testTag(TestTags.dialogPositive),
                         text = submitText,
                         enabled = enabled,
                         size = ButtonSize.Medium,
-                        onClick = onSubmitClicked,
+                        onClick = onSubmitClick,
                         destructive = destructiveSubmit,
                     )
                 } else {
@@ -139,7 +139,7 @@ internal fun SimpleAlertDialogContent(
                         text = submitText,
                         enabled = enabled,
                         size = ButtonSize.Medium,
-                        onClick = onSubmitClicked,
+                        onClick = onSubmitClick,
                         destructive = destructiveSubmit,
                     )
                 }
@@ -444,7 +444,7 @@ internal fun DialogWithTitleIconAndOkButtonPreview() {
                 content = "A dialog is a type of modal window that appears in front of app content to provide critical information," +
                     " or prompt for a decision to be made. Learn more",
                 submitText = "OK",
-                onSubmitClicked = {},
+                onSubmitClick = {},
             )
         }
     }
@@ -461,7 +461,7 @@ internal fun DialogWithTitleAndOkButtonPreview() {
                 content = "A dialog is a type of modal window that appears in front of app content to provide critical information," +
                     " or prompt for a decision to be made. Learn more",
                 submitText = "OK",
-                onSubmitClicked = {},
+                onSubmitClick = {},
             )
         }
     }
@@ -477,7 +477,7 @@ internal fun DialogWithOnlyMessageAndOkButtonPreview() {
                 content = "A dialog is a type of modal window that appears in front of app content to provide critical information," +
                     " or prompt for a decision to be made. Learn more",
                 submitText = "OK",
-                onSubmitClicked = {},
+                onSubmitClick = {},
             )
         }
     }
@@ -494,7 +494,7 @@ internal fun DialogWithDestructiveButtonPreview() {
                 cancelText = "Cancel",
                 submitText = "Delete",
                 destructiveSubmit = true,
-                onSubmitClicked = {},
+                onSubmitClick = {},
             )
         }
     }
@@ -511,7 +511,7 @@ internal fun DialogWithThirdButtonPreview() {
                 cancelText = "Cancel",
                 submitText = "Delete",
                 thirdButtonText = "Other",
-                onSubmitClicked = {},
+                onSubmitClick = {},
             )
         }
     }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Slider.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Slider.kt
index 65f43bb250..182ab961d6 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Slider.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/Slider.kt
@@ -39,7 +39,7 @@ fun Slider(
     valueRange: ClosedFloatingPointRange<Float> = 0f..1f,
     // @IntRange(from = 0)
     steps: Int = 0,
-    onValueChangeFinished: (() -> Unit)? = null,
+    onValueChangeFinish: (() -> Unit)? = null,
     colors: SliderColors = SliderDefaults.colors(),
     interactionSource: MutableInteractionSource = remember { MutableInteractionSource() }
 ) {
@@ -50,7 +50,7 @@ fun Slider(
         enabled = enabled,
         valueRange = valueRange,
         steps = steps,
-        onValueChangeFinished = onValueChangeFinished,
+        onValueChangeFinished = onValueChangeFinish,
         colors = colors,
         interactionSource = interactionSource,
     )
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AvatarActionBottomSheet.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AvatarActionBottomSheet.kt
index 84caa006d2..41aecd16f3 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AvatarActionBottomSheet.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/AvatarActionBottomSheet.kt
@@ -51,7 +51,7 @@ import kotlinx.collections.immutable.persistentListOf
 fun AvatarActionBottomSheet(
     actions: ImmutableList<AvatarAction>,
     isVisible: Boolean,
-    onActionSelected: (action: AvatarAction) -> Unit,
+    onSelectAction: (action: AvatarAction) -> Unit,
     onDismiss: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
@@ -64,8 +64,8 @@ fun AvatarActionBottomSheet(
         sheetState.hide(coroutineScope, then = { onDismiss() })
     }
 
-    fun onItemActionClicked(itemAction: AvatarAction) {
-        onActionSelected(itemAction)
+    fun onItemActionClick(itemAction: AvatarAction) {
+        onSelectAction(itemAction)
         sheetState.hide(coroutineScope, then = { onDismiss() })
     }
 
@@ -79,7 +79,7 @@ fun AvatarActionBottomSheet(
         ) {
             AvatarActionBottomSheetContent(
                 actions = actions,
-                onActionClicked = ::onItemActionClicked,
+                onActionClick = ::onItemActionClick,
                 modifier = Modifier
                     .navigationBarsPadding()
                     .imePadding()
@@ -92,7 +92,7 @@ fun AvatarActionBottomSheet(
 private fun AvatarActionBottomSheetContent(
     actions: ImmutableList<AvatarAction>,
     modifier: Modifier = Modifier,
-    onActionClicked: (AvatarAction) -> Unit = { },
+    onActionClick: (AvatarAction) -> Unit = { },
 ) {
     LazyColumn(
         modifier = modifier.fillMaxWidth()
@@ -101,7 +101,7 @@ private fun AvatarActionBottomSheetContent(
             items = actions,
         ) { action ->
             ListItem(
-                modifier = Modifier.clickable { onActionClicked(action) },
+                modifier = Modifier.clickable { onActionClick(action) },
                 headlineContent = {
                     Text(
                         text = stringResource(action.titleResId),
@@ -125,7 +125,7 @@ internal fun AvatarActionBottomSheetPreview() = ElementPreview {
     AvatarActionBottomSheet(
         actions = persistentListOf(AvatarAction.TakePhoto, AvatarAction.ChoosePhoto, AvatarAction.Remove),
         isVisible = true,
-        onActionSelected = { },
+        onSelectAction = { },
         onDismiss = { },
     )
 }
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableAvatarView.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableAvatarView.kt
index ad9babb4a4..c9dc2c7c5a 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableAvatarView.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableAvatarView.kt
@@ -52,7 +52,7 @@ fun EditableAvatarView(
     displayName: String?,
     avatarUrl: Uri?,
     avatarSize: AvatarSize,
-    onAvatarClicked: () -> Unit,
+    onAvatarClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Column(
@@ -64,7 +64,7 @@ fun EditableAvatarView(
                 .size(avatarSize.dp)
                 .clickable(
                     interactionSource = remember { MutableInteractionSource() },
-                    onClick = onAvatarClicked,
+                    onClick = onAvatarClick,
                     indication = rememberRipple(bounded = false),
                 )
                 .testTag(TestTags.editAvatar)
@@ -113,7 +113,7 @@ internal fun EditableAvatarViewPreview(
         displayName = "A room",
         avatarUrl = uri,
         avatarSize = AvatarSize.EditRoomDetails,
-        onAvatarClicked = {},
+        onAvatarClick = {},
     )
 }
 
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt
index c95f3e4cde..7f8f9f2f56 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt
@@ -50,7 +50,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
 @Composable
 fun SelectedRoom(
     roomSummary: RoomSummaryDetails,
-    onRoomRemoved: (RoomSummaryDetails) -> Unit,
+    onRemoveRoom: (RoomSummaryDetails) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Box(
@@ -78,7 +78,7 @@ fun SelectedRoom(
                 .clickable(
                     indication = rememberRipple(),
                     interactionSource = remember { MutableInteractionSource() },
-                    onClick = { onRoomRemoved(roomSummary) }
+                    onClick = { onRemoveRoom(roomSummary) }
                 ),
         ) {
             Icon(
@@ -98,6 +98,6 @@ internal fun SelectedRoomPreview(
 ) = ElementPreview {
     SelectedRoom(
         roomSummary = roomSummaryDetails,
-        onRoomRemoved = {},
+        onRemoveRoom = {},
     )
 }
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUser.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUser.kt
index 418e2ca2ef..8e94763f3c 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUser.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUser.kt
@@ -53,7 +53,7 @@ import io.element.android.libraries.ui.strings.CommonStrings
 fun SelectedUser(
     matrixUser: MatrixUser,
     canRemove: Boolean,
-    onUserRemoved: (MatrixUser) -> Unit,
+    onUserRemove: (MatrixUser) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Box(
@@ -83,7 +83,7 @@ fun SelectedUser(
                     .clickable(
                         indication = rememberRipple(),
                         interactionSource = remember { MutableInteractionSource() },
-                        onClick = { onUserRemoved(matrixUser) }
+                        onClick = { onUserRemove(matrixUser) }
                     ),
             ) {
                 Icon(
@@ -103,7 +103,7 @@ internal fun SelectedUserPreview() = ElementPreview {
     SelectedUser(
         aMatrixUser(displayName = "John Doe"),
         canRemove = true,
-        onUserRemoved = {},
+        onUserRemove = {},
     )
 }
 
@@ -113,6 +113,6 @@ internal fun SelectedUserCannotRemovePreview() = ElementPreview {
     SelectedUser(
         aMatrixUser(),
         canRemove = false,
-        onUserRemoved = {},
+        onUserRemove = {},
     )
 }
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUsersRowList.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUsersRowList.kt
index 065f23a661..9299f4eecc 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUsersRowList.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUsersRowList.kt
@@ -48,7 +48,7 @@ import kotlin.math.floor
 @Composable
 fun SelectedUsersRowList(
     selectedUsers: ImmutableList<MatrixUser>,
-    onUserRemoved: (MatrixUser) -> Unit,
+    onUserRemove: (MatrixUser) -> Unit,
     modifier: Modifier = Modifier,
     autoScroll: Boolean = false,
     canDeselect: (MatrixUser) -> Boolean = { true },
@@ -112,7 +112,7 @@ fun SelectedUsersRowList(
                     SelectedUser(
                         matrixUser = selectedUser,
                         canRemove = canDeselect(selectedUser),
-                        onUserRemoved = onUserRemoved,
+                        onUserRemove = onUserRemove,
                     )
                 },
                 measurePolicy = { measurables, constraints ->
@@ -137,7 +137,7 @@ internal fun SelectedUsersRowListPreview() = ElementPreview {
         // Two users that will be visible with no scrolling
         SelectedUsersRowList(
             selectedUsers = aMatrixUserList().take(2).toImmutableList(),
-            onUserRemoved = {},
+            onUserRemove = {},
             modifier = Modifier
                 .width(200.dp)
                 .border(1.dp, Color.Red)
@@ -147,7 +147,7 @@ internal fun SelectedUsersRowListPreview() = ElementPreview {
         for (i in 0..5) {
             SelectedUsersRowList(
                 selectedUsers = aMatrixUserList().take(6).toImmutableList(),
-                onUserRemoved = {},
+                onUserRemove = {},
                 modifier = Modifier
                     .width((200 + i * 20).dp)
                     .border(1.dp, Color.Red)
diff --git a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/viewer/MediaViewerNode.kt b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/viewer/MediaViewerNode.kt
index 09c8397f50..8504158906 100644
--- a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/viewer/MediaViewerNode.kt
+++ b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/viewer/MediaViewerNode.kt
@@ -56,7 +56,7 @@ open class MediaViewerNode @AssistedInject constructor(
             MediaViewerView(
                 state = state,
                 modifier = modifier,
-                onBackPressed = this::navigateUp
+                onBackClick = this::navigateUp
             )
         }
     }
diff --git a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/viewer/MediaViewerView.kt b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/viewer/MediaViewerView.kt
index 1e8261d431..ac9db95644 100644
--- a/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/viewer/MediaViewerView.kt
+++ b/libraries/mediaviewer/api/src/main/kotlin/io/element/android/libraries/mediaviewer/api/viewer/MediaViewerView.kt
@@ -84,7 +84,7 @@ import kotlin.time.Duration
 @Composable
 fun MediaViewerView(
     state: MediaViewerState,
-    onBackPressed: () -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     val snackbarHostState = rememberSnackbarHostState(snackbarMessage = state.snackbarMessage)
@@ -99,9 +99,9 @@ fun MediaViewerView(
             showOverlay = showOverlay,
             state = state,
             onDismiss = {
-                onBackPressed()
+                onBackClick()
             },
-            onShowOverlayChanged = {
+            onShowOverlayChange = {
                 showOverlay = it
             }
         )
@@ -109,7 +109,7 @@ fun MediaViewerView(
             MediaViewerTopBar(
                 actionsEnabled = state.downloadedMedia is AsyncData.Success,
                 mimeType = state.mediaInfo.mimeType,
-                onBackPressed = onBackPressed,
+                onBackClick = onBackClick,
                 canDownload = state.canDownload,
                 canShare = state.canShare,
                 eventSink = state.eventSink
@@ -123,7 +123,7 @@ private fun MediaViewerPage(
     showOverlay: Boolean,
     state: MediaViewerState,
     onDismiss: () -> Unit,
-    onShowOverlayChanged: (Boolean) -> Unit,
+    onShowOverlayChange: (Boolean) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     fun onRetry() {
@@ -135,7 +135,7 @@ private fun MediaViewerPage(
     }
 
     val currentShowOverlay by rememberUpdatedState(showOverlay)
-    val currentOnShowOverlayChanged by rememberUpdatedState(onShowOverlayChanged)
+    val currentOnShowOverlayChange by rememberUpdatedState(onShowOverlayChange)
     val flickState = rememberFlickToDismissState(dismissThresholdRatio = 0.1f, rotateOnDrag = false)
 
     DismissFlickEffects(
@@ -145,7 +145,7 @@ private fun MediaViewerPage(
             onDismiss()
         },
         onDragging = {
-            currentOnShowOverlayChanged(false)
+            currentOnShowOverlayChange(false)
         }
     )
 
@@ -171,7 +171,7 @@ private fun MediaViewerPage(
 
                 LaunchedEffect(playableState) {
                     if (playableState is PlayableState.Playable) {
-                        currentOnShowOverlayChanged(playableState.isShowingControls)
+                        currentOnShowOverlayChange(playableState.isShowingControls)
                     }
                 }
 
@@ -182,7 +182,7 @@ private fun MediaViewerPage(
                     mediaInfo = state.mediaInfo,
                     onClick = {
                         if (playableState is PlayableState.NotPlayable) {
-                            currentOnShowOverlayChanged(!currentShowOverlay)
+                            currentOnShowOverlayChange(!currentShowOverlay)
                         }
                     },
                 )
@@ -263,7 +263,7 @@ private fun MediaViewerTopBar(
     canDownload: Boolean,
     canShare: Boolean,
     mimeType: String,
-    onBackPressed: () -> Unit,
+    onBackClick: () -> Unit,
     eventSink: (MediaViewerEvents) -> Unit,
 ) {
     TopAppBar(
@@ -271,7 +271,7 @@ private fun MediaViewerTopBar(
         colors = TopAppBarDefaults.topAppBarColors(
             containerColor = Color.Transparent.copy(0.6f),
         ),
-        navigationIcon = { BackButton(onClick = onBackPressed) },
+        navigationIcon = { BackButton(onClick = onBackClick) },
         actions = {
             IconButton(
                 enabled = actionsEnabled,
@@ -386,6 +386,6 @@ private fun backgroundColorFor(flickState: FlickToDismissState): Color {
 internal fun MediaViewerViewPreview(@PreviewParameter(MediaViewerStateProvider::class) state: MediaViewerState) = ElementPreviewDark {
     MediaViewerView(
         state = state,
-        onBackPressed = {}
+        onBackClick = {}
     )
 }
diff --git a/libraries/mediaviewer/api/src/test/kotlin/io/element/android/libraries/mediaviewer/api/viewer/MediaViewerViewTest.kt b/libraries/mediaviewer/api/src/test/kotlin/io/element/android/libraries/mediaviewer/api/viewer/MediaViewerViewTest.kt
index e6c210a19d..38c41fac4b 100644
--- a/libraries/mediaviewer/api/src/test/kotlin/io/element/android/libraries/mediaviewer/api/viewer/MediaViewerViewTest.kt
+++ b/libraries/mediaviewer/api/src/test/kotlin/io/element/android/libraries/mediaviewer/api/viewer/MediaViewerViewTest.kt
@@ -53,7 +53,7 @@ class MediaViewerViewTest {
                 aMediaViewerState(
                     eventSink = eventsRecorder
                 ),
-                onBackPressed = callback,
+                onBackClick = callback,
             )
             rule.pressBack()
         }
@@ -127,7 +127,7 @@ class MediaViewerViewTest {
                     mediaInfo = anImageMediaInfo(),
                     eventSink = eventsRecorder
                 ),
-                onBackPressed = callback,
+                onBackClick = callback,
             )
             val imageContentDescription = rule.activity.getString(CommonStrings.common_image)
             rule.onNodeWithContentDescription(imageContentDescription).performTouchInput { swipeDown() }
@@ -166,12 +166,12 @@ class MediaViewerViewTest {
 
 private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setMediaViewerView(
     state: MediaViewerState,
-    onBackPressed: () -> Unit = EnsureNeverCalled(),
+    onBackClick: () -> Unit = EnsureNeverCalled(),
 ) {
     setContent {
         MediaViewerView(
             state = state,
-            onBackPressed = onBackPressed,
+            onBackClick = onBackClick,
         )
     }
 }
diff --git a/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsView.kt b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsView.kt
index 38b40e6403..93800c55be 100644
--- a/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsView.kt
+++ b/libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsView.kt
@@ -38,7 +38,7 @@ fun PermissionsView(
         title = stringResource(id = CommonStrings.common_permission),
         content = state.permission.toDialogContent(),
         submitText = stringResource(id = CommonStrings.action_open_settings),
-        onSubmitClicked = {
+        onSubmitClick = {
             state.eventSink.invoke(PermissionsEvents.OpenSystemSettingAndCloseDialog)
         },
         onDismiss = { state.eventSink.invoke(PermissionsEvents.CloseDialog) },
diff --git a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectView.kt b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectView.kt
index 77df71c268..438cb8d4e6 100644
--- a/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectView.kt
+++ b/libraries/roomselect/impl/src/main/kotlin/io/element/android/libraries/roomselect/impl/RoomSelectView.kt
@@ -82,7 +82,7 @@ fun RoomSelectView(
         if (isForwarding) return
         SelectedRooms(
             selectedRooms = selectedRooms,
-            onRoomRemoved = ::onRoomRemoved,
+            onRemoveRoom = ::onRoomRemoved,
             modifier = Modifier.padding(vertical = 16.dp)
         )
     }
@@ -192,7 +192,7 @@ fun RoomSelectView(
 @Composable
 private fun SelectedRooms(
     selectedRooms: ImmutableList<RoomSummaryDetails>,
-    onRoomRemoved: (RoomSummaryDetails) -> Unit,
+    onRemoveRoom: (RoomSummaryDetails) -> Unit,
     modifier: Modifier = Modifier,
 ) {
     LazyRow(
@@ -201,7 +201,7 @@ private fun SelectedRooms(
         horizontalArrangement = Arrangement.spacedBy(32.dp)
     ) {
         items(selectedRooms, key = { it.roomId.value }) { roomSummary ->
-            SelectedRoom(roomSummary = roomSummary, onRoomRemoved = onRoomRemoved)
+            SelectedRoom(roomSummary = roomSummary, onRemoveRoom = onRemoveRoom)
         }
     }
 }
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt
index 7216f7b9cd..81a019a43a 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposer.kt
@@ -106,8 +106,8 @@ fun TextComposer(
     onDeleteVoiceMessage: () -> Unit,
     onError: (Throwable) -> Unit,
     onTyping: (Boolean) -> Unit,
-    onSuggestionReceived: (Suggestion?) -> Unit,
-    onRichContentSelected: ((Uri) -> Unit)?,
+    onReceiveSuggestion: (Suggestion?) -> Unit,
+    onSelectRichContent: ((Uri) -> Unit)?,
     modifier: Modifier = Modifier,
     showTextFormatting: Boolean = false,
     subcomposing: Boolean = false,
@@ -116,15 +116,15 @@ fun TextComposer(
         is TextEditorState.Markdown -> state.state.text.value()
         is TextEditorState.Rich -> state.richTextEditorState.messageMarkdown
     }
-    val onSendClicked = {
+    val onSendClick = {
         onSendMessage()
     }
 
-    val onPlayVoiceMessageClicked = {
+    val onPlayVoiceMessageClick = {
         onVoicePlayerEvent(VoiceMessagePlayerEvent.Play)
     }
 
-    val onPauseVoiceMessageClicked = {
+    val onPauseVoiceMessageClick = {
         onVoicePlayerEvent(VoiceMessagePlayerEvent.Pause)
     }
 
@@ -169,7 +169,7 @@ fun TextComposer(
                         resolveRoomMentionDisplay = { TextDisplay.Custom(mentionSpanProvider.getMentionSpanFor("@room", "#")) },
                         onError = onError,
                         onTyping = onTyping,
-                        onRichContentSelected = onRichContentSelected,
+                        onSelectRichContent = onSelectRichContent,
                     )
                 }
             }
@@ -188,9 +188,9 @@ fun TextComposer(
                         state = state.state,
                         subcomposing = subcomposing,
                         onTyping = onTyping,
-                        onSuggestionReceived = onSuggestionReceived,
+                        onReceiveSuggestion = onReceiveSuggestion,
                         richTextEditorStyle = style,
-                        onRichContentSelected = onRichContentSelected,
+                        onSelectRichContent = onSelectRichContent,
                     )
                 }
             }
@@ -201,7 +201,7 @@ fun TextComposer(
     val sendButton = @Composable {
         SendButton(
             canSendMessage = canSendMessage,
-            onClick = onSendClicked,
+            onClick = onSendClick,
             composerMode = composerMode,
         )
     }
@@ -251,8 +251,8 @@ fun TextComposer(
                     waveform = voiceMessageState.waveform,
                     playbackProgress = voiceMessageState.playbackProgress,
                     time = voiceMessageState.time,
-                    onPlayClick = onPlayVoiceMessageClicked,
-                    onPauseClick = onPauseVoiceMessageClicked,
+                    onPlayClick = onPlayVoiceMessageClick,
+                    onPauseClick = onPauseVoiceMessageClick,
                     onSeek = onSeekVoiceMessage,
                 )
             is VoiceMessageState.Recording ->
@@ -302,15 +302,15 @@ fun TextComposer(
         SoftKeyboardEffect(showTextFormatting, onRequestFocus) { it }
     }
 
-    val latestOnSuggestionReceived by rememberUpdatedState(onSuggestionReceived)
+    val latestOnReceiveSuggestion by rememberUpdatedState(onReceiveSuggestion)
     if (state is TextEditorState.Rich) {
         val menuAction = state.richTextEditorState.menuAction
         LaunchedEffect(menuAction) {
             if (menuAction is MenuAction.Suggestion) {
                 val suggestion = Suggestion(menuAction.suggestionPattern)
-                latestOnSuggestionReceived(suggestion)
+                latestOnReceiveSuggestion(suggestion)
             } else {
-                latestOnSuggestionReceived(null)
+                latestOnReceiveSuggestion(null)
             }
         }
     }
@@ -481,7 +481,7 @@ private fun TextInput(
     resolveMentionDisplay: (text: String, url: String) -> TextDisplay,
     onError: (Throwable) -> Unit,
     onTyping: (Boolean) -> Unit,
-    onRichContentSelected: ((Uri) -> Unit)?,
+    onSelectRichContent: ((Uri) -> Unit)?,
 ) {
     TextInputBox(
         composerMode = composerMode,
@@ -502,7 +502,7 @@ private fun TextInput(
             resolveMentionDisplay = resolveMentionDisplay,
             resolveRoomMentionDisplay = resolveRoomMentionDisplay,
             onError = onError,
-            onRichContentSelected = onRichContentSelected,
+            onRichContentSelected = onSelectRichContent,
             onTyping = onTyping,
         )
     }
@@ -842,8 +842,8 @@ private fun ATextComposer(
         onDeleteVoiceMessage = {},
         onError = {},
         onTyping = {},
-        onSuggestionReceived = {},
-        onRichContentSelected = null,
+        onReceiveSuggestion = {},
+        onSelectRichContent = null,
     )
 }
 
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposerLinkDialog.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposerLinkDialog.kt
index b0078a40eb..3f026ed4fa 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposerLinkDialog.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/TextComposerLinkDialog.kt
@@ -104,14 +104,14 @@ private fun CreateLinkWithTextDialog(
             TextFieldListItem(
                 placeholder = stringResource(id = CommonStrings.common_text),
                 text = linkText,
-                onTextChanged = { linkText = it },
+                onTextChange = { linkText = it },
             )
         }
         item {
             TextFieldListItem(
                 placeholder = stringResource(id = R.string.rich_text_editor_url_placeholder),
                 text = linkUrl,
-                onTextChanged = { linkUrl = it },
+                onTextChange = { linkUrl = it },
             )
         }
     }
@@ -142,7 +142,7 @@ private fun CreateLinkWithoutTextDialog(
             TextFieldListItem(
                 placeholder = stringResource(id = R.string.rich_text_editor_url_placeholder),
                 text = linkUrl,
-                onTextChanged = { linkUrl = it },
+                onTextChange = { linkUrl = it },
             )
         }
     }
@@ -167,7 +167,7 @@ private fun EditLinkDialog(
         onDismissRequest()
     }
 
-    fun onRemoveClicked() {
+    fun onRemoveClick() {
         onRemoveLinkRequest()
         onDismissRequest()
     }
@@ -182,7 +182,7 @@ private fun EditLinkDialog(
             TextFieldListItem(
                 placeholder = stringResource(id = R.string.rich_text_editor_url_placeholder),
                 text = linkUrl,
-                onTextChanged = { linkUrl = it },
+                onTextChange = { linkUrl = it },
             )
         }
         item {
@@ -193,7 +193,7 @@ private fun EditLinkDialog(
                         color = ElementTheme.colors.textCriticalPrimary
                     )
                 },
-                onClick = ::onRemoveClicked,
+                onClick = ::onRemoveClick,
             )
         }
     }
diff --git a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/markdown/MarkdownTextInput.kt b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/markdown/MarkdownTextInput.kt
index 00b00ef62b..a30334f04c 100644
--- a/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/markdown/MarkdownTextInput.kt
+++ b/libraries/textcomposer/impl/src/main/kotlin/io/element/android/libraries/textcomposer/components/markdown/MarkdownTextInput.kt
@@ -52,9 +52,9 @@ fun MarkdownTextInput(
     state: MarkdownTextEditorState,
     subcomposing: Boolean,
     onTyping: (Boolean) -> Unit,
-    onSuggestionReceived: (Suggestion?) -> Unit,
+    onReceiveSuggestion: (Suggestion?) -> Unit,
     richTextEditorStyle: RichTextEditorStyle,
-    onRichContentSelected: ((Uri) -> Unit)?,
+    onSelectRichContent: ((Uri) -> Unit)?,
 ) {
     val canUpdateState = !subcomposing
 
@@ -106,18 +106,18 @@ fun MarkdownTextInput(
                         state.lineCount = lineCount
 
                         state.currentMentionSuggestion = editable?.checkSuggestionNeeded()
-                        onSuggestionReceived(state.currentMentionSuggestion)
+                        onReceiveSuggestion(state.currentMentionSuggestion)
                     }
                     onSelectionChangeListener = { selStart, selEnd ->
                         state.selection = selStart..selEnd
                         state.currentMentionSuggestion = editableText.checkSuggestionNeeded()
-                        onSuggestionReceived(state.currentMentionSuggestion)
+                        onReceiveSuggestion(state.currentMentionSuggestion)
                     }
-                    if (onRichContentSelected != null) {
+                    if (onSelectRichContent != null) {
                         ViewCompat.setOnReceiveContentListener(
                             this,
                             arrayOf("image/*"),
-                            ReceiveUriContentListener { onRichContentSelected(it) }
+                            ReceiveUriContentListener { onSelectRichContent(it) }
                         )
                     }
                     state.requestFocusAction = { this.requestFocus() }
@@ -188,9 +188,9 @@ internal fun MarkdownTextInputPreview() {
             state = aMarkdownTextEditorState(),
             subcomposing = false,
             onTyping = {},
-            onSuggestionReceived = {},
+            onReceiveSuggestion = {},
             richTextEditorStyle = style,
-            onRichContentSelected = {},
+            onSelectRichContent = {},
         )
     }
 }
diff --git a/libraries/textcomposer/impl/src/test/kotlin/io/element/android/libraries/textcomposer/impl/components/markdown/MarkdownTextInputTest.kt b/libraries/textcomposer/impl/src/test/kotlin/io/element/android/libraries/textcomposer/impl/components/markdown/MarkdownTextInputTest.kt
index 3ced6bf400..dc2d197db8 100644
--- a/libraries/textcomposer/impl/src/test/kotlin/io/element/android/libraries/textcomposer/impl/components/markdown/MarkdownTextInputTest.kt
+++ b/libraries/textcomposer/impl/src/test/kotlin/io/element/android/libraries/textcomposer/impl/components/markdown/MarkdownTextInputTest.kt
@@ -189,9 +189,9 @@ class MarkdownTextInputTest {
                 state = state,
                 subcomposing = subcomposing,
                 onTyping = onTyping,
-                onSuggestionReceived = onSuggestionReceived,
+                onReceiveSuggestion = onSuggestionReceived,
                 richTextEditorStyle = style,
-                onRichContentSelected = null,
+                onSelectRichContent = null,
             )
         }
     }
diff --git a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsNode.kt b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsNode.kt
index 96404d6d8c..351baff498 100644
--- a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsNode.kt
+++ b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsNode.kt
@@ -49,7 +49,7 @@ class TroubleshootNotificationsNode @AssistedInject constructor(
         val state = presenter.present()
         TroubleshootNotificationsView(
             state = state,
-            onBackPressed = ::onDone,
+            onBackClick = ::onDone,
             modifier = modifier,
         )
     }
diff --git a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsView.kt b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsView.kt
index 8b2ba843be..26232f8d69 100644
--- a/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsView.kt
+++ b/libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsView.kt
@@ -44,7 +44,7 @@ import io.element.android.libraries.troubleshoot.api.test.NotificationTroublesho
 @Composable
 fun TroubleshootNotificationsView(
     state: TroubleshootNotificationsState,
-    onBackPressed: () -> Unit,
+    onBackClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     OnLifecycleEvent { _, event ->
@@ -60,7 +60,7 @@ fun TroubleshootNotificationsView(
 
     PreferencePage(
         modifier = modifier,
-        onBackPressed = onBackPressed,
+        onBackClick = onBackClick,
         title = stringResource(id = R.string.troubleshoot_notifications_screen_title),
     ) {
         TroubleshootNotificationsContent(state)
@@ -70,7 +70,7 @@ fun TroubleshootNotificationsView(
 @Composable
 private fun TroubleshootTestView(
     testState: NotificationTroubleshootTestState,
-    onQuickFixClicked: () -> Unit,
+    onQuickFixClick: () -> Unit,
 ) {
     if ((testState.status as? Status.Idle)?.visible == false) return
     ListItem(
@@ -119,7 +119,7 @@ private fun TroubleshootTestView(
             trailingContent = ListItemContent.Custom {
                 Button(
                     text = stringResource(id = R.string.troubleshoot_notifications_screen_quick_fix_action),
-                    onClick = onQuickFixClicked
+                    onClick = onQuickFixClick
                 )
             }
         )
@@ -135,7 +135,7 @@ private fun TroubleshootNotificationsContent(state: TroubleshootNotificationsSta
         is AsyncAction.Failure -> {
             TestSuiteView(
                 testSuiteState = state.testSuiteState,
-                onQuickFixClicked = {
+                onQuickFixClick = {
                     state.eventSink(TroubleshootNotificationsEvents.QuickFix(it))
                 }
             )
@@ -199,13 +199,13 @@ private fun RunTestButton(state: TroubleshootNotificationsState) {
 @Composable
 private fun TestSuiteView(
     testSuiteState: TroubleshootTestSuiteState,
-    onQuickFixClicked: (Int) -> Unit,
+    onQuickFixClick: (Int) -> Unit,
 ) {
     testSuiteState.tests.forEachIndexed { index, testState ->
         TroubleshootTestView(
             testState = testState,
-            onQuickFixClicked = {
-                onQuickFixClicked(index)
+            onQuickFixClick = {
+                onQuickFixClick(index)
             },
         )
     }
@@ -218,6 +218,6 @@ internal fun TroubleshootNotificationsViewPreview(
 ) = ElementPreview {
     TroubleshootNotificationsView(
         state = state,
-        onBackPressed = {},
+        onBackClick = {},
     )
 }
diff --git a/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsViewTest.kt b/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsViewTest.kt
index 5acd0e5635..683fea637d 100644
--- a/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsViewTest.kt
+++ b/libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsViewTest.kt
@@ -45,7 +45,7 @@ class TroubleshootNotificationsViewTest {
                 state = aTroubleshootNotificationsState(
                     eventSink = eventsRecorder
                 ),
-                onBackPressed = it,
+                onBackClick = it,
             )
             rule.pressBack()
         }
@@ -112,12 +112,12 @@ class TroubleshootNotificationsViewTest {
 
 private fun <R : TestRule> AndroidComposeTestRule<R, ComponentActivity>.setTroubleshootNotificationsView(
     state: TroubleshootNotificationsState,
-    onBackPressed: () -> Unit = EnsureNeverCalled(),
+    onBackClick: () -> Unit = EnsureNeverCalled(),
 ) {
     setContent {
         TroubleshootNotificationsView(
             state = state,
-            onBackPressed = onBackPressed,
+            onBackClick = onBackClick,
         )
     }
 }
diff --git a/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/LoginScreen.kt b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/LoginScreen.kt
index 5fe994f6d9..5eb64cb515 100644
--- a/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/LoginScreen.kt
+++ b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/LoginScreen.kt
@@ -46,7 +46,7 @@ class LoginScreen(private val authenticationService: MatrixAuthenticationService
         LoginPasswordView(
             state = state,
             modifier = modifier,
-            onBackPressed = {},
+            onBackClick = {},
             onWaitListError = {},
         )
     }
diff --git a/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/RoomListScreen.kt b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/RoomListScreen.kt
index 7dc75904e3..306a69edcc 100644
--- a/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/RoomListScreen.kt
+++ b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/RoomListScreen.kt
@@ -143,7 +143,7 @@ class RoomListScreen(
 
     @Composable
     fun Content(modifier: Modifier = Modifier) {
-        fun onRoomClicked(roomId: RoomId) {
+        fun onRoomClick(roomId: RoomId) {
             Singleton.appScope.launch {
                 withContext(coroutineDispatchers.io) {
                     matrixClient.getRoom(roomId)!!.use { room ->
@@ -156,16 +156,16 @@ class RoomListScreen(
         val state = presenter.present()
         RoomListView(
             state = state,
-            onRoomClicked = ::onRoomClicked,
-            onSettingsClicked = {},
-            onConfirmRecoveryKeyClicked = {},
-            onCreateRoomClicked = {},
-            onRoomSettingsClicked = {},
-            onMenuActionClicked = {},
-            onRoomDirectorySearchClicked = {},
+            onRoomClick = ::onRoomClick,
+            onSettingsClick = {},
+            onConfirmRecoveryKeyClick = {},
+            onCreateRoomClick = {},
+            onRoomSettingsClick = {},
+            onMenuActionClick = {},
+            onRoomDirectorySearchClick = {},
             modifier = modifier,
             acceptDeclineInviteView = {
-                AcceptDeclineInviteView(state = state.acceptDeclineInviteState, onInviteAccepted = {}, onInviteDeclined = {})
+                AcceptDeclineInviteView(state = state.acceptDeclineInviteState, onAcceptInvite = {}, onDeclineInvite = {})
             }
         )