diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index 73b835bdd..b1239c4ad 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -159,7 +159,7 @@ set(cockatrice_SOURCES
     src/server/user/user_context_menu.cpp
     src/server/user/user_info_connection.cpp
     src/server/user/user_info_box.cpp
-    src/server/user/user_list.cpp
+    src/server/user/user_list_widget.cpp
     src/client/ui/window_main.cpp
     src/game/zones/view_zone_widget.cpp
     src/game/zones/view_zone.cpp
diff --git a/cockatrice/src/client/tabs/tab_account.cpp b/cockatrice/src/client/tabs/tab_account.cpp
index 3aecdeb60..602eb2f60 100644
--- a/cockatrice/src/client/tabs/tab_account.cpp
+++ b/cockatrice/src/client/tabs/tab_account.cpp
@@ -3,7 +3,7 @@
 #include "../../deck/custom_line_edit.h"
 #include "../../server/pending_command.h"
 #include "../../server/user/user_info_box.h"
-#include "../../server/user/user_list.h"
+#include "../../server/user/user_list_widget.h"
 #include "../game_logic/abstract_client.h"
 #include "../sound_engine.h"
 #include "pb/event_add_to_list.pb.h"
diff --git a/cockatrice/src/client/tabs/tab_room.cpp b/cockatrice/src/client/tabs/tab_room.cpp
index ea6432fe7..4f3b26714 100644
--- a/cockatrice/src/client/tabs/tab_room.cpp
+++ b/cockatrice/src/client/tabs/tab_room.cpp
@@ -6,7 +6,7 @@
 #include "../../main.h"
 #include "../../server/chat_view/chat_view.h"
 #include "../../server/pending_command.h"
-#include "../../server/user/user_list.h"
+#include "../../server/user/user_list_widget.h"
 #include "../../settings/cache_settings.h"
 #include "get_pb_extension.h"
 #include "pb/event_join_room.pb.h"
diff --git a/cockatrice/src/client/tabs/tab_server.cpp b/cockatrice/src/client/tabs/tab_server.cpp
index 029964d8e..40fa401d2 100644
--- a/cockatrice/src/client/tabs/tab_server.cpp
+++ b/cockatrice/src/client/tabs/tab_server.cpp
@@ -2,7 +2,7 @@
 
 #include "../../client/game_logic/abstract_client.h"
 #include "../../server/pending_command.h"
-#include "../../server/user/user_list.h"
+#include "../../server/user/user_list_widget.h"
 #include "pb/event_list_rooms.pb.h"
 #include "pb/event_server_message.pb.h"
 #include "pb/response_join_room.pb.h"
diff --git a/cockatrice/src/client/tabs/tab_supervisor.cpp b/cockatrice/src/client/tabs/tab_supervisor.cpp
index d3704661b..0e1e41db5 100644
--- a/cockatrice/src/client/tabs/tab_supervisor.cpp
+++ b/cockatrice/src/client/tabs/tab_supervisor.cpp
@@ -2,7 +2,7 @@
 
 #include "../../client/game_logic/abstract_client.h"
 #include "../../main.h"
-#include "../../server/user/user_list.h"
+#include "../../server/user/user_list_widget.h"
 #include "../../settings/cache_settings.h"
 #include "../ui/pixel_map_generator.h"
 #include "pb/event_game_joined.pb.h"
diff --git a/cockatrice/src/game/games_model.cpp b/cockatrice/src/game/games_model.cpp
index 4d3104a19..a2b42ee7a 100644
--- a/cockatrice/src/game/games_model.cpp
+++ b/cockatrice/src/game/games_model.cpp
@@ -2,7 +2,7 @@
 
 #include "../client/tabs/tab_account.h"
 #include "../client/ui/pixel_map_generator.h"
-#include "../server/user/user_list.h"
+#include "../server/user/user_list_widget.h"
 #include "../settings/cache_settings.h"
 #include "pb/serverinfo_game.pb.h"
 
diff --git a/cockatrice/src/game/player/player_list_widget.cpp b/cockatrice/src/game/player/player_list_widget.cpp
index ef63c9dc0..bca98a35b 100644
--- a/cockatrice/src/game/player/player_list_widget.cpp
+++ b/cockatrice/src/game/player/player_list_widget.cpp
@@ -6,7 +6,7 @@
 #include "../../client/tabs/tab_supervisor.h"
 #include "../../client/ui/pixel_map_generator.h"
 #include "../../server/user/user_context_menu.h"
-#include "../../server/user/user_list.h"
+#include "../../server/user/user_list_widget.h"
 #include "pb/command_kick_from_game.pb.h"
 #include "pb/serverinfo_playerproperties.pb.h"
 #include "pb/session_commands.pb.h"
diff --git a/cockatrice/src/server/chat_view/chat_view.h b/cockatrice/src/server/chat_view/chat_view.h
index c48ef4dfe..cf5437dd4 100644
--- a/cockatrice/src/server/chat_view/chat_view.h
+++ b/cockatrice/src/server/chat_view/chat_view.h
@@ -2,7 +2,7 @@
 #define CHATVIEW_H
 
 #include "../../client/tabs/tab_supervisor.h"
-#include "../user/user_list.h"
+#include "../user/user_list_widget.h"
 #include "room_message_type.h"
 #include "user_level.h"
 #include "user_list_proxy.h"
diff --git a/cockatrice/src/server/user/user_context_menu.cpp b/cockatrice/src/server/user/user_context_menu.cpp
index 25026801c..8b055af34 100644
--- a/cockatrice/src/server/user/user_context_menu.cpp
+++ b/cockatrice/src/server/user/user_context_menu.cpp
@@ -18,7 +18,7 @@
 #include "pb/response_warn_list.pb.h"
 #include "pb/session_commands.pb.h"
 #include "user_info_box.h"
-#include "user_list.h"
+#include "user_list_widget.h"
 
 #include <QAction>
 #include <QMenu>
diff --git a/cockatrice/src/server/user/user_list.cpp b/cockatrice/src/server/user/user_list_widget.cpp
similarity index 99%
rename from cockatrice/src/server/user/user_list.cpp
rename to cockatrice/src/server/user/user_list_widget.cpp
index 52740da91..bed1d85a6 100644
--- a/cockatrice/src/server/user/user_list.cpp
+++ b/cockatrice/src/server/user/user_list_widget.cpp
@@ -1,4 +1,4 @@
-#include "user_list.h"
+#include "user_list_widget.h"
 
 #include "../../client/game_logic/abstract_client.h"
 #include "../../client/tabs/tab_account.h"
diff --git a/cockatrice/src/server/user/user_list.h b/cockatrice/src/server/user/user_list_widget.h
similarity index 100%
rename from cockatrice/src/server/user/user_list.h
rename to cockatrice/src/server/user/user_list_widget.h