diff --git a/src/modules/m_addline.c b/src/modules/m_addline.c
index f9cf3d79e..949ca6e87 100644
--- a/src/modules/m_addline.c
+++ b/src/modules/m_addline.c
@@ -84,13 +84,13 @@ DLLFUNC CMD_FUNC(m_addline)
 
 	if (!ValidatePermissionsForPath("server:addline",sptr,NULL,NULL,NULL))
 	{
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
 	if (parc < 2)
 	{
 		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
-		    me.name, parv[0], "ADDLINE");
+		    me.name, sptr->name, "ADDLINE");
 		return 0;
 	}
 	/* writes to current -f */
diff --git a/src/modules/m_addmotd.c b/src/modules/m_addmotd.c
index 93e6c4f6c..2edb255e9 100644
--- a/src/modules/m_addmotd.c
+++ b/src/modules/m_addmotd.c
@@ -88,13 +88,13 @@ DLLFUNC CMD_FUNC(m_addmotd)
 
 	if (!ValidatePermissionsForPath("server:addmotd",sptr,NULL,NULL,NULL))
 	{
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
 	if (parc < 2)
 	{
 		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
-		    me.name, parv[0], "ADDMOTD");
+		    me.name, sptr->name, "ADDMOTD");
 		return 0;
 	}
 	conf = fopen(MOTD, "a");
diff --git a/src/modules/m_addomotd.c b/src/modules/m_addomotd.c
index d353dd7f8..127da346c 100644
--- a/src/modules/m_addomotd.c
+++ b/src/modules/m_addomotd.c
@@ -88,13 +88,13 @@ DLLFUNC CMD_FUNC(m_addomotd)
 
 	if (!ValidatePermissionsForPath("server:addomotd",sptr,NULL,NULL,NULL))
 	{
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
 	if (parc < 2)
 	{
 		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
-		    me.name, parv[0], "ADDOMOTD");
+		    me.name, sptr->name, "ADDOMOTD");
 		return 0;
 	}
 	conf = fopen(conf_files->opermotd_file, "a");
diff --git a/src/modules/m_admin.c b/src/modules/m_admin.c
index 79da7b2ef..ad41332fe 100644
--- a/src/modules/m_admin.c
+++ b/src/modules/m_admin.c
@@ -73,7 +73,6 @@ MOD_UNLOAD(m_admin)
 
 /*
 ** m_admin
-**	parv[0] = sender prefix
 **	parv[1] = servername
 */
 DLLFUNC CMD_FUNC(m_admin)
@@ -89,11 +88,11 @@ DLLFUNC CMD_FUNC(m_admin)
 	if (!conf_admin_tail)
 	{
 		sendto_one(sptr, err_str(ERR_NOADMININFO),
-		    me.name, parv[0], me.name);
+		    me.name, sptr->name, me.name);
 		return 0;
 	}
 
-	sendto_one(sptr, rpl_str(RPL_ADMINME), me.name, parv[0], me.name);
+	sendto_one(sptr, rpl_str(RPL_ADMINME), me.name, sptr->name, me.name);
 
 	/* cycle through the list backwards */
 	for (admin = conf_admin_tail; admin;
@@ -101,13 +100,13 @@ DLLFUNC CMD_FUNC(m_admin)
 	{
 		if (!admin->next)
 			sendto_one(sptr, rpl_str(RPL_ADMINLOC1),
-			    me.name, parv[0], admin->line);
+			    me.name, sptr->name, admin->line);
 		else if (!admin->next->next)
 			sendto_one(sptr, rpl_str(RPL_ADMINLOC2),
-			    me.name, parv[0], admin->line);
+			    me.name, sptr->name, admin->line);
 		else
 			sendto_one(sptr, rpl_str(RPL_ADMINEMAIL),
-			    me.name, parv[0], admin->line);
+			    me.name, sptr->name, admin->line);
 	}
 	return 0;
 }
diff --git a/src/modules/m_away.c b/src/modules/m_away.c
index 1a226a8e3..9ced4a746 100644
--- a/src/modules/m_away.c
+++ b/src/modules/m_away.c
@@ -85,7 +85,6 @@ MOD_UNLOAD(m_away)
 
 /*
 ** m_away
-**      parv[0] = sender prefix
 **      parv[1] = away message
 */
 int  m_away(aClient *cptr, aClient *sptr, int parc, char *parv[])
@@ -105,14 +104,14 @@ int n, wasaway = 0;
                         MyFree(away);
                         sptr->user->away = NULL;
 			/* Only send this if they were actually away -- codemastr */
-	                sendto_server(cptr, 0, 0, ":%s AWAY", parv[0]);
+	                sendto_server(cptr, 0, 0, ":%s AWAY", sptr->name);
 	                hash_check_watch(cptr, RPL_NOTAWAY);
 
 			sendto_common_channels_local_butone(sptr, PROTO_AWAY_NOTIFY, ":%s AWAY", sptr->name);
                 }
                 /* hope this works XX */
                 if (MyConnect(sptr))
-                        sendto_one(sptr, rpl_str(RPL_UNAWAY), me.name, parv[0]);
+                        sendto_one(sptr, rpl_str(RPL_UNAWAY), me.name, sptr->name);
 				RunHook2(HOOKTYPE_AWAY, sptr, NULL);
                 return 0;
         }
@@ -133,7 +132,7 @@ int n, wasaway = 0;
 			sptr->user->flood.away_c++;
 		if (sptr->user->flood.away_c > AWAY_COUNT)
 		{
-			sendto_one(sptr, err_str(ERR_TOOMANYAWAY), me.name, parv[0]);
+			sendto_one(sptr, err_str(ERR_TOOMANYAWAY), me.name, sptr->name);
 			return 0;
 		}
 	}
@@ -148,7 +147,7 @@ int n, wasaway = 0;
 
 	sptr->user->lastaway = TStime();
 	
-        sendto_server(cptr, 0, 0, ":%s AWAY :%s", parv[0], awy2);
+        sendto_server(cptr, 0, 0, ":%s AWAY :%s", sptr->name, awy2);
 
 	if (away)
 	{
@@ -159,7 +158,7 @@ int n, wasaway = 0;
 	away = sptr->user->away = strdup(awy2);
 
         if (MyConnect(sptr))
-                sendto_one(sptr, rpl_str(RPL_NOWAWAY), me.name, parv[0]);
+                sendto_one(sptr, rpl_str(RPL_NOWAWAY), me.name, sptr->name);
 
 	hash_check_watch(cptr, wasaway ? RPL_REAWAY : RPL_GONEAWAY);
 	sendto_common_channels_local_butone(sptr, PROTO_AWAY_NOTIFY, ":%s AWAY :%s", sptr->name, away);
diff --git a/src/modules/m_cap.c b/src/modules/m_cap.c
index 0edf8030b..ff07bbb53 100644
--- a/src/modules/m_cap.c
+++ b/src/modules/m_cap.c
@@ -422,7 +422,7 @@ DLLFUNC int m_cap(aClient *cptr, aClient *sptr, int parc, char *parv[])
 	{
 		/* I know nothing! */
 		if (IsPerson(sptr))
-			sendto_one(sptr, err_str(ERR_UNKNOWNCOMMAND), me.name, parv[0], "CAP");
+			sendto_one(sptr, err_str(ERR_UNKNOWNCOMMAND), me.name, sptr->name, "CAP");
 		else
 			sendto_one(sptr, err_str(ERR_NOTREGISTERED), me.name, "CAP");
 		return 0;
diff --git a/src/modules/m_chghost.c b/src/modules/m_chghost.c
index 8df9c03b7..942fa25d7 100644
--- a/src/modules/m_chghost.c
+++ b/src/modules/m_chghost.c
@@ -81,7 +81,6 @@ MOD_UNLOAD(m_chghost)
 /* 
  * m_chghost - 12/07/1999 (two months after I made SETIDENT) - Stskeeps
  * :prefix CHGHOST <nick> <new hostname>
- * parv[0] - sender
  * parv[1] - nickname
  * parv[2] - hostname
  *
@@ -93,8 +92,7 @@ DLLFUNC int m_chghost(aClient *cptr, aClient *sptr, int parc, char *parv[])
 
 	if (MyClient(sptr) && !ValidatePermissionsForPath("client:host",sptr,NULL,NULL,NULL))
 	{
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name,
-			parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
 
diff --git a/src/modules/m_chgident.c b/src/modules/m_chgident.c
index e42825db4..d6e7a64b7 100644
--- a/src/modules/m_chgident.c
+++ b/src/modules/m_chgident.c
@@ -87,7 +87,6 @@ MOD_UNLOAD(m_chgident)
 /* 
  * m_chgident - 12/07/1999 (two months after I made SETIDENT) - Stskeeps
  * :prefix CHGIDENT <nick> <new identname>
- * parv[0] - sender
  * parv[1] - nickname
  * parv[2] - identname
  *
@@ -101,7 +100,7 @@ int  legalident = 1;
 
 	if (!ValidatePermissionsForPath("client:ident",sptr,NULL,NULL,NULL))
 	{
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
 
diff --git a/src/modules/m_chgname.c b/src/modules/m_chgname.c
index 3d2460b6d..46e409d9e 100644
--- a/src/modules/m_chgname.c
+++ b/src/modules/m_chgname.c
@@ -87,7 +87,6 @@ MOD_UNLOAD(m_chgname)
 /*
  * m_chgname - Tue May 23 13:06:35 BST 200 (almost a year after I made CHGIDENT) - Stskeeps
  * :prefix CHGNAME <nick> <new realname>
- * parv[0] - sender
  * parv[1] - nickname
  * parv[2] - realname
  *
@@ -99,8 +98,7 @@ DLLFUNC int m_chgname(aClient *cptr, aClient *sptr, int parc, char *parv[])
 
 	if (!ValidatePermissionsForPath("client:name",sptr,NULL,NULL,NULL))
 	{
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name,
-		    parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
 
diff --git a/src/modules/m_close.c b/src/modules/m_close.c
index 689f8e177..31f93f41b 100644
--- a/src/modules/m_close.c
+++ b/src/modules/m_close.c
@@ -82,19 +82,19 @@ DLLFUNC CMD_FUNC(m_close)
 
 	if (!ValidatePermissionsForPath("server:close",sptr,NULL,NULL,NULL))
 	{
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
 
 	list_for_each_entry_safe(acptr, acptr2, &unknown_list, lclient_node)
 	{
-		sendto_one(sptr, rpl_str(RPL_CLOSING), me.name, parv[0],
+		sendto_one(sptr, rpl_str(RPL_CLOSING), me.name, sptr->name,
 		    get_client_name(acptr, TRUE), acptr->status);
 		(void)exit_client(acptr, acptr, acptr, "Oper Closing");
 		closed++;
 	}
 
-	sendto_one(sptr, rpl_str(RPL_CLOSEEND), me.name, parv[0], closed);
+	sendto_one(sptr, rpl_str(RPL_CLOSEEND), me.name, sptr->name, closed);
 	sendto_realops("%s!%s@%s closed %d unknown connections", sptr->name,
 	    sptr->user->username, GetHost(sptr), closed);
 	IRCstats.unknown = 0;
diff --git a/src/modules/m_connect.c b/src/modules/m_connect.c
index cd64b12d8..ebabad32f 100644
--- a/src/modules/m_connect.c
+++ b/src/modules/m_connect.c
@@ -75,7 +75,6 @@ MOD_UNLOAD(m_connect)
  * m_connect() - Added by Jto 11 Feb 1989
  ***********************************************************************//*
    ** m_connect
-   **  parv[0] = sender prefix
    **  parv[1] = servername
  */
 DLLFUNC CMD_FUNC(m_connect)
@@ -89,12 +88,12 @@ DLLFUNC CMD_FUNC(m_connect)
 	if (!IsServer(sptr) && MyConnect(sptr) && !ValidatePermissionsForPath("route:global",sptr,NULL,NULL,NULL) && parc > 3)
 	{			/* Only allow LocOps to make */
 		/* local CONNECTS --SRB      */
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
 	if (!IsServer(sptr) && MyClient(sptr) && !ValidatePermissionsForPath("route:local",sptr,NULL,NULL,NULL) && parc <= 3)
 	{
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
 	if (hunt_server(cptr, sptr, ":%s CONNECT %s %s :%s", 3, parc, parv) != HUNTED_ISME)
@@ -103,7 +102,7 @@ DLLFUNC CMD_FUNC(m_connect)
 	if (parc < 2 || *parv[1] == '\0')
 	{
 		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
-		    me.name, parv[0], "CONNECT");
+		    me.name, sptr->name, "CONNECT");
 		return -1;
 	}
 
diff --git a/src/modules/m_cycle.c b/src/modules/m_cycle.c
index 3ed9a29f8..f691170d3 100644
--- a/src/modules/m_cycle.c
+++ b/src/modules/m_cycle.c
@@ -77,7 +77,6 @@ MOD_UNLOAD(m_cycle)
 
 /*
  * m_cycle() - Stskeeps
- * parv[0] = prefix
  * parv[1] = channels
 */
 
diff --git a/src/modules/m_dccdeny.c b/src/modules/m_dccdeny.c
index c51ed6100..028f6d912 100644
--- a/src/modules/m_dccdeny.c
+++ b/src/modules/m_dccdeny.c
@@ -73,7 +73,6 @@ MOD_UNLOAD(m_dccdeny)
 
 /* Add a temporary dccdeny line
  *
- * parv[0] - sender
  * parv[1] - file
  * parv[2] - reason
  */
@@ -84,32 +83,32 @@ DLLFUNC CMD_FUNC(m_dccdeny)
 
 	if (!ValidatePermissionsForPath("client:dcc",sptr,NULL,NULL,NULL))
 	{
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
 	/* fixup --Stskeeps */
 	if (parc < 2)
 	{
-		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0],
+		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, sptr->name,
 		    "DCCDENY");
 		return 0;
 	}
 	
 	if (BadPtr(parv[2]))
 	{
-		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0],
+		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, sptr->name,
 		    "DCCDENY");
 		return 0;
 	}
 	if (!Find_deny_dcc(parv[1]))
 	{
-		sendto_ops("%s added a temp dccdeny for %s (%s)", parv[0],
+		sendto_ops("%s added a temp dccdeny for %s (%s)", sptr->name,
 		    parv[1], parv[2]);
 		DCCdeny_add(parv[1], parv[2], DCCDENY_HARD, CONF_BAN_TYPE_TEMPORARY);
 		return 0;
 	}
 	else
-		sendto_one(sptr, "NOTICE %s :*** %s already has a dccdeny", parv[0],
+		sendto_one(sptr, "NOTICE %s :*** %s already has a dccdeny", sptr->name,
 		    parv[1]);
 	return 0;
 }
diff --git a/src/modules/m_eos.c b/src/modules/m_eos.c
index f73baf2c5..c21ce5196 100644
--- a/src/modules/m_eos.c
+++ b/src/modules/m_eos.c
@@ -88,7 +88,7 @@ DLLFUNC CMD_FUNC(m_eos)
 	ircd_log(LOG_ERROR, "[EOSDBG] m_eos: got sync from %s (path:%s)", sptr->name, cptr->name);
 	ircd_log(LOG_ERROR, "[EOSDBG] m_eos: broadcasting it back to everyone except route from %s", cptr->name);
 #endif
-	sendto_server(cptr, 0, 0, ":%s EOS", parv[0]);
+	sendto_server(cptr, 0, 0, ":%s EOS", sptr->name);
 
 	return 0;
 }
diff --git a/src/modules/m_globops.c b/src/modules/m_globops.c
index d74e03fcc..2ecd15448 100644
--- a/src/modules/m_globops.c
+++ b/src/modules/m_globops.c
@@ -73,7 +73,6 @@ MOD_UNLOAD(m_globops)
 
 /*
 ** m_globops (write to opers who are +g currently online)
-**      parv[0] = sender prefix
 **      parv[1] = message text
 */
 DLLFUNC CMD_FUNC(m_globops)
@@ -85,13 +84,13 @@ DLLFUNC CMD_FUNC(m_globops)
 	if (BadPtr(message))
 	{
 		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
-		    me.name, parv[0], "GLOBOPS");
+		    me.name, sptr->name, "GLOBOPS");
 		return 0;
 	}
 
 	if (MyClient(sptr) && !ValidatePermissionsForPath("chat:globops",sptr,NULL,NULL,NULL))
 	{
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
 
diff --git a/src/modules/m_help.c b/src/modules/m_help.c
index 2f2bc60eb..46ca6700c 100644
--- a/src/modules/m_help.c
+++ b/src/modules/m_help.c
@@ -75,7 +75,6 @@ MOD_UNLOAD(m_help)
 
 /*
 ** m_help (help/write to +h currently online) -Donwulff
-**	parv[0] = sender prefix
 **	parv[1] = optional message text
 */
 CMD_FUNC(m_help)
@@ -89,18 +88,18 @@ CMD_FUNC(m_help)
 	{
 		/* New syntax: ?... never goes out, !... always does. */
 		if (BadPtr(message)) {
-			parse_help(sptr, parv[0], NULL);
+			parse_help(sptr, sptr->name, NULL);
 			return 0;
 		}
 		else if (message[0] == '?') {
-			parse_help(sptr, parv[0], message+1);
+			parse_help(sptr, sptr->name, message+1);
 			return 0;
 		}
 		else if (message[0] == '!') {
 			message++;
 		}
 		else {
-			if (parse_help(sptr, parv[0], message))
+			if (parse_help(sptr, sptr->name, message))
 				return 0;
 		}
 	}
diff --git a/src/modules/m_invite.c b/src/modules/m_invite.c
index a1bef9032..9cf3afba9 100644
--- a/src/modules/m_invite.c
+++ b/src/modules/m_invite.c
@@ -87,7 +87,6 @@ int send_invite_list(aClient *sptr)
 
 /*
 ** m_invite
-**	parv[0] - sender prefix
 **	parv[1] - user to invite
 **	parv[2] - channel number
 */
@@ -104,14 +103,14 @@ DLLFUNC CMD_FUNC(m_invite)
         else if (parc < 3 || *parv[1] == '\0')
         {
                 sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
-                    me.name, parv[0], "INVITE");
+                    me.name, sptr->name, "INVITE");
                 return -1;
         }
 
         if (!(acptr = find_person(parv[1], (aClient *)NULL)))
         {
                 sendto_one(sptr, err_str(ERR_NOSUCHNICK),
-                    me.name, parv[0], parv[1]);
+                    me.name, sptr->name, parv[1]);
                 return -1;
         }
 
@@ -121,7 +120,7 @@ DLLFUNC CMD_FUNC(m_invite)
         if (!(chptr = find_channel(parv[2], NullChn)))
         {
                 sendto_one(sptr, err_str(ERR_NOSUCHCHANNEL),
-                    me.name, parv[0], parv[2]);
+                    me.name, sptr->name, parv[2]);
                 return -1;
         }
 
@@ -140,7 +139,7 @@ DLLFUNC CMD_FUNC(m_invite)
                 else {
 #endif
                         sendto_one(sptr, err_str(ERR_NOINVITE),
-                            me.name, parv[0], parv[2]);
+                            me.name, sptr->name, parv[2]);
                         return -1;
 #ifndef NO_OPEROVERRIDE
                 }
@@ -155,7 +154,7 @@ DLLFUNC CMD_FUNC(m_invite)
                 else {
 #endif
                         sendto_one(sptr, err_str(ERR_NOTONCHANNEL),
-                            me.name, parv[0], parv[2]);
+                            me.name, sptr->name, parv[2]);
                         return -1;
 #ifndef NO_OPEROVERRIDE
                 }
@@ -165,7 +164,7 @@ DLLFUNC CMD_FUNC(m_invite)
         if (IsMember(acptr, chptr))
         {
                 sendto_one(sptr, err_str(ERR_USERONCHANNEL),
-                    me.name, parv[0], parv[1], parv[2]);
+                    me.name, sptr->name, parv[1], parv[2]);
                 return 0;
         }
 
@@ -179,7 +178,7 @@ DLLFUNC CMD_FUNC(m_invite)
                         else {
 #endif
                                 sendto_one(sptr, err_str(ERR_CHANOPRIVSNEEDED),
-                                    me.name, parv[0], chptr->chname);
+                                    me.name, sptr->name, chptr->chname);
                                 return -1;
 #ifndef NO_OPEROVERRIDE
                         }
@@ -193,7 +192,7 @@ DLLFUNC CMD_FUNC(m_invite)
                         else {
 #endif
                                 sendto_one(sptr, err_str(ERR_CHANOPRIVSNEEDED),
-                                    me.name, parv[0],
+                                    me.name, sptr->name,
                                         ((chptr) ? (chptr->chname) : parv[2]));
                                 return -1;
 #ifndef NO_OPEROVERRIDE
@@ -207,7 +206,7 @@ DLLFUNC CMD_FUNC(m_invite)
 		    !is_chan_op(sptr, chptr) && !ValidatePermissionsForPath("immune:viruscheck",sptr,NULL,NULL,NULL))
 		{
 			sendto_one(sptr, err_str(ERR_CHANOPRIVSNEEDED),
-				me.name, parv[0], chptr->chname);
+				me.name, sptr->name, chptr->chname);
 			return -1;
 		}
 
@@ -218,11 +217,11 @@ DLLFUNC CMD_FUNC(m_invite)
                 if (!over)
                 {
                         sendto_one(sptr, rpl_str(RPL_INVITING), me.name,
-                            parv[0], acptr->name,
+                            sptr->name, acptr->name,
                             ((chptr) ? (chptr->chname) : parv[2]));
                         if (acptr->user->away)
                                 sendto_one(sptr, rpl_str(RPL_AWAY), me.name,
-                                    parv[0], acptr->name, acptr->user->away);
+                                    sptr->name, acptr->name, acptr->user->away);
                 }
         }
         /* Note: is_banned() here will cause some extra CPU load,
@@ -306,7 +305,7 @@ DLLFUNC CMD_FUNC(m_invite)
 			}
 	}
 	if (!is_silenced(sptr, acptr))
-		sendto_prefix_one(acptr, sptr, ":%s INVITE %s :%s", parv[0],
+		sendto_prefix_one(acptr, sptr, ":%s INVITE %s :%s", sptr->name,
 			acptr->name, ((chptr) ? (chptr->chname) : parv[2]));
 
         return 0;
diff --git a/src/modules/m_ison.c b/src/modules/m_ison.c
index 530de5232..f02d008f3 100644
--- a/src/modules/m_ison.c
+++ b/src/modules/m_ison.c
@@ -92,7 +92,7 @@ DLLFUNC CMD_FUNC(m_ison) {
 
 	if (parc < 2) {
 		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
-		    me.name, parv[0], "ISON");
+		    me.name, sptr->name, "ISON");
 		return 0;
 	}
 
diff --git a/src/modules/m_join.c b/src/modules/m_join.c
index eb14a9b29..9573bbbc4 100644
--- a/src/modules/m_join.c
+++ b/src/modules/m_join.c
@@ -168,7 +168,6 @@ int i=0,j=0;
 
 /*
 ** m_join
-**	parv[0] = sender prefix
 **	parv[1] = channel
 **	parv[2] = channel password (key)
 */
@@ -335,7 +334,7 @@ DLLFUNC CMD_FUNC(_do_join)
 	if (parc < 2 || *parv[1] == '\0')
 	{
 		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
-		    me.name, parv[0], "JOIN");
+		    me.name, sptr->name, "JOIN");
 		return 0;
 	}
 	bouncedtimes++;
@@ -379,9 +378,7 @@ DLLFUNC CMD_FUNC(_do_join)
 		else if (!IsChannelName(name))
 		{
 			if (MyClient(sptr))
-				sendto_one(sptr,
-				    err_str(ERR_NOSUCHCHANNEL), me.name,
-				    parv[0], name);
+				sendto_one(sptr, err_str(ERR_NOSUCHCHANNEL), me.name, sptr->name, name);
 			continue;
 		}
 		if (*jbuf)
@@ -412,13 +409,13 @@ DLLFUNC CMD_FUNC(_do_join)
 			{
 				chptr = lp->chptr;
 				sendto_channel_butserv(chptr, sptr,
-				    PARTFMT2, parv[0], chptr->chname,
+				    PARTFMT2, sptr->name, chptr->chname,
 				    "Left all channels");
 				if (MyConnect(sptr))
 					RunHook4(HOOKTYPE_LOCAL_PART, cptr, sptr, chptr, "Left all channels");
 				remove_user_from_channel(sptr, chptr);
 			}
-			sendto_server(cptr, 0, 0, ":%s JOIN 0", parv[0]);
+			sendto_server(cptr, 0, 0, ":%s JOIN 0", sptr->name);
 			continue;
 		}
 
@@ -444,7 +441,7 @@ DLLFUNC CMD_FUNC(_do_join)
 					sendto_one(sptr,
 					    err_str
 					    (ERR_TOOMANYCHANNELS),
-					    me.name, parv[0], name);
+					    me.name, sptr->name, name);
 					RET(0)
 				}
 /* RESTRICTCHAN */
@@ -461,7 +458,7 @@ DLLFUNC CMD_FUNC(_do_join)
 								get_client_name(sptr, 1), name);
 						}
 						if (d->reason)
