diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/new/NewCallActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/new/NewCallActivity.kt
index 725a5dc56b..a18dfeeae7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/calls/new/NewCallActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/calls/new/NewCallActivity.kt
@@ -84,7 +84,7 @@ private fun NewCallScreen(
   val context = LocalActivity.current as FragmentActivity
 
   val callbacks = remember {
-    object : UiCallbacks {
+    object : NewCallUiCallbacks {
       override fun onSearchQueryChanged(query: String) = viewModel.onSearchQueryChanged(query)
       override fun onRecipientSelected(selection: RecipientSelection) = viewModel.startCall(selection)
       override fun onInviteToSignal() = context.startActivity(AppSettingsActivity.invite(context))
@@ -111,7 +111,7 @@ private fun NewCallScreen(
   )
 }
 
-private interface UiCallbacks :
+private interface NewCallUiCallbacks :
   RecipientPickerCallbacks.ListActions,
   RecipientPickerCallbacks.Refresh,
   RecipientPickerCallbacks.NewCall {
@@ -120,7 +120,7 @@ private interface UiCallbacks :
   fun onUserMessageDismissed(userMessage: UserMessage)
   fun onBackPressed()
 
-  object Empty : UiCallbacks {
+  object Empty : NewCallUiCallbacks {
     override fun onSearchQueryChanged(query: String) = Unit
     override fun onRecipientSelected(selection: RecipientSelection) = Unit
     override fun onInviteToSignal() = Unit
@@ -134,7 +134,7 @@ private interface UiCallbacks :
 @Composable
 private fun NewCallScreenUi(
   uiState: NewCallUiState,
-  callbacks: UiCallbacks
+  callbacks: NewCallUiCallbacks
 ) {
   val snackbarHostState = remember { SnackbarHostState() }
 
@@ -173,7 +173,7 @@ private fun NewCallScreenUi(
 }
 
 @Composable
-private fun TopAppBarActions(callbacks: UiCallbacks) {
+private fun TopAppBarActions(callbacks: NewCallUiCallbacks) {
   val menuController = remember { DropdownMenus.MenuController() }
   IconButton(
     onClick = { menuController.show() },
@@ -250,7 +250,7 @@ private fun NewCallScreenPreview() {
       uiState = NewCallUiState(
         forceSplitPane = false
       ),
-      callbacks = UiCallbacks.Empty
+      callbacks = NewCallUiCallbacks.Empty
     )
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationActivity.kt
index 140f5019c2..d9ae2ece06 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/NewConversationActivity.kt
@@ -119,7 +119,7 @@ private fun NewConversationScreen(
 
   val coroutineScope = rememberCoroutineScope()
   val callbacks = remember {
-    object : UiCallbacks {
+    object : NewConversationUiCallbacks {
       override fun onSearchQueryChanged(query: String) = viewModel.onSearchQueryChanged(query)
       override fun onCreateNewGroup() = createGroupLauncher.launch(CreateGroupActivity.createIntent(context))
       override fun onFindByUsername() = findByLauncher.launch(FindByMode.USERNAME)
@@ -189,7 +189,7 @@ private suspend fun openConversation(
 @Composable
 private fun NewConversationScreenUi(
   uiState: NewConversationUiState,
-  callbacks: UiCallbacks
+  callbacks: NewConversationUiCallbacks
 ) {
   val snackbarHostState = remember { SnackbarHostState() }
 
@@ -221,7 +221,7 @@ private fun NewConversationScreenUi(
 }
 
 @Composable
-private fun TopAppBarActions(callbacks: UiCallbacks) {
+private fun TopAppBarActions(callbacks: NewConversationUiCallbacks) {
   val menuController = remember { DropdownMenus.MenuController() }
   IconButton(
     onClick = { menuController.show() },
@@ -265,7 +265,7 @@ private fun TopAppBarActions(callbacks: UiCallbacks) {
   }
 }
 
-private interface UiCallbacks :
+private interface NewConversationUiCallbacks :
   RecipientPickerCallbacks.ListActions,
   RecipientPickerCallbacks.Refresh,
   RecipientPickerCallbacks.ContextMenu,
@@ -278,7 +278,7 @@ private interface UiCallbacks :
   fun onUserMessageDismissed(userMessage: UserMessage)
   fun onBackPressed()
 
-  object Empty : UiCallbacks {
+  object Empty : NewConversationUiCallbacks {
     override fun onSearchQueryChanged(query: String) = Unit
     override fun onCreateNewGroup() = Unit
     override fun onFindByUsername() = Unit
@@ -303,7 +303,7 @@ private interface UiCallbacks :
 @Composable
 private fun NewConversationRecipientPicker(
   uiState: NewConversationUiState,
-  callbacks: UiCallbacks,
+  callbacks: NewConversationUiCallbacks,
   modifier: Modifier = Modifier
 ) {
   RecipientPicker(
@@ -400,7 +400,7 @@ private fun NewConversationScreenPreview() {
       uiState = NewConversationUiState(
         forceSplitPaneOnCompactLandscape = false
       ),
-      callbacks = UiCallbacks.Empty
+      callbacks = NewConversationUiCallbacks.Empty
     )
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/memberlabel/MemberLabelFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/memberlabel/MemberLabelFragment.kt
index e0c75a5abc..07e6e8a452 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/memberlabel/MemberLabelFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/memberlabel/MemberLabelFragment.kt
@@ -78,7 +78,7 @@ class MemberLabelFragment : ComposeFragment(), ReactWithAnyEmojiBottomSheetDialo
     val backPressedDispatcher = LocalOnBackPressedDispatcherOwner.current?.onBackPressedDispatcher
 
     val callbacks = remember {
-      object : UiCallbacks {
+      object : MemberLabelUiCallbacks {
         override fun onClosePressed() {
           backPressedDispatcher?.onBackPressed()
         }
@@ -116,7 +116,7 @@ class MemberLabelFragment : ComposeFragment(), ReactWithAnyEmojiBottomSheetDialo
 @Composable
 private fun MemberLabelScreenUi(
   state: MemberLabelUiState,
-  callbacks: UiCallbacks
+  callbacks: MemberLabelUiCallbacks
 ) {
   Scaffolds.Settings(
     title = stringResource(R.string.GroupMemberLabel__title),
@@ -272,7 +272,7 @@ private fun SaveButton(
   }
 }
 
-private interface UiCallbacks {
+private interface MemberLabelUiCallbacks {
   fun onClosePressed()
   fun onLabelEmojiChanged(emoji: String)
   fun onLabelTextChanged(text: String)
@@ -280,7 +280,7 @@ private interface UiCallbacks {
   fun onClearLabelClicked()
   fun onSaveClicked()
 
-  object Empty : UiCallbacks {
+  object Empty : MemberLabelUiCallbacks {
     override fun onClosePressed() = Unit
     override fun onLabelEmojiChanged(emoji: String) = Unit
     override fun onLabelTextChanged(text: String) = Unit
@@ -302,7 +302,7 @@ private fun MemberLabelScreenPreview() {
         labelEmoji = "⛑️",
         labelText = "Vet Coordinator"
       ),
-      callbacks = UiCallbacks.Empty
+      callbacks = MemberLabelUiCallbacks.Empty
     )
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersActivity.kt
index a9f74cdcc6..09563e6ec7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersActivity.kt
@@ -116,7 +116,7 @@ private fun AddMembersScreen(
   )
 
   val callbacks = remember {
-    object : UiCallbacks {
+    object : AddMembersUiCallbacks {
       override fun onSearchQueryChanged(query: String) = viewModel.onSearchQueryChanged(query)
       override fun onFindByUsername() = findByLauncher.launch(FindByMode.USERNAME)
       override fun onFindByPhoneNumber() = findByLauncher.launch(FindByMode.PHONE_NUMBER)
@@ -151,7 +151,7 @@ private fun AddMembersScreen(
 @Composable
 private fun AddMembersScreenUi(
   uiState: AddMembersUiState,
-  callbacks: UiCallbacks
+  callbacks: AddMembersUiCallbacks
 ) {
   val title = if (uiState.totalMembersCount > 0) {
     pluralStringResource(
@@ -199,7 +199,7 @@ private fun AddMembersScreenUi(
 @Composable
 private fun AddMembersRecipientPicker(
   uiState: AddMembersUiState,
-  callbacks: UiCallbacks,
+  callbacks: AddMembersUiCallbacks,
   modifier: Modifier = Modifier
 ) {
   RecipientPicker(
@@ -220,7 +220,7 @@ private fun AddMembersRecipientPicker(
   )
 }
 
-private interface UiCallbacks :
+private interface AddMembersUiCallbacks :
   RecipientPickerCallbacks.ListActions,
   RecipientPickerCallbacks.FindByUsername,
   RecipientPickerCallbacks.FindByPhoneNumber {
@@ -231,7 +231,7 @@ private interface UiCallbacks :
   fun onUserMessageDismissed(userMessage: UserMessage)
   fun onBackPressed()
 
-  object Empty : UiCallbacks {
+  object Empty : AddMembersUiCallbacks {
     override fun onSearchQueryChanged(query: String) = Unit
     override fun onFindByUsername() = Unit
     override fun onFindByPhoneNumber() = Unit
@@ -323,7 +323,7 @@ private fun AddMembersScreenPreview() {
         forceSplitPane = false,
         selectionLimits = SelectionLimits.NO_LIMITS
       ),
-      callbacks = UiCallbacks.Empty
+      callbacks = AddMembersUiCallbacks.Empty
     )
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addtogroup/AddToGroupsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addtogroup/AddToGroupsActivity.kt
index 7805c385b2..d66c1e1d4f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addtogroup/AddToGroupsActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addtogroup/AddToGroupsActivity.kt
@@ -99,7 +99,7 @@ private fun AddToGroupsScreen(
   closeScreen: () -> Unit
 ) {
   val callbacks = remember {
-    object : UiCallbacks {
+    object : AddToGroupsUiCallbacks {
       override fun onSearchQueryChanged(query: String) = viewModel.onSearchQueryChanged(query)
       override fun onSelectionChanged(newSelections: List<SelectedContact>) = viewModel.selectGroups(newSelections)
       override fun addToSelectedGroups() = viewModel.addToSelectedGroups()
@@ -121,7 +121,7 @@ private fun AddToGroupsScreen(
 @Composable
 private fun AddToGroupsScreenUi(
   uiState: AddToGroupsUiState,
-  callbacks: UiCallbacks
+  callbacks: AddToGroupsUiCallbacks
 ) {
   val title = if (uiState.isMultiSelectEnabled) {
     stringResource(R.string.AddToGroupActivity_add_to_groups)
@@ -154,7 +154,7 @@ private fun AddToGroupsScreenUi(
 
 private fun getDoneButton(
   uiState: AddToGroupsUiState,
-  callbacks: UiCallbacks
+  callbacks: AddToGroupsUiCallbacks
 ): (@Composable () -> Unit)? {
   return if (uiState.isMultiSelectEnabled) {
     {
@@ -173,7 +173,7 @@ private fun getDoneButton(
 @Composable
 private fun AddToGroupsRecipientPicker(
   uiState: AddToGroupsUiState,
-  callbacks: UiCallbacks,
+  callbacks: AddToGroupsUiCallbacks,
   modifier: Modifier = Modifier
 ) {
   RecipientPicker(
@@ -194,7 +194,7 @@ private fun AddToGroupsRecipientPicker(
   )
 }
 
-private interface UiCallbacks : RecipientPickerCallbacks.ListActions {
+private interface AddToGroupsUiCallbacks : RecipientPickerCallbacks.ListActions {
   override suspend fun shouldAllowSelection(selection: RecipientSelection): Boolean = true
   override fun onRecipientSelected(selection: RecipientSelection) = Unit
   override fun onPendingRecipientSelectionsConsumed() = Unit
@@ -203,7 +203,7 @@ private interface UiCallbacks : RecipientPickerCallbacks.ListActions {
   fun onUserMessageDismissed(userMessage: UserMessage)
   fun onBackPressed()
 
-  object Empty : UiCallbacks {
+  object Empty : AddToGroupsUiCallbacks {
     override fun onSearchQueryChanged(query: String) = Unit
     override fun addToSelectedGroups() = Unit
     override fun onAddConfirmed(groupRecipient: Recipient) = Unit
@@ -287,7 +287,7 @@ private fun AddToSingleGroupScreenPreview() {
         forceSplitPane = false,
         selectionLimits = null
       ),
-      callbacks = UiCallbacks.Empty
+      callbacks = AddToGroupsUiCallbacks.Empty
     )
   }
 }
@@ -301,7 +301,7 @@ private fun AddToMultipleGroupsScreenPreview() {
         forceSplitPane = false,
         selectionLimits = SelectionLimits.NO_LIMITS
       ),
-      callbacks = UiCallbacks.Empty
+      callbacks = AddToGroupsUiCallbacks.Empty
     )
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivity.kt
index 5dd3b50382..0a9c933492 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivity.kt
@@ -112,7 +112,7 @@ private fun CreateGroupScreen(
   )
 
   val callbacks = remember {
-    object : UiCallbacks {
+    object : CreateGroupUiCallbacks {
       override fun onSearchQueryChanged(query: String) = viewModel.onSearchQueryChanged(query)
       override fun onFindByUsername() = findByLauncher.launch(FindByMode.USERNAME)
       override fun onFindByPhoneNumber() = findByLauncher.launch(FindByMode.PHONE_NUMBER)
@@ -150,7 +150,7 @@ private fun CreateGroupScreen(
 @Composable
 private fun CreateGroupScreenUi(
   uiState: CreateGroupUiState,
-  callbacks: UiCallbacks
+  callbacks: CreateGroupUiCallbacks
 ) {
   val title = if (uiState.newSelections.isNotEmpty()) {
     pluralStringResource(
@@ -218,7 +218,7 @@ private fun CreateGroupScreenUi(
 @Composable
 private fun CreateGroupRecipientPicker(
   uiState: CreateGroupUiState,
-  callbacks: UiCallbacks,
+  callbacks: CreateGroupUiCallbacks,
   modifier: Modifier = Modifier
 ) {
   RecipientPicker(
@@ -240,7 +240,7 @@ private fun CreateGroupRecipientPicker(
   )
 }
 
-private interface UiCallbacks :
+private interface CreateGroupUiCallbacks :
   RecipientPickerCallbacks.ListActions,
   RecipientPickerCallbacks.FindByUsername,
   RecipientPickerCallbacks.FindByPhoneNumber {
@@ -251,7 +251,7 @@ private interface UiCallbacks :
   fun onBackPressed()
   fun onPendingDestinationConsumed()
 
-  object Empty : UiCallbacks {
+  object Empty : CreateGroupUiCallbacks {
     override fun onSearchQueryChanged(query: String) = Unit
     override fun onFindByUsername() = Unit
     override fun onFindByPhoneNumber() = Unit
@@ -290,7 +290,7 @@ private fun CreateGroupScreenPreview() {
         forceSplitPane = false,
         selectionLimits = SelectionLimits.NO_LIMITS
       ),
-      callbacks = UiCallbacks.Empty
+      callbacks = CreateGroupUiCallbacks.Empty
     )
   }
 }