diff --git a/sweebot.py b/sweebot.py
index 75256ec..57dc810 100644
--- a/sweebot.py
+++ b/sweebot.py
@@ -432,9 +432,9 @@ while True:
 
                     elif command[0] == "$whoami":
                         if perms != "":
-                            irc.send_irc(channel, nick + ": " + username + " (Your cloak has permissions, use the 'perms' command to see)")
+                            irc.send_irc(channel, nick + ": " + mask + " (Your hostmask has permissions, use the 'perms' command to see)")
                         else:
-                            irc.send_irc(channel, nick + ": " + username)
+                            irc.send_irc(channel, nick + ": " + mask)
 
                     elif command[0] == "$welcome":
                         name = nick if not len(command) > 1 else " ".join(command[1:])
@@ -446,9 +446,9 @@ while True:
                     elif command[0] == "$perms":
                         if len(command) == 2:
                             if sbconfig.perms(command[1]) != "":
-                                irc.send_irc(channel, nick + ": permissions of user " + command[1] + ": " + sbconfig.perms(command[1]))
+                                irc.send_irc(channel, nick + ": permissions of hostmask " + command[1] + ": " + sbconfig.perms(command[1]))
                             else:
-                                irc.send_irc(channel, nick + ": The user wildcard at " + command[1] + " Doesn't have permissions.")
+                                irc.send_irc(channel, nick + ": The hostmask wildcard " + command[1] + " Doesn't have permissions.")
                         else:
                             if perms != "":
                                 irc.send_irc(channel, nick + ": " + perms)