-							sendto_one(sptr, err_str(ERR_FORBIDDENCHANNEL), me.name, BadPtr(parv[0]) ? "*" : parv[0], name, d->reason);
+							sendto_one(sptr, err_str(ERR_FORBIDDENCHANNEL), me.name, sptr->name, name, d->reason);
 						if (d->redirect)
 						{
 							sendnotice(sptr, "*** Redirecting you to %s", d->redirect);
@@ -477,7 +474,7 @@ DLLFUNC CMD_FUNC(_do_join)
 			}
 			if (ValidatePermissionsForPath("immune:forbiddenchan",sptr,NULL,NULL,NULL) && (tklban = find_qline(sptr, name, &ishold)))
 			{
-				sendto_one(sptr, err_str(ERR_FORBIDDENCHANNEL), me.name, BadPtr(parv[0]) ? "*" : parv[0], name, tklban->reason);
+				sendto_one(sptr, err_str(ERR_FORBIDDENCHANNEL), me.name, sptr->name, name, tklban->reason);
 				continue;
 			}
 			/* ugly set::spamfilter::virus-help-channel-deny hack.. */
@@ -540,8 +537,7 @@ DLLFUNC CMD_FUNC(_do_join)
 #else
 				if (i != -1)
 #endif
-					sendto_one(sptr, err_str(i),
-					    me.name, parv[0], name);
+					sendto_one(sptr, err_str(i), me.name, sptr->name, name);
 #ifndef NO_OPEROVERRIDE
 				else if (i != -1 && ValidatePermissionsForPath("override:join",sptr,NULL,chptr,NULL) )
 				{
diff --git a/src/modules/m_kick.c b/src/modules/m_kick.c
index e62c798bd..a7c5e0e63 100644
--- a/src/modules/m_kick.c
+++ b/src/modules/m_kick.c
@@ -73,7 +73,6 @@ MOD_UNLOAD(m_kick)
 
 /*
 ** m_kick
-**	parv[0] = sender prefix
 **	parv[1] = channel
 **	parv[2] = client to kick
 **	parv[3] = kick comment
@@ -99,11 +98,11 @@ CMD_FUNC(m_kick)
 	if (parc < 3 || *parv[1] == '\0')
 	{
 		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
-		    me.name, parv[0], "KICK");
+		    me.name, sptr->name, "KICK");
 		return 0;
 	}
 
-	comment = (BadPtr(parv[3])) ? parv[0] : parv[3];
+	comment = (BadPtr(parv[3])) ? sptr->name : parv[3];
 
 	if (strlen(comment) > (size_t)TOPICLEN)
 		comment[TOPICLEN] = '\0';
@@ -115,7 +114,7 @@ CMD_FUNC(m_kick)
 		if (!chptr)
 		{
 			sendto_one(sptr, err_str(ERR_NOSUCHCHANNEL),
-			    me.name, parv[0], name);
+			    me.name, sptr->name, name);
 			continue;
 		}
 		/* Store "sptr" access flags */
@@ -125,7 +124,7 @@ CMD_FUNC(m_kick)
 		    && !(sptr_flags & CHFL_ISOP) && !(sptr_flags & CHFL_HALFOP))
 		{
 			sendto_one(sptr, err_str(ERR_CHANOPRIVSNEEDED),
-			    me.name, parv[0], chptr->chname);
+			    me.name, sptr->name, chptr->chname);
 			continue;
 		}
 
@@ -330,7 +329,7 @@ CMD_FUNC(m_kick)
 						/* NORMAL */
 						sendto_channel_butserv(chptr,
 						    sptr, ":%s KICK %s %s :%s",
-						    parv[0], chptr->chname, who->name, comment);
+						    sptr->name, chptr->chname, who->name, comment);
 					}
 				}
 				sendto_server(cptr, PROTO_SID, 0, ":%s KICK %s %s :%s",
@@ -345,7 +344,7 @@ CMD_FUNC(m_kick)
 			else if (MyClient(sptr))
 				sendto_one(sptr,
 				    err_str(ERR_USERNOTINCHANNEL),
-				    me.name, parv[0], user, name);
+				    me.name, sptr->name, user, name);
 			if (MyClient(cptr))
 				break;
 		}		/* loop on parv[2] */
diff --git a/src/modules/m_kill.c b/src/modules/m_kill.c
index e84ccc02b..a6891834f 100644
--- a/src/modules/m_kill.c
+++ b/src/modules/m_kill.c
@@ -79,7 +79,6 @@ MOD_UNLOAD(m_kill)
 
 /*
 ** m_kill
-**	parv[0] = sender prefix
 **	parv[1] = kill victim(s) - comma separated list
 **	parv[2] = kill path
 */
@@ -96,7 +95,7 @@ DLLFUNC int  m_kill(aClient *cptr, aClient *sptr, int parc, char *parv[])
 	if (parc < 2 || *parv[1] == '\0')
 	{
 		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
-		    me.name, parv[0], "KILL");
+		    me.name, sptr->name, "KILL");
 		return 0;
 	}
 
@@ -112,13 +111,13 @@ DLLFUNC int  m_kill(aClient *cptr, aClient *sptr, int parc, char *parv[])
 
 	if (!IsServer(cptr) && !ValidatePermissionsForPath("kill:global",sptr,NULL,NULL,NULL) && !ValidatePermissionsForPath("kill:local",sptr,NULL,NULL,NULL))
 	{
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
 	if (BadPtr(path))
 	{
 		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
-		    me.name, parv[0], "KILL");
+		    me.name, sptr->name, "KILL");
 		return 0;
 	}
 	if (strlen(path) > (size_t)TOPICLEN)
@@ -144,7 +143,7 @@ DLLFUNC int  m_kill(aClient *cptr, aClient *sptr, int parc, char *parv[])
 			    get_history(nick, (long)KILLCHASETIMELIMIT)))
 			{
 				sendto_one(sptr, err_str(ERR_NOSUCHNICK),
-				    me.name, parv[0], nick);
+				    me.name, sptr->name, nick);
 				continue;
 			}
 			sendnotice(sptr,
@@ -156,21 +155,18 @@ DLLFUNC int  m_kill(aClient *cptr, aClient *sptr, int parc, char *parv[])
 		    || (MyConnect(acptr) && MyClient(cptr)
 		    && !ValidatePermissionsForPath("kill:local",sptr,acptr,NULL,NULL)))
 		{
-			sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name,
-			    parv[0]);
+			sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 			continue;
 		}
 		if (IsServer(acptr) || IsMe(acptr))
 		{
-			sendto_one(sptr, err_str(ERR_CANTKILLSERVER),
-			    me.name, parv[0]);
+			sendto_one(sptr, err_str(ERR_CANTKILLSERVER), me.name, sptr->name);
 			continue;
 		}
 		if (!IsPerson(acptr))
 		{
 			/* Nick exists but user is not registered yet: IOTW "doesn't exist". -- Syzop */
-			sendto_one(sptr, err_str(ERR_NOSUCHNICK),
-			    me.name, parv[0], nick);
+			sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name, sptr->name, nick);
 			continue;
 		}
 
@@ -239,10 +235,10 @@ DLLFUNC int  m_kill(aClient *cptr, aClient *sptr, int parc, char *parv[])
 		    "*** Notice -- Received KILL message for %s!%s@%s from %s Path: %s!%s",
 		    acptr->name, auser->username,
 		    IsHidden(acptr) ? auser->virthost : auser->realhost,
-		    parv[0], inpath, path);
+		    sptr->name, inpath, path);
 #if defined(USE_SYSLOG) && defined(SYSLOG_KILL)
 			syslog(LOG_DEBUG, "KILL From %s For %s Path %s!%s",
-			    parv[0], acptr->name, inpath, path);
+			    sptr->name, acptr->name, inpath, path);
 #endif
 		/*
 		 * By otherguy
@@ -251,7 +247,7 @@ DLLFUNC int  m_kill(aClient *cptr, aClient *sptr, int parc, char *parv[])
                     (LOG_KILL, "KILL (%s) by  %s(%s!%s)",
                            make_nick_user_host
                      (acptr->name, acptr->user->username, GetHost(acptr)),
-                            parv[0],
+                            sptr->name,
                             inpath,
                             path);
 		/*
@@ -263,7 +259,7 @@ DLLFUNC int  m_kill(aClient *cptr, aClient *sptr, int parc, char *parv[])
 		if (!MyConnect(acptr) || !MyConnect(sptr))
 		{
 			sendto_server(cptr, 0, 0, ":%s KILL %s :%s!%s",
-			    parv[0], acptr->name, inpath, path);
+			    sptr->name, acptr->name, inpath, path);
 			if (chasing && IsServer(cptr))
 				sendto_one(cptr, ":%s KILL %s :%s!%s",
 				    me.name, acptr->name, inpath, path);
@@ -278,7 +274,7 @@ DLLFUNC int  m_kill(aClient *cptr, aClient *sptr, int parc, char *parv[])
 		 */
 		if (MyConnect(acptr))
 			sendto_prefix_one(acptr, sptr, ":%s KILL %s :%s!%s",
-			    parv[0], acptr->name, inpath, path);
+			    sptr->name, acptr->name, inpath, path);
 		/*
 		   ** Set FLAGS_KILLED. This prevents exit_one_client from sending
 		   ** the unnecessary QUIT for this. (This flag should never be
diff --git a/src/modules/m_knock.c b/src/modules/m_knock.c
index aa18e31f6..e3ebdf6ad 100644
--- a/src/modules/m_knock.c
+++ b/src/modules/m_knock.c
@@ -73,7 +73,6 @@ MOD_UNLOAD(m_knock)
 
 /*
 ** m_knock
-**	parv[0] - sender prefix
 **	parv[1] - channel
 **	parv[2] - reason
 **
@@ -94,7 +93,7 @@ CMD_FUNC(m_knock)
 	if (parc < 2 || *parv[1] == '\0')
 	{
 		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
-		    me.name, parv[0], "KNOCK");
+		    me.name, sptr->name, "KNOCK");
 		return -1;
 	}
 
diff --git a/src/modules/m_lag.c b/src/modules/m_lag.c
index e78403665..7c7c0a2a7 100644
--- a/src/modules/m_lag.c
+++ b/src/modules/m_lag.c
@@ -75,7 +75,6 @@ MOD_UNLOAD(m_lag)
 }
 
 /* m_lag (lag measure) - Stskeeps
- * parv[0] = prefix
  * parv[1] = server to query
 */
 
@@ -85,21 +84,20 @@ DLLFUNC int m_lag(aClient *cptr, aClient *sptr, int parc, char *parv[])
 	if (MyClient(sptr))
 		if (!ValidatePermissionsForPath("server:info:lag",sptr,NULL,NULL,NULL))
 		{
-			sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name,
-			    parv[0]);
+			sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 			return 0;
 		}
 
 	if (parc < 2)
 	{
 		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
-		    me.name, parv[0], "LAG");
+		    me.name, sptr->name, "LAG");
 		return 0;
 	}
 	if (*parv[1] == '\0')
 	{
 		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
-		    me.name, parv[0], "LAG");
+		    me.name, sptr->name, "LAG");
 		return 0;
 	}
 	if (hunt_server(cptr, sptr, ":%s LAG :%s", 1, parc, parv) == HUNTED_NOSUCH)
diff --git a/src/modules/m_links.c b/src/modules/m_links.c
index 87dab52bb..fd0e0785b 100644
--- a/src/modules/m_links.c
+++ b/src/modules/m_links.c
@@ -71,14 +71,6 @@ MOD_UNLOAD(m_links)
 	return MOD_SUCCESS;
 }
 
-/*
-** m_links
-**	parv[0] = sender prefix
-** or
-**	parv[0] = sender prefix
-**
-** Recoded by Stskeeps
-*/
 DLLFUNC CMD_FUNC(m_links)
 {
 	aClient *acptr;
@@ -91,14 +83,14 @@ DLLFUNC CMD_FUNC(m_links)
 			continue;
 		if (flat)
 			sendto_one(sptr, rpl_str(RPL_LINKS),
-			    me.name, parv[0], acptr->name, me.name,
+			    me.name, sptr->name, acptr->name, me.name,
 			    (acptr != &me) ? 1 : 1, (acptr->info[0] ? acptr->info : "(Unknown Location)"));
 		else
 			sendto_one(sptr, rpl_str(RPL_LINKS),
-			    me.name, parv[0], acptr->name, acptr->serv->up,
+			    me.name, sptr->name, acptr->name, acptr->serv->up,
 			    acptr->hopcount, (acptr->info[0] ? acptr->info : "(Unknown Location)"));
 	}
 
-	sendto_one(sptr, rpl_str(RPL_ENDOFLINKS), me.name, parv[0], "*");
+	sendto_one(sptr, rpl_str(RPL_ENDOFLINKS), me.name, sptr->name, "*");
 	return 0;
 }
diff --git a/src/modules/m_list.c b/src/modules/m_list.c
index 0c79f2014..c77a28b0d 100644
--- a/src/modules/m_list.c
+++ b/src/modules/m_list.c
@@ -84,7 +84,7 @@ MOD_UNLOAD(m_list)
  * HTM is active -- codemastr */
 
 /*
- * * m_list *      parv[0] = sender prefix *      parv[1] = channel
+ * parv[1] = channel
  */
 DLLFUNC CMD_FUNC(m_list)
 {
@@ -123,7 +123,7 @@ DLLFUNC CMD_FUNC(m_list)
 	/* If a /list is in progress, then another one will cancel it */
 	if ((lopt = sptr->user->lopt) != NULL)
 	{
-		sendto_one(sptr, rpl_str(RPL_LISTEND), me.name, parv[0]);
+		sendto_one(sptr, rpl_str(RPL_LISTEND), me.name, sptr->name);
 		free_str_list(sptr->user->lopt->yeslist);
 		free_str_list(sptr->user->lopt->nolist);
 		MyFree(sptr->user->lopt);
@@ -134,7 +134,7 @@ DLLFUNC CMD_FUNC(m_list)
 	if (parc < 2 || BadPtr(parv[1]))
 	{
 
-		sendto_one(sptr, rpl_str(RPL_LISTSTART), me.name, parv[0]);
+		sendto_one(sptr, rpl_str(RPL_LISTSTART), me.name, sptr->name);
 		lopt = sptr->user->lopt = (LOpts *) MyMalloc(sizeof(LOpts));
 		memset(lopt, '\0', sizeof(LOpts));
 
@@ -155,7 +155,7 @@ DLLFUNC CMD_FUNC(m_list)
 		return 0;
 	}
 
-	sendto_one(sptr, rpl_str(RPL_LISTSTART), me.name, parv[0]);
+	sendto_one(sptr, rpl_str(RPL_LISTSTART), me.name, sptr->name);
 
 	chantimemax = topictimemax = currenttime + 86400;
 	chantimemin = topictimemin = 0;
@@ -260,7 +260,7 @@ DLLFUNC CMD_FUNC(m_list)
 #endif
 					  sendto_one(sptr,
 					      rpl_str(RPL_LIST),
-					      me.name, parv[0],
+					      me.name, sptr->name,
 					      name, chptr->users,
 #ifdef LIST_SHOW_MODES
 					      modebuf,
@@ -290,7 +290,7 @@ DLLFUNC CMD_FUNC(m_list)
 		return 0;
 	}
 
-	sendto_one(sptr, rpl_str(RPL_LISTEND), me.name, parv[0]);
+	sendto_one(sptr, rpl_str(RPL_LISTEND), me.name, sptr->name);
 
 	return 0;
 }
diff --git a/src/modules/m_locops.c b/src/modules/m_locops.c
index e9ae06634..53182759d 100644
--- a/src/modules/m_locops.c
+++ b/src/modules/m_locops.c
@@ -73,7 +73,6 @@ MOD_UNLOAD(m_locops)
 
 /*
 ** m_locops (write to opers who are +g currently online *this* server)
-**      parv[0] = sender prefix
 **      parv[1] = message text
 */
 DLLFUNC CMD_FUNC(m_locops)
@@ -85,14 +84,14 @@ DLLFUNC CMD_FUNC(m_locops)
 	if (BadPtr(message))
 	{
 		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
-		    me.name, parv[0], "LOCOPS");
+		    me.name, sptr->name, "LOCOPS");
 		return 0;
 	}
 	if (MyClient(sptr) && !ValidatePermissionsForPath("chat:locops",sptr,NULL,NULL,NULL))
 	{
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
-	sendto_umode(UMODE_OPER, "from %s: %s", parv[0], message);
+	sendto_umode(UMODE_OPER, "from %s: %s", sptr->name, message);
 	return 0;
 }
diff --git a/src/modules/m_lusers.c b/src/modules/m_lusers.c
index 91c1ec434..b079ae0ae 100644
--- a/src/modules/m_lusers.c
+++ b/src/modules/m_lusers.c
@@ -72,7 +72,6 @@ MOD_UNLOAD(m_lusers)
 }
 
 /*
- * parv[0] = sender
  * parv[1] = server to query
  */
 DLLFUNC CMD_FUNC(m_lusers)
@@ -90,25 +89,25 @@ char flatmap;
 	if (IRCstats.me_clients > IRCstats.me_max)
 		IRCstats.me_max = IRCstats.me_clients;
 
-	sendto_one(sptr, rpl_str(RPL_LUSERCLIENT), me.name, parv[0],
+	sendto_one(sptr, rpl_str(RPL_LUSERCLIENT), me.name, sptr->name,
 	    IRCstats.clients - IRCstats.invisible, IRCstats.invisible,
 	    IRCstats.servers);
 
 	if (IRCstats.operators)
 		sendto_one(sptr, rpl_str(RPL_LUSEROP),
-		    me.name, parv[0], IRCstats.operators);
+		    me.name, sptr->name, IRCstats.operators);
 	if (IRCstats.unknown)
 		sendto_one(sptr, rpl_str(RPL_LUSERUNKNOWN),
-		    me.name, parv[0], IRCstats.unknown);
+		    me.name, sptr->name, IRCstats.unknown);
 	if (IRCstats.channels)
 		sendto_one(sptr, rpl_str(RPL_LUSERCHANNELS),
-		    me.name, parv[0], IRCstats.channels);
+		    me.name, sptr->name, IRCstats.channels);
 	sendto_one(sptr, rpl_str(RPL_LUSERME),
-	    me.name, parv[0], IRCstats.me_clients, flatmap ? 0 : IRCstats.me_servers);
+	    me.name, sptr->name, IRCstats.me_clients, flatmap ? 0 : IRCstats.me_servers);
 	sendto_one(sptr, rpl_str(RPL_LOCALUSERS),
-	    me.name, parv[0], IRCstats.me_clients, IRCstats.me_max, IRCstats.me_clients, IRCstats.me_max);
+	    me.name, sptr->name, IRCstats.me_clients, IRCstats.me_max, IRCstats.me_clients, IRCstats.me_max);
 	sendto_one(sptr, rpl_str(RPL_GLOBALUSERS),
-	    me.name, parv[0], IRCstats.clients, IRCstats.global_max, IRCstats.clients, IRCstats.global_max);
+	    me.name, sptr->name, IRCstats.clients, IRCstats.global_max, IRCstats.clients, IRCstats.global_max);
 	if ((IRCstats.me_clients + IRCstats.me_servers) > max_connection_count)
 	{
 		max_connection_count =
diff --git a/src/modules/m_map.c b/src/modules/m_map.c
index 0444b9021..4a4d14ef0 100644
--- a/src/modules/m_map.c
+++ b/src/modules/m_map.c
@@ -165,7 +165,6 @@ int cnt = 0, hide_ulines;
 ** New /MAP format. -Potvin
 ** m_map (NEW)
 **
-**      parv[0] = sender prefix
 **      parv[1] = server mask
 **/
 DLLFUNC CMD_FUNC(m_map)
@@ -188,7 +187,7 @@ DLLFUNC CMD_FUNC(m_map)
 		dump_flat_map(sptr, &me, longest);
 	else
 		dump_map(sptr, &me, "*", 0, longest);
-	sendto_one(sptr, rpl_str(RPL_MAPEND), me.name, parv[0]);
+	sendto_one(sptr, rpl_str(RPL_MAPEND), me.name, sptr->name);
 
 	return 0;
 }
diff --git a/src/modules/m_message.c b/src/modules/m_message.c
index 4821a7411..34ba00e03 100644
--- a/src/modules/m_message.c
+++ b/src/modules/m_message.c
@@ -175,7 +175,6 @@ int ret;
 ** m_message (used in m_private() and m_notice())
 ** the general function to deliver MSG's between users/channels
 **
-**	parv[0] = sender prefix
 **	parv[1] = receiver list
 **	parv[2] = message text
 **
@@ -217,13 +216,13 @@ DLLFUNC int m_message(aClient *cptr, aClient *sptr, int parc, char *parv[], int
 	if (parc < 2 || *parv[1] == '\0')
 	{
 		sendto_one(sptr, err_str(ERR_NORECIPIENT),
-		    me.name, parv[0], cmd);
+		    me.name, sptr->name, cmd);
 		return -1;
 	}
 
 	if (parc < 3 || *parv[2] == '\0')
 	{
-		sendto_one(sptr, err_str(ERR_NOTEXTTOSEND), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOTEXTTOSEND), me.name, sptr->name);
 		return -1;
 	}
 
@@ -258,7 +257,7 @@ DLLFUNC int m_message(aClient *cptr, aClient *sptr, int parc, char *parv[], int
 			ret = can_privmsg(cptr, sptr, acptr, notice, &text, &newcmd);
 			if (ret == CANPRIVMSG_SEND)
 			{
-				sendto_message_one(acptr, sptr, parv[0], newcmd, nick, text);
+				sendto_message_one(acptr, sptr, sptr->name, newcmd, nick, text);
 				continue;
 			} else
 			if (ret == CANPRIVMSG_CONTINUE)
@@ -400,7 +399,7 @@ DLLFUNC int m_message(aClient *cptr, aClient *sptr, int parc, char *parv[], int
 				    sptr, chptr,
 				    prefix,
 				    notice ? ":%s NOTICE %s :%s" : ":%s PRIVMSG %s :%s",
-				    parv[0], nick, text);
+				    sptr->name, nick, text);
 
 				sendanyways = 0;
 				RunHook4(HOOKTYPE_CHANMSG, sptr, chptr, text, notice);
@@ -411,7 +410,7 @@ DLLFUNC int m_message(aClient *cptr, aClient *sptr, int parc, char *parv[], int
 			{
 				if (!notice || (cansend == 8)) /* privmsg or 'cannot send notice'... */
 					sendto_one(sptr, err_str(ERR_CANNOTSENDTOCHAN),
-					    me.name, parv[0], chptr->chname,
+					    me.name, sptr->name, chptr->chname,
 					    err_cantsend[cansend - 1], p2);
 			}
 			continue;
@@ -419,7 +418,7 @@ DLLFUNC int m_message(aClient *cptr, aClient *sptr, int parc, char *parv[], int
 		else if (p2)
 		{
 			sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name,
-			    parv[0], p2);
+			    sptr->name, p2);
 			continue;
 		}
 
@@ -437,7 +436,7 @@ DLLFUNC int m_message(aClient *cptr, aClient *sptr, int parc, char *parv[], int
 			    sptr, nick + 1,
 			    (*nick == '#') ? MATCH_HOST :
 			    MATCH_SERVER,
-			    ":%s %s %s :%s", parv[0], cmd, nick, parv[2]);
+			    ":%s %s %s :%s", sptr->name, cmd, nick, parv[2]);
 			continue;
 		}
 
@@ -478,16 +477,16 @@ DLLFUNC int m_message(aClient *cptr, aClient *sptr, int parc, char *parv[], int
 				}
 				/* NICK@SERVER NOT FOUND: */
 				if (server && strncasecmp(server + 1, SERVICES_NAME, strlen(SERVICES_NAME)) == 0)
-					sendto_one(sptr, err_str(ERR_SERVICESDOWN), me.name, parv[0], nick);
+					sendto_one(sptr, err_str(ERR_SERVICESDOWN), me.name, sptr->name, nick);
 				else
-					sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name, parv[0], fulltarget);
+					sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name, sptr->name, fulltarget);
 
 				continue;
 			}
 
 		}
 		/* nothing, nada, not anything found */
-		sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name, parv[0],
+		sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name, sptr->name,
 		    nick);
 		continue;
 	}
@@ -496,7 +495,6 @@ DLLFUNC int m_message(aClient *cptr, aClient *sptr, int parc, char *parv[], int
 
 /*
 ** m_private
-**	parv[0] = sender prefix
 **	parv[1] = receiver list
 **	parv[2] = message text
 */
@@ -508,7 +506,6 @@ DLLFUNC int  m_private(aClient *cptr, aClient *sptr, int parc, char *parv[])
 
 /*
 ** m_notice
-**	parv[0] = sender prefix
 **	parv[1] = receiver list
 **	parv[2] = notice text
 */
diff --git a/src/modules/m_mkpasswd.c b/src/modules/m_mkpasswd.c
index 5b0bcf9d6..7897fabe8 100644
--- a/src/modules/m_mkpasswd.c
+++ b/src/modules/m_mkpasswd.c
@@ -75,7 +75,6 @@ MOD_UNLOAD(m_mkpasswd)
 
 /*
 ** m_mkpasswd
-**      parv[0] = sender prefix
 **      parv[1] = password to encrypt
 */
 int  m_mkpasswd(aClient *cptr, aClient *sptr, int parc, char *parv[])
diff --git a/src/modules/m_mode.c b/src/modules/m_mode.c
index 01a3e3410..f1aef9943 100644
--- a/src/modules/m_mode.c
+++ b/src/modules/m_mode.c
@@ -112,7 +112,6 @@ MOD_UNLOAD(m_mode)
  * *decent* coding.  This is also easier to read, change, and fine-tune.  Plus,
  * everything isn't scattered; everything's grouped where it should be.
  *
- * parv[0] - sender
  * parv[1] - channel
  */
 CMD_FUNC(m_mode)
@@ -139,7 +138,7 @@ CMD_FUNC(m_mode)
 	else
 	{
 		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
-		    me.name, parv[0], "MODE");
+		    me.name, sptr->name, "MODE");
 		return 0;
 	}
 
