diff --git a/ChatApp/README.md b/ChatApp/README.md
index 20e6708..071e771 100644
--- a/ChatApp/README.md
+++ b/ChatApp/README.md
@@ -29,4 +29,11 @@ You will also be able to create a new room.
 - /listRooms
 - /joinRoom *roomName*
 - /leaveRoom
-- /help
\ No newline at end of file
+- /help
+
+> [!NOTE]
+> There are some aliases for the commands:
+> - /create
+> - /list
+> - /join
+> - /leave
\ No newline at end of file
diff --git a/ChatApp/src/client/ClientConsole.java b/ChatApp/src/client/ClientConsole.java
index c463a70..8c7d6af 100644
--- a/ChatApp/src/client/ClientConsole.java
+++ b/ChatApp/src/client/ClientConsole.java
@@ -51,7 +51,7 @@ public class ClientConsole implements ClientListener {
 	}
 
 	private void inputLoop() {
-		//waiting to be connected
+		// waiting to be connected
 		try {
 			Thread.sleep(2000);
 			return;
@@ -78,28 +78,33 @@ public class ClientConsole implements ClientListener {
 	private void visitMessage(String message) {
 		try {
 			if (message.startsWith("/")) {
-				if (message.startsWith("/createRoom")) {
+				if (message.startsWith("/createRoom ")) {
 					String roomName = message.substring(12).trim();
 					this.client.SendCreateRoom(roomName);
-				} else if (message.startsWith("/listRooms")) {
+				} else if (message.startsWith("/create ")) {
+					String roomName = message.substring(8).trim();
+					this.client.SendCreateRoom(roomName);
+				} else if (message.equals("/listRooms") || message.equals("/list")) {
 					this.client.RequestRoomList();
-				} else if (message.startsWith("/joinRoom")) {
+				} else if (message.startsWith("/joinRoom ")) {
 					String roomName = message.substring(10).trim();
 					this.client.SendJoinRoom(roomName);
-				} else if (message.startsWith("/leaveRoom")) {
+				} else if (message.startsWith("/join ")) {
+					String roomName = message.substring(6).trim();
+					this.client.SendJoinRoom(roomName);
+				} else if (message.equals("/leaveRoom") || message.equals("/leave")) {
 					this.client.SendLeaveRoom();
-				} else if (message.startsWith("/bye")) {
+				} else if (message.equals("/bye")) {
 					this.client.close();
-				} else if (message.startsWith("/help")) {
+				} else if (message.equals("/help")) {
 					System.out.println("Available commands:");
-					System.out.println("\t/bye");
 					System.out.println("\t/createRoom <roomName>");
 					System.out.println("\t/listRooms");
 					System.out.println("\t/joinRoom <roomName>");
 					System.out.println("\t/leaveRoom");
 					System.out.println("\t/help");
 				} else {
-					System.out.println("Unknown command");
+					System.out.println(ANSIColor.formatString("&rUnknown command&n"));
 				}
 			} else {
 				this.client.SendChatMessage(message);