4 files changed, 4 insertions, 4 deletions
diff --git a/src/commands/cmd_commands.cpp b/src/commands/cmd_commands.cpp
index 63b4b24fb..cc662f3b6 100644
--- a/src/commands/cmd_commands.cpp
+++ b/src/commands/cmd_commands.cpp
@@ -53,7 +53,7 @@ CmdResult CommandCommands::Handle (const std::vector<std::string>&, User *user)
 		Module* src = i->second->creator;
 		user->WriteNumeric(RPL_COMMANDS, "%s :%s %s %d %d",
 				user->nick.c_str(),
-				i->second->command.c_str(),
+				i->second->name.c_str(),
 				src ? src->ModuleSourceFile.c_str() : "<core>",
 				i->second->min_params,
 				i->second->Penalty);
diff --git a/src/commands/cmd_server.cpp b/src/commands/cmd_server.cpp
index e5a7622b8..c6e7d9888 100644
--- a/src/commands/cmd_server.cpp
+++ b/src/commands/cmd_server.cpp
@@ -41,7 +41,7 @@ CmdResult CommandServer::Handle (const std::vector<std::string>&, User *user)
 	}
 	else
 	{
-		user->WriteNumeric(ERR_NOTREGISTERED, "%s :You may not register as a server (servers have seperate ports from clients, change your config)",command.c_str());
+		user->WriteNumeric(ERR_NOTREGISTERED, "%s :You may not register as a server (servers have seperate ports from clients, change your config)",name.c_str());
 	}
 	return CMD_FAILURE;
 }
diff --git a/src/commands/cmd_who.cpp b/src/commands/cmd_who.cpp
index da797201b..b5ace291b 100644
--- a/src/commands/cmd_who.cpp
+++ b/src/commands/cmd_who.cpp
@@ -109,7 +109,7 @@ bool CommandWho::whomatch(User* cuser, User* user, const char* matchtext)
 			match = false;
 			const Extensible::ExtensibleStore& list = user->GetExtList();
 			for(Extensible::ExtensibleStore::const_iterator i = list.begin(); i != list.end(); ++i)
-				if (InspIRCd::Match(i->first->key, matchtext))
+				if (InspIRCd::Match(i->first->name, matchtext))
 					match = true;
 		}
 		else if (opt_realname)
diff --git a/src/commands/cmd_whowas.cpp b/src/commands/cmd_whowas.cpp
index 34e7e74e0..21c30d742 100644
--- a/src/commands/cmd_whowas.cpp
+++ b/src/commands/cmd_whowas.cpp
@@ -29,7 +29,7 @@ CmdResult CommandWhowas::Handle (const std::vector<std::string>& parameters, Use
 	/* if whowas disabled in config */
 	if (ServerInstance->Config->WhoWasGroupSize == 0 || ServerInstance->Config->WhoWasMaxGroups == 0)
 	{
-		user->WriteNumeric(421, "%s %s :This command has been disabled.",user->nick.c_str(),command.c_str());
+		user->WriteNumeric(421, "%s %s :This command has been disabled.",user->nick.c_str(),name.c_str());
 		return CMD_FAILURE;
 	}