@@ -152,9 +151,9 @@ CMD_FUNC(m_mode)
 
 		modebuf[1] = '\0';
 		channel_modes(sptr, modebuf, parabuf, sizeof(modebuf), sizeof(parabuf), chptr);
-		sendto_one(sptr, rpl_str(RPL_CHANNELMODEIS), me.name, parv[0],
+		sendto_one(sptr, rpl_str(RPL_CHANNELMODEIS), me.name, sptr->name,
 		    chptr->chname, modebuf, parabuf);
-		sendto_one(sptr, rpl_str(RPL_CREATIONTIME), me.name, parv[0],
+		sendto_one(sptr, rpl_str(RPL_CREATIONTIME), me.name, sptr->name,
 		    chptr->chname, chptr->creationtime);
 		return 0;
 	}
@@ -286,11 +285,11 @@ CMD_FUNC(m_mode)
 		if (cptr == sptr)
 		{
 			sendto_one(sptr, err_str(ERR_CHANOPRIVSNEEDED),
-			    me.name, parv[0], chptr->chname);
+			    me.name, sptr->name, chptr->chname);
 			return 0;
 		}
 		sendto_one(cptr, ":%s MODE %s -oh %s %s 0",
-		    me.name, chptr->chname, parv[0], parv[0]);
+		    me.name, chptr->chname, sptr->name, sptr->name);
 		/* Tell the other server that the user is
 		 * de-opped.  Fix op desyncs. */
 		bounce_mode(chptr, cptr, parc - 2, parv + 2);
@@ -1574,7 +1573,6 @@ DLLFUNC void _set_mode(aChannel *chptr, aClient *cptr, int parc, char *parv[], u
 
 /*
  * m_umode() added 15/10/91 By Darren Reed.
- * parv[0] - sender
  * parv[1] - username to change mode for
  * parv[2] - modes to change
  */
@@ -1592,7 +1590,7 @@ DLLFUNC CMD_FUNC(_m_umode)
 	if (parc < 2)
 	{
 		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
-		    me.name, parv[0], "MODE");
+		    me.name, sptr->name, "MODE");
 		return 0;
 	}
 
@@ -1600,7 +1598,7 @@ DLLFUNC CMD_FUNC(_m_umode)
 	{
 		if (MyConnect(sptr))
 			sendto_one(sptr, err_str(ERR_NOSUCHNICK),
-			    me.name, parv[0], parv[1]);
+			    me.name, sptr->name, parv[1]);
 		return 0;
 	}
 	if (acptr != sptr)
@@ -1609,10 +1607,10 @@ DLLFUNC CMD_FUNC(_m_umode)
 	if (parc < 3)
 	{
 		sendto_one(sptr, rpl_str(RPL_UMODEIS),
-		    me.name, parv[0], get_mode_str(sptr));
+		    me.name, sptr->name, get_mode_str(sptr));
 		if (sptr->user->snomask)
 			sendto_one(sptr, rpl_str(RPL_SNOMASK),
-				me.name, parv[0], get_sno_str(sptr));
+				me.name, sptr->name, get_sno_str(sptr));
 		return 0;
 	}
 
@@ -1749,7 +1747,7 @@ DLLFUNC CMD_FUNC(_m_umode)
   			  	  {
 				  	sendto_one(sptr,
 				      		err_str(ERR_UMODEUNKNOWNFLAG),
-				      		me.name, parv[0]);
+				      		me.name, sptr->name);
 					  rpterror = 1;
 				  }
 			  }
@@ -1880,7 +1878,7 @@ DLLFUNC CMD_FUNC(_m_umode)
 
 	if (MyConnect(sptr) && setsnomask != sptr->user->snomask)
 		sendto_one(sptr, rpl_str(RPL_SNOMASK),
-			me.name, parv[0], get_sno_str(sptr));
+			me.name, sptr->name, get_sno_str(sptr));
 
 	return 0;
 }
diff --git a/src/modules/m_motd.c b/src/modules/m_motd.c
index f8a60cd74..b615d4304 100644
--- a/src/modules/m_motd.c
+++ b/src/modules/m_motd.c
@@ -99,19 +99,19 @@ DLLFUNC CMD_FUNC(m_motd)
       playmotd:
 	if (themotd == NULL || themotd->lines == NULL)
 	{
-		sendto_one(sptr, err_str(ERR_NOMOTD), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOMOTD), me.name, sptr->name);
 		svsnofile = 1;
 		goto svsmotd;
 	}
 
-	sendto_one(sptr, rpl_str(RPL_MOTDSTART), me.name, parv[0],
+	sendto_one(sptr, rpl_str(RPL_MOTDSTART), me.name, sptr->name,
 		   me.name);
 
 	/* tm_year should be zero only if the struct is zero-ed */
 	if (themotd && themotd->lines && themotd->last_modified.tm_year)
 	{
 		sendto_one(sptr, ":%s %d %s :- %d/%d/%d %d:%02d",
-			me.name, RPL_MOTD, parv[0],
+			me.name, RPL_MOTD, sptr->name,
 			themotd->last_modified.tm_mday,
 			themotd->last_modified.tm_mon + 1,
 			themotd->last_modified.tm_year + 1900,
@@ -124,7 +124,7 @@ DLLFUNC CMD_FUNC(m_motd)
 		motdline = themotd->lines;
 	while (motdline)
 	{
-		sendto_one(sptr, rpl_str(RPL_MOTD), me.name, parv[0],
+		sendto_one(sptr, rpl_str(RPL_MOTD), me.name, sptr->name,
 		    motdline->line);
 		motdline = motdline->next;
 	}
@@ -133,11 +133,11 @@ DLLFUNC CMD_FUNC(m_motd)
 	motdline = svsmotd.lines;
 	while (motdline)
 	{
-		sendto_one(sptr, rpl_str(RPL_MOTD), me.name, parv[0],
+		sendto_one(sptr, rpl_str(RPL_MOTD), me.name, sptr->name,
 		    motdline->line);
 		motdline = motdline->next;
 	}
 	if (svsnofile == 0)
-		sendto_one(sptr, rpl_str(RPL_ENDOFMOTD), me.name, parv[0]);
+		sendto_one(sptr, rpl_str(RPL_ENDOFMOTD), me.name, sptr->name);
 	return 0;
 }
diff --git a/src/modules/m_names.c b/src/modules/m_names.c
index 9ca2e47a1..6a65b9acc 100644
--- a/src/modules/m_names.c
+++ b/src/modules/m_names.c
@@ -80,7 +80,6 @@ static char buf[BUFSIZE];
 
 /*
 ** m_names
-**	parv[0] = sender prefix
 **	parv[1] = channel
 */
 #define TRUNCATED_NAMES 64
@@ -103,7 +102,7 @@ DLLFUNC CMD_FUNC(m_names)
 	if (parc < 2 || !MyConnect(sptr))
 	{
 		sendto_one(sptr, rpl_str(RPL_ENDOFNAMES), me.name,
-		    parv[0], "*");
+		    sptr->name, "*");
 		return 0;
 	}
 
@@ -126,7 +125,7 @@ DLLFUNC CMD_FUNC(m_names)
 	if (!chptr || (!ShowChannel(sptr, chptr) && !ValidatePermissionsForPath("override:see:names:secret",sptr,NULL,chptr,NULL)))
 	{
 		sendto_one(sptr, rpl_str(RPL_ENDOFNAMES), me.name,
-		    parv[0], para);
+		    sptr->name, para);
 		return 0;
 	}
 
@@ -226,16 +225,16 @@ DLLFUNC CMD_FUNC(m_names)
 		if (mlen + idx + bufLen > BUFSIZE - 7)
 		{
 			sendto_one(sptr, rpl_str(RPL_NAMREPLY), me.name,
-			    parv[0], buf);
+			    sptr->name, buf);
 			idx = spos;
 			flag = 0;
 		}
 	}
 
 	if (flag)
-		sendto_one(sptr, rpl_str(RPL_NAMREPLY), me.name, parv[0], buf);
+		sendto_one(sptr, rpl_str(RPL_NAMREPLY), me.name, sptr->name, buf);
 
-	sendto_one(sptr, rpl_str(RPL_ENDOFNAMES), me.name, parv[0], para);
+	sendto_one(sptr, rpl_str(RPL_ENDOFNAMES), me.name, sptr->name, para);
 
 	return 0;
 
diff --git a/src/modules/m_netinfo.c b/src/modules/m_netinfo.c
index 9427b88c5..977b48441 100644
--- a/src/modules/m_netinfo.c
+++ b/src/modules/m_netinfo.c
@@ -72,7 +72,6 @@ MOD_UNLOAD(m_netinfo)
 /*
 ** m_netinfo
 ** by Stskeeps
-**  parv[0] = sender prefix
 **  parv[1] = max global count
 **  parv[2] = time of end sync
 **  parv[3] = unreal protocol using (numeric)
diff --git a/src/modules/m_nick.c b/src/modules/m_nick.c
index 9c7fe1dc4..0b2869acf 100644
--- a/src/modules/m_nick.c
+++ b/src/modules/m_nick.c
@@ -86,7 +86,6 @@ static char spamfilter_user[NICKLEN + USERLEN + HOSTLEN + REALLEN + 64];
 
 /*
 ** m_uid
-**	parv[0] = sender prefix
 **	parv[1] = nickname
 **      parv[2] = hopcount
 **      parv[3] = timestamp
@@ -125,13 +124,13 @@ DLLFUNC CMD_FUNC(m_uid)
 	if (IsServer(cptr) && !do_remote_nick_name(nick))
 	{
 		sendto_one(sptr, err_str(ERR_ERRONEUSNICKNAME),
-		    me.name, parv[0], parv[1], "Illegal characters");
+		    me.name, sptr->name, parv[1], "Illegal characters");
 
 		if (IsServer(cptr))
 		{
 			ircstp->is_kill++;
 			sendto_umode(UMODE_OPER, "Bad Nick: %s From: %s %s",
-			    parv[1], parv[0], get_client_name(cptr, FALSE));
+			    parv[1], sptr->name, get_client_name(cptr, FALSE));
 			sendto_one(cptr, ":%s KILL %s :%s (%s <- %s[%s])",
 			    me.name, parv[1], me.name, parv[1],
 			    nick, cptr->name);
@@ -139,9 +138,9 @@ DLLFUNC CMD_FUNC(m_uid)
 			{	/* bad nick change */
 				sendto_server(cptr, 0, 0,
 				    ":%s KILL %s :%s (%s <- %s!%s@%s)",
-				    me.name, parv[0], me.name,
+				    me.name, sptr->name, me.name,
 				    get_client_name(cptr, FALSE),
-				    parv[0],
+				    sptr->name,
 				    sptr->user ? sptr->username : "",
 				    sptr->user ? sptr->user->server :
 				    cptr->name);
@@ -178,10 +177,10 @@ DLLFUNC CMD_FUNC(m_uid)
 	 */
 	if (IsServer(cptr) &&
 	    (parc > 7
-	    && (!(serv = (aClient *)find_server(parv[0], NULL))
+	    && (!(serv = (aClient *)find_server(sptr->name, NULL))
 	    || serv->from != cptr->from)))
 	{
-		sendto_realops("Cannot find SID %s (%s)", parv[0],
+		sendto_realops("Cannot find SID for %s (%s)", sptr->name,
 		    backupbuf);
 		return 0;
 	}
@@ -191,17 +190,10 @@ DLLFUNC CMD_FUNC(m_uid)
 	   ** client, just reject it. -Lefler
 	   ** Allow opers to use Q-lined nicknames. -Russell
 	 */
-	if (!stricmp("ircd", nick))
+	if (!stricmp("ircd", nick) || !stricmp("irc", nick))
 	{
 		sendto_one(sptr, err_str(ERR_ERRONEUSNICKNAME), me.name,
-		    BadPtr(parv[0]) ? "*" : parv[0], nick,
-		    "Reserved for internal IRCd purposes");
-		return 0;
-	}
-	if (!stricmp("irc", nick))
-	{
-		sendto_one(sptr, err_str(ERR_ERRONEUSNICKNAME), me.name,
-		    BadPtr(parv[0]) ? "*" : parv[0], nick,
+		    sptr->name, nick,
 		    "Reserved for internal IRCd purposes");
 		return 0;
 	}
@@ -358,7 +350,7 @@ DLLFUNC CMD_FUNC(m_uid)
 	{
 		/* XXX: we need to split this out into register_remote_user() or something. */
 		parv[3] = nick;
-		parv[6] = parv[0];
+		parv[6] = sptr->name;
 		do_cmd(cptr, sptr, "USER", parc - 3, &parv[3]);
 		if (GotNetInfo(cptr) && !IsULine(sptr))
 			sendto_fconnectnotice(sptr->name, sptr->user, sptr, 0, NULL);
@@ -371,7 +363,6 @@ DLLFUNC CMD_FUNC(m_uid)
 
 /*
 ** m_nick
-**	parv[0] = sender prefix
 **	parv[1] = nickname
 **  if from new client  -taz
 **	parv[2] = nick password
@@ -412,7 +403,7 @@ DLLFUNC CMD_FUNC(m_nick)
 	if (parc < 2)
 	{
 		sendto_one(sptr, err_str(ERR_NONICKNAMEGIVEN),
-		    me.name, parv[0]);
+		    me.name, sptr->name);
 		return 0;
 	}
 
@@ -442,13 +433,13 @@ DLLFUNC CMD_FUNC(m_nick)
 	    (!IsServer(cptr) && !do_nick_name(nick)))
 	{
 		sendto_one(sptr, err_str(ERR_ERRONEUSNICKNAME),
-		    me.name, parv[0], parv[1], "Illegal characters");
+		    me.name, sptr->name, parv[1], "Illegal characters");
 
 		if (IsServer(cptr))
 		{
 			ircstp->is_kill++;
 			sendto_umode(UMODE_OPER, "Bad Nick: %s From: %s %s",
-			    parv[1], parv[0], get_client_name(cptr, FALSE));
+			    parv[1], sptr->name, get_client_name(cptr, FALSE));
 			sendto_one(cptr, ":%s KILL %s :%s (%s <- %s[%s])",
 			    me.name, parv[1], me.name, parv[1],
 			    nick, cptr->name);
@@ -456,9 +447,9 @@ DLLFUNC CMD_FUNC(m_nick)
 			{	/* bad nick change */
 				sendto_server(cptr, 0, 0,
 				    ":%s KILL %s :%s (%s <- %s!%s@%s)",
-				    me.name, parv[0], me.name,
+				    me.name, sptr->name, me.name,
 				    get_client_name(cptr, FALSE),
-				    parv[0],
+				    sptr->name,
 				    sptr->user ? sptr->username : "",
 				    sptr->user ? sptr->user->server :
 				    cptr->name);
@@ -522,7 +513,7 @@ DLLFUNC CMD_FUNC(m_nick)
 			}
 #endif
 			sendto_one(sptr, err_str(ERR_NICKNAMEINUSE), me.name,
-			    BadPtr(parv[0]) ? "*" : parv[0], nick);
+			    *sptr->name ? sptr->name : "*", nick);
 			return 0;	/* NICK message ignored */
 		}
 	}
@@ -532,17 +523,10 @@ DLLFUNC CMD_FUNC(m_nick)
 	   ** client, just reject it. -Lefler
 	   ** Allow opers to use Q-lined nicknames. -Russell
 	 */
-	if (!stricmp("ircd", nick))
+	if (!stricmp("ircd", nick) || !stricmp("irc", nick))
 	{
 		sendto_one(sptr, err_str(ERR_ERRONEUSNICKNAME), me.name,
-		    BadPtr(parv[0]) ? "*" : parv[0], nick,
-		    "Reserved for internal IRCd purposes");
-		return 0;
-	}
-	if (!stricmp("irc", nick))
-	{
-		sendto_one(sptr, err_str(ERR_ERRONEUSNICKNAME), me.name,
-		    BadPtr(parv[0]) ? "*" : parv[0], nick,
+		    *sptr->name ? sptr->name : "*", nick,
 		    "Reserved for internal IRCd purposes");
 		return 0;
 	}
@@ -581,7 +565,7 @@ DLLFUNC CMD_FUNC(m_nick)
 			if (ishold)
 			{
 				sendto_one(sptr, err_str(ERR_ERRONEUSNICKNAME),
-				    me.name, BadPtr(parv[0]) ? "*" : parv[0],
+				    me.name, *sptr->name ? sptr->name : "*",
 				    nick, tklban->reason);
 				return 0;
 			}
@@ -589,7 +573,7 @@ DLLFUNC CMD_FUNC(m_nick)
 			{
 				sptr->since += 4; /* lag them up */
 				sendto_one(sptr, err_str(ERR_ERRONEUSNICKNAME),
-				    me.name, BadPtr(parv[0]) ? "*" : parv[0],
+				    me.name, *sptr->name ? sptr->name : "*",
 				    nick, tklban->reason);
 				sendto_snomask(SNO_QLINE, "Forbidding Q-lined nick %s from %s.",
 				    nick, get_client_name(cptr, FALSE));
@@ -706,8 +690,7 @@ DLLFUNC CMD_FUNC(m_nick)
 		}
 #endif
 		sendto_one(sptr, err_str(ERR_NICKNAMEINUSE),
-		    /* parv[0] is empty when connecting */
-		    me.name, BadPtr(parv[0]) ? "*" : parv[0], nick);
+		    me.name, *sptr->name ? sptr->name : "*", nick);
 		return 0;	/* NICK message ignored */
 	}
 	/*
@@ -911,7 +894,7 @@ DLLFUNC CMD_FUNC(m_nick)
 				{
 					sendto_one(sptr,
 					    err_str(ERR_BANNICKCHANGE),
-					    me.name, parv[0],
+					    me.name, sptr->name,
 					    mp->chptr->chname);
 					return 0;
 				}
@@ -919,7 +902,7 @@ DLLFUNC CMD_FUNC(m_nick)
 				{
 					sendto_one(sptr,
 					    ":%s 437 %s %s :Cannot change to a nickname banned on channel",
-					    me.name, parv[0],
+					    me.name, sptr->name,
 					    mp->chptr->chname);
 					return 0;
 				}
@@ -935,7 +918,7 @@ DLLFUNC CMD_FUNC(m_nick)
 				{
 					sendto_one(sptr,
 					    err_str(ERR_NONICKCHANGE),
-					    me.name, parv[0],
+					    me.name, sptr->name,
 					    mp->chptr->chname);
 					return 0;
 				}
@@ -964,7 +947,7 @@ DLLFUNC CMD_FUNC(m_nick)
 		 * on a channel, send note of change to all clients
 		 * on that channel. Propagate notice to other servers.
 		 */
-		if (mycmp(parv[0], nick) ||
+		if (mycmp(sptr->name, nick) ||
 		    /* Next line can be removed when all upgraded  --Run */
 		    (!MyClient(sptr) && parc > 2
 		    && atol(parv[2]) < sptr->lastnick))
@@ -976,9 +959,9 @@ DLLFUNC CMD_FUNC(m_nick)
 			sptr->lastnick = TStime();
 		}
 		add_history(sptr, 1);
-		sendto_common_channels(sptr, ":%s NICK :%s", parv[0], nick);
+		sendto_common_channels(sptr, ":%s NICK :%s", sptr->name, nick);
 		sendto_server(cptr, 0, 0, ":%s NICK %s %ld",
-		    parv[0], nick, sptr->lastnick);
+		    sptr->name, nick, sptr->lastnick);
 		if (removemoder)
 			sptr->umodes &= ~UMODE_REGNICK;
 	}
