diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm
index 4ee0213f8f..b599c1fa6f 100644
--- a/code/game/verbs/ooc.dm
+++ b/code/game/verbs/ooc.dm
@@ -58,16 +58,14 @@
 	var/ooc_style = "everyone"
 	if(holder && !holder.fakekey)
 		ooc_style = "elevated"
-		//VOREStation Block Edit Start
-		if(holder.rights & R_EVENT) //Retired Admins
-			ooc_style = "event_manager"
-		if(holder.rights & R_ADMIN && !(holder.rights & R_BAN)) //Game Masters
+		//YawnWider Block Edit Start
+		if(holder.rights & R_MOD && !(holder.rights & R_BAN)) //Moderator
 			ooc_style = "moderator"
-		if(holder.rights & R_SERVER && !(holder.rights & R_BAN)) //Developers
+		if(holder.rights & R_DEBUG && !(holder.rights & R_BAN)) //Developers
 			ooc_style = "developer"
 		if(holder.rights & R_ADMIN && holder.rights & R_BAN) //Admins
 			ooc_style = "admin"
-		//VOREStation Block Edit End
+		//YawnWider Block Edit End
 
 	for(var/client/target in GLOB.clients)
 		if(target.is_preference_enabled(/datum/client_preference/show_ooc))
diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm
index 3cb25b702e..6ce49d78be 100644
--- a/code/game/verbs/who.dm
+++ b/code/game/verbs/who.dm
@@ -80,10 +80,10 @@
 	var/num_admins_online = 0
 	var/num_devs_online = 0
 	var/num_event_managers_online = 0
-	
+
 	if(holder)
 		for(var/client/C in GLOB.admins)
-			if(R_ADMIN & C.holder.rights && R_BAN & C.holder.rights)
+			if(R_ADMIN & C.holder.rights || (!R_MOD & C.holder.rights))	//YW EDIT: Used to determine who shows up in admin rows
 
 				if(C.holder.fakekey && (!R_ADMIN & holder.rights && !R_MOD & holder.rights))		//Event Managerss can't see stealthmins
 					continue
@@ -108,7 +108,7 @@
 				msg += "\n"
 
 				num_admins_online++
-			else if(R_ADMIN & C.holder.rights && !(R_SERVER & C.holder.rights))
+			else if(R_MOD & C.holder.rights && !(R_SERVER & C.holder.rights))
 				modmsg += "\t[C] is a [C.holder.rank]"
 
 				if(C.holder.fakekey && (!R_ADMIN & holder.rights && !R_MOD & holder.rights))
@@ -179,7 +179,7 @@
 				if(!C.holder.fakekey)
 					msg += "\t[C] is a [C.holder.rank]\n"
 					num_admins_online++
-			else if(R_ADMIN & C.holder.rights && !(R_SERVER & C.holder.rights))
+			else if (R_MOD & C.holder.rights && !(R_SERVER & C.holder.rights))	//YW EDIT
 				if(!C.holder.fakekey)
 					modmsg += "\t[C] is a [C.holder.rank]\n"
 					num_mods_online++
@@ -195,7 +195,7 @@
 	msg = "<b>Current Admins ([num_admins_online]):</b>\n" + msg
 
 	if(config.show_mods)
-		msg += "\n<b> Current Game Masters ([num_mods_online]):</b>\n" + modmsg
+		msg += "\n<b> Current Moderators ([num_mods_online]):</b>\n" + modmsg	//YW EDIT
 
 	if(config.show_devs)
 		msg += "\n<b> Current Developers ([num_devs_online]):</b>\n" + devmsg