diff --git a/Modules/Whoer.lua b/Modules/Whoer.lua
index 903e5e4..83df98a 100644
--- a/Modules/Whoer.lua
+++ b/Modules/Whoer.lua
@@ -386,7 +386,7 @@ function shared.Whoer.Init()
 		local ret = {}
 		for _, player in pairs(HeimdallStinkies) do
 			if Heimdall_Data.config.who.zoneNotifyFor[player.zone] then
-				ret[#ret + 1] = string.format("%s (%s) %s", player.name, player.zone, player.stinky and "(!!!!)" or "")
+				ret[#ret + 1] = string.format("%s-%s (%s) %s", player.name, player.class, player.zone, player.stinky and "(!!!!)" or "")
 			end
 		end
 		return ret
@@ -475,7 +475,7 @@ function shared.Whoer.Init()
 			local msg = {
 				channel = "CHANNEL",
 				data = channelname,
-				message = strjoin(", ", unpack(Who()))
+				message = "who: " .. strjoin(", ", unpack(Who()))
 			}
 			table.insert(shared.messenger.queue, msg)
 		end
@@ -484,7 +484,7 @@ function shared.Whoer.Init()
 			local msg = {
 				channel = "CHANNEL",
 				data = channelname,
-				message = strjoin(", ", unpack(Count()))
+				message = "howmany: " .. strjoin(", ", unpack(Count()))
 			}
 			table.insert(shared.messenger.queue, msg)
 		end
@@ -493,7 +493,7 @@ function shared.Whoer.Init()
 			local msg = {
 				channel = "CHANNEL",
 				data = channelname,
-				message = strjoin(", ", unpack(CountClass()))
+				message = "classes: " .. strjoin(", ", unpack(CountClass()))
 			}
 			table.insert(shared.messenger.queue, msg)
 		end