@@ -1112,7 +1095,7 @@ extern int short_motd(aClient *sptr);
 int _register_user(aClient *cptr, aClient *sptr, char *nick, char *username, char *umode, char *virthost, char *ip)
 {
 	ConfigItem_ban *bconf;
-	char *parv[3], *tmpstr;
+	char *tmpstr;
 	const char *id;
 #ifdef HOSTILENAME
 	char stripuser[USERLEN + 1], *u1 = stripuser, *u2, olduser[USERLEN + 1],
@@ -1137,8 +1120,6 @@ int _register_user(aClient *cptr, aClient *sptr, char *nick, char *username, cha
 	aTKline *savetkl = NULL;
 	ConfigItem_tld *tlds;
 	cptr->last = TStime();
-	parv[0] = sptr->name;
-	parv[1] = parv[2] = NULL;
 	nick = sptr->name; /* <- The data is always the same, but the pointer is sometimes not,
 	                    *    I need this for one of my modules, so do not remove! ;) -- Syzop */
 	
@@ -1358,7 +1339,7 @@ int _register_user(aClient *cptr, aClient *sptr, char *nick, char *username, cha
 			sendto_one(sptr, rpl_str(RPL_YOURHOST), me.name, nick,
 			    me.name, version);
 		sendto_one(sptr, rpl_str(RPL_CREATED), me.name, nick, creation);
-		sendto_one(sptr, rpl_str(RPL_MYINFO), me.name, parv[0],
+		sendto_one(sptr, rpl_str(RPL_MYINFO), me.name, sptr->name,
 		    me.name, version, umodestring, cmodestring);
 
 		for (i = 0; IsupportStrings[i]; i++)
@@ -1370,13 +1351,25 @@ int _register_user(aClient *cptr, aClient *sptr, char *nick, char *username, cha
 			sendto_one(sptr, err_str(RPL_HOSTHIDDEN), me.name, sptr->name, user->virthost);
 
 		if (sptr->flags & FLAGS_SSL)
+		{
 			if (sptr->ssl)
+			{
 				sendto_one(sptr,
 				    ":%s NOTICE %s :*** You are connected to %s with %s",
 				    me.name, sptr->name, me.name,
 				    ssl_get_cipher(sptr->ssl));
-		do_cmd(sptr, sptr, "LUSERS", 1, parv);
+			}
+		}
+		
+		{
+			char *parv[2];
+			parv[0] = sptr->name;
+			parv[1] = NULL;
+			do_cmd(sptr, sptr, "LUSERS", 1, parv);
+		}
+		
 		short_motd(sptr);
+
 #ifdef EXPERIMENTAL
 		sendto_one(sptr,
 		    ":%s NOTICE %s :*** \2NOTE:\2 This server is running experimental IRC server software (Unreal%s). If you find any bugs or problems, please report them at http://bugs.unrealircd.org/",
diff --git a/src/modules/m_oper.c b/src/modules/m_oper.c
index 42d744f7a..a69797ce8 100644
--- a/src/modules/m_oper.c
+++ b/src/modules/m_oper.c
@@ -97,7 +97,6 @@ void set_oper_host(aClient *sptr, char *host)
 
 /*
 ** m_oper
-**	parv[0] = sender prefix
 **	parv[1] = oper name
 **	parv[2] = oper password
 */
@@ -114,7 +113,7 @@ DLLFUNC int  m_oper(aClient *cptr, aClient *sptr, int parc, char *parv[])
 
 	if (parc < 2) {
 		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
-		    me.name, parv[0], "OPER");
+		    me.name, sptr->name, "OPER");
 		return 0;
 	}
 
@@ -126,7 +125,7 @@ DLLFUNC int  m_oper(aClient *cptr, aClient *sptr, int parc, char *parv[])
 
 	if (IsOper(sptr)) {
 		sendto_one(sptr, rpl_str(RPL_YOUREOPER),
-		    me.name, parv[0]);
+		    me.name, sptr->name);
 		// TODO: de-confuse this ? ;)
 		return 0;
 	}
@@ -136,11 +135,11 @@ DLLFUNC int  m_oper(aClient *cptr, aClient *sptr, int parc, char *parv[])
 
 	if (!(aconf = Find_oper(name)))
 	{
-		sendto_one(sptr, err_str(ERR_NOOPERHOST), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOOPERHOST), me.name, sptr->name);
 		sendto_snomask_global
 		    (SNO_OPER, "Failed OPER attempt by %s (%s@%s) [unknown oper]",
-		    parv[0], sptr->user->username, sptr->sockhost);
-		ircd_log(LOG_OPER, "OPER UNKNOWNOPER (%s) by (%s!%s@%s)", name, parv[0],
+		    sptr->name, sptr->user->username, sptr->sockhost);
+		ircd_log(LOG_OPER, "OPER UNKNOWNOPER (%s) by (%s!%s@%s)", name, sptr->name,
 			sptr->user->username, sptr->sockhost);
 		sptr->since += 7;
 		return 0;
@@ -148,11 +147,11 @@ DLLFUNC int  m_oper(aClient *cptr, aClient *sptr, int parc, char *parv[])
 
 	if (!unreal_mask_match(sptr, aconf->mask))
 	{
-		sendto_one(sptr, err_str(ERR_NOOPERHOST), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOOPERHOST), me.name, sptr->name);
 		sendto_snomask_global
 		    (SNO_OPER, "Failed OPER attempt by %s (%s@%s) using UID %s [host doesnt match]",
-		    parv[0], sptr->user->username, sptr->sockhost, name);
-		ircd_log(LOG_OPER, "OPER NOHOSTMATCH (%s) by (%s!%s@%s)", name, parv[0],
+		    sptr->name, sptr->user->username, sptr->sockhost, name);
+		ircd_log(LOG_OPER, "OPER NOHOSTMATCH (%s) by (%s!%s@%s)", name, sptr->name,
 			sptr->user->username, sptr->sockhost);
 		sptr->since += 7;
 		return 0;
@@ -161,15 +160,15 @@ DLLFUNC int  m_oper(aClient *cptr, aClient *sptr, int parc, char *parv[])
 	i = Auth_Check(cptr, aconf->auth, password);
 	if (i == -1)
 	{
-		sendto_one(sptr, err_str(ERR_PASSWDMISMATCH), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_PASSWDMISMATCH), me.name, sptr->name);
 		if (FAILOPER_WARN)
 			sendnotice(sptr,
 			    "*** Your attempt has been logged.");
-		ircd_log(LOG_OPER, "OPER FAILEDAUTH (%s) by (%s!%s@%s)", name, parv[0],
+		ircd_log(LOG_OPER, "OPER FAILEDAUTH (%s) by (%s!%s@%s)", name, sptr->name,
 			sptr->user->username, sptr->sockhost);
 		sendto_snomask_global
 		    (SNO_OPER, "Failed OPER attempt by %s (%s@%s) using UID %s [FAILEDAUTH]",
-		    parv[0], sptr->user->username, sptr->sockhost, name);
+		    sptr->name, sptr->user->username, sptr->sockhost, name);
 		sptr->since += 7;
 		return 0;
 	}
@@ -185,12 +184,12 @@ DLLFUNC int  m_oper(aClient *cptr, aClient *sptr, int parc, char *parv[])
 	/* Check oper::require_modes */
 	if (aconf->require_modes & ~sptr->umodes)
 	{
-		sendto_one(sptr, ":%s %d %s :You are missing user modes required to OPER", me.name, ERR_NOOPERHOST, parv[0]);
+		sendto_one(sptr, ":%s %d %s :You are missing user modes required to OPER", me.name, ERR_NOOPERHOST, sptr->name);
 		sendto_snomask_global
 			(SNO_OPER, "Failed OPER attempt by %s (%s@%s) [lacking modes '%s' in oper::require-modes]",
-			 parv[0], sptr->user->username, sptr->sockhost, get_modestr(aconf->require_modes & ~sptr->umodes));
+			 sptr->name, sptr->user->username, sptr->sockhost, get_modestr(aconf->require_modes & ~sptr->umodes));
 		ircd_log(LOG_OPER, "OPER MISSINGMODES (%s) by (%s!%s@%s), needs modes=%s",
-			 name, parv[0], sptr->user->username, sptr->sockhost,
+			 name, sptr->name, sptr->user->username, sptr->sockhost,
 			 get_modestr(aconf->require_modes & ~sptr->umodes));
 		sptr->since += 7;
 		return 0;
@@ -198,13 +197,13 @@ DLLFUNC int  m_oper(aClient *cptr, aClient *sptr, int parc, char *parv[])
 
 	if (aconf->maxlogins && (count_oper_sessions(aconf->name) >= aconf->maxlogins))
 	{
-		sendto_one(sptr, err_str(ERR_NOOPERHOST), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOOPERHOST), me.name, sptr->name);
 		sendto_one(sptr, ":%s NOTICE %s :Your maximum number of concurrent oper logins has been reached (%d)",
 			me.name, sptr->name, aconf->maxlogins);
 		sendto_snomask_global
 			(SNO_OPER, "Failed OPER attempt by %s (%s@%s) using UID %s [maxlogins reached]",
-			parv[0], sptr->user->username, sptr->sockhost, name);
-		ircd_log(LOG_OPER, "OPER TOOMANYLOGINS (%s) by (%s!%s@%s)", name, parv[0],
+			sptr->name, sptr->user->username, sptr->sockhost, name);
+		ircd_log(LOG_OPER, "OPER TOOMANYLOGINS (%s) by (%s!%s@%s)", name, sptr->name,
 			sptr->user->username, sptr->sockhost);
 		sptr->since += 4;
 		return 0;
@@ -250,10 +249,10 @@ DLLFUNC int  m_oper(aClient *cptr, aClient *sptr, int parc, char *parv[])
 
 	sendto_snomask_global(SNO_OPER,
 		"%s (%s@%s) [%s] is now an operator",
-		parv[0], sptr->user->username, sptr->sockhost,
+		sptr->name, sptr->user->username, sptr->sockhost,
 		parv[1]);
 
-	ircd_log(LOG_OPER, "OPER (%s) by (%s!%s@%s)", name, parv[0], sptr->user->username,
+	ircd_log(LOG_OPER, "OPER (%s) by (%s!%s@%s)", name, sptr->name, sptr->user->username,
 		sptr->sockhost);
 
 	/* set oper snomasks */
@@ -272,13 +271,13 @@ DLLFUNC int  m_oper(aClient *cptr, aClient *sptr, int parc, char *parv[])
 	old = (sptr->umodes & ALL_UMODES);
 	send_umode_out(cptr, sptr, old);
 	sendto_one(sptr, rpl_str(RPL_SNOMASK),
-		me.name, parv[0], get_sno_str(sptr));
+		me.name, sptr->name, get_sno_str(sptr));
 
 	list_add(&sptr->special_node, &oper_list);
 
 	RunHook2(HOOKTYPE_LOCAL_OPER, sptr, 1);
 
-	sendto_one(sptr, rpl_str(RPL_YOUREOPER), me.name, parv[0]);
+	sendto_one(sptr, rpl_str(RPL_YOUREOPER), me.name, sptr->name);
 
 	/* Update statistics */
 	if (IsInvisible(sptr) && !(old & UMODE_INVISIBLE))
diff --git a/src/modules/m_opermotd.c b/src/modules/m_opermotd.c
index b504a9efc..084139aa8 100644
--- a/src/modules/m_opermotd.c
+++ b/src/modules/m_opermotd.c
@@ -82,7 +82,7 @@ DLLFUNC CMD_FUNC(m_opermotd)
 
 	if (!ValidatePermissionsForPath("server:opermotd",sptr,NULL,NULL,NULL))
 	{
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
 
@@ -97,19 +97,19 @@ DLLFUNC CMD_FUNC(m_opermotd)
 
 	if (!motdline)
 	{
-		sendto_one(sptr, err_str(ERR_NOOPERMOTD), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOOPERMOTD), me.name, sptr->name);
 		return 0;
 	}
-	sendto_one(sptr, rpl_str(RPL_MOTDSTART), me.name, parv[0], me.name);
-	sendto_one(sptr, rpl_str(RPL_MOTD), me.name, parv[0],
+	sendto_one(sptr, rpl_str(RPL_MOTDSTART), me.name, sptr->name, me.name);
+	sendto_one(sptr, rpl_str(RPL_MOTD), me.name, sptr->name,
 	    "IRC Operator Message of the Day");
 
 	while (motdline)
 	{
-		sendto_one(sptr, rpl_str(RPL_MOTD), me.name, parv[0],
+		sendto_one(sptr, rpl_str(RPL_MOTD), me.name, sptr->name,
 			   motdline->line);
 		motdline = motdline->next;
 	}
-	sendto_one(sptr, rpl_str(RPL_ENDOFMOTD), me.name, parv[0]);
+	sendto_one(sptr, rpl_str(RPL_ENDOFMOTD), me.name, sptr->name);
 	return 0;
 }
diff --git a/src/modules/m_part.c b/src/modules/m_part.c
index 7875bd2ec..3a13469d0 100644
--- a/src/modules/m_part.c
+++ b/src/modules/m_part.c
@@ -73,7 +73,6 @@ MOD_UNLOAD(m_part)
 
 /*
 ** m_part
-**	parv[0] = sender prefix
 **	parv[1] = channel
 **	parv[2] = comment (added by Lefler)
 */
@@ -91,7 +90,7 @@ DLLFUNC CMD_FUNC(m_part)
 	if (parc < 2 || parv[1][0] == '\0')
 	{
 		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
-		    me.name, parv[0], "PART");
+		    me.name, sptr->name, "PART");
 		return 0;
 	}
 
@@ -124,7 +123,7 @@ DLLFUNC CMD_FUNC(m_part)
 		if (!chptr)
 		{
 			sendto_one(sptr, err_str(ERR_NOSUCHCHANNEL),
-			    me.name, parv[0], name);
+			    me.name, sptr->name, name);
 			continue;
 		}
 
@@ -143,7 +142,7 @@ DLLFUNC CMD_FUNC(m_part)
 			if (MyClient(sptr))
 				sendto_one(sptr,
 				    err_str(ERR_NOTONCHANNEL), me.name,
-				    parv[0], name);
+				    sptr->name, name);
 			continue;
 		}
 
@@ -225,11 +224,11 @@ DLLFUNC CMD_FUNC(m_part)
 				if (!comment)
 
 					sendto_channel_butserv(chptr,
-					    sptr, PARTFMT, parv[0],
+					    sptr, PARTFMT, sptr->name,
 					    chptr->chname);
 				else
 					sendto_channel_butserv(chptr,
-					    sptr, PARTFMT2, parv[0],
+					    sptr, PARTFMT2, sptr->name,
 					    chptr->chname, comment);
 			}
 			if (MyClient(sptr))
diff --git a/src/modules/m_pass.c b/src/modules/m_pass.c
index 1165e1a50..5f343ebb8 100644
--- a/src/modules/m_pass.c
+++ b/src/modules/m_pass.c
@@ -147,7 +147,6 @@ ConfigItem_ban *bconf;
  ***************************************************************************/
 /*
 ** m_pass
-**	parv[0] = sender prefix
 **	parv[1] = password
 */
 DLLFUNC CMD_FUNC(m_pass)
@@ -157,13 +156,13 @@ DLLFUNC CMD_FUNC(m_pass)
 	if (BadPtr(password))
 	{
 		sendto_one(cptr, err_str(ERR_NEEDMOREPARAMS),
-		    me.name, parv[0], "PASS");
+		    me.name, sptr->name, "PASS");
 		return 0;
 	}
 	if (!MyConnect(sptr) || (!IsUnknown(cptr) && !IsHandshake(cptr)))
 	{
 		sendto_one(cptr, err_str(ERR_ALREADYREGISTRED),
-		    me.name, parv[0]);
+		    me.name, sptr->name);
 		return 0;
 	}
 
diff --git a/src/modules/m_pingpong.c b/src/modules/m_pingpong.c
index 034312f69..4c343ab20 100644
--- a/src/modules/m_pingpong.c
+++ b/src/modules/m_pingpong.c
@@ -85,7 +85,6 @@ MOD_UNLOAD(m_pingpong)
 
 /*
 ** m_ping
-**	parv[0] = sender prefix
 **	parv[1] = origin
 **	parv[2] = destination
 */
@@ -96,7 +95,7 @@ DLLFUNC int  m_ping(aClient *cptr, aClient *sptr, int parc, char *parv[])
 
 	if (parc < 2 || *parv[1] == '\0')
 	{
-		sendto_one(sptr, err_str(ERR_NOORIGIN), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOORIGIN), me.name, sptr->name);
 		return 0;
 	}
 	origin = parv[1];
@@ -117,11 +116,11 @@ DLLFUNC int  m_ping(aClient *cptr, aClient *sptr, int parc, char *parv[])
 		if (MyClient(sptr))
 			origin = sptr->name; /* Make sure origin is not spoofed */
 		if ((acptr = find_server_quick(destination)) && (acptr != &me))
-			sendto_one(acptr, ":%s PING %s :%s", parv[0], origin, destination);
+			sendto_one(acptr, ":%s PING %s :%s", sptr->name, origin, destination);
 		else
 		{
 			sendto_one(sptr, err_str(ERR_NOSUCHSERVER),
-			    me.name, parv[0], destination);
+			    me.name, sptr->name, destination);
 			return 0;
 		}
 	}
@@ -133,7 +132,6 @@ DLLFUNC int  m_ping(aClient *cptr, aClient *sptr, int parc, char *parv[])
 
 /*
 ** m_nospoof - allows clients to respond to no spoofing patch
-**	parv[0] = prefix
 **	parv[1] = code
 */
 DLLFUNC int  m_nospoof(aClient *cptr, aClient *sptr, int parc, char *parv[])
@@ -177,7 +175,6 @@ Debug((DEBUG_NOTICE, "NOSPOOF"));
 
 /*
 ** m_pong
-**	parv[0] = sender prefix
 **	parv[1] = origin
 **	parv[2] = destination
 */
@@ -191,7 +188,7 @@ DLLFUNC int m_pong(aClient *cptr, aClient *sptr, int parc, char *parv[])
 
 	if (parc < 2 || *parv[1] == '\0')
 	{
-		sendto_one(sptr, err_str(ERR_NOORIGIN), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOORIGIN), me.name, sptr->name);
 		return 0;
 	}
 
@@ -212,17 +209,17 @@ DLLFUNC int m_pong(aClient *cptr, aClient *sptr, int parc, char *parv[])
 			if (!IsServer(cptr) && !IsServer(acptr))
 			{
 				sendto_one(sptr, err_str(ERR_NOSUCHSERVER),
-				    me.name, parv[0], destination);
+				    me.name, sptr->name, destination);
 				return 0;
 			}
 			else
 				sendto_one(acptr, ":%s PONG %s %s",
-				    parv[0], origin, destination);
+				    sptr->name, origin, destination);
 		}
 		else
 		{
 			sendto_one(sptr, err_str(ERR_NOSUCHSERVER),
-			    me.name, parv[0], destination);
+			    me.name, sptr->name, destination);
 			return 0;
 		}
 	}
diff --git a/src/modules/m_protoctl.c b/src/modules/m_protoctl.c
index f05609c7f..4c0880db6 100644
--- a/src/modules/m_protoctl.c
+++ b/src/modules/m_protoctl.c
@@ -71,7 +71,6 @@ MOD_UNLOAD(m_protoctl)
 
 /*
  * m_protoctl
- *	parv[0] = Sender prefix
  *	parv[1+] = Options
  */
 CMD_FUNC(m_protoctl)
diff --git a/src/modules/m_quit.c b/src/modules/m_quit.c
index 3e484257c..b3513c469 100644
--- a/src/modules/m_quit.c
+++ b/src/modules/m_quit.c
@@ -76,12 +76,11 @@ MOD_UNLOAD(m_quit)
 
 /*
 ** m_quit
-**	parv[0] = sender prefix
 **	parv[1] = comment
 */
 DLLFUNC int  m_quit(aClient *cptr, aClient *sptr, int parc, char *parv[])
 {
-	char *ocomment = (parc > 1 && parv[1]) ? parv[1] : parv[0];
+	char *ocomment = (parc > 1 && parv[1]) ? parv[1] : sptr->name;
 	static char comment[TOPICLEN + 1];
 	Membership *lp;
 
@@ -103,18 +102,18 @@ DLLFUNC int  m_quit(aClient *cptr, aClient *sptr, int parc, char *parv[])
 		if (n == FLUSH_BUFFER)
 			return n;
 		if (n < 0)
-			ocomment = parv[0];
+			ocomment = sptr->name;
 		
 		if (!ValidatePermissionsForPath("immune:antispamtimer",sptr,NULL,NULL,NULL) && ANTI_SPAM_QUIT_MSG_TIME)
 			if (sptr->firsttime+ANTI_SPAM_QUIT_MSG_TIME > TStime())
-				ocomment = parv[0];
+				ocomment = sptr->name;
 
                 for (tmphook = Hooks[HOOKTYPE_PRE_LOCAL_QUIT]; tmphook; tmphook = tmphook->next)
 		{
                 	ocomment = (*(tmphook->func.pcharfunc))(sptr, ocomment);
                         if (!ocomment)
 			{			
-				ocomment = parv[0];
+				ocomment = sptr->name;
                                 break;
                         }
                 }
diff --git a/src/modules/m_rping.c b/src/modules/m_rping.c
index 42b7c8416..d1a5b31fd 100644
--- a/src/modules/m_rping.c
+++ b/src/modules/m_rping.c
@@ -83,7 +83,6 @@ MOD_UNLOAD(m_rping)
 /*
  * m_rping  -- by Run
  *
- *    parv[0] = sender (sptr->name thus)
  * if sender is a person: (traveling towards start server)
  *    parv[1] = pinged server[mask]
  *    parv[2] = start server (current target)
@@ -101,13 +100,13 @@ DLLFUNC int  m_rping(aClient *cptr, aClient *sptr, int parc, char *parv[])
 
 	if (!IsServer(sptr) && !ValidatePermissionsForPath("server:rping",sptr,NULL,NULL,NULL))
 	{
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
 	
 	if (parc < (ValidatePermissionsForPath("server:rping",sptr,NULL,NULL,NULL) ? (MyConnect(sptr) ? 2 : 3) : 6))
 	{
-		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0],
+		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, sptr->name,
 		    "RPING");
 		return 0;
 	}
@@ -134,7 +133,7 @@ DLLFUNC int  m_rping(aClient *cptr, aClient *sptr, int parc, char *parv[])
 		if (!(acptr = (aClient *)find_match_server(parv[1])) || !IsServer(acptr))
 		{
 			sendto_one(sptr, err_str(ERR_NOSUCHSERVER), me.name,
-			    parv[0], parv[1]);
+			    sptr->name, parv[1]);
 			return 0;
 		}
 		sendto_one(acptr, ":%s RPING %s %s %s :%s",
@@ -145,7 +144,7 @@ DLLFUNC int  m_rping(aClient *cptr, aClient *sptr, int parc, char *parv[])
 	{
 		if (hunt_server(cptr, sptr, ":%s RPING %s %s %s %s :%s", 1, parc, parv) != HUNTED_ISME)
 			return 0;
-		sendto_one(cptr, ":%s RPONG %s %s %s %s :%s", me.name, parv[0],
+		sendto_one(cptr, ":%s RPONG %s %s %s %s :%s", me.name, sptr->name,
 		    parv[2], parv[3], parv[4], parv[5]);
 	}
 	return 0;
@@ -153,7 +152,6 @@ DLLFUNC int  m_rping(aClient *cptr, aClient *sptr, int parc, char *parv[])
 /*
  * m_rpong  -- by Run too :)
  *
- * parv[0] = sender prefix
  * parv[1] = from pinged server: start server; from start server: sender
  * parv[2] = from pinged server: sender; from start server: pinged server
  * parv[3] = pingtime in ms
@@ -169,7 +167,7 @@ DLLFUNC int  m_rpong(aClient *cptr, aClient *sptr, int parc, char *parv[])
 	if (parc < 5)
 	{
 		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
-		    me.name, parv[0], "RPING");
+		    me.name, sptr->name, "RPING");
 		return 0;
 	}
 
@@ -183,7 +181,7 @@ DLLFUNC int  m_rpong(aClient *cptr, aClient *sptr, int parc, char *parv[])
 		if (IsServer(acptr) && parc > 5)
 		{
 			sendto_one(acptr, ":%s RPONG %s %s %s %s :%s",
-			    parv[0], parv[1], parv[2], parv[3], parv[4],
+			    sptr->name, parv[1], parv[2], parv[3], parv[4],
 			    parv[5]);
 			return 0;
 		}
@@ -192,7 +190,6 @@ DLLFUNC int  m_rpong(aClient *cptr, aClient *sptr, int parc, char *parv[])
 	{
 		parv[1] = parv[2];
 		parv[2] = sptr->name;
-		parv[0] = me.name;
 		parv[3] = militime(parv[3], parv[4]);
 		parv[4] = parv[5];
 		if (!(acptr = find_person(parv[1], (aClient *)NULL)))
@@ -200,7 +197,7 @@ DLLFUNC int  m_rpong(aClient *cptr, aClient *sptr, int parc, char *parv[])
 	}
 
 	sendto_one(acptr, ":%s RPONG %s %s %s :%s",
-	    parv[0], parv[1], parv[2], parv[3], parv[4]);
+	    sptr->name, parv[1], parv[2], parv[3], parv[4]);
 	return 0;
 }
 
diff --git a/src/modules/m_rules.c b/src/modules/m_rules.c
index c60abc4fe..d91364bea 100644
--- a/src/modules/m_rules.c
+++ b/src/modules/m_rules.c
@@ -100,19 +100,19 @@ DLLFUNC CMD_FUNC(m_rules)
       playrules:
 	if (temp == NULL)
 	{
-		sendto_one(sptr, err_str(ERR_NORULES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NORULES), me.name, sptr->name);
 		return 0;
 
 	}
 
-	sendto_one(sptr, rpl_str(RPL_RULESSTART), me.name, parv[0], me.name);
+	sendto_one(sptr, rpl_str(RPL_RULESSTART), me.name, sptr->name, me.name);
 
 	while (temp)
 	{
-		sendto_one(sptr, rpl_str(RPL_RULES), me.name, parv[0],
+		sendto_one(sptr, rpl_str(RPL_RULES), me.name, sptr->name,
 		    temp->line);
 		temp = temp->next;
 	}
-	sendto_one(sptr, rpl_str(RPL_ENDOFRULES), me.name, parv[0]);
+	sendto_one(sptr, rpl_str(RPL_ENDOFRULES), me.name, sptr->name);
 	return 0;
 }
diff --git a/src/modules/m_sajoin.c b/src/modules/m_sajoin.c
index 3a6dda136..e5b12bba3 100644
--- a/src/modules/m_sajoin.c
+++ b/src/modules/m_sajoin.c
@@ -75,7 +75,6 @@ MOD_UNLOAD(m_sajoin)
    Copied off PTlink IRCd (C) PTlink coders team.
    Coded for Sadmin by Stskeeps
    also Modified by NiQuiL (niquil@programmer.net)
-	parv[0] - sender
 	parv[1] - nick to make join
 	parv[2] - channel(s) to join
 */
@@ -87,20 +86,20 @@ DLLFUNC CMD_FUNC(m_sajoin)
 
 	if (parc < 3) 
         {
-         sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0], "SAJOIN");     
+         sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, sptr->name, "SAJOIN");     
          return 0;
         }
 
 	if (!(acptr = find_person(parv[1], NULL)))
         {
-                sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name, parv[0], parv[1]);
+                sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name, sptr->name, parv[1]);
                 return 0;
         }
 
 	/* Is this user disallowed from operating on this victim at all? */
 	if (!IsULine(sptr) && !ValidatePermissionsForPath("sajoin",sptr,acptr,NULL,NULL))
 	{
-	 sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+	 sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 	 return 0;
 	}
 
@@ -132,7 +131,7 @@ DLLFUNC CMD_FUNC(m_sajoin)
 			{
 				sendto_one(sptr,
 				    err_str(ERR_NOSUCHCHANNEL), me.name,
-				    parv[0], name);
+				    sptr->name, name);
 				continue;
 			}
 
