diff --git a/binaries/data/mods/public/gui/lobby/Lobby.js b/binaries/data/mods/public/gui/lobby/LobbyHandler.js
similarity index 96%
rename from binaries/data/mods/public/gui/lobby/Lobby.js
rename to binaries/data/mods/public/gui/lobby/LobbyHandler.js
index 716dc1ea4e..d99dd19d3a 100644
--- a/binaries/data/mods/public/gui/lobby/Lobby.js
+++ b/binaries/data/mods/public/gui/lobby/LobbyHandler.js
@@ -1,7 +1,7 @@
 /**
  * This class owns the page handlers.
  */
-class Lobby
+class LobbyHandler
 {
 	constructor(dialog)
 	{
diff --git a/binaries/data/mods/public/gui/lobby/lobby.js b/binaries/data/mods/public/gui/lobby/lobby.js
index 009bbb73bb..9d94a89329 100644
--- a/binaries/data/mods/public/gui/lobby/lobby.js
+++ b/binaries/data/mods/public/gui/lobby/lobby.js
@@ -26,7 +26,7 @@ var g_Nickname = Engine.LobbyGetNick();
 /**
  * This class organizes all components of this GUI page.
  */
-var g_Lobby;
+var g_LobbyHandler;
 
 /**
  * Called after the XmppConnection succeeded and when returning from a game.
@@ -34,7 +34,7 @@ var g_Lobby;
 function init(attribs)
 {
 	if (g_Settings)
-		g_Lobby = new Lobby(attribs && attribs.dialog);
+		g_LobbyHandler = new LobbyHandler(attribs && attribs.dialog);
 	else
 		error("Could not load settings");
 }