diff --git a/JetHerald/ChatCommandRouter.cs b/JetHerald/ChatCommandRouter.cs
index a2e7f01..7c5dca7 100644
--- a/JetHerald/ChatCommandRouter.cs
+++ b/JetHerald/ChatCommandRouter.cs
@@ -30,7 +30,7 @@ namespace JetHerald
             var text = args.Message.Text;
             if (CommandString.TryParse(text, out var cmd))
             {
-                if (cmd.UserName != null && cmd.UserName != Username)
+                if (cmd.Username != null && cmd.Username != Username)
                 {
                     Log.LogDebug("Message not directed at us");
                     return null;
diff --git a/JetHerald/CommandString.cs b/JetHerald/CommandString.cs
index 77e5e05..df79f6f 100644
--- a/JetHerald/CommandString.cs
+++ b/JetHerald/CommandString.cs
@@ -9,11 +9,12 @@ namespace JetHerald
         public CommandString(string command, string username, params string[] parameters)
         {
             Command = command;
+            Username = username;
             Parameters = parameters;
         }
 
         public string Command { get; }
-        public string UserName { get; }
+        public string Username { get; }
         public string[] Parameters { get; }
 
         static readonly char[] WS_CHARS = new[] { ' ', '\r', '\n', '\n' };