@@ -141,13 +140,13 @@ DLLFUNC CMD_FUNC(m_sajoin)
 			/* If this _specific_ channel is not permitted, skip it */
 			if (!IsULine(sptr) && !ValidatePermissionsForPath("sajoin",sptr,acptr,chptr,NULL))
         		{
-         			sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+         			sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 				continue;
 		        }
 
 			if (!parted && chptr && (lp = find_membership_link(acptr->user->channel, chptr)))
 			{
-				sendto_one(sptr, err_str(ERR_USERONCHANNEL), me.name, parv[0], 
+				sendto_one(sptr, err_str(ERR_USERONCHANNEL), me.name, sptr->name, 
 					   parv[1], name);
 				continue;
 			}
@@ -224,8 +223,7 @@ DLLFUNC CMD_FUNC(m_sajoin)
 	}
 	else
 	{
-		sendto_one(acptr, ":%s SAJOIN %s %s", parv[0],
-		    parv[1], parv[2]);
+		sendto_one(acptr, ":%s SAJOIN %s %s", sptr->name, parv[1], parv[2]);
 
 		/* Logging function added by XeRXeS */
 		ircd_log(LOG_SACMDS,"SAJOIN: %s used SAJOIN to make %s join %s",
diff --git a/src/modules/m_samode.c b/src/modules/m_samode.c
index d02fcb4ae..1eb47cea5 100644
--- a/src/modules/m_samode.c
+++ b/src/modules/m_samode.c
@@ -73,7 +73,6 @@ MOD_UNLOAD(m_samode)
 
 /*
  * m_samode
- * parv[0] = sender
  * parv[1] = channel
  * parv[2] = modes
  * -t
@@ -91,13 +90,13 @@ DLLFUNC CMD_FUNC(m_samode)
 	else
         {
                 sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
-                    me.name, parv[0], "SAMODE");
+                    me.name, sptr->name, "SAMODE");
                 return 0;
         }
 
 	if (!ValidatePermissionsForPath("samode",sptr,NULL,chptr,NULL))
 	{
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
 
diff --git a/src/modules/m_sapart.c b/src/modules/m_sapart.c
index b3a9cb1e0..71d13b92f 100644
--- a/src/modules/m_sapart.c
+++ b/src/modules/m_sapart.c
@@ -75,7 +75,6 @@ MOD_UNLOAD(m_sapart)
    Copied off PTlink IRCd (C) PTlink coders team.
    Coded for Sadmin by Stskeeps
    also Modified by NiQuiL (niquil@programmer.net)
-	parv[0] - sender
 	parv[1] - nick to make part
 	parv[2] - channel(s) to part
 	parv[3] - comment
@@ -94,20 +93,20 @@ DLLFUNC CMD_FUNC(m_sapart)
 
 	if (parc < 3)
         {
-                sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0], "SAPART");
+                sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, sptr->name, "SAPART");
                 return 0;
         }
 
         if (!(acptr = find_person(parv[1], NULL)))
         {
-                sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name, parv[0], parv[1]);
+                sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name, sptr->name, parv[1]);
                 return 0;
         }
 
 	/* See if we can operate on this vicim/this command */
 	if (!IsULine(sptr) && !ValidatePermissionsForPath("sapart",sptr,acptr,NULL,NULL))
 	{
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
 
@@ -121,7 +120,7 @@ DLLFUNC CMD_FUNC(m_sapart)
 		{
 			if (!(chptr = get_channel(acptr, name, 0)))
 			{
-				sendto_one(sptr, err_str(ERR_NOSUCHCHANNEL), me.name, parv[0],
+				sendto_one(sptr, err_str(ERR_NOSUCHCHANNEL), me.name, sptr->name,
 					name);
 				continue;
 			}
@@ -129,13 +128,13 @@ DLLFUNC CMD_FUNC(m_sapart)
 			/* Validate oper can do this on chan/victim */
 			if (!IsULine(sptr) && !ValidatePermissionsForPath("sapart",sptr,acptr,chptr,NULL))
         		{
-                		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+                		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 				continue;
         		}
 	
 			if (!(lp = find_membership_link(acptr->user->channel, chptr)))
 			{
-				sendto_one(sptr, err_str(ERR_USERNOTINCHANNEL), me.name, parv[0],
+				sendto_one(sptr, err_str(ERR_USERNOTINCHANNEL), me.name, sptr->name,
 					parv[1], name);
 				continue;
 			}
@@ -156,7 +155,7 @@ DLLFUNC CMD_FUNC(m_sapart)
 			strlcat(commentx, comment, 512);
 		}
 
-		parv[0] = parv[1]; // nick
+		parv[0] = acptr->name; // nick
 		parv[1] = parv[2]; // chan
 		parv[2] = comment ? commentx : NULL; // comment
 		if (comment)
@@ -164,25 +163,25 @@ DLLFUNC CMD_FUNC(m_sapart)
 			sendnotice(acptr,
 			    "*** You were forced to part %s (%s)",
 			    parv[1], commentx);
-			sendto_realops("%s used SAPART to make %s part %s (%s)", sptr->name, parv[0],
+			sendto_realops("%s used SAPART to make %s part %s (%s)", sptr->name, acptr->name,
 				parv[1], comment);
 			sendto_server(&me, 0, 0, ":%s GLOBOPS :%s used SAPART to make %s part %s (%s)",
-				me.name, sptr->name, parv[0], parv[1], comment);
+				me.name, sptr->name, acptr->name, parv[1], comment);
 			/* Logging function added by XeRXeS */
 			ircd_log(LOG_SACMDS,"SAPART: %s used SAPART to make %s part %s (%s)",
-				sptr->name, parv[0], parv[1], comment);
+				sptr->name, acptr->name, parv[1], comment);
 		}
 		else
 		{
 			sendnotice(acptr,
 			    "*** You were forced to part %s", parv[1]);
-			sendto_realops("%s used SAPART to make %s part %s", sptr->name, parv[0],
+			sendto_realops("%s used SAPART to make %s part %s", sptr->name, acptr->name,
 				parv[1]);
 			sendto_server(&me, 0, 0, ":%s GLOBOPS :%s used SAPART to make %s part %s",
-				me.name, sptr->name, parv[0], parv[1]);
+				me.name, sptr->name, acptr->name, parv[1]);
 			/* Logging function added by XeRXeS */
 			ircd_log(LOG_SACMDS,"SAPART: %s used SAPART to make %s part %s",
-				sptr->name, parv[0], parv[1]);
+				sptr->name, acptr->name, parv[1]);
 		}
 		do_cmd(acptr, acptr, "PART", comment ? 3 : 2, parv);
 	}
@@ -190,7 +189,7 @@ DLLFUNC CMD_FUNC(m_sapart)
 	{
 		if (comment)
 		{
-			sendto_one(acptr, ":%s SAPART %s %s :%s", parv[0],
+			sendto_one(acptr, ":%s SAPART %s %s :%s", sptr->name,
 			    parv[1], parv[2], comment);
 			/* Logging function added by XeRXeS */
 			ircd_log(LOG_SACMDS,"SAPART: %s used SAPART to make %s part %s (%s)",
@@ -198,7 +197,7 @@ DLLFUNC CMD_FUNC(m_sapart)
 		}
 		else
 		{
-			sendto_one(acptr, ":%s SAPART %s %s", parv[0], parv[1],
+			sendto_one(acptr, ":%s SAPART %s %s", sptr->name, parv[1],
 				   parv[2]);
 			/* Logging function added by XeRXeS */
 			ircd_log(LOG_SACMDS,"SAPART: %s used SAPART to make %s part %s",
diff --git a/src/modules/m_sasl.c b/src/modules/m_sasl.c
index fbfe7f48c..adfa8217f 100644
--- a/src/modules/m_sasl.c
+++ b/src/modules/m_sasl.c
@@ -135,7 +135,6 @@ static const char *encode_puid(aClient *client)
 /*
  * SVSLOGIN message
  *
- * parv[0]: source
  * parv[1]: propagation mask
  * parv[2]: target PUID
  * parv[3]: ESVID
@@ -170,7 +169,7 @@ static int m_svslogin(aClient *cptr, aClient *sptr, int parc, char *parv[])
 
 	/* not for us; propagate. */
 	sendto_server(cptr, 0, 0, ":%s SVSLOGIN %s %s %s",
-	    parv[0], parv[1], parv[2], parv[3]);
+	    sptr->name, parv[1], parv[2], parv[3]);
 
 	return 0;
 }
@@ -178,7 +177,6 @@ static int m_svslogin(aClient *cptr, aClient *sptr, int parc, char *parv[])
 /*
  * SASL message
  *
- * parv[0]: prefix
  * parv[1]: distribution mask
  * parv[2]: target PUID
  * parv[3]: mode/state
@@ -202,10 +200,10 @@ static int m_sasl(aClient *cptr, aClient *sptr, int parc, char *parv[])
 			make_user(target_p);
 
 		/* reject if another SASL agent is answering */
-		if (*target_p->sasl_agent && stricmp(parv[0], target_p->sasl_agent))
+		if (*target_p->sasl_agent && stricmp(sptr->name, target_p->sasl_agent))
 			return 0;
 		else
-			strlcpy(target_p->sasl_agent, parv[0], sizeof(target_p->sasl_agent));
+			strlcpy(target_p->sasl_agent, sptr->name, sizeof(target_p->sasl_agent));
 
 		if (*parv[3] == 'C')
 			sendto_one(target_p, "AUTHENTICATE %s", parv[4]);
@@ -227,7 +225,7 @@ static int m_sasl(aClient *cptr, aClient *sptr, int parc, char *parv[])
 
 	/* not for us; propagate. */
 	sendto_server(cptr, 0, 0, ":%s SASL %s %s %c %s %s",
-	    parv[0], parv[1], parv[2], *parv[3], parv[4], parc > 5 ? parv[5] : "");
+	    sptr->name, parv[1], parv[2], *parv[3], parv[4], parc > 5 ? parv[5] : "");
 
 	return 0;
 }
@@ -235,7 +233,6 @@ static int m_sasl(aClient *cptr, aClient *sptr, int parc, char *parv[])
 /*
  * AUTHENTICATE message
  *
- * parv[0]: prefix
  * parv[1]: data
  */
 static int m_authenticate(aClient *cptr, aClient *sptr, int parc, char *parv[])
diff --git a/src/modules/m_sdesc.c b/src/modules/m_sdesc.c
index 30beee6c2..371d1883c 100644
--- a/src/modules/m_sdesc.c
+++ b/src/modules/m_sdesc.c
@@ -74,7 +74,6 @@ MOD_UNLOAD(m_sdesc)
 
 /* m_sdesc - 15/05/1999 - Stskeeps
  *  :prefix SDESC
- *  parv[0] - sender
  *  parv[1] - description
  *  D: Sets server info if you are Server Admin (ONLINE)
 */
@@ -119,9 +118,9 @@ int m_sdesc(aClient *cptr, aClient *sptr, int parc, char *parv[])
 	if (MyConnect(sptr))
 		sendto_one(sptr,
 			":%s NOTICE %s :Your \"server description\" is now set to be %s - you have to set it manually to undo it",
-			me.name, parv[0], parv[1]);
+			me.name, sptr->name, parv[1]);
 
 	sendto_ops("Server description for %s is now '%s' changed by %s",
-		sptr->srvptr->name, sptr->srvptr->info, parv[0]);
+		sptr->srvptr->name, sptr->srvptr->info, sptr->name);
 	return 0;
 }
diff --git a/src/modules/m_sendsno.c b/src/modules/m_sendsno.c
index a2cb614d4..6d0241a06 100644
--- a/src/modules/m_sendsno.c
+++ b/src/modules/m_sendsno.c
@@ -76,7 +76,6 @@ MOD_UNLOAD(m_sendsno)
 
 /*
 ** m_sendsno - Written by Syzop, bit based on SENDUMODE from Stskeeps
-**      parv[0] = sender prefix
 **      parv[1] = target snomask
 **      parv[2] = message text
 ** Servers can use this to:
@@ -91,7 +90,7 @@ aClient *acptr;
 
 	if ((parc < 3) || BadPtr(parv[2]))
 	{
-		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0], "SENDSNO");
+		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, sptr->name, "SENDSNO");
 		return 0;
 	}
 	sno = parv[1];
diff --git a/src/modules/m_sendumode.c b/src/modules/m_sendumode.c
index acaec2f0f..7c9ce4229 100644
--- a/src/modules/m_sendumode.c
+++ b/src/modules/m_sendumode.c
@@ -78,7 +78,6 @@ MOD_UNLOAD(m_sendumode)
 
 /*
 ** m_sendumode - Stskeeps
-**      parv[0] = sender prefix
 **      parv[1] = target
 **      parv[2] = message text
 ** Pretty handy proc.. 
@@ -102,18 +101,18 @@ DLLFUNC int m_sendumode(aClient *cptr, aClient *sptr, int parc, char *parv[])
 	if (parc < 3)
 	{
 		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
-		    me.name, parv[0], "SENDUMODE");
+		    me.name, sptr->name, "SENDUMODE");
 		return 0;
 	}
 
 	if (!IsServer(sptr))
 	{
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
 
 	sendto_server(IsServer(cptr) ? cptr : NULL, 0, 0,
-	    ":%s SENDUMODE %s :%s", parv[0], parv[1], message);
+	    ":%s SENDUMODE %s :%s", sptr->name, parv[1], message);
 
 	for (p = parv[1]; *p; p++)
 	{
diff --git a/src/modules/m_server.c b/src/modules/m_server.c
index 03bce3b9b..a7eb642ca 100644
--- a/src/modules/m_server.c
+++ b/src/modules/m_server.c
@@ -262,7 +262,6 @@ skip_host_check:
 
 /*
 ** m_sid
-**      parv[0] = sender prefix
 **      parv[1] = servername
 **      parv[2] = hopcount
 **      parv[3] = sid
@@ -271,7 +270,6 @@ skip_host_check:
 
 /*
 ** m_server
-**	parv[0] = sender prefix
 **	parv[1] = servername
 **      parv[2] = hopcount
 **      parv[3] = numeric { ignored }
@@ -299,7 +297,7 @@ DLLFUNC CMD_FUNC(m_server)
 	if (IsPerson(sptr))
 	{
 		sendto_one(cptr, err_str(ERR_ALREADYREGISTRED),
-		    me.name, parv[0]);
+		    me.name, sptr->name);
 		sendnotice(cptr,
 		    "*** Sorry, but your IRC program doesn't appear to support changing servers.");
 		sptr->since += 7;
@@ -569,7 +567,7 @@ CMD_FUNC(m_server_remote)
 				cptr->name, servername);
 			return exit_client(cptr, cptr, cptr, "Too deep link depth (leaf)");
 	}
-	acptr = make_client(cptr, find_server(parv[0], cptr));
+	acptr = make_client(cptr, find_server(sptr->name, cptr));
 	(void)make_server(acptr);
 	acptr->hopcount = hop;
 
diff --git a/src/modules/m_sethost.c b/src/modules/m_sethost.c
index 1affbd3a7..feb277f5e 100644
--- a/src/modules/m_sethost.c
+++ b/src/modules/m_sethost.c
@@ -77,7 +77,6 @@ MOD_UNLOAD(m_sethost)
    m_sethost() added by Stskeeps (30/04/1999)
                (modified at 15/05/1999) by Stskeeps | Potvin
    :prefix SETHOST newhost
-   parv[0] - sender
    parv[1] - newhost
 */
 DLLFUNC int m_sethost(aClient *cptr, aClient *sptr, int parc, char *parv[])
@@ -87,7 +86,7 @@ DLLFUNC int m_sethost(aClient *cptr, aClient *sptr, int parc, char *parv[])
 	if (!ValidatePermissionsForPath("client:host",sptr,NULL,NULL,NULL))
 	{
   		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name,
-	        parv[0]);
+	        sptr->name);
 		return 0;
 	}
 
@@ -103,7 +102,7 @@ DLLFUNC int m_sethost(aClient *cptr, aClient *sptr, int parc, char *parv[])
 		{
 			sendto_one(sptr,
 			    ":%s NOTICE %s :*** Syntax: /SetHost <new host>",
-			    me.name, parv[0]);
+			    me.name, sptr->name);
 		}
 		return 0;
 	}
@@ -131,7 +130,7 @@ DLLFUNC int m_sethost(aClient *cptr, aClient *sptr, int parc, char *parv[])
 	{
 		sendto_one(sptr,
 		    ":%s NOTICE %s :*** /SetHost Error: A hostname may contain a-z, A-Z, 0-9, '-' & '.' - Please only use them",
-		    me.name, parv[0]);
+		    me.name, sptr->name);
 		return 0;
 	}
 	if (vhost[0] == ':')
@@ -144,7 +143,7 @@ DLLFUNC int m_sethost(aClient *cptr, aClient *sptr, int parc, char *parv[])
 	{
 		sendto_one(sptr,
 		    ":%s NOTICE %s :*** /SetHost Error: requested host is same as current host.",
-		    me.name, parv[0]);
+		    me.name, sptr->name);
 		return 0;
 	}
 
@@ -196,8 +195,8 @@ DLLFUNC int m_sethost(aClient *cptr, aClient *sptr, int parc, char *parv[])
 		sendto_one(sptr, err_str(RPL_HOSTHIDDEN), me.name, sptr->name, vhost);
 		sendto_one(sptr,
 		    ":%s NOTICE %s :Your nick!user@host-mask is now (%s!%s@%s) - To disable it type /mode %s -x",
-		    me.name, parv[0], parv[0], sptr->user->username, vhost,
-		    parv[0]);
+		    me.name, sptr->name, sptr->name, sptr->user->username, vhost,
+		    sptr->name);
 	}
 	return 0;
 }
diff --git a/src/modules/m_setident.c b/src/modules/m_setident.c
index e9e456665..93a3f66c1 100644
--- a/src/modules/m_setident.c
+++ b/src/modules/m_setident.c
@@ -74,7 +74,6 @@ MOD_UNLOAD(m_setident)
 
 /* m_setident - 12/05/1999 - Stskeeps
  *  :prefix SETIDENT newident
- *  parv[0] - sender
  *  parv[1] - newident
  *  D: This will set your username to be <x> (like (/setident Root))
  *     (if you are IRCop) **efg*
@@ -101,7 +100,7 @@ DLLFUNC int m_setident(aClient *cptr, aClient *sptr, int parc, char *parv[])
 		  if (!ValidatePermissionsForPath("self:ident",sptr,NULL,NULL,NULL))
 		  {
 			  sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name,
-			      parv[0]);
+			      sptr->name);
 			  return 0;
 		  }
 		  break;
@@ -109,7 +108,7 @@ DLLFUNC int m_setident(aClient *cptr, aClient *sptr, int parc, char *parv[])
 		  if (MyConnect(sptr))
 		  {
 			  sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name,
-			      parv[0]);
+			      sptr->name);
 			  return 0;
 		  }
 		  break;
@@ -132,7 +131,7 @@ DLLFUNC int m_setident(aClient *cptr, aClient *sptr, int parc, char *parv[])
 		{
 			sendto_one(sptr,
 			    ":%s NOTICE %s :*** Syntax: /SetIdent <new ident>",
-			    me.name, parv[0]);
+			    me.name, sptr->name);
 		}
 		return 1;
 	}
@@ -172,7 +171,7 @@ DLLFUNC int m_setident(aClient *cptr, aClient *sptr, int parc, char *parv[])
 	{
 		sendto_one(sptr,
 		    ":%s NOTICE %s :*** /SetIdent Error: A username may contain a-z, A-Z, 0-9, '-', '~' & '.' - Please only use them",
-		    me.name, parv[0]);
+		    me.name, sptr->name);
 		return 0;
 	}
 
@@ -213,7 +212,7 @@ DLLFUNC int m_setident(aClient *cptr, aClient *sptr, int parc, char *parv[])
 	{
 		sendto_one(sptr,
 		    ":%s NOTICE %s :Your nick!user@host-mask is now (%s!%s@%s) - To disable ident set change it manually by /setident'ing again",
-		    me.name, parv[0], parv[0], sptr->user->username, GetHost(sptr));
+		    me.name, sptr->name, sptr->name, sptr->user->username, GetHost(sptr));
 	}
 	return 0;
 }
diff --git a/src/modules/m_setname.c b/src/modules/m_setname.c
index 718c25b28..2e7f8f30b 100644
--- a/src/modules/m_setname.c
+++ b/src/modules/m_setname.c
@@ -74,7 +74,6 @@ MOD_UNLOAD(m_setname)
 
 /* m_setname - 12/05/1999 - Stskeeps
  * :prefix SETNAME :gecos
- * parv[0] - sender
  * parv[1] - gecos
  * D: This will set your gecos to be <x> (like (/setname :The lonely wanderer))
    yes it is experimental but anyways ;P
@@ -88,7 +87,7 @@ DLLFUNC CMD_FUNC(m_setname)
 
  	if ((parc < 2) || BadPtr(parv[1]))
  	{
- 		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0], "SETNAME");
+ 		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, sptr->name, "SETNAME");
  		return 0;
 	}
 
diff --git a/src/modules/m_silence.c b/src/modules/m_silence.c
index 059b2d53f..38c276e45 100644
--- a/src/modules/m_silence.c
+++ b/src/modules/m_silence.c
@@ -73,7 +73,6 @@ MOD_UNLOAD(m_silence)
 
 /*
 ** m_silence
-**	parv[0] = sender prefix
 ** From local client:
 **	parv[1] = mask (NULL sends the list)
 ** From remote client:
@@ -111,7 +110,7 @@ DLLFUNC CMD_FUNC(m_silence)
 		    index(cp, '!') || index(cp, '*')))
 		{
 			sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name,
-			    parv[0], parv[1]);
+			    sptr->name, parv[1]);
 			return -1;
 		}
 		else
@@ -121,7 +120,7 @@ DLLFUNC CMD_FUNC(m_silence)
 		    (c != '-' && !add_silence(sptr, cp, 1)))
 		{
 			sendto_prefix_one(sptr, sptr, ":%s SILENCE %c%s",
-			    parv[0], c, cp);
+			    sptr->name, c, cp);
 			if (c == '-')
 				sendto_server(NULL, 0, 0, ":%s SILENCE * -%s",
 				    sptr->name, cp);
@@ -129,7 +128,7 @@ DLLFUNC CMD_FUNC(m_silence)
 	}
 	else if (parc < 3 || *parv[2] == '\0')
 	{
-		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0],
+		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, sptr->name,
 		    "SILENCE");
 		return -1;
 	}
@@ -139,20 +138,19 @@ DLLFUNC CMD_FUNC(m_silence)
 		{
 			if (!del_silence(sptr, parv[2] + 1))
 				sendto_server(cptr, 0, 0, ":%s SILENCE %s :%s",
-				    parv[0], parv[1], parv[2]);
+				    sptr->name, parv[1], parv[2]);
 		}
 		else
 		{
 			(void)add_silence(sptr, parv[2], 1);
 			if (!MyClient(acptr))
 				sendto_one(acptr, ":%s SILENCE %s :%s",
-				    parv[0], parv[1], parv[2]);
+				    sptr->name, parv[1], parv[2]);
 		}
 	}
 	else
 	{
-		sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name, parv[0],
-		    parv[1]);
+		sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name, sptr->name, parv[1]);
 		return -1;
 	}
 	return 0;
diff --git a/src/modules/m_sjoin.c b/src/modules/m_sjoin.c
index 0068adf2c..9a9a4f4db 100644
--- a/src/modules/m_sjoin.c
+++ b/src/modules/m_sjoin.c
@@ -107,7 +107,6 @@ aParv *mp2parv(char *xmbuf, char *parmbuf)
    **         
    **  Modified for UnrealIRCd by Stskeeps
    **  Recoded by Stskeeps
-   **      parv[0] = sender prefix
    **      parv[1]	aChannel *chptr;
 	aClient *cptr;
 	int  parc;
diff --git a/src/modules/m_sqline.c b/src/modules/m_sqline.c
index 7eda2131d..d332d00b1 100644
--- a/src/modules/m_sqline.c
+++ b/src/modules/m_sqline.c
@@ -78,7 +78,6 @@ MOD_UNLOAD(m_sqline)
 }
 
 /*    m_sqline
-**	parv[0] = sender
 **	parv[1] = nickmask
 **	parv[2] = reason
 */
diff --git a/src/modules/m_squit.c b/src/modules/m_squit.c
index 4fa5a30c8..64b846a09 100644
--- a/src/modules/m_squit.c
+++ b/src/modules/m_squit.c
@@ -73,7 +73,6 @@ MOD_UNLOAD(m_squit)
 
 /*
 ** m_squit
-**	parv[0] = sender prefix
 **	parv[1] = server name
 **	parv[parc-1] = comment
 */
@@ -87,7 +86,7 @@ CMD_FUNC(m_squit)
 
 	if (!IsServer(sptr) && !ValidatePermissionsForPath("route:local",sptr,NULL,NULL,NULL))
 	{
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
 
@@ -143,13 +142,13 @@ CMD_FUNC(m_squit)
 	if (!acptr)
 	{
 		sendto_one(sptr, err_str(ERR_NOSUCHSERVER),
-		    me.name, parv[0], server);
+		    me.name, sptr->name, server);
 		return 0;
 	}
 	if (MyClient(sptr) && ((!ValidatePermissionsForPath("route:global",sptr,NULL,NULL,NULL) && !MyConnect(acptr)) ||
 	    (!ValidatePermissionsForPath("route:local",sptr,NULL,NULL,NULL) && MyConnect(acptr))))
 	{
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
 	/*
diff --git a/src/modules/m_stats.c b/src/modules/m_stats.c
index 5b72a6e03..8a1f46272 100644
--- a/src/modules/m_stats.c
+++ b/src/modules/m_stats.c
@@ -382,7 +382,7 @@ DLLFUNC CMD_FUNC(m_stats)
 	if (parc < 2 || !*parv[1])
 	{
 		stats_help(sptr);
-		sendto_one(sptr, rpl_str(RPL_ENDOFSTATS), me.name, parv[0], '*');
+		sendto_one(sptr, rpl_str(RPL_ENDOFSTATS), me.name, sptr->name, '*');
 		return 0;
 	}
 
@@ -391,7 +391,7 @@ DLLFUNC CMD_FUNC(m_stats)
 	{
 		if (!ValidatePermissionsForPath("server:info",sptr,NULL,NULL,NULL) && stats_operonly_short(parv[1][0]))
 		{
-			sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);	
+			sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);	
 			return 0;
 		}	
 		/* Old style, we can use a binary search here */
@@ -401,7 +401,7 @@ DLLFUNC CMD_FUNC(m_stats)
 	{
 		if (!ValidatePermissionsForPath("server:info",sptr,NULL,NULL,NULL) && stats_operonly_long(parv[1]))
 		{
-			sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);	
+			sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);	
 			return 0;
 		}
 		/* New style, search the hard way */
@@ -414,7 +414,7 @@ DLLFUNC CMD_FUNC(m_stats)
 		{
 			if (!ValidatePermissionsForPath("server:info",sptr,NULL,NULL,NULL) && stats_operonly_long(stat->longflag))
 			{
-				sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+				sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 				return 0;
 			}
 		}
@@ -423,7 +423,7 @@ DLLFUNC CMD_FUNC(m_stats)
 		{
 			if (!ValidatePermissionsForPath("server:info",sptr,NULL,NULL,NULL) && stats_operonly_short(stat->flag))
 			{
-				sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);	
+				sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);	
 				return 0;
 			}
 		}
@@ -450,7 +450,7 @@ DLLFUNC CMD_FUNC(m_stats)
 		}
 		else
 			stat->func(sptr, NULL);
-		sendto_one(sptr, rpl_str(RPL_ENDOFSTATS), me.name, parv[0], stat->flag);
+		sendto_one(sptr, rpl_str(RPL_ENDOFSTATS), me.name, sptr->name, stat->flag);
 		if (!IsULine(sptr))
 			sendto_snomask(SNO_EYES, "Stats \'%c\' requested by %s (%s@%s)",
 				stat->flag, sptr->name, sptr->user->username, GetHost(sptr));
@@ -461,7 +461,7 @@ DLLFUNC CMD_FUNC(m_stats)
 	else
 	{
 		stats_help(sptr);
-		sendto_one(sptr, rpl_str(RPL_ENDOFSTATS), me.name, parv[0], '*');
+		sendto_one(sptr, rpl_str(RPL_ENDOFSTATS), me.name, sptr->name, '*');
 		return 0;
 	}
 	return 0;
