diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0d014dfc1..b82355363 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -126,7 +126,7 @@
             android:name=".account.WebViewLoginActivity"
             android:theme="@style/AppTheme" />
 
-        <activity android:name=".contacts.ContactsActivityCompose"
+        <activity android:name=".contacts.ContactsActivity"
             android:theme="@style/AppTheme"/>
 
         <activity android:name=".conversationcreation.ConversationCreationActivity"
diff --git a/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt b/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivity.kt
similarity index 96%
rename from app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt
rename to app/src/main/java/com/nextcloud/talk/contacts/ContactsActivity.kt
index 9805a7e05..65682dd61 100644
--- a/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivityCompose.kt
+++ b/app/src/main/java/com/nextcloud/talk/contacts/ContactsActivity.kt
@@ -25,7 +25,7 @@ import com.nextcloud.talk.utils.bundle.BundleKeys
 import javax.inject.Inject
 
 @AutoInjector(NextcloudTalkApplication::class)
-class ContactsActivityCompose : BaseActivity() {
+class ContactsActivity : BaseActivity() {
 
     @Inject
     lateinit var viewModelFactory: ViewModelProvider.Factory
@@ -73,7 +73,7 @@ class ContactsActivityCompose : BaseActivity() {
 
 class CompanionClass {
     companion object {
-        internal val TAG = ContactsActivityCompose::class.simpleName
+        internal val TAG = ContactsActivity::class.simpleName
         internal const val ROOM_TYPE_ONE_ONE = "1"
     }
 }
diff --git a/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationActivity.kt
index 1212833d7..215ffde5f 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationActivity.kt
@@ -84,8 +84,8 @@ import com.nextcloud.talk.R
 import com.nextcloud.talk.activities.BaseActivity
 import com.nextcloud.talk.application.NextcloudTalkApplication
 import com.nextcloud.talk.chat.ChatActivity
+import com.nextcloud.talk.contacts.ContactsActivity
 import com.nextcloud.talk.components.SetupSystemBars
-import com.nextcloud.talk.contacts.ContactsActivityCompose
 import com.nextcloud.talk.contacts.loadImage
 import com.nextcloud.talk.extensions.getParcelableArrayListExtraProvider
 import com.nextcloud.talk.models.json.autocomplete.AutocompleteUser
@@ -379,7 +379,7 @@ fun AddParticipants(
                     modifier = Modifier
                         .padding(start = 16.dp, bottom = 16.dp)
                         .clickable {
-                            val intent = Intent(context, ContactsActivityCompose::class.java)
+                            val intent = Intent(context, ContactsActivity::class.java)
                             intent.putParcelableArrayListExtra(
                                 "selectedParticipants",
                                 participants as ArrayList<AutocompleteUser>
@@ -417,7 +417,7 @@ fun AddParticipants(
             modifier = Modifier
                 .fillMaxWidth()
                 .clickable {
-                    val intent = Intent(context, ContactsActivityCompose::class.java)
+                    val intent = Intent(context, ContactsActivity::class.java)
                     intent.putExtra(BundleKeys.KEY_ADD_PARTICIPANTS, true)
                     launcher.launch(intent)
                 },
diff --git a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
index 104e3af76..1c97e4efb 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt
@@ -53,7 +53,7 @@ import com.nextcloud.talk.application.NextcloudTalkApplication
 import com.nextcloud.talk.bottomsheet.items.BasicListItemWithImage
 import com.nextcloud.talk.bottomsheet.items.listItemsWithImage
 import com.nextcloud.talk.chat.ChatActivity
-import com.nextcloud.talk.contacts.ContactsActivityCompose
+import com.nextcloud.talk.contacts.ContactsActivity
 import com.nextcloud.talk.conversationinfo.viewmodel.ConversationInfoViewModel
 import com.nextcloud.talk.conversationinfoedit.ConversationInfoEditActivity
 import com.nextcloud.talk.data.user.model.User
@@ -694,7 +694,7 @@ class ConversationInfoActivity :
         bundle.putStringArrayList(BundleKeys.KEY_EXISTING_PARTICIPANTS, existingParticipantsId)
         bundle.putString(BundleKeys.KEY_TOKEN, conversation!!.token)
 
-        val intent = Intent(this, ContactsActivityCompose::class.java)
+        val intent = Intent(this, ContactsActivity::class.java)
         intent.putExtras(bundle)
 
         addParticipantsResult.launch(intent)
diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
index 189dd62cc..eaf024c5a 100644
--- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt
@@ -82,7 +82,7 @@ import com.nextcloud.talk.application.NextcloudTalkApplication
 import com.nextcloud.talk.arbitrarystorage.ArbitraryStorageManager
 import com.nextcloud.talk.chat.ChatActivity
 import com.nextcloud.talk.chat.viewmodels.ChatViewModel
-import com.nextcloud.talk.contacts.ContactsActivityCompose
+import com.nextcloud.talk.contacts.ContactsActivity
 import com.nextcloud.talk.contacts.ContactsUiState
 import com.nextcloud.talk.contacts.ContactsViewModel
 import com.nextcloud.talk.contacts.RoomUiState
@@ -1252,7 +1252,7 @@ class ConversationsListActivity :
             conversation.type === ConversationEnums.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL
 
     private fun showNewConversationsScreen() {
-        val intent = Intent(context, ContactsActivityCompose::class.java)
+        val intent = Intent(context, ContactsActivity::class.java)
         startActivity(intent)
     }