diff --git a/src/main.cpp b/src/main.cpp
index d308f017f..899e92160 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -194,7 +194,7 @@ int main(int argc, char *argv[])
     qmlRegisterType<SortFilterRoomListModel>("org.kde.neochat", 1, 0, "SortFilterRoomListModel");
     qmlRegisterType<DevicesModel>("org.kde.neochat", 1, 0, "DevicesModel");
     qmlRegisterUncreatableType<RoomMessageEvent>("org.kde.neochat", 1, 0, "RoomMessageEvent", "ENUM");
-    qmlRegisterUncreatableType<RoomType>("org.kde.neochat", 1, 0, "RoomType", "ENUM");
+    qmlRegisterUncreatableType<NeoChatRoomType>("org.kde.neochat", 1, 0, "NeoChatRoomType", "ENUM");
     qmlRegisterUncreatableType<UserType>("org.kde.neochat", 1, 0, "UserType", "ENUM");
 
     qRegisterMetaType<User *>("User*");
diff --git a/src/roomlistmodel.cpp b/src/roomlistmodel.cpp
index f283c22d9..93c2e1b21 100644
--- a/src/roomlistmodel.cpp
+++ b/src/roomlistmodel.cpp
@@ -342,26 +342,26 @@ QVariant RoomListModel::data(const QModelIndex &index, int role) const
     }
     if (role == CategoryRole) {
         if (room->joinState() == JoinState::Invite) {
-            return RoomType::Invited;
+            return NeoChatRoomType::Invited;
         }
         if (room->isFavourite()) {
-            return RoomType::Favorite;
+            return NeoChatRoomType::Favorite;
         }
         if (room->isLowPriority()) {
-            return RoomType::Deprioritized;
+            return NeoChatRoomType::Deprioritized;
         }
         if (room->isDirectChat()) {
-            return RoomType::Direct;
+            return NeoChatRoomType::Direct;
         }
         const RoomCreateEvent *creationEvent = room->creation();
         QJsonObject contentJson = creationEvent->contentJson();
         QJsonObject::const_iterator typeIter = contentJson.find("type");
         if (typeIter != contentJson.end()) {
             if (typeIter.value().toString() == "m.space") {
-                return RoomType::Space;
+                return NeoChatRoomType::Space;
             }
         }
-        return RoomType::Normal;
+        return NeoChatRoomType::Normal;
     }
     if (role == UnreadCountRole) {
         return room->unreadCount();
diff --git a/src/roomlistmodel.h b/src/roomlistmodel.h
index 565562cd3..eba679aa5 100644
--- a/src/roomlistmodel.h
+++ b/src/roomlistmodel.h
@@ -12,7 +12,7 @@
 
 using namespace Quotient;
 
-class RoomType : public QObject
+class NeoChatRoomType : public QObject
 {
     Q_OBJECT
 
diff --git a/src/sortfilterroomlistmodel.cpp b/src/sortfilterroomlistmodel.cpp
index d0cb4e8e1..797d18059 100644
--- a/src/sortfilterroomlistmodel.cpp
+++ b/src/sortfilterroomlistmodel.cpp
@@ -36,16 +36,16 @@ bool SortFilterRoomListModel::lessThan(const QModelIndex &source_left, const QMo
 {
     if (m_sortOrder == SortFilterRoomListModel::LastActivity) {
         // display favorite rooms always on top
-        const auto categoryLeft = static_cast<RoomType::Types>(sourceModel()->data(source_left, RoomListModel::CategoryRole).toInt());
-        const auto categoryRight = static_cast<RoomType::Types>(sourceModel()->data(source_right, RoomListModel::CategoryRole).toInt());
+        const auto categoryLeft = static_cast<NeoChatRoomType::Types>(sourceModel()->data(source_left, RoomListModel::CategoryRole).toInt());
+        const auto categoryRight = static_cast<NeoChatRoomType::Types>(sourceModel()->data(source_right, RoomListModel::CategoryRole).toInt());
 
-        if (categoryLeft == RoomType::Types::Favorite && categoryRight == RoomType::Types::Favorite) {
+        if (categoryLeft == NeoChatRoomType::Types::Favorite && categoryRight == NeoChatRoomType::Types::Favorite) {
             return sourceModel()->data(source_left, RoomListModel::LastActiveTimeRole).toDateTime()
                 > sourceModel()->data(source_right, RoomListModel::LastActiveTimeRole).toDateTime();
         }
-        if (categoryLeft == RoomType::Types::Favorite) {
+        if (categoryLeft == NeoChatRoomType::Types::Favorite) {
             return true;
-        } else if (categoryRight == RoomType::Types::Favorite) {
+        } else if (categoryRight == NeoChatRoomType::Types::Favorite) {
             return false;
         }