diff --git a/src/modules/m_svsjoin.c b/src/modules/m_svsjoin.c
index f6989fb90..526d2aa5f 100644
--- a/src/modules/m_svsjoin.c
+++ b/src/modules/m_svsjoin.c
@@ -76,7 +76,6 @@ MOD_UNLOAD(m_svsjoin)
 
 /* m_svsjoin() - Lamego - Wed Jul 21 20:04:48 1999
    Copied off PTlink IRCd (C) PTlink coders team.
-	parv[0] - sender
 	parv[1] - nick to make join
 	parv[2] - channel(s) to join
 	parv[3] - (optional) channel key(s)
@@ -92,7 +91,7 @@ CMD_FUNC(m_svsjoin)
 
 	if (MyClient(acptr))
 	{
-		parv[0] = parv[1];
+		parv[0] = acptr->name;
 		parv[1] = parv[2];
 		if (parc == 3)
 		{
@@ -107,10 +106,10 @@ CMD_FUNC(m_svsjoin)
 	else
 	{
 		if (parc == 3)
-			sendto_one(acptr, ":%s SVSJOIN %s %s", parv[0],
+			sendto_one(acptr, ":%s SVSJOIN %s %s", sptr->name,
 			    parv[1], parv[2]);
 		else
-			sendto_one(acptr, ":%s SVSJOIN %s %s %s", parv[0],
+			sendto_one(acptr, ":%s SVSJOIN %s %s %s", sptr->name,
 				parv[1], parv[2], parv[3]);
 	}
 
diff --git a/src/modules/m_svskill.c b/src/modules/m_svskill.c
index 355dcb676..31516dc3c 100644
--- a/src/modules/m_svskill.c
+++ b/src/modules/m_svskill.c
@@ -77,7 +77,6 @@ MOD_UNLOAD(m_svskill)
 
 /*
 ** m_svskill
-**	parv[0] = servername
 **	parv[1] = client
 **	parv[2] = kill message
 */
@@ -104,7 +103,7 @@ CMD_FUNC(m_svskill)
 	if (!(acptr = find_person(parv[1], NULL)))
 		return 0;
 
-	sendto_server(cptr, 0, 0, ":%s SVSKILL %s :%s", parv[0], parv[1], comment);
+	sendto_server(cptr, 0, 0, ":%s SVSKILL %s :%s", sptr->name, parv[1], comment);
 
 	acptr->flags |= FLAGS_KILLED;
 
diff --git a/src/modules/m_svslusers.c b/src/modules/m_svslusers.c
index a72ddca6a..5abc0481d 100644
--- a/src/modules/m_svslusers.c
+++ b/src/modules/m_svslusers.c
@@ -73,7 +73,6 @@ MOD_UNLOAD(m_svslusers)
 }
 /*
 ** m_svslusers
-**      parv[0] = sender
 **      parv[1] = server to update
 **      parv[2] = max global users
 **      parv[3] = max local users
diff --git a/src/modules/m_svsmode.c b/src/modules/m_svsmode.c
index ae4a13aa6..da719dde7 100644
--- a/src/modules/m_svsmode.c
+++ b/src/modules/m_svsmode.c
@@ -378,7 +378,6 @@ int channel_svsmode(aClient *cptr, aClient *sptr, int parc, char *parv[])
 
 /*
  * do_svsmode() [merge from svsmode/svs2mode]
- * parv[0] - sender
  * parv[1] - username to change mode for
  * parv[2] - modes to change
  * parv[3] - Service Stamp (if mode == d)
@@ -544,11 +543,11 @@ int  what, setflags;
 
 	if (parc > 3)
 		sendto_server(cptr, 0, 0, ":%s %s %s %s %s",
-		    parv[0], show_change ? "SVS2MODE" : "SVSMODE",
+		    sptr->name, show_change ? "SVS2MODE" : "SVSMODE",
 		    parv[1], parv[2], parv[3]);
 	else
 		sendto_server(cptr, 0, 0,  ":%s %s %s %s",
-		    parv[0], show_change ? "SVS2MODE" : "SVSMODE",
+		    sptr->name, show_change ? "SVS2MODE" : "SVSMODE",
 		    parv[1], parv[2]);
 
 	/* Here we trigger the same hooks that m_mode does and, likewise,
@@ -562,7 +561,7 @@ int  what, setflags;
 		char buf[BUFSIZE];
 		send_umode(NULL, acptr, setflags, ALL_UMODES, buf);
 		if (MyClient(acptr) && buf[0] && buf[1])
-			sendto_one(acptr, ":%s MODE %s :%s", parv[0], parv[1], buf);
+			sendto_one(acptr, ":%s MODE %s :%s", sptr->name, parv[1], buf);
 	}
 
 	VERIFY_OPERCOUNT(acptr, "svsmodeX");
@@ -571,7 +570,6 @@ int  what, setflags;
 
 /*
  * m_svsmode() added by taz
- * parv[0] - sender
  * parv[1] - username to change mode for
  * parv[2] - modes to change
  * parv[3] - Service Stamp (if mode == d)
@@ -583,7 +581,6 @@ int  m_svsmode(aClient *cptr, aClient *sptr, int parc, char *parv[])
 
 /*
  * m_svs2mode() added by Potvin
- * parv[0] - sender
  * parv[1] - username to change mode for
  * parv[2] - modes to change
  * parv[3] - Service Stamp (if mode == d)
diff --git a/src/modules/m_svsmotd.c b/src/modules/m_svsmotd.c
index 8f6e122d7..bd8fc273f 100644
--- a/src/modules/m_svsmotd.c
+++ b/src/modules/m_svsmotd.c
@@ -83,20 +83,20 @@ int  m_svsmotd(aClient *cptr, aClient *sptr, int parc, char *parv[])
 
         if (!IsULine(sptr))
         {
-                sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+                sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
                 return 0;
         }
         if (parc < 2)
         {
                 sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
-                    me.name, parv[0], "SVSMOTD");
+                    me.name, sptr->name, "SVSMOTD");
                 return 0;
         }
 
         if ((*parv[1] != '!') && parc < 3)
         {
                 sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
-                    me.name, parv[0], "SVSMOTD");
+                    me.name, sptr->name, "SVSMOTD");
                 return 0;
         }
 
@@ -117,9 +117,9 @@ int  m_svsmotd(aClient *cptr, aClient *sptr, int parc, char *parv[])
                   return 0;
         }
         if (parv[2])
-                sendto_server(cptr, 0, 0, ":%s SVSMOTD %s :%s", parv[0], parv[1], parv[2]);
+                sendto_server(cptr, 0, 0, ":%s SVSMOTD %s :%s", sptr->name, parv[1], parv[2]);
         else
-                sendto_server(cptr, 0, 0, ":%s SVSMOTD %s", parv[0], parv[1]);
+                sendto_server(cptr, 0, 0, ":%s SVSMOTD %s", sptr->name, parv[1]);
 
         if (conf == NULL)
         {
diff --git a/src/modules/m_svsnick.c b/src/modules/m_svsnick.c
index b8a42fbe1..ea47373f2 100644
--- a/src/modules/m_svsnick.c
+++ b/src/modules/m_svsnick.c
@@ -74,7 +74,6 @@ MOD_UNLOAD(m_svsnick)
 }
 /*
 ** m_svsnick
-**      parv[0] = sender
 **      parv[1] = old nickname
 **      parv[2] = new nickname
 **      parv[3] = timestamp
diff --git a/src/modules/m_svsnolag.c b/src/modules/m_svsnolag.c
index 96379a04f..cd591b76e 100644
--- a/src/modules/m_svsnolag.c
+++ b/src/modules/m_svsnolag.c
@@ -90,7 +90,7 @@ int do_svsnolag(aClient *cptr, aClient *sptr, int parc, char *parv[], int show_c
 
 	if (!MyClient(acptr))
 	{
-		sendto_one(acptr, ":%s %s %s %s", parv[0], cmd, parv[1], parv[2]);
+		sendto_one(acptr, ":%s %s %s %s", sptr->name, cmd, parv[1], parv[2]);
 		return 0;
 	}
 
diff --git a/src/modules/m_svspart.c b/src/modules/m_svspart.c
index 0baf30c0f..ba6ea8664 100644
--- a/src/modules/m_svspart.c
+++ b/src/modules/m_svspart.c
@@ -77,7 +77,6 @@ MOD_UNLOAD(m_svspart)
 /* m_svspart() - Lamego - Wed Jul 21 20:04:48 1999
    Copied off PTlink IRCd (C) PTlink coders team.
   Modified for PART by Stskeeps
-	parv[0] - sender
 	parv[1] - nick to make part
 	parv[2] - channel(s) to part
 	parv[3] - comment
@@ -94,7 +93,7 @@ CMD_FUNC(m_svspart)
 
 	if (MyClient(acptr))
 	{
-		parv[0] = parv[1];
+		parv[0] = acptr->name;
 		parv[1] = parv[2];
 		parv[2] = comment;
 		parv[3] = NULL;
@@ -103,10 +102,10 @@ CMD_FUNC(m_svspart)
 	else
 	{
 		if (comment)
-			sendto_one(acptr, ":%s SVSPART %s %s :%s", parv[0],
+			sendto_one(acptr, ":%s SVSPART %s %s :%s", sptr->name,
 			    parv[1], parv[2], parv[3]);
 		else
-			sendto_one(acptr, ":%s SVSPART %s %s", parv[0],
+			sendto_one(acptr, ":%s SVSPART %s %s", sptr->name,
 			    parv[1], parv[2]);
 	}
 
diff --git a/src/modules/m_svssilence.c b/src/modules/m_svssilence.c
index eb49ae55c..1f94de3aa 100644
--- a/src/modules/m_svssilence.c
+++ b/src/modules/m_svssilence.c
@@ -77,7 +77,6 @@ MOD_UNLOAD(m_svssilence)
 /* m_svssilence()
  * written by Syzop (copied a lot from m_silence),
  * suggested by <??>.
- * parv[0] - sender
  * parv[1] - target nick
  * parv[2] - space delimited silence list (+Blah +Blih -Bluh etc)
  * SERVER DISTRIBUTION:
@@ -96,7 +95,7 @@ CMD_FUNC(m_svssilence)
 	if (parc < 3 || BadPtr(parv[2]) || !(acptr = find_person(parv[1], NULL)))
 		return 0;
 	
-	sendto_server(sptr, 0, 0, ":%s SVSSILENCE %s :%s", parv[0], parv[1], parv[2]);
+	sendto_server(sptr, 0, 0, ":%s SVSSILENCE %s :%s", sptr->name, parv[1], parv[2]);
 
 	mine = MyClient(acptr) ? 1 : 0;
 
@@ -118,7 +117,7 @@ CMD_FUNC(m_svssilence)
 			(c != '-' && !add_silence(acptr, cp, 0)))
 		{
 			if (mine)
-				sendto_prefix_one(acptr, acptr, ":%s SILENCE %c%s", parv[0], c, cp);
+				sendto_prefix_one(acptr, acptr, ":%s SILENCE %c%s", sptr->name, c, cp);
 		}
 	}
 	return 0;
diff --git a/src/modules/m_svssno.c b/src/modules/m_svssno.c
index 5914b0eee..2689264ff 100644
--- a/src/modules/m_svssno.c
+++ b/src/modules/m_svssno.c
@@ -76,7 +76,6 @@ MOD_UNLOAD(m_svssno)
 
 /*
  * do_svssno() 
- * parv[0] - sender
  * parv[1] - username to change snomask for
  * parv[2] - snomasks to change
  * show_change determines whether to show the change to the user
diff --git a/src/modules/m_svswatch.c b/src/modules/m_svswatch.c
index 542e80780..749d68203 100644
--- a/src/modules/m_svswatch.c
+++ b/src/modules/m_svswatch.c
@@ -76,7 +76,6 @@ MOD_UNLOAD(m_svswatch)
 }
 
 /* m_svswatch() - written by Syzop, suggested by Griever.
- * parv[0] - sender
  * parv[1] - target nick
  * parv[2] - parameters
  */
@@ -91,13 +90,13 @@ CMD_FUNC(m_svswatch)
 
 	if (MyClient(acptr))
 	{
-		parv[0] = parv[1];
+		parv[0] = acptr->name;
 		parv[1] = parv[2];
 		parv[2] = NULL;
 		do_cmd(acptr, acptr, "WATCH", 2, parv);
 	}
 	else
-		sendto_one(acptr, ":%s SVSWATCH %s :%s", parv[0], parv[1], parv[2]);
+		sendto_one(acptr, ":%s SVSWATCH %s :%s", sptr->name, parv[1], parv[2]);
 
 	return 0;
 }
diff --git a/src/modules/m_time.c b/src/modules/m_time.c
index e03225413..1ea8164e2 100644
--- a/src/modules/m_time.c
+++ b/src/modules/m_time.c
@@ -77,13 +77,12 @@ MOD_UNLOAD(m_time)
 
 /*
 ** m_time
-**	parv[0] = sender prefix
 **	parv[1] = servername
 */
 CMD_FUNC(m_time)
 {
 	if (hunt_server(cptr, sptr, ":%s TIME :%s", 1, parc, parv) == HUNTED_ISME)
-		sendto_one(sptr, rpl_str(RPL_TIME), me.name, parv[0], me.name,
+		sendto_one(sptr, rpl_str(RPL_TIME), me.name, sptr->name, me.name,
 		    date((long)0));
 	return 0;
 }
diff --git a/src/modules/m_tkl.c b/src/modules/m_tkl.c
index f6b4ebbf2..0afbd4eff 100644
--- a/src/modules/m_tkl.c
+++ b/src/modules/m_tkl.c
@@ -183,7 +183,6 @@ MOD_UNLOAD(m_tkl)
 ** m_gline (oper function - /TKL takes care of distribution)
 ** /gline [+|-]u@h mask time :reason
 **
-** parv[0] = sender
 ** parv[1] = [+|-]u@h mask
 ** parv[2] = for how long
 ** parv[3] = reason
@@ -395,7 +394,7 @@ DLLFUNC int m_tkline(aClient *cptr, aClient *sptr, int parc, char *parv[])
 	}
 	if (!ValidatePermissionsForPath("tkl:kline:remove",sptr,NULL,NULL,NULL) && *parv[1] == '-')
 	{
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
 	return m_tkl_line(cptr, sptr, parc, parv, "k");
@@ -465,7 +464,6 @@ DLLFUNC int m_tzline(aClient *cptr, aClient *sptr, int parc, char *parv[])
 ** m_tkl_line (oper function - /TKL takes care of distribution)
 ** /gline [+|-]u@h mask time :reason
 **
-** parv[0] = sender
 ** parv[1] = [+|-]u@h mask
 ** parv[2] = for how long
 ** parv[3] = reason
diff --git a/src/modules/m_topic.c b/src/modules/m_topic.c
index dc69b1735..4e9b680dc 100644
--- a/src/modules/m_topic.c
+++ b/src/modules/m_topic.c
@@ -86,11 +86,9 @@ void topicoverride(aClient *sptr, aChannel *chptr, char *topic)
 
 /*
 ** m_topic
-**	parv[0] = sender prefix
 **	parv[1] = topic text
 **
 **	For servers using TS: (Lefler)
-**	parv[0] = sender prefix
 **	parv[1] = channel name
 **	parv[2] = topic nickname
 **	parv[3] = topic time
@@ -111,7 +109,7 @@ long flags = 0; /* cache: membership flags */
 	if (parc < 2)
 	{
 		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
-		    me.name, parv[0], "TOPIC");
+		    me.name, sptr->name, "TOPIC");
 		return 0;
 	}
 	name = parv[1];
@@ -128,7 +126,7 @@ long flags = 0; /* cache: membership flags */
 				    parv[1], backupbuf);
 			}
 			sendto_one(sptr, rpl_str(ERR_NOSUCHCHANNEL),
-			    me.name, parv[0], name);
+			    me.name, sptr->name, name);
 			return 0;
 		}
 		
@@ -142,7 +140,7 @@ long flags = 0; /* cache: membership flags */
 			    && !ValidatePermissionsForPath("override:see:list:secret",sptr,NULL,chptr,NULL) && !IsULine(sptr))
 			{
 				sendto_one(sptr, err_str(ERR_NOTONCHANNEL),
-				    me.name, parv[0], name);
+				    me.name, sptr->name, name);
 				return 0;
 			}
 			if (parc > 2)
@@ -168,21 +166,21 @@ long flags = 0; /* cache: membership flags */
 			/* If you're not a member, and you can't view outside channel, deny */
 			if ((!ismember && i == HOOK_DENY) || (is_banned(sptr,chptr,BANCHK_JOIN) && !ValidatePermissionsForPath("channel:view",sptr,NULL,chptr,NULL)))
 			{
-				sendto_one(sptr, err_str(ERR_NOTONCHANNEL), me.name, parv[0], name);
+				sendto_one(sptr, err_str(ERR_NOTONCHANNEL), me.name, sptr->name, name);
 				return 0;
 			}
 
 			if (!chptr->topic)
 				sendto_one(sptr, rpl_str(RPL_NOTOPIC),
-				    me.name, parv[0], chptr->chname);
+				    me.name, sptr->name, chptr->chname);
 			else
 			{
 				sendto_one(sptr, rpl_str(RPL_TOPIC),
-				    me.name, parv[0],
+				    me.name, sptr->name,
 				    chptr->chname, chptr->topic);
 				sendto_one(sptr,
 				    rpl_str(RPL_TOPICWHOTIME), me.name,
-				    parv[0], chptr->chname,
+				    sptr->name, chptr->chname,
 				    chptr->topic_nick, chptr->topic_time);
 			}
 		}
@@ -226,7 +224,7 @@ long flags = 0; /* cache: membership flags */
 				    sptr->name, chptr->chname, chptr->topic_nick,
 				    chptr->topic_time, chptr->topic);
 				sendto_channel_butserv(chptr, sptr,
-				    ":%s TOPIC %s :%s", parv[0],
+				    ":%s TOPIC %s :%s", sptr->name,
 				    chptr->chname, chptr->topic);
 			}
 		}
@@ -245,7 +243,7 @@ long flags = 0; /* cache: membership flags */
 					{
 #endif
 					sendto_one(sptr, err_str(ERR_CHANOPRIVSNEEDED),
-					    me.name, parv[0], chptr->chname);
+					    me.name, sptr->name, chptr->chname);
 					return 0;
 #ifndef NO_OPEROVERRIDE
 					}
@@ -263,7 +261,7 @@ long flags = 0; /* cache: membership flags */
 					topicoverride(sptr, chptr, topic);
 				} else {
 					ircsnprintf(buf, sizeof(buf), "You cannot change the topic on %s while being banned", chptr->chname);
-					sendto_one(sptr, err_str(ERR_CANNOTDOCOMMAND), me.name, parv[0], "TOPIC",  buf);
+					sendto_one(sptr, err_str(ERR_CANNOTDOCOMMAND), me.name, sptr->name, "TOPIC",  buf);
 					return -1;
 				}
 			} else
@@ -277,7 +275,7 @@ long flags = 0; /* cache: membership flags */
 				} else {
 					/* With +m and -t, only voice and higher may change the topic */
 					ircsnprintf(buf, sizeof(buf), "Voice (+v) or higher is required in order to change the topic on %s (channel is +m)", chptr->chname);
-					sendto_one(sptr, err_str(ERR_CANNOTDOCOMMAND), me.name, parv[0], "TOPIC",  buf);
+					sendto_one(sptr, err_str(ERR_CANNOTDOCOMMAND), me.name, sptr->name, "TOPIC",  buf);
 					return -1;
 				}
 			}
@@ -331,15 +329,15 @@ long flags = 0; /* cache: membership flags */
 			else
 				chptr->topic_time = TStime();
 			sendto_server(cptr, 0, 0, ":%s TOPIC %s %s %lu :%s",
-			    parv[0], chptr->chname, chptr->topic_nick,
+			    sptr->name, chptr->chname, chptr->topic_nick,
 			    chptr->topic_time, chptr->topic);
 			sendto_channel_butserv(chptr, sptr,
-			    ":%s TOPIC %s :%s", parv[0], chptr->chname,
+			    ":%s TOPIC %s :%s", sptr->name, chptr->chname,
 			    chptr->topic);
 		}
 		else
 			sendto_one(sptr, err_str(ERR_CHANOPRIVSNEEDED),
-			    me.name, parv[0], chptr->chname);
+			    me.name, sptr->name, chptr->chname);
 	}
 	return 0;
 }
diff --git a/src/modules/m_trace.c b/src/modules/m_trace.c
index 1390b7e05..4e5923411 100644
--- a/src/modules/m_trace.c
+++ b/src/modules/m_trace.c
@@ -73,7 +73,6 @@ MOD_UNLOAD(m_trace)
 
 /*
 ** m_trace
-**	parv[0] = sender prefix
 **	parv[1] = servername
 */
 DLLFUNC CMD_FUNC(m_trace)
@@ -104,11 +103,11 @@ DLLFUNC CMD_FUNC(m_trace)
 			if (strcasecmp(tname, me.name))
 			{
 				sendnotice(sptr, "You can only /TRACE local servers as a locop");
-				sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+				sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 				return 0;
 			}
 		} else {
-			sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+			sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 			return 0;
 		}
 	}
@@ -120,7 +119,7 @@ DLLFUNC CMD_FUNC(m_trace)
 		  aClient *ac2ptr;
 
 		  ac2ptr = find_client(tname, NULL);
-		  sendto_one(sptr, rpl_str(RPL_TRACELINK), me.name, parv[0],
+		  sendto_one(sptr, rpl_str(RPL_TRACELINK), me.name, sptr->name,
 		      version, debugmode, tname, ac2ptr->from->name);
 		  return 0;
 	  }
@@ -172,19 +171,19 @@ DLLFUNC CMD_FUNC(m_trace)
 		{
 		  case STAT_CONNECTING:
 			  sendto_one(sptr, rpl_str(RPL_TRACECONNECTING),
-			      me.name, parv[0], class, name);
+			      me.name, sptr->name, class, name);
 			  cnt++;
 			  break;
 		  case STAT_HANDSHAKE:
 			  sendto_one(sptr, rpl_str(RPL_TRACEHANDSHAKE), me.name,
-			      parv[0], class, name);
+			      sptr->name, class, name);
 			  cnt++;
 			  break;
 		  case STAT_ME:
 			  break;
 		  case STAT_UNKNOWN:
 			  sendto_one(sptr, rpl_str(RPL_TRACEUNKNOWN),
-			      me.name, parv[0], class, name);
+			      me.name, sptr->name, class, name);
 			  cnt++;
 			  break;
 		  case STAT_CLIENT:
@@ -198,13 +197,13 @@ DLLFUNC CMD_FUNC(m_trace)
 					  sendto_one(sptr,
 					      rpl_str(RPL_TRACEOPERATOR),
 					      me.name,
-					      parv[0], class, acptr->name,
+					      sptr->name, class, acptr->name,
 					      GetHost(acptr),
 					      now - acptr->lasttime);
 				  else
 					  sendto_one(sptr,
 					      rpl_str(RPL_TRACEUSER), me.name,
-					      parv[0], class, acptr->name,
+					      sptr->name, class, acptr->name,
 					      acptr->user->realhost,
 					      now - acptr->lasttime);
 				  cnt++;
@@ -213,14 +212,14 @@ DLLFUNC CMD_FUNC(m_trace)
 		  case STAT_SERVER:
 			  if (acptr->serv->user)
 				  sendto_one(sptr, rpl_str(RPL_TRACESERVER),
-				      me.name, parv[0], class, link_s[i],
+				      me.name, sptr->name, class, link_s[i],
 				      link_u[i], name, acptr->serv->by,
 				      acptr->serv->user->username,
 				      acptr->serv->user->realhost,
 				      now - acptr->lasttime);
 			  else
 				  sendto_one(sptr, rpl_str(RPL_TRACESERVER),
-				      me.name, parv[0], class, link_s[i],
+				      me.name, sptr->name, class, link_s[i],
 				      link_u[i], name, *(acptr->serv->by) ?
 				      acptr->serv->by : "*", "*", me.name,
 				      now - acptr->lasttime);
@@ -228,24 +227,24 @@ DLLFUNC CMD_FUNC(m_trace)
 			  break;
 		  case STAT_LOG:
 			  sendto_one(sptr, rpl_str(RPL_TRACELOG), me.name,
-			      parv[0], LOGFILE, acptr->port);
+			      sptr->name, LOGFILE, acptr->port);
 			  cnt++;
 			  break;
 #ifdef USE_SSL
 		  case STAT_SSL_CONNECT_HANDSHAKE:
 		  	sendto_one(sptr, rpl_str(RPL_TRACENEWTYPE), me.name,
-		  	 parv[0], "SSL-Connect-Handshake", name); 
+		  	 sptr->name, "SSL-Connect-Handshake", name); 
 			cnt++;
 			break;
 		  case STAT_SSL_ACCEPT_HANDSHAKE:
 		  	sendto_one(sptr, rpl_str(RPL_TRACENEWTYPE), me.name,
-		  	 parv[0], "SSL-Accept-Handshake", name); 
+		  	 sptr->name, "SSL-Accept-Handshake", name); 
 			cnt++;
 			break;
 #endif
 		  default:	/* ...we actually shouldn't come here... --msa */
 			  sendto_one(sptr, rpl_str(RPL_TRACENEWTYPE), me.name,
-			      parv[0], "<newtype>", name);
+			      sptr->name, "<newtype>", name);
 			  cnt++;
 			  break;
 		}
