diff --git a/src/org/yaaic/command/CommandParser.java b/src/org/yaaic/command/CommandParser.java
index 059a297..1b6d805 100644
--- a/src/org/yaaic/command/CommandParser.java
+++ b/src/org/yaaic/command/CommandParser.java
@@ -100,8 +100,7 @@ public class CommandParser
 					errorMessage.setColor(Message.COLOR_RED);
 					channel.addMessage(errorMessage);
 					
-					Message usageMessage = new Message("Usage of " + type + ": " + command.getUsage());
-					//usageMessage.setColor(Message.COLOR_RED);
+					Message usageMessage = new Message("Syntax: " + command.getUsage());
 					channel.addMessage(usageMessage);
 					
 					Intent intent = new Intent(Broadcast.CHANNEL_MESSAGE);
diff --git a/src/org/yaaic/command/JoinCommand.java b/src/org/yaaic/command/JoinCommand.java
index caa2f34..f631373 100644
--- a/src/org/yaaic/command/JoinCommand.java
+++ b/src/org/yaaic/command/JoinCommand.java
@@ -52,6 +52,6 @@ public class JoinCommand extends BaseCommand
 	@Override
 	public String getUsage()
 	{
-		return "/join channel [key]";
+		return "/join <channel> [<key>]";
 	}
 }
diff --git a/src/org/yaaic/command/NickCommand.java b/src/org/yaaic/command/NickCommand.java
index 8cb4df5..bd72107 100644
--- a/src/org/yaaic/command/NickCommand.java
+++ b/src/org/yaaic/command/NickCommand.java
@@ -50,6 +50,6 @@ public class NickCommand extends BaseCommand
 	@Override
 	public String getUsage()
 	{
-		return "/nick nickname";
+		return "/nick <nickname>";
 	}
 }