--- a/gameServer/HWProtoLobbyState.hs	Wed Mar 18 22:02:55 2009 +0000
+++ b/gameServer/HWProtoLobbyState.hs	Sat Mar 21 10:49:58 2009 +0000
@@ -41,7 +41,7 @@
 		clientNick = nick $ clients IntMap.! clID
 
 
-handleCmd_lobby clID clients rooms ["CREATE", newRoom, roomPassword] =
+handleCmd_lobby clID clients rooms ["CREATE_ROOM", newRoom, roomPassword] =
 	if haveSameRoom then
 		[Warning "Room exists"]
 	else
@@ -54,11 +54,11 @@
 		haveSameRoom = isJust $ find (\room -> newRoom == name room) $ IntMap.elems rooms
 
 
-handleCmd_lobby clID clients rooms ["CREATE", newRoom] =
-	handleCmd_lobby clID clients rooms ["CREATE", newRoom, ""]
+handleCmd_lobby clID clients rooms ["CREATE_ROOM", newRoom] =
+	handleCmd_lobby clID clients rooms ["CREATE_ROOM", newRoom, ""]
 
 
-handleCmd_lobby clID clients rooms ["JOIN", roomName, roomPassword] =
+handleCmd_lobby clID clients rooms ["JOIN_ROOM", roomName, roomPassword] =
 	if noSuchRoom then
 		[Warning "No such room"]
 	else if isRestrictedJoins jRoom then
@@ -106,8 +106,8 @@
 				answerAllTeams (teams jRoom)
 
 
-handleCmd_lobby clID clients rooms ["JOIN", roomName] =
-	handleCmd_lobby clID clients rooms ["JOIN", roomName, ""]
+handleCmd_lobby clID clients rooms ["JOIN_ROOM", roomName] =
+	handleCmd_lobby clID clients rooms ["JOIN_ROOM", roomName, ""]
 
 
 handleCmd_lobby clID clients rooms ["KICK", kickNick] =