@@ -262,13 +261,13 @@ DLLFUNC CMD_FUNC(m_trace)
 		 * trace
 		 */
 		sendto_one(sptr, rpl_str(RPL_TRACESERVER),
-		    me.name, parv[0], "0", link_s[me.fd],
+		    me.name, sptr->name, "0", link_s[me.fd],
 		    link_u[me.fd], me.name, "*", "*", me.name, 0L);
 		return 0;
 	}
 	for (cltmp = conf_class; doall && cltmp; cltmp = (ConfigItem_class *) cltmp->next)
 	/*	if (cltmp->clients > 0) */
 			sendto_one(sptr, rpl_str(RPL_TRACECLASS), me.name,
-			    parv[0], cltmp->name ? cltmp->name : "[noname]", cltmp->clients);
+			    sptr->name, cltmp->name ? cltmp->name : "[noname]", cltmp->clients);
 	return 0;
 }
diff --git a/src/modules/m_tsctl.c b/src/modules/m_tsctl.c
index ef2bcf748..87867f79e 100644
--- a/src/modules/m_tsctl.c
+++ b/src/modules/m_tsctl.c
@@ -79,7 +79,6 @@ MOD_UNLOAD(m_tsctl)
 
 /*
 ** m_tsctl - Stskeeps
-**      parv[0] = sender prefix
 **      parv[1] = command
 **      parv[2] = options
 */
@@ -93,7 +92,7 @@ DLLFUNC int m_tsctl(aClient *cptr, aClient *sptr, int parc, char *parv[])
 		goto doit;
 	if (!ValidatePermissionsForPath("server:tsctl",sptr,NULL,NULL,NULL))
 	{
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
       doit:
@@ -102,7 +101,7 @@ DLLFUNC int m_tsctl(aClient *cptr, aClient *sptr, int parc, char *parv[])
 		if (*parv[1] == '\0')
 		{
 			sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
-			    me.name, parv[0], "TSCTL");
+			    me.name, sptr->name, "TSCTL");
 			return 0;
 		}
 
@@ -110,7 +109,7 @@ DLLFUNC int m_tsctl(aClient *cptr, aClient *sptr, int parc, char *parv[])
 		{
 			if (!ValidatePermissionsForPath("server:tsctl:set",sptr,NULL,NULL,NULL))
                         {
-			    sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+			    sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 			    return 0;
 			}
 
@@ -189,13 +188,13 @@ DLLFUNC int m_tsctl(aClient *cptr, aClient *sptr, int parc, char *parv[])
 		{
 			if (!IsULine(sptr))
 			{
-				if (MyClient(sptr)) sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+				if (MyClient(sptr)) sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 				return 0;
 			}
 
 			if (!parv[2] || *parv[2] == '\0')
 			{
-				if (MyClient(sptr)) sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0], "TSCTL");
+				if (MyClient(sptr)) sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, sptr->name, "TSCTL");
 				return 0;
 			}
 
@@ -218,7 +217,7 @@ DLLFUNC int m_tsctl(aClient *cptr, aClient *sptr, int parc, char *parv[])
 	}
 
 	//default: no parameter was entered
-	sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0], "TSCTL");
+	sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, sptr->name, "TSCTL");
 
 	return 0;
 }
diff --git a/src/modules/m_umode2.c b/src/modules/m_umode2.c
index 6e3974a9b..14c88b43f 100644
--- a/src/modules/m_umode2.c
+++ b/src/modules/m_umode2.c
@@ -73,17 +73,15 @@ MOD_UNLOAD(m_umode2)
 
 /*
     m_umode2 added by Stskeeps
-    parv[0] - sender
     parv[1] - modes to change
-
     Small wrapper to bandwidth save
 */
 
 CMD_FUNC(m_umode2)
 {
 	char *xparv[5] = {
-		parv[0],
-		parv[0],
+		sptr->name,
+		sptr->name,
 		parv[1],
 		(parc > 3) ? parv[3] : NULL,
 		NULL
diff --git a/src/modules/m_undccdeny.c b/src/modules/m_undccdeny.c
index a90c790e1..03c52595b 100644
--- a/src/modules/m_undccdeny.c
+++ b/src/modules/m_undccdeny.c
@@ -72,7 +72,6 @@ MOD_UNLOAD(m_undccdeny)
 }
 
 /* Remove a temporary dccdeny line
- * parv[0] - sender
  * parv[1] - file/mask
  */
 DLLFUNC CMD_FUNC(m_undccdeny)
@@ -83,43 +82,34 @@ DLLFUNC CMD_FUNC(m_undccdeny)
 
 	if (!ValidatePermissionsForPath("client:dcc",sptr,NULL,NULL,NULL))
 	{
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
 
 	if (parc < 2)
 	{
-		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0],
+		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, sptr->name,
 		    "UNDCCDENY");
 		return 0;
 	}
 
 	if (BadPtr(parv[1]))
 	{
-		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0],
+		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, sptr->name,
 		    "UNDCCDENY");
 		return 0;
 	}
-/* If we find an exact match even if it is a wild card only remove the exact match -- codemastr */
 	if ((p = Find_deny_dcc(parv[1])) && p->flag.type2 == CONF_BAN_TYPE_TEMPORARY)
 	{
-		sendto_ops("%s removed a temp dccdeny for %s", parv[0],
+		sendto_ops("%s removed a temp dccdeny for %s", sptr->name,
 		    parv[1]);
 		DCCdeny_del(p);
 		return 1;
 	}
-/* Next search using the wild card -- codemastr */
-/* Uncommented by Stskeeps:
-	else if (dcc_del_wild_match(parv[1]) == 1)
-		sendto_ops
-		    ("%s removed a temp dccdeny for all dccdenys matching %s",
-		    parv[0], parv[1]);
-*/
-/* If still no match, give an error */
 	else
 		sendto_one(sptr,
 		    "NOTICE %s :*** Unable to find a temp dccdeny matching %s",
-		    parv[0], parv[1]);
+		    sptr->name, parv[1]);
 	return 0;
 
 }
diff --git a/src/modules/m_unkline.c b/src/modules/m_unkline.c
index 34b13ba49..b07133fa3 100644
--- a/src/modules/m_unkline.c
+++ b/src/modules/m_unkline.c
@@ -76,7 +76,6 @@ MOD_UNLOAD(m_unkline)
 
 /*
  *  m_unkline
- *    parv[0] = sender prefix
  *    parv[1] = userhost
  */
 
@@ -84,10 +83,10 @@ DLLFUNC int m_unkline(aClient *cptr, aClient *sptr, int parc, char *parv[])
 {
 	if (!MyClient(sptr) || !ValidatePermissionsForPath("tkl:kline:remove",sptr,NULL,NULL,NULL))
 	{
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
-	sendto_one(sptr, ":%s NOTICE %s :Please use /kline -user@host", me.name, parv[0]);
+	sendto_one(sptr, ":%s NOTICE %s :Please use /kline -user@host", me.name, sptr->name);
 
 	return 0;
 }
diff --git a/src/modules/m_unsqline.c b/src/modules/m_unsqline.c
index 28ba41ca0..b80d4aa48 100644
--- a/src/modules/m_unsqline.c
+++ b/src/modules/m_unsqline.c
@@ -75,7 +75,6 @@ MOD_UNLOAD(m_unsqline)
 }
 
 /*    m_unsqline
-**	parv[0] = sender
 **	parv[1] = nickmask
 */
 DLLFUNC int m_unsqline(aClient *cptr, aClient *sptr, int parc, char *parv[])
diff --git a/src/modules/m_unzline.c b/src/modules/m_unzline.c
index 5a421c501..fbea2d156 100644
--- a/src/modules/m_unzline.c
+++ b/src/modules/m_unzline.c
@@ -77,7 +77,6 @@ MOD_UNLOAD(m_unzline)
 
 /*
  *  m_unzline                        remove a temporary zap line
- *    parv[0] = sender prefix
  *    parv[1] = host
  */
 
@@ -85,11 +84,11 @@ DLLFUNC int m_unzline(aClient *cptr, aClient *sptr, int parc, char *parv[])
 {
         if (!MyClient(sptr) || !ValidatePermissionsForPath("tkl:zline:local:remove",sptr,NULL,NULL,NULL))
         {
-                sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+                sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
                 return 0;
         }
 
-        sendto_one(sptr, ":%s NOTICE %s :Please use /zline -user@host", me.name, parv[0]);
+        sendto_one(sptr, ":%s NOTICE %s :Please use /zline -user@host", me.name, sptr->name);
 
 	return 0;
 }
diff --git a/src/modules/m_user.c b/src/modules/m_user.c
index a02b4cfa0..0b681dd78 100644
--- a/src/modules/m_user.c
+++ b/src/modules/m_user.c
@@ -73,7 +73,6 @@ MOD_UNLOAD(m_user)
 
 /*
 ** m_user
-**	parv[0] = sender prefix
 **	parv[1] = username (login name, account)
 **	parv[2] = client host name (used only from other servers)
 **	parv[3] = server host name (used only from other servers)
@@ -106,10 +105,10 @@ DLLFUNC CMD_FUNC(m_user)
 	    *parv[3] == '\0' || *parv[4] == '\0')
 	{
 		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
-		    me.name, parv[0], "USER");
+		    me.name, sptr->name, "USER");
 		if (IsServer(cptr))
 			sendto_ops("bad USER param count for %s from %s",
-			    parv[0], get_client_name(cptr, FALSE));
+			    sptr->name, get_client_name(cptr, FALSE));
 		else
 			return 0;
 	}
@@ -171,7 +170,7 @@ DLLFUNC CMD_FUNC(m_user)
 	if (!IsUnknown(sptr))
 	{
 		sendto_one(sptr, err_str(ERR_ALREADYREGISTRED),
-		    me.name, parv[0]);
+		    me.name, sptr->name);
 		return 0;
 	}
 
diff --git a/src/modules/m_userhost.c b/src/modules/m_userhost.c
index 8b296e74d..f2e45ecd1 100644
--- a/src/modules/m_userhost.c
+++ b/src/modules/m_userhost.c
@@ -89,7 +89,7 @@ DLLFUNC CMD_FUNC(m_userhost)
 	if (parc < 2)
 	{
 		sendto_one(sptr, rpl_str(ERR_NEEDMOREPARAMS),
-		    me.name, parv[0], "USERHOST");
+		    me.name, sptr->name, "USERHOST");
 		return 0;
 	}
 
@@ -127,7 +127,7 @@ DLLFUNC CMD_FUNC(m_userhost)
 		cn = p;
 	}
 
-	sendto_one(sptr, rpl_str(RPL_USERHOST), me.name, parv[0],
+	sendto_one(sptr, rpl_str(RPL_USERHOST), me.name, sptr->name,
 	    response[0], response[1], response[2], response[3], response[4]);
 
 	return 0;
diff --git a/src/modules/m_userip.c b/src/modules/m_userip.c
index e95bb1834..e80357262 100644
--- a/src/modules/m_userip.c
+++ b/src/modules/m_userip.c
@@ -94,7 +94,7 @@ DLLFUNC CMD_FUNC(m_userip)
 	if (parc < 2)
 	{
 		sendto_one(sptr, rpl_str(ERR_NEEDMOREPARAMS),
-		    me.name, parv[0], "USERIP");
+		    me.name, sptr->name, "USERIP");
 		return 0;
 	}
 
@@ -138,7 +138,7 @@ DLLFUNC CMD_FUNC(m_userip)
 		cn = p;
 	}
 
-	sendto_one(sptr, rpl_str(RPL_USERIP), me.name, parv[0],
+	sendto_one(sptr, rpl_str(RPL_USERIP), me.name, sptr->name,
 	    response[0], response[1], response[2], response[3], response[4]);
 
 	return 0;
diff --git a/src/modules/m_vhost.c b/src/modules/m_vhost.c
index 5e58a641b..db7b3bee6 100644
--- a/src/modules/m_vhost.c
+++ b/src/modules/m_vhost.c
@@ -85,7 +85,7 @@ int  m_vhost(aClient *cptr, aClient *sptr, int parc, char *parv[])
 	if (parc < 2)
 	{
 		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
-		    me.name, parv[0], "VHOST");
+		    me.name, sptr->name, "VHOST");
 		return 0;
 
 	}
diff --git a/src/modules/m_wallops.c b/src/modules/m_wallops.c
index aa34c65b9..fed3ea6c9 100644
--- a/src/modules/m_wallops.c
+++ b/src/modules/m_wallops.c
@@ -73,7 +73,6 @@ MOD_UNLOAD(m_wallops)
 
 /*
 ** m_wallops (write to *all* opers currently online)
-**	parv[0] = sender prefix
 **	parv[1] = message text
 */
 DLLFUNC CMD_FUNC(m_wallops)
@@ -84,15 +83,15 @@ DLLFUNC CMD_FUNC(m_wallops)
 	if (BadPtr(message))
 	{
 		sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS),
-		    me.name, parv[0], "WALLOPS");
+		    me.name, sptr->name, "WALLOPS");
 		return 0;
 	}
 	if (MyClient(sptr) && !ValidatePermissionsForPath("chat:wallops",sptr,NULL,NULL,NULL))
 	{
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
 	sendto_ops_butone(IsServer(cptr) ? cptr : NULL, sptr,
-	    ":%s WALLOPS :%s", parv[0], message);
+	    ":%s WALLOPS :%s", sptr->name, message);
 	return 0;
 }
diff --git a/src/modules/m_watch.c b/src/modules/m_watch.c
index f081cbfc9..f895ea4b5 100644
--- a/src/modules/m_watch.c
+++ b/src/modules/m_watch.c
@@ -210,7 +210,7 @@ DLLFUNC CMD_FUNC(m_watch)
 				    (lp = lp->next); count++)
 					;
 			sendto_one(sptr, rpl_str(RPL_WATCHSTAT), me.name,
-			    parv[0], sptr->watches, count);
+			    sptr->name, sptr->watches, count);
 
 			/*
 			 * Send a list of everybody in their WATCH list. Be careful
@@ -219,13 +219,13 @@ DLLFUNC CMD_FUNC(m_watch)
 			if ((lp = sptr->watch) == NULL)
 			{
 				sendto_one(sptr, rpl_str(RPL_ENDOFWATCHLIST),
-				    me.name, parv[0], *s);
+				    me.name, sptr->name, *s);
 				continue;
 			}
 			*buf = '\0';
 			strlcpy(buf, lp->value.wptr->nick, sizeof buf);
 			count =
-			    strlen(parv[0]) + strlen(me.name) + 10 +
+			    strlen(sptr->name) + strlen(me.name) + 10 +
 			    strlen(buf);
 			while ((lp = lp->next))
 			{
@@ -233,10 +233,10 @@ DLLFUNC CMD_FUNC(m_watch)
 				    BUFSIZE - 2)
 				{
 					sendto_one(sptr, rpl_str(RPL_WATCHLIST),
-					    me.name, parv[0], buf);
+					    me.name, sptr->name, buf);
 					*buf = '\0';
 					count =
-					    strlen(parv[0]) + strlen(me.name) +
+					    strlen(sptr->name) + strlen(me.name) +
 					    10;
 				}
 				strcat(buf, " ");
@@ -244,10 +244,10 @@ DLLFUNC CMD_FUNC(m_watch)
 				count += (strlen(lp->value.wptr->nick) + 1);
 			}
 			sendto_one(sptr, rpl_str(RPL_WATCHLIST), me.name,
-			    parv[0], buf);
+			    sptr->name, buf);
 
 			sendto_one(sptr, rpl_str(RPL_ENDOFWATCHLIST), me.name,
-			    parv[0], *s);
+			    sptr->name, *s);
 			continue;
 		}
 
@@ -268,7 +268,7 @@ DLLFUNC CMD_FUNC(m_watch)
 				    find_person(lp->value.wptr->nick, NULL)))
 				{
 					sendto_one(sptr, rpl_str(RPL_NOWON),
-					    me.name, parv[0], acptr->name,
+					    me.name, sptr->name, acptr->name,
 					    acptr->user->username,
 					    IsHidden(acptr) ? acptr->user->
 					    virthost : acptr->user->realhost,
@@ -280,14 +280,14 @@ DLLFUNC CMD_FUNC(m_watch)
 				 */
 				else if (isupper(*s))
 					sendto_one(sptr, rpl_str(RPL_NOWOFF),
-					    me.name, parv[0],
+					    me.name, sptr->name,
 					    lp->value.wptr->nick, "*", "*",
 					    lp->value.wptr->lasttime);
 				lp = lp->next;
 			}
 
 			sendto_one(sptr, rpl_str(RPL_ENDOFWATCHLIST), me.name,
-			    parv[0], *s);
+			    sptr->name, *s);
 
 			continue;
 		}
diff --git a/src/modules/m_who.c b/src/modules/m_who.c
index 559e37548..927cb0e59 100644
--- a/src/modules/m_who.c
+++ b/src/modules/m_who.c
@@ -149,7 +149,7 @@ int i = 0;
 		i = parse_who_options(sptr, parc - 1, parv + 1);
 		if (i < 0)
 		{
-			sendto_one(sptr, getreply(RPL_ENDOFWHO), me.name, parv[0], mask);
+			sendto_one(sptr, getreply(RPL_ENDOFWHO), me.name, sptr->name, mask);
 			return 0;
 		}
 	}
@@ -167,14 +167,14 @@ int i = 0;
 	if (*mask == '\0')
 	{
 		/* no mask given */
-		sendto_one(sptr, getreply(RPL_ENDOFWHO), me.name, parv[0], "*");
+		sendto_one(sptr, getreply(RPL_ENDOFWHO), me.name, sptr->name, "*");
 		return 0;
 	}
 
 	if ((target_channel = find_channel(mask, NULL)) != NULL)
 	{
 		do_channel_who(sptr, target_channel, mask);
-		sendto_one(sptr, getreply(RPL_ENDOFWHO), me.name, parv[0], mask);
+		sendto_one(sptr, getreply(RPL_ENDOFWHO), me.name, sptr->name, mask);
 		return 0;
 	}
 
@@ -182,13 +182,13 @@ int i = 0;
 	    (target_channel = find_channel(wfl.channel, NULL)) != NULL)
 	{
 		do_channel_who(sptr, target_channel, mask);
-		sendto_one(sptr, getreply(RPL_ENDOFWHO), me.name, parv[0], mask);
+		sendto_one(sptr, getreply(RPL_ENDOFWHO), me.name, sptr->name, mask);
 		return 0;
 	}
 	else
 	{
 		do_other_who(sptr, mask);
-		sendto_one(sptr, getreply(RPL_ENDOFWHO), me.name, parv[0], mask);
+		sendto_one(sptr, getreply(RPL_ENDOFWHO), me.name, sptr->name, mask);
 		return 0;
 	}
 
diff --git a/src/modules/m_whois.c b/src/modules/m_whois.c
index 536829c9c..443cf152b 100644
--- a/src/modules/m_whois.c
+++ b/src/modules/m_whois.c
@@ -79,7 +79,6 @@ MOD_UNLOAD(m_whois)
 
 /*
 ** m_whois
-**	parv[0] = sender prefix
 **	parv[1] = nickname masklist
 */
 DLLFUNC int  m_whois(aClient *cptr, aClient *sptr, int parc, char *parv[])
@@ -99,7 +98,7 @@ DLLFUNC int  m_whois(aClient *cptr, aClient *sptr, int parc, char *parv[])
 	if (parc < 2)
 	{
 		sendto_one(sptr, err_str(ERR_NONICKNAMEGIVEN),
-		    me.name, parv[0]);
+		    me.name, sptr->name);
 		return 0;
 	}
 
@@ -154,7 +153,7 @@ DLLFUNC int  m_whois(aClient *cptr, aClient *sptr, int parc, char *parv[])
 				hideoper = 1;
 
 			sendto_one(sptr, rpl_str(RPL_WHOISUSER), me.name,
-			    parv[0], name,
+			    sptr->name, name,
 			    user->username,
 			    IsHidden(acptr) ? user->virthost : user->realhost,
 			    acptr->info);
@@ -166,22 +165,22 @@ DLLFUNC int  m_whois(aClient *cptr, aClient *sptr, int parc, char *parv[])
 				
 				/* send the target user's modes */
 				sendto_one(sptr, rpl_str(RPL_WHOISMODES),
-				    me.name, parv[0], name,
+				    me.name, sptr->name, name,
 				    get_mode_str(acptr), sno[1] == 0 ? "" : sno);
 			}
 			if ((acptr == sptr) || IsOper(sptr))
 			{
 				sendto_one(sptr, rpl_str(RPL_WHOISHOST),
-				    me.name, parv[0], acptr->name,
+				    me.name, sptr->name, acptr->name,
 					(MyConnect(acptr) && strcmp(acptr->username, "unknown")) ? acptr->username : "*",
 					user->realhost, user->ip_str ? user->ip_str : "");
 			}
 
 			if (IsARegNick(acptr))
-				sendto_one(sptr, rpl_str(RPL_WHOISREGNICK), me.name, parv[0], name);
+				sendto_one(sptr, rpl_str(RPL_WHOISREGNICK), me.name, sptr->name, name);
 			
 			found = 1;
-			mlen = strlen(me.name) + strlen(parv[0]) + 10 + strlen(name);
+			mlen = strlen(me.name) + strlen(sptr->name) + 10 + strlen(name);
 			for (len = 0, *buf = '\0', lp = user->channel; lp; lp = lp->next)
 			{
 				Hook *h;
@@ -238,7 +237,7 @@ DLLFUNC int  m_whois(aClient *cptr, aClient *sptr, int parc, char *parv[])
 						    ":%s %d %s %s :%s",
 						    me.name,
 						    RPL_WHOISCHANNELS,
-						    parv[0], name, buf);
+						    sptr->name, name, buf);
 						*buf = '\0';
 						len = 0;
 					}
@@ -302,16 +301,16 @@ DLLFUNC int  m_whois(aClient *cptr, aClient *sptr, int parc, char *parv[])
 			}
 
 			if (buf[0] != '\0')
-				sendto_one(sptr, rpl_str(RPL_WHOISCHANNELS), me.name, parv[0], name, buf); 
+				sendto_one(sptr, rpl_str(RPL_WHOISCHANNELS), me.name, sptr->name, name, buf); 
 
                         if (!(IsULine(acptr) && !IsOper(sptr) && HIDE_ULINES))
 				sendto_one(sptr, rpl_str(RPL_WHOISSERVER),
-				    me.name, parv[0], name, user->server,
+				    me.name, sptr->name, name, user->server,
 				    acptr->srvptr ? acptr->srvptr->info : "*Not On This Net*");
 
 			if (user->away)
 				sendto_one(sptr, rpl_str(RPL_AWAY), me.name,
-				    parv[0], name, user->away);
+				    sptr->name, name, user->away);
 
 			if (IsOper(acptr) && !hideoper)
 			{
@@ -331,17 +330,17 @@ DLLFUNC int  m_whois(aClient *cptr, aClient *sptr, int parc, char *parv[])
 							operclass = oper->operclass;
 						sendto_one(sptr,
 						    ":%s 313 %s %s :is %s (%s) [%s]", me.name,
-						    parv[0], name, buf, acptr->user->operlogin, operclass);
+						    sptr->name, name, buf, acptr->user->operlogin, operclass);
 					}
 					else
 						sendto_one(sptr,
 						    rpl_str(RPL_WHOISOPERATOR), me.name,
-						    parv[0], name, buf);
+						    sptr->name, name, buf);
 				}
 			}
 
 			if (acptr->umodes & UMODE_SECURE)
-				sendto_one(sptr, rpl_str(RPL_WHOISSECURE), me.name, parv[0], name,
+				sendto_one(sptr, rpl_str(RPL_WHOISSECURE), me.name, sptr->name, name,
 					"is using a Secure Connection");
 			
 			RunHook2(HOOKTYPE_WHOIS, sptr, acptr);
@@ -361,7 +360,7 @@ DLLFUNC int  m_whois(aClient *cptr, aClient *sptr, int parc, char *parv[])
 			 * not a legacy timestamp.  --nenolod
 			 */
 			if (!isdigit(*user->svid))
-				sendto_one(sptr, rpl_str(RPL_WHOISLOGGEDIN), me.name, parv[0], name, user->svid);
+				sendto_one(sptr, rpl_str(RPL_WHOISLOGGEDIN), me.name, sptr->name, name, user->svid);
 
 			/*
 			 * Umode +I hides an oper's idle time from regular users.
@@ -370,15 +369,15 @@ DLLFUNC int  m_whois(aClient *cptr, aClient *sptr, int parc, char *parv[])
 			if (MyConnect(acptr) && (IsOper(sptr) || !(acptr->umodes & UMODE_HIDLE)))
 			{
 				sendto_one(sptr, rpl_str(RPL_WHOISIDLE),
-				    me.name, parv[0], name,
+				    me.name, sptr->name, name,
 				    TStime() - acptr->last, acptr->firsttime);
 			}
 		}
 		if (!found)
 			sendto_one(sptr, err_str(ERR_NOSUCHNICK),
-			    me.name, parv[0], nick);
+			    me.name, sptr->name, nick);
 	}
-	sendto_one(sptr, rpl_str(RPL_ENDOFWHOIS), me.name, parv[0], querybuf);
+	sendto_one(sptr, rpl_str(RPL_ENDOFWHOIS), me.name, sptr->name, querybuf);
 
 	return 0;
 }
diff --git a/src/modules/m_whowas.c b/src/modules/m_whowas.c
index 621055c44..b5428e76b 100644
--- a/src/modules/m_whowas.c
+++ b/src/modules/m_whowas.c
@@ -79,7 +79,6 @@ extern MODVAR aWhowas *WHOWASHASH[WW_MAX];
 
 /*
 ** m_whowas
-**      parv[0] = sender prefix
 **      parv[1] = nickname queried
 */
 DLLFUNC CMD_FUNC(m_whowas)
@@ -92,7 +91,7 @@ DLLFUNC CMD_FUNC(m_whowas)
 	if (parc < 2)
 	{
 		sendto_one(sptr, err_str(ERR_NONICKNAMEGIVEN),
-		    me.name, parv[0]);
+		    me.name, sptr->name);
 		return 0;
 	}
 	if (parc > 2)
