diff --git a/src/gui/MainPane/AccountBar.qml b/src/gui/MainPane/AccountBar.qml
index 88fc80b4..cdbc74d9 100644
--- a/src/gui/MainPane/AccountBar.qml
+++ b/src/gui/MainPane/AccountBar.qml
@@ -38,7 +38,7 @@ Rectangle {
 
         model: ModelStore.get("matching_accounts")
 
-        delegate: Account {
+        delegate: AccountDelegate {
             width: accountList.cellWidth
             height: accountList.cellHeight
             padded: false
diff --git a/src/gui/MainPane/Account.qml b/src/gui/MainPane/AccountDelegate.qml
similarity index 100%
rename from src/gui/MainPane/Account.qml
rename to src/gui/MainPane/AccountDelegate.qml
diff --git a/src/gui/MainPane/Room.qml b/src/gui/MainPane/RoomDelegate.qml
similarity index 100%
rename from src/gui/MainPane/Room.qml
rename to src/gui/MainPane/RoomDelegate.qml
diff --git a/src/gui/MainPane/RoomList.qml b/src/gui/MainPane/RoomList.qml
index ffc3e3f1..081aa9a7 100644
--- a/src/gui/MainPane/RoomList.qml
+++ b/src/gui/MainPane/RoomList.qml
@@ -15,7 +15,7 @@ HListView {
 
         DelegateChoice {
             roleValue: "Account"
-            Account {
+            AccountDelegate {
                 width: roomList.width
                 leftPadding: theme.spacing
                 rightPadding: 0  // the right buttons have padding
@@ -38,7 +38,7 @@ HListView {
 
         DelegateChoice {
             roleValue: "Room"
-            Room {
+            RoomDelegate {
                 width: roomList.width
                 onLeftClicked: showItemAtIndex(model.index)
             }