diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
index 0a23661bf..02827bc14 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -124,7 +124,7 @@ import com.nextcloud.talk.callbacks.MentionAutocompleteCallback
 import com.nextcloud.talk.conversationinfo.ConversationInfoActivity
 import com.nextcloud.talk.conversationlist.ConversationsListActivity
 import com.nextcloud.talk.data.user.model.User
-import com.nextcloud.talk.databinding.ControllerChatBinding
+import com.nextcloud.talk.databinding.ActivityChatBinding
 import com.nextcloud.talk.events.UserMentionClickEvent
 import com.nextcloud.talk.events.WebSocketCommunicationEvent
 import com.nextcloud.talk.extensions.loadAvatarOrImagePreview
@@ -231,7 +231,7 @@ class ChatActivity :
 
     var active = false
 
-    private lateinit var binding: ControllerChatBinding
+    private lateinit var binding: ActivityChatBinding
 
     @Inject
     lateinit var ncApi: NcApi
@@ -315,7 +315,7 @@ class ChatActivity :
         super.onCreate(savedInstanceState)
         NextcloudTalkApplication.sharedApplication!!.componentApplication.inject(this)
 
-        binding = ControllerChatBinding.inflate(layoutInflater)
+        binding = ActivityChatBinding.inflate(layoutInflater)
         setupActionBar()
         setContentView(binding.root)
         setupSystemColors()
diff --git a/app/src/main/res/layout/controller_chat.xml b/app/src/main/res/layout/activity_chat.xml
similarity index 100%
rename from app/src/main/res/layout/controller_chat.xml
rename to app/src/main/res/layout/activity_chat.xml