@@ -115,7 +114,7 @@ DLLFUNC CMD_FUNC(m_whowas)
 		if (!mycmp(nick, temp->name))
 		{
 			sendto_one(sptr, rpl_str(RPL_WHOWASUSER),
-			    me.name, parv[0], temp->name,
+			    me.name, sptr->name, temp->name,
 			    temp->username,
 			    (IsOper(sptr) ? temp->hostname :
 			    (*temp->virthost !=
@@ -123,7 +122,7 @@ DLLFUNC CMD_FUNC(m_whowas)
 			    temp->realname);
                 	if (!((Find_uline(temp->servername)) && !IsOper(sptr) && HIDE_ULINES))
 				sendto_one(sptr, rpl_str(RPL_WHOISSERVER), me.name,
-				    parv[0], temp->name, temp->servername,
+				    sptr->name, temp->name, temp->servername,
 				    myctime(temp->logoff));
 			cur++;
 			found++;
@@ -133,8 +132,8 @@ DLLFUNC CMD_FUNC(m_whowas)
 	}
 	if (!found)
 		sendto_one(sptr, err_str(ERR_WASNOSUCHNICK),
-		    me.name, parv[0], nick);
+		    me.name, sptr->name, nick);
 
-	sendto_one(sptr, rpl_str(RPL_ENDOFWHOWAS), me.name, parv[0], parv[1]);
+	sendto_one(sptr, rpl_str(RPL_ENDOFWHOWAS), me.name, sptr->name, parv[1]);
 	return 0;
 }
diff --git a/src/s_numeric.c b/src/s_numeric.c
index 8ebbcea08..8954e83dc 100644
--- a/src/s_numeric.c
+++ b/src/s_numeric.c
@@ -40,7 +40,6 @@ static char buffer[1024];
 ** DoNumeric (replacement for the old do_numeric)
 **
 **	parc	number of arguments ('sender' counted as one!)
-**	parv[0]	pointer to 'sender' (may point to empty string) (not used)
 **	parv[1]..parv[parc-1]
 **		pointers to additional parameters, this is a NULL
 **		terminated list (parv[parc] == NULL).
@@ -100,7 +99,7 @@ int  do_numeric(int numeric, aClient *cptr, aClient *sptr, int parc, char *parv[
 	else
 		sendto_realops("do_numeric( %i, %s, %s, %i, { %s, %s } )!",
 		    numeric, cptr->name, sptr->name, parc,
-		    parv[0], parv[1] ? parv[1] : "<null>");
+		    sptr->name, parv[1] ? parv[1] : "<null>");
 	for (; (nick = strtoken(&p, parv[1], ",")); parv[1] = NULL)
 	{
 		if ((acptr = find_client(nick, (aClient *)NULL)))
@@ -128,21 +127,21 @@ int  do_numeric(int numeric, aClient *cptr, aClient *sptr, int parc, char *parv[
 				 */
 
 				sendto_prefix_one(acptr, sptr, ":%s %d %s%s",
-				    parv[0], numeric, nick, buffer);
+				    sptr->name, numeric, nick, buffer);
 			}
 			else if (IsServer(acptr) && acptr->from != cptr)
 				sendto_prefix_one(acptr, sptr, ":%s %d %s%s",
-				    parv[0], numeric, nick, buffer);
+				    sptr->name, numeric, nick, buffer);
 		}
 		else if ((acptr = find_server_quick(nick)))
 		{
 			if (!IsMe(acptr) && acptr->from != cptr)
 				sendto_prefix_one(acptr, sptr, ":%s %d %s%s",
-				    parv[0], numeric, nick, buffer);
+				    sptr->name, numeric, nick, buffer);
 		}
 		else if ((chptr = find_channel(nick, (aChannel *)NULL)))
 			sendto_channel_butone(cptr, sptr, chptr, ":%s %d %s%s",
-			    parv[0], numeric, chptr->chname, buffer);
+			    sptr->name, numeric, chptr->chname, buffer);
 	}
 	return 0;
 }
diff --git a/src/s_serv.c b/src/s_serv.c
index ed938c779..d7fc1c20a 100644
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -130,13 +130,11 @@ void reread_motdsandrules();
 **
 **	parv	a NULL terminated list of parameter pointers,
 **
-**			parv[0], sender (prefix string), if not present
-**				this points to an empty string.
 **			parv[1]...parv[parc-1]
 **				pointers to additional parameters
 **			parv[parc] == NULL, *always*
 **
-**		note:	it is guaranteed that parv[0]..parv[parc-1] are all
+**		note:	it is guaranteed that parv[1]..parv[parc-1] are all
 **			non-NULL pointers.
 */
 #ifndef _WIN32
@@ -177,7 +175,6 @@ inline void send_version(aClient* sptr, int reply)
 
 /*
 ** m_version
-**	parv[0] = sender prefix
 **	parv[1] = remote server
 */
 CMD_FUNC(m_version)
@@ -189,7 +186,7 @@ CMD_FUNC(m_version)
 	if (hunt_server(cptr, sptr, ":%s VERSION :%s", 1, parc, parv) == HUNTED_ISME)
 	{
 		sendto_one(sptr, rpl_str(RPL_VERSION), me.name,
-		    parv[0], version, debugmode, me.name,
+		    sptr->name, version, debugmode, me.name,
 		    serveropts, extraflags ? extraflags : "",
 		    tainted ? "3" : "",
 		    (ValidatePermissionsForPath("server:info",sptr,NULL,NULL,NULL) ? MYOSNAME : "*"), UnrealProtocol);
@@ -317,7 +314,6 @@ char **text = unrealinfo;
 
 /*
 ** m_info
-**	parv[0] = sender prefix
 **	parv[1] = servername
 **  Modified for hardcode by Stskeeps
 */
@@ -337,7 +333,6 @@ CMD_FUNC(m_info)
 
 /*
 ** m_dalinfo
-**      parv[0] = sender prefix
 **      parv[1] = servername
 */
 CMD_FUNC(m_dalinfo)
@@ -351,15 +346,15 @@ CMD_FUNC(m_dalinfo)
 	{
 		while (*text)
 			sendto_one(sptr, rpl_str(RPL_INFO),
-			    me.name, parv[0], *text++);
+			    me.name, sptr->name, *text++);
 
-		sendto_one(sptr, rpl_str(RPL_INFO), me.name, parv[0], "");
+		sendto_one(sptr, rpl_str(RPL_INFO), me.name, sptr->name, "");
 		sendto_one(sptr,
 		    ":%s %d %s :Birth Date: %s, compile # %s",
-		    me.name, RPL_INFO, parv[0], creation, generation);
+		    me.name, RPL_INFO, sptr->name, creation, generation);
 		sendto_one(sptr, ":%s %d %s :On-line since %s",
-		    me.name, RPL_INFO, parv[0], myctime(me.firsttime));
-		sendto_one(sptr, rpl_str(RPL_ENDOFINFO), me.name, parv[0]);
+		    me.name, RPL_INFO, sptr->name, myctime(me.firsttime));
+		sendto_one(sptr, rpl_str(RPL_ENDOFINFO), me.name, sptr->name);
 	}
 
 	return 0;
@@ -367,7 +362,6 @@ CMD_FUNC(m_dalinfo)
 
 /*
 ** m_license
-**      parv[0] = sender prefix
 **      parv[1] = servername
 */
 CMD_FUNC(m_license)
@@ -381,10 +375,10 @@ CMD_FUNC(m_license)
 	{
 		while (*text)
 			sendto_one(sptr, rpl_str(RPL_INFO),
-			    me.name, parv[0], *text++);
+			    me.name, sptr->name, *text++);
 
-		sendto_one(sptr, rpl_str(RPL_INFO), me.name, parv[0], "");
-		sendto_one(sptr, rpl_str(RPL_ENDOFINFO), me.name, parv[0]);
+		sendto_one(sptr, rpl_str(RPL_INFO), me.name, sptr->name, "");
+		sendto_one(sptr, rpl_str(RPL_ENDOFINFO), me.name, sptr->name);
 	}
 
 	return 0;
@@ -392,7 +386,6 @@ CMD_FUNC(m_license)
 
 /*
 ** m_credits
-**      parv[0] = sender prefix
 **      parv[1] = servername
 */
 CMD_FUNC(m_credits)
@@ -406,15 +399,15 @@ CMD_FUNC(m_credits)
 	{
 		while (*text)
 			sendto_one(sptr, rpl_str(RPL_INFO),
-			    me.name, parv[0], *text++);
+			    me.name, sptr->name, *text++);
 
-		sendto_one(sptr, rpl_str(RPL_INFO), me.name, parv[0], "");
+		sendto_one(sptr, rpl_str(RPL_INFO), me.name, sptr->name, "");
 		sendto_one(sptr,
 		    ":%s %d %s :Birth Date: %s, compile # %s",
-		    me.name, RPL_INFO, parv[0], creation, generation);
+		    me.name, RPL_INFO, sptr->name, creation, generation);
 		sendto_one(sptr, ":%s %d %s :On-line since %s",
-		    me.name, RPL_INFO, parv[0], myctime(me.firsttime));
-		sendto_one(sptr, rpl_str(RPL_ENDOFINFO), me.name, parv[0]);
+		    me.name, RPL_INFO, sptr->name, myctime(me.firsttime));
+		sendto_one(sptr, rpl_str(RPL_ENDOFINFO), me.name, sptr->name);
 	}
 
 	return 0;
@@ -471,33 +464,31 @@ char *get_client_name2(aClient *acptr, int showports)
 
 /*
 ** m_summon
-** parv[0] = sender prefix
 */
 CMD_FUNC(m_summon)
 {
 	/* /summon is old and out dated, we just return an error as
 	 * required by RFC1459 -- codemastr
-	 */ sendto_one(sptr, err_str(ERR_SUMMONDISABLED), me.name, parv[0]);
+	 */ sendto_one(sptr, err_str(ERR_SUMMONDISABLED), me.name, sptr->name);
 	return 0;
 }
 /*
 ** m_users
-**	parv[0] = sender prefix
 **	parv[1] = servername
 */ 
 CMD_FUNC(m_users)
 {
 	/* /users is out of date, just return an error as  required by
 	 * RFC1459 -- codemastr
-	 */ sendto_one(sptr, err_str(ERR_USERSDISABLED), me.name, parv[0]);
+	 */ sendto_one(sptr, err_str(ERR_USERSDISABLED), me.name, sptr->name);
 	return 0;
 }
+
 /*
 ** Note: At least at protocol level ERROR has only one parameter,
 ** although this is called internally from other functions
 ** --msa
 **
-**	parv[0] = sender prefix
 **	parv[*] = parameters
 */ 
 CMD_FUNC(m_error)
@@ -626,13 +617,13 @@ CMD_FUNC(m_rehash)
 
 	if (MyClient(sptr) && !ValidatePermissionsForPath("server:rehash",sptr,NULL,NULL,NULL))
 	{
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
 	if (!MyClient(sptr) && !ValidatePermissionsForPath("server:rehash",sptr,NULL,NULL,NULL)
 	    && !IsULine(sptr))
 	{
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
 	x = 0;
@@ -657,7 +648,7 @@ CMD_FUNC(m_rehash)
 	if (cptr != sptr)
 	{
 #ifndef REMOTE_REHASH
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 #endif
 		if (parv[2] == NULL)
@@ -673,7 +664,7 @@ CMD_FUNC(m_rehash)
 			    me.name, sptr->name);
 			sendto_ops
 			    ("%s is remotely rehashing server config file",
-			    parv[0]);
+			    sptr->name);
 			reread_motdsandrules();
 			return rehash(cptr, sptr,
 			    (parc > 1) ? ((*parv[1] == 'q') ? 2 : 0) : 0);
@@ -698,7 +689,7 @@ CMD_FUNC(m_rehash)
 			 */
 			if (!ValidatePermissionsForPath("server:rehash",sptr,NULL,NULL,NULL))
 			{
-				sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+				sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 				sendnotice(sptr, "'/REHASH -global' requires you to have server::rehash permissions");
 				return 0;
 			}
@@ -726,7 +717,7 @@ CMD_FUNC(m_rehash)
 
 		if (!ValidatePermissionsForPath("server:rehash",sptr,NULL,NULL,NULL))
 		{
-			sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+			sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 			return 0;
 		}
 
@@ -797,12 +788,12 @@ CMD_FUNC(m_rehash)
 				me.name, sptr->name);
 			return 0;
 		}
-		sendto_ops("%s is rehashing server config file", parv[0]);
+		sendto_ops("%s is rehashing server config file", sptr->name);
 	}
 
 	/* Normal rehash, rehash motds&rules too, just like the on in the tld block will :p */
 	if (cptr == sptr)
-		sendto_one(sptr, rpl_str(RPL_REHASHING), me.name, parv[0], configfile);
+		sendto_one(sptr, rpl_str(RPL_REHASHING), me.name, sptr->name, configfile);
 	x = rehash(cptr, sptr, (parc > 1) ? ((*parv[1] == 'q') ? 2 : 0) : 0);
 	reread_motdsandrules();
 	return x;
@@ -825,12 +816,12 @@ char *reason = parv[1];
 	/* Check permissions */
 	if (MyClient(sptr) && !ValidatePermissionsForPath("server:restart",sptr,NULL,NULL,NULL))
 	{
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
 	if (!MyClient(sptr) && !ValidatePermissionsForPath("server:restart",sptr,NULL,NULL,NULL) && !IsULine(sptr))
 	{
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
 
@@ -844,7 +835,7 @@ char *reason = parv[1];
 	{
 		if (conf_drpass)
 		{
-			sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, parv[0], "RESTART");
+			sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name, sptr->name, "RESTART");
 			return 0;
 		}
 	} else
@@ -857,7 +848,7 @@ char *reason = parv[1];
 			ret = Auth_Check(cptr, conf_drpass->restartauth, parv[1]);
 			if (ret == -1)
 			{
-				sendto_one(sptr, err_str(ERR_PASSWDMISMATCH), me.name, parv[0]);
+				sendto_one(sptr, err_str(ERR_PASSWDMISMATCH), me.name, sptr->name);
 				return 0;
 			}
 			if (ret < 1)
@@ -865,7 +856,7 @@ char *reason = parv[1];
 			reason = parv[2];
 		}
 	}
-	sendto_ops("Server is Restarting by request of %s", parv[0]);
+	sendto_ops("Server is Restarting by request of %s", sptr->name);
 
 	list_for_each_entry(acptr, &lclient_list, lclient_node)
 	{
@@ -1183,7 +1174,7 @@ CMD_FUNC(m_die)
 	int  i;
 	if (!MyClient(sptr) || !ValidatePermissionsForPath("server:die",sptr,NULL,NULL,NULL))
 	{
-		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, sptr->name);
 		return 0;
 	}
 
@@ -1192,14 +1183,14 @@ CMD_FUNC(m_die)
 		if (parc < 2)	/* And if so, require a password :) */
 		{
 			sendto_one(sptr, err_str(ERR_NEEDMOREPARAMS), me.name,
-			    parv[0], "DIE");
+			    sptr->name, "DIE");
 			return 0;
 		}
 		i = Auth_Check(cptr, conf_drpass->dieauth, parv[1]);
 		if (i == -1)
 		{
 			sendto_one(sptr, err_str(ERR_PASSWDMISMATCH), me.name,
-			    parv[0]);
+			    sptr->name);
 			return 0;
 		}
 		if (i < 1)
@@ -1209,7 +1200,7 @@ CMD_FUNC(m_die)
 	}
 
 	/* Let the +s know what is going on */
-	sendto_ops("Server Terminating by request of %s", parv[0]);
+	sendto_ops("Server Terminating by request of %s", sptr->name);
 
 	list_for_each_entry(acptr, &lclient_list, lclient_node)
 	{
diff --git a/src/s_svs.c b/src/s_svs.c
index 3b658e4ad..c46de8216 100644
--- a/src/s_svs.c
+++ b/src/s_svs.c
@@ -171,14 +171,14 @@ int ret;
 	if (!(alias = Find_alias(cmd))) 
 	{
 		sendto_one(sptr, ":%s %d %s %s :Unknown command",
-			me.name, ERR_UNKNOWNCOMMAND, parv[0], cmd);
+			me.name, ERR_UNKNOWNCOMMAND, sptr->name, cmd);
 		return 0;
 	}
 	
 	/* If it isn't an ALIAS_COMMAND, we require a paramter ... We check ALIAS_COMMAND LATER */
 	if (alias->type != ALIAS_COMMAND && (parc < 2 || *parv[1] == '\0'))
 	{
-		sendto_one(sptr, err_str(ERR_NOTEXTTOSEND), me.name, parv[0]);
+		sendto_one(sptr, err_str(ERR_NOTEXTTOSEND), me.name, sptr->name);
 		return -1;
 	}
 
@@ -188,12 +188,12 @@ int ret;
 		{
 			if (alias->spamfilter && (ret = dospamfilter(sptr, parv[1], SPAMF_USERMSG, alias->nick, 0, NULL)) < 0)
 				return ret;
-			sendto_one(acptr, ":%s PRIVMSG %s@%s :%s", parv[0],
+			sendto_one(acptr, ":%s PRIVMSG %s@%s :%s", sptr->name,
 				alias->nick, SERVICES_NAME, parv[1]);
 		}
 		else
 			sendto_one(sptr, err_str(ERR_SERVICESDOWN), me.name,
-				parv[0], alias->nick);
+				sptr->name, alias->nick);
 	}
 	else if (alias->type == ALIAS_STATS) 
 	{
@@ -201,12 +201,12 @@ int ret;
 		{
 			if (alias->spamfilter && (ret = dospamfilter(sptr, parv[1], SPAMF_USERMSG, alias->nick, 0, NULL)) < 0)
 				return ret;
-			sendto_one(acptr, ":%s PRIVMSG %s@%s :%s", parv[0],
+			sendto_one(acptr, ":%s PRIVMSG %s@%s :%s", sptr->name,
 				alias->nick, STATS_SERVER, parv[1]);
 		}
 		else
 			sendto_one(sptr, err_str(ERR_SERVICESDOWN), me.name,
-				parv[0], alias->nick);
+				sptr->name, alias->nick);
 	}
 	else if (alias->type == ALIAS_NORMAL) 
 	{
@@ -215,16 +215,16 @@ int ret;
 			if (alias->spamfilter && (ret = dospamfilter(sptr, parv[1], SPAMF_USERMSG, alias->nick, 0, NULL)) < 0)
 				return ret;
 			if (MyClient(acptr))
-				sendto_one(acptr, ":%s!%s@%s PRIVMSG %s :%s", parv[0], 
+				sendto_one(acptr, ":%s!%s@%s PRIVMSG %s :%s", sptr->name, 
 					sptr->user->username, GetHost(sptr),
 					alias->nick, parv[1]);
 			else
-				sendto_one(acptr, ":%s PRIVMSG %s :%s", parv[0],
+				sendto_one(acptr, ":%s PRIVMSG %s :%s", sptr->name,
 					alias->nick, parv[1]);
 		}
 		else
 			sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name,
-				parv[0], alias->nick);
+				sptr->name, alias->nick);
 	}
 	else if (alias->type == ALIAS_CHANNEL)
 	{
@@ -237,12 +237,12 @@ int ret;
 					return ret;
 				sendto_channelprefix_butone(sptr,
 				    sptr, chptr, PREFIX_ALL,
-                                    ":%s PRIVMSG %s :%s", parv[0],
+                                    ":%s PRIVMSG %s :%s", sptr->name,
 				    chptr->chname, parv[1]);
 				return 0;
 			}
 		}
-		sendto_one(sptr, err_str(ERR_CANNOTDOCOMMAND), me.name, parv[0],
+		sendto_one(sptr, err_str(ERR_CANNOTDOCOMMAND), me.name, sptr->name,
 				cmd, "You may not use this command at this time");
 	}
 	else if (alias->type == ALIAS_COMMAND) 
@@ -295,8 +295,8 @@ int ret;
 						else if (format->parameters[i] == 'n' ||
 							 format->parameters[i] == 'N')
 						{
-							strlcat(output, parv[0], sizeof output);
-							j += strlen(parv[0]);
+							strlcat(output, sptr->name, sizeof output);
+							j += strlen(sptr->name);
 						}
 						else 
 						{
@@ -322,11 +322,11 @@ int ret;
 					{
 						if (alias->spamfilter && (ret = dospamfilter(sptr, output, SPAMF_USERMSG, format->nick, 0, NULL)) < 0)
 							return ret;
-						sendto_one(acptr, ":%s PRIVMSG %s@%s :%s", parv[0],
+						sendto_one(acptr, ":%s PRIVMSG %s@%s :%s", sptr->name,
 							format->nick, SERVICES_NAME, output);
 					} else
 						sendto_one(sptr, err_str(ERR_SERVICESDOWN), me.name,
-							parv[0], format->nick);
+							sptr->name, format->nick);
 				}
 				else if (format->type == ALIAS_STATS) 
 				{
@@ -334,11 +334,11 @@ int ret;
 					{
 						if (alias->spamfilter && (ret = dospamfilter(sptr, output, SPAMF_USERMSG, format->nick, 0, NULL)) < 0)
 							return ret;
-						sendto_one(acptr, ":%s PRIVMSG %s@%s :%s", parv[0],
+						sendto_one(acptr, ":%s PRIVMSG %s@%s :%s", sptr->name,
 							format->nick, STATS_SERVER, output);
 					} else
 						sendto_one(sptr, err_str(ERR_SERVICESDOWN), me.name,
-							parv[0], format->nick);
+							sptr->name, format->nick);
 				}
 				else if (format->type == ALIAS_NORMAL) 
 				{
@@ -347,16 +347,16 @@ int ret;
 						if (alias->spamfilter && (ret = dospamfilter(sptr, output, SPAMF_USERMSG, format->nick, 0, NULL)) < 0)
 							return ret;
 						if (MyClient(acptr))
-							sendto_one(acptr, ":%s!%s@%s PRIVMSG %s :%s", parv[0], 
+							sendto_one(acptr, ":%s!%s@%s PRIVMSG %s :%s", sptr->name, 
 							sptr->user->username, IsHidden(sptr) ? sptr->user->virthost : sptr->user->realhost,
 							format->nick, output);
 						else
-							sendto_one(acptr, ":%s PRIVMSG %s :%s", parv[0],
+							sendto_one(acptr, ":%s PRIVMSG %s :%s", sptr->name,
 								format->nick, output);
 					}
 					else
 						sendto_one(sptr, err_str(ERR_NOSUCHNICK), me.name,
-							parv[0], format->nick);
+							sptr->name, format->nick);
 				}
 				else if (format->type == ALIAS_CHANNEL)
 				{
@@ -369,13 +369,13 @@ int ret;
 								return ret;
 							sendto_channelprefix_butone(sptr,
 							    sptr, chptr, PREFIX_ALL,
-			                                    ":%s PRIVMSG %s :%s", parv[0],
+			                                    ":%s PRIVMSG %s :%s", sptr->name,
 							    chptr->chname, parv[1]);
 							return 0;
 						}
 					}
 					sendto_one(sptr, err_str(ERR_CANNOTDOCOMMAND), me.name,
-						 parv[0], cmd, 
+						 sptr->name, cmd, 
 						"You may not use this command at this time");
 				}
 				else if (format->type == ALIAS_REAL)
@@ -387,7 +387,7 @@ int ret;
 
 					if (recursive_alias)
 					{
-						sendto_one(sptr, err_str(ERR_CANNOTDOCOMMAND), me.name, parv[0], cmd, "You may not use this command at this time -- recursion");
+						sendto_one(sptr, err_str(ERR_CANNOTDOCOMMAND), me.name, sptr->name, cmd, "You may not use this command at this time -- recursion");
 						return -1;
 					}
 
diff --git a/src/s_user.c b/src/s_user.c
index 2e34a2925..9a51c91ed 100644
--- a/src/s_user.c
+++ b/src/s_user.c
@@ -174,13 +174,11 @@ long set_usermode(char *umode)
 **
 **	parv	a NULL terminated list of parameter pointers,
 **
-**			parv[0], sender (prefix string), if not present
-**				this points to an empty string.
 **			parv[1]...parv[parc-1]
 **				pointers to additional parameters
 **			parv[parc] == NULL, *always*
 **
-**		note:	it is guaranteed that parv[0]..parv[parc-1] are all
+**		note:	it is guaranteed that parv[1]..parv[parc-1] are all
 **			non-NULL pointers.
 */
 
@@ -279,13 +277,13 @@ int  hunt_server(aClient *cptr, aClient *sptr, char *command, int server, int pa
 			return HUNTED_ISME;
 		if (match(acptr->name, parv[server]))
 			parv[server] = acptr->name;
-		sendto_one(acptr, command, parv[0],
+		sendto_one(acptr, command, sptr->name,
 		    parv[1], parv[2], parv[3], parv[4],
 		    parv[5], parv[6], parv[7], parv[8]);
 		return (HUNTED_PASS);
 	}
 	sendto_one(sptr, err_str(ERR_NOSUCHSERVER), me.name,
-	    parv[0], parv[server]);
+	    sptr->name, parv[server]);
 	return (HUNTED_NOSUCH);
 }