diff --git a/code/WorkInProgress/buildmode.dm b/code/WorkInProgress/buildmode.dm
index 1227ed67bcce..6140edf60f2b 100644
--- a/code/WorkInProgress/buildmode.dm
+++ b/code/WorkInProgress/buildmode.dm
@@ -151,7 +151,7 @@
 				if(objholder in removed_paths)
 					alert("That path is not allowed.")
 					objholder = "/obj/closet"
-				else if (dd_hasprefix(objholder, "/mob") && !(usr.client.holder.rank in list("Game Master", "Game Admin", "Admin who Sinned")))
+				else if (dd_hasprefix(objholder, "/mob") && !(usr.client.holder.rank in list("Game Master", "Game Admin", "Badmin")))
 					objholder = "/obj/closet"
 			if(3)
 				var/list/locked = list("vars", "key", "ckey", "client", "firemut", "ishulk", "telekinesis", "xray", "virus", "cuffed", "ka", "last_eaten", "urine")
diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm
index e3edd725b8e4..16863a72c717 100644
--- a/code/game/verbs/ooc.dm
+++ b/code/game/verbs/ooc.dm
@@ -38,7 +38,7 @@
 	for (var/client/C)
 		if (src.client.holder && (!src.client.stealth || C.holder))
 //			C << "<span class=\"adminooc\"><span class=\"prefix\">OOC:</span> <span class=\"name\">[src.key]:</span> <span class=\"message\">[msg]</span></span>"
-			if (src.client.holder.rank == "Punished Admin")
+			if (src.client.holder.rank == "Admin Observer")
 				C << "<span class=\"gfartooc\"><span class=\"prefix\">OOC:</span> <span class=\"name\">[src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]:</span> <span class=\"message\">[msg]</span></span>"
 			else if (src.client.holder.rank == "Game Master")
 				C << "<font color=[src.client.ooccolor]><b><span class=\"prefix\">OOC:</span> <span class=\"name\">[src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]:</span> <span class=\"message\">[msg]</span></b></font>"
@@ -69,7 +69,7 @@
 	for (var/client/C)
 		if (C.goon)
 			if(src.client.holder && (!src.client.stealth || C.holder))
-				if (src.client.holder.rank == "Punished Admin")
+				if (src.client.holder.rank == "Admin Observer")
 					C << "<span class=\"gfartgoonsay\"><span class=\"prefix\">GOONSAY:</span> <span class=\"name\">[src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]:</span> <span class=\"message\">[msg]</span></span>"
 				else
 					C << "<span class=\"admingoonsay\"><span class=\"prefix\">GOONSAY:</span> <span class=\"name\">[src.key][src.client.stealth ? "/([src.client.fakekey])" : ""]:</span> <span class=\"message\">[msg]</span></span>"
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index c02cdc8a7be6..e2b8cf075828 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -24,7 +24,7 @@ var/showadminmessages = 1
 		return
 
 	if(href_list["call_shuttle"])
-		if (src.rank in list("Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"))
+		if (src.rank in list("Trial Admin", "Badmin", "Game Admin", "Game Master"))
 			if( ticker.mode.name == "blob" )
 				alert("You can't call the shuttle during blob!")
 				return
@@ -58,7 +58,7 @@ var/showadminmessages = 1
 			return
 
 	if(href_list["edit_shuttle_time"])
-		if (src.rank in list("Admin who Sinned", "Game Admin", "Game Master"))
+		if (src.rank in list("Badmin", "Game Admin", "Game Master"))
 			emergency_shuttle.settimeleft( input("Enter new shuttle duration (seconds):","Edit Shuttle Timeleft", emergency_shuttle.timeleft() ) as num )
 			log_admin("[key_name(usr)] edited the Emergency Shuttle's timeleft to [emergency_shuttle.timeleft()]")
 			message_admins("\blue [key_name_admin(usr)] edited the Emergency Shuttle's timeleft to [emergency_shuttle.timeleft()]", 1)
@@ -150,7 +150,7 @@ var/showadminmessages = 1
 		return
 
 	if(href_list["jobban3"])
-		if (src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"  ))
+		if (src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Badmin", "Game Admin", "Game Master"  ))
 			var/mob/M = locate(href_list["jobban4"])
 			var/job = href_list["jobban3"]
 			if ((M.client && M.client.holder && (M.client.holder.level > src.level)))
@@ -172,7 +172,7 @@ var/showadminmessages = 1
 
 
 	if (href_list["boot2"])
-		if ((src.rank in list( "Admin Observer", "Temporary Admin", "Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"  )))
+		if ((src.rank in list( "Moderator", "Temporary Admin", "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master"  )))
 			var/mob/M = locate(href_list["boot2"])
 			if (ismob(M))
 				if ((M.client && M.client.holder && (M.client.holder.level >= src.level)))
@@ -193,7 +193,7 @@ var/showadminmessages = 1
 				href_list["ban"] = 1 // lets it fall through and refresh
 
 	if (href_list["newban"])
-		if ((src.rank in list( "Temporary Admin", "Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"  )))
+		if ((src.rank in list( "Temporary Admin", "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master"  )))
 			var/mob/M = locate(href_list["newban"])
 			if(!ismob(M)) return
 			if ((M.client && M.client.holder && (M.client.holder.level >= src.level)))
@@ -240,7 +240,7 @@ var/showadminmessages = 1
 					return
 /*
 	if (href_list["remove"])
-		if ((src.rank in list( "Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"  )))
+		if ((src.rank in list( "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master"  )))
 			var/t = href_list["remove"]
 			if(t && isgoon(t))
 				log_admin("[key_name(usr)] removed [t] from the goonlist.")
@@ -248,7 +248,7 @@ var/showadminmessages = 1
 				remove_goon(t)
 */
 	if (href_list["mute2"])
-		if ((src.rank in list( "Admin Observer", "Temporary Admin", "Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"  )))
+		if ((src.rank in list( "Moderator", "Temporary Admin", "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master"  )))
 			var/mob/M = locate(href_list["mute2"])
 			if (ismob(M))
 				if ((M.client && M.client.holder && (M.client.holder.level >= src.level)))
@@ -260,7 +260,7 @@ var/showadminmessages = 1
 				M << "You have been [(M.muted ? "muted" : "voiced")]."
 
 	if (href_list["c_mode"])
-		if ((src.rank in list( "Temporary Admin", "Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"  )))
+		if ((src.rank in list( "Temporary Admin", "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master"  )))
 			if (ticker && ticker.mode)
 				return alert(usr, "The game has already started.", null, null, null, null)
 			var/dat = text({"<B>What mode do you wish to play?</B><HR>
@@ -290,7 +290,7 @@ var/showadminmessages = 1
 
 
 	if (href_list["c_mode2"])
-		if ((src.rank in list( "Temporary Admin", "Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"  )))
+		if ((src.rank in list( "Temporary Admin", "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master"  )))
 			if (ticker && ticker.mode)
 				return alert(usr, "The game has already started.", null, null, null, null)
 			switch(href_list["c_mode2"])
@@ -338,7 +338,7 @@ var/showadminmessages = 1
 			world.save_mode(master_mode)
 
 	if (href_list["monkeyone"])
-		if ((src.rank in list( "Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"  )))
+		if ((src.rank in list( "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master"  )))
 			var/mob/M = locate(href_list["monkeyone"])
 			if(!ismob(M))
 				return
@@ -352,7 +352,7 @@ var/showadminmessages = 1
 				return
 
 	if (href_list["forcespeech"])
-		if ((src.rank in list( "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"  )))
+		if ((src.rank in list( "Trial Admin", "Badmin", "Game Admin", "Game Master"  )))
 			var/mob/M = locate(href_list["forcespeech"])
 			if (ismob(M))
 				var/speech = input("What will [key_name(M)] say?.", "Force speech", "")
@@ -367,7 +367,7 @@ var/showadminmessages = 1
 			return
 
 	if (href_list["sendtoprison"])
-		if ((src.rank in list( "Admin Observer", "Admin Candidate", "Temporary Admin", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"  )))
+		if ((src.rank in list( "Moderator", "Admin Candidate", "Temporary Admin", "Trial Admin", "Badmin", "Game Admin", "Game Master"  )))
 			var/mob/M = locate(href_list["sendtoprison"])
 			if (ismob(M))
 				if(istype(M, /mob/living/silicon/ai))
@@ -402,7 +402,7 @@ var/showadminmessages = 1
 			return
 
 	if (href_list["sendtomaze"])
-		if ((src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"  )))
+		if ((src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Badmin", "Game Admin", "Game Master"  )))
 			var/mob/M = locate(href_list["sendtomaze"])
 			if (ismob(M))
 				if(istype(M, /mob/living/silicon/ai))
@@ -434,7 +434,7 @@ var/showadminmessages = 1
 			return
 
 	if (href_list["tdome1"])
-		if ((src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"  )))
+		if ((src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Badmin", "Game Admin", "Game Master"  )))
 			var/mob/M = locate(href_list["tdome1"])
 			if (ismob(M))
 				if(istype(M, /mob/living/silicon/ai))
@@ -460,7 +460,7 @@ var/showadminmessages = 1
 				message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 1)", 1)
 
 	if (href_list["tdome2"])
-		if ((src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"  )))
+		if ((src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Badmin", "Game Admin", "Game Master"  )))
 			var/mob/M = locate(href_list["tdome2"])
 			if (ismob(M))
 				if(istype(M, /mob/living/silicon/ai))
@@ -486,7 +486,7 @@ var/showadminmessages = 1
 				message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 2)", 1)
 
 	if (href_list["tdomeadmin"])
-		if ((src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"  )))
+		if ((src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Badmin", "Game Admin", "Game Master"  )))
 			var/mob/M = locate(href_list["tdomeadmin"])
 			if (ismob(M))
 				if(istype(M, /mob/living/silicon/ai))
@@ -501,7 +501,7 @@ var/showadminmessages = 1
 				message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Admin.)", 1)
 
 	if (href_list["tdomeobserve"])
-		if ((src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"  )))
+		if ((src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Badmin", "Game Admin", "Game Master"  )))
 			var/mob/M = locate(href_list["tdomeobserve"])
 			if (ismob(M))
 				if(istype(M, /mob/living/silicon/ai))
@@ -531,7 +531,7 @@ var/showadminmessages = 1
 				message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Observer.)", 1)
 
 	if (href_list["adminauth"])
-		if ((src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"  )))
+		if ((src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Badmin", "Game Admin", "Game Master"  )))
 			var/mob/M = locate(href_list["adminauth"])
 			if (ismob(M) && !M.client.authenticated && !M.client.authenticating)
 				M.client.verbs -= /client/proc/authorize
@@ -541,7 +541,7 @@ var/showadminmessages = 1
 				M.client << text("You have been authorized by []", usr.key)
 
 	if (href_list["revive"])
-		if ((src.rank in list( "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"  )))
+		if ((src.rank in list( "Trial Admin", "Badmin", "Game Admin", "Game Master"  )))
 			var/mob/M = locate(href_list["revive"])
 			if (ismob(M))
 				if(istype(M, /mob/dead/observer))
@@ -559,7 +559,7 @@ var/showadminmessages = 1
 			return
 
 	if (href_list["makeai"]) //Yes, im fucking lazy, so what? it works ... hopefully
-		if ((src.rank in list( "Trial Admin", "Game Admin", "Game Master", "Admin Candidate", "Admin who Sinned"  )))
+		if ((src.rank in list( "Trial Admin", "Game Admin", "Game Master", "Admin Candidate", "Badmin"  )))
 			var/mob/M = locate(href_list["makeai"])
 			if(istype(M, /mob/living/carbon/human))
 				var/mob/living/carbon/human/H = M
@@ -749,18 +749,18 @@ var/showadminmessages = 1
 		else
 			alert("Cannot make this mob a traitor")
 	if (href_list["create_object"])
-		if (src.rank in list("Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"))
+		if (src.rank in list("Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master"))
 			return create_object(usr)
 		else
 			alert("You are not a high enough administrator! Sorry!!!!")
 
 	if (href_list["create_turf"])
-		if (src.rank in list("Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"))
+		if (src.rank in list("Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master"))
 			return create_turf(usr)
 		else
 			alert("You are not a high enough administrator! Sorry!!!!")
 	if (href_list["create_mob"])
-		if (src.rank in list("Admin who Sinned", "Game Admin", "Game Master"))
+		if (src.rank in list("Badmin", "Game Admin", "Game Master"))
 			return create_mob(usr)
 		else
 			alert("You are not a high enough administrator! Sorry!!!!")
@@ -774,7 +774,7 @@ var/showadminmessages = 1
 		voteres()
 
 	if (href_list["prom_demot"])
-		if ((src.rank in list("Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"  )))
+		if ((src.rank in list("Trial Admin", "Badmin", "Game Admin", "Game Master"  )))
 			var/client/C = locate(href_list["prom_demot"])
 			if(C.holder && (C.holder.level >= src.level))
 				alert("This cannot be done as [C] is a [C.holder.rank]")
@@ -784,22 +784,22 @@ var/showadminmessages = 1
 			//host
 				dat += {"
 				<A href='?src=\ref[src];chgadlvl=Game Admin;client4ad=\ref[C]'>Game Admin</A> //coder<BR>
-				<A href='?src=\ref[src];chgadlvl=Admin who Sinned;client4ad=\ref[C]'>Admin who Sinned</A> // Shit Guy<BR>
+				<A href='?src=\ref[src];chgadlvl=Badmin;client4ad=\ref[C]'>Badmin</A> // Shit Guy<BR>
 				<A href='?src=\ref[src];chgadlvl=Trial Admin;client4ad=\ref[C]'>Trial Admin</A> // Primary Administrator<BR>
 				<A href='?src=\ref[src];chgadlvl=Admin Candidate;client4ad=\ref[C]'>Admin Candidate</A> // // Administrator<BR>
 				<A href='?src=\ref[src];chgadlvl=Temporary Admin;client4ad=\ref[C]'>Temporary Admin</A> // Secondary Admin<BR>
-				<A href='?src=\ref[src];chgadlvl=Admin Observer;client4ad=\ref[C]'>Admin Observer</A> // Moderator<BR>
-				<A href='?src=\ref[src];chgadlvl=Punnished Admin;client4ad=\ref[C]'>Punnished Admin</A> // Filthy Xeno<BR>
+				<A href='?src=\ref[src];chgadlvl=Moderator;client4ad=\ref[C]'>Moderator</A> // Moderator<BR>
+				<A href='?src=\ref[src];chgadlvl=Admin Observer;client4ad=\ref[C]'>Admin Observer</A> // Filthy Xeno<BR>
 				<A href='?src=\ref[src];chgadlvl=Remove;client4ad=\ref[C]'>Remove Admin</A><BR>"}
 			else if(src.level == 5)
 			//coder
 				dat += {"
-				<A href='?src=\ref[src];chgadlvl=Admin who Sinned;client4ad=\ref[C]'>Admin who Sinned</A> // Shit Guy<BR>
+				<A href='?src=\ref[src];chgadlvl=Badmin;client4ad=\ref[C]'>Badmin</A> // Shit Guy<BR>
 				<A href='?src=\ref[src];chgadlvl=Trial Admin;client4ad=\ref[C]'>Trial Admin</A> // Primary Administrator<BR>
 				<A href='?src=\ref[src];chgadlvl=Admin Candidate;client4ad=\ref[C]'>Admin Candidate</A> // // Administrator<BR>
 				<A href='?src=\ref[src];chgadlvl=Temporary Admin;client4ad=\ref[C]'>Temporary Admin</A> // Secondary Admin<BR>
-				<A href='?src=\ref[src];chgadlvl=Admin Observer;client4ad=\ref[C]'>Admin Observer</A> // Moderator<BR>
-				<A href='?src=\ref[src];chgadlvl=Punnished Admin;client4ad=\ref[C]'>Punnished Admin</A> // Filthy Xeno<BR>
+				<A href='?src=\ref[src];chgadlvl=Moderator;client4ad=\ref[C]'>Moderator</A> // Moderator<BR>
+				<A href='?src=\ref[src];chgadlvl=Admin Observer;client4ad=\ref[C]'>Admin Observer</A> // Filthy Xeno<BR>
 				<A href='?src=\ref[src];chgadlvl=Remove;client4ad=\ref[C]'>Remove Admin</A><BR>"}
 			else
 				alert("Not a high enough level admin, sorry.")
@@ -825,8 +825,8 @@ var/showadminmessages = 1
 
 
 	if (href_list["object_list"])
-		if (src.rank in list("Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"))
-			if (config.allow_admin_spawning && ((src.state == 2) || (src.rank in list("Admin who Sinned", "Game Admin", "Game Master"))))
+		if (src.rank in list("Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master"))
+			if (config.allow_admin_spawning && ((src.state == 2) || (src.rank in list("Badmin", "Game Admin", "Game Master"))))
 				var/atom/loc = usr.loc
 
 				var/dirty_paths
@@ -847,7 +847,7 @@ var/showadminmessages = 1
 						removed_paths += dirty_path
 					else if (ispath(path, /obj/bhole) && !(src.rank in list("Game Admin", "Game Master")))
 						removed_paths += dirty_path
-					else if (ispath(path, /mob) && !(src.rank in list("Admin who Sinned", "Game Admin", "Game Master")))
+					else if (ispath(path, /mob) && !(src.rank in list("Badmin", "Game Admin", "Game Master")))
 						removed_paths += dirty_path
 
 					else
@@ -898,7 +898,7 @@ var/showadminmessages = 1
 				return
 
 	if (href_list["secretsfun"])
-		if ((src.rank in list( "Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"  )))
+		if ((src.rank in list( "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master"  )))
 			var/ok = 0
 			switch(href_list["secretsfun"])
 				if("sec_clothes")
@@ -1010,7 +1010,7 @@ var/showadminmessages = 1
 							H.loc = pick(prisonsecuritywarp)
 						prisonwarped += H
 				if("traitor_all")
-					if ((src.rank in list( "Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"  )))
+					if ((src.rank in list( "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master"  )))
 						if(!ticker)
 							alert("The game hasn't started yet!")
 							return
@@ -1030,7 +1030,7 @@ var/showadminmessages = 1
 					else
 						alert("You're not of a high enough rank to do this")
 				if("moveminingshuttle")
-					if ((src.rank in list( "Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"  )))
+					if ((src.rank in list( "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master"  )))
 						if(mining_shuttle_moving)
 							return
 						move_mining_shuttle()
@@ -1039,14 +1039,14 @@ var/showadminmessages = 1
 					else
 						alert("You're not of a high enough rank to do this")
 				if("moveadminshuttle")
-					if ((src.rank in list( "Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"  )))
+					if ((src.rank in list( "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master"  )))
 						move_admin_shuttle()
 						message_admins("\blue [key_name_admin(usr)] moved the centcom administration shuttle", 1)
 						log_admin("[key_name(usr)] moved the centcom administration shuttle")
 					else
 						alert("You're not of a high enough rank to do this")
 				if("moveferry")
-					if ((src.rank in list( "Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"  )))
+					if ((src.rank in list( "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master"  )))
 						move_ferry()
 						message_admins("\blue [key_name_admin(usr)] moved the centcom ferry", 1)
 						log_admin("[key_name(usr)] moved the centcom ferry")
@@ -1124,7 +1124,7 @@ var/showadminmessages = 1
 							sleep(rand(30,400))
 							Wall.ex_act(rand(2,1)) */
 				if("wave")
-					if ((src.rank in list("Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"  )))
+					if ((src.rank in list("Trial Admin", "Badmin", "Game Admin", "Game Master"  )))
 						meteor_wave()
 						message_admins("[key_name_admin(usr)] has spawned meteors", 1)
 						command_alert("Meteors have been detected on collision course with the station.", "Meteor Alert")
@@ -1204,7 +1204,7 @@ var/showadminmessages = 1
 						viral_outbreak(V)
 						message_admins("[key_name_admin(usr)] has triggered a virus outbreak of [V]", 1)
 				if("retardify")
-					if (src.rank in list("Admin who Sinned", "Game Admin", "Game Master"))
+					if (src.rank in list("Badmin", "Game Admin", "Game Master"))
 						for(var/mob/living/carbon/human/H in world)
 							if(H.client)
 								H << "\red <B>You suddenly feel stupid.</B>"
@@ -1214,7 +1214,7 @@ var/showadminmessages = 1
 						alert("You cannot perform this action. You must be of a higher administrative rank!")
 						return
 				if("fakeguns")
-					if (src.rank in list("Admin who Sinned", "Game Admin", "Game Master"))
+					if (src.rank in list("Badmin", "Game Admin", "Game Master"))
 						for(var/obj/item/W in world)
 							if(istype(W, /obj/item/clothing) || istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/weapon/disk) || istype(W, /obj/item/weapon/tank))
 								continue
@@ -1226,7 +1226,7 @@ var/showadminmessages = 1
 						alert("You cannot perform this action. You must be of a higher administrative rank!")
 						return
 				if("schoolgirl")
-					if (src.rank in list("Admin who Sinned", "Game Admin", "Game Master"))
+					if (src.rank in list("Badmin", "Game Admin", "Game Master"))
 						for(var/obj/item/clothing/under/W in world)
 							W.icon_state = "schoolgirl"
 							W.item_state = "w_suit"
@@ -1237,7 +1237,7 @@ var/showadminmessages = 1
 						alert("You cannot perform this action. You must be of a higher administrative rank!")
 						return
 				if("dorf")
-					if (src.rank in list("Admin who Sinned","Game Admin", "Game Master"))
+					if (src.rank in list("Badmin","Game Admin", "Game Master"))
 						for(var/mob/living/carbon/human/B in world)
 							B.face_icon_state = "facial_wise"
 							B.update_face()
@@ -1252,7 +1252,7 @@ var/showadminmessages = 1
 		return
 
 	if (href_list["secretsadmin"])
-		if ((src.rank in list( "Admin Observer", "Temporary Admin", "Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"  )))
+		if ((src.rank in list( "Moderator", "Temporary Admin", "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master"  )))
 			var/ok = 0
 			switch(href_list["secretsadmin"])
 				if("clear_bombs")
@@ -1453,7 +1453,7 @@ var/showadminmessages = 1
 					world << text("<B>A secret has been activated by []!</B>", usr.key)
 		return
 	if (href_list["secretscoder"])
-		if ((src.rank in list( "Admin who Sinned", "Game Admin", "Game Master" )))
+		if ((src.rank in list( "Badmin", "Game Admin", "Game Master" )))
 			switch(href_list["secretscoder"])
 				if("spawn_objects")
 					var/dat = "<B>Admin Log<HR></B>"
@@ -1560,7 +1560,7 @@ var/showadminmessages = 1
 	var/dat
 	var/lvl = 0
 	switch(src.rank)
-		if("Admin Observer")
+		if("Moderator")
 			lvl = 1
 		if("Temporary Admin")
 			lvl = 2
@@ -1568,7 +1568,7 @@ var/showadminmessages = 1
 			lvl = 3
 		if("Trial Admin")
 			lvl = 4
-		if("Admin who Sinned")
+		if("Badmin")
 			lvl = 5
 		if("Game Admin")
 			lvl = 6
@@ -1611,7 +1611,7 @@ var/showadminmessages = 1
 
 	var/lvl = 0
 	switch(src.rank)
-		if("Admin Observer")
+		if("Moderator")
 			lvl = 1
 		if("Temporary Admin")
 			lvl = 2
@@ -1619,7 +1619,7 @@ var/showadminmessages = 1
 			lvl = 3
 		if("Trial Admin")
 			lvl = 4
-		if("Admin who Sinned")
+		if("Badmin")
 			lvl = 5
 		if("Game Admin")
 			lvl = 6
@@ -1694,7 +1694,7 @@ var/showadminmessages = 1
 	var/dat
 	var/lvl = 0
 	switch(src.rank)
-		if("Admin Observer")
+		if("Moderator")
 			lvl = 1
 		if("Temporary Admin")
 			lvl = 2
@@ -1702,7 +1702,7 @@ var/showadminmessages = 1
 			lvl = 3
 		if("Trial Admin")
 			lvl = 4
-		if("Admin who Sinned")
+		if("Badmin")
 			lvl = 5
 		if("Game Admin")
 			lvl = 6
@@ -2075,7 +2075,7 @@ var/showadminmessages = 1
 
 /obj/admins/proc/traitorize(mob/M as mob, var/objective, var/mode)
 	//mode = 1 for normal traitorise, mode = 0 for traitor_all
-	if ((src.rank in list( "Admin Candidate", "Trial Admin", "Admin who Sinned", "Game Admin", "Game Master"  )))
+	if ((src.rank in list( "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master"  )))
 		if(M.stat == 2 || !(M.client))
 			alert("Person is dead or not logged in or hasn't started yet. Be nice")
 			return
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 5078ed506aeb..5c77e91de346 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -291,7 +291,7 @@
 //			src.verbs += /client/proc/cmd_admin_list_admins
 //			src.verbs += /client/proc/getmobs
 
-		if ("Admin who Sinned")
+		if ("Badmin")
 			src.deadchat = 1
 			src.holder.level = 4
 
@@ -853,7 +853,7 @@
 //			src.verbs += /client/proc/cmd_admin_list_admins
 //			src.verbs += /client/proc/getmobs
 
-		if ("Admin Observer")
+		if ("Moderator")
 			src.holder.level = 0
 
 			// Settings
@@ -976,7 +976,7 @@
 //			src.verbs += /client/proc/cmd_admin_list_admins
 //			src.verbs += /client/proc/getmobs
 
-		if ("Punished Admin")
+		if ("Admin Observer")
 			src.holder.level = -1
 			src.verbs += /client/proc/cmd_admin_say
 			src.verbs += /client/proc/cmd_admin_gib_self
@@ -1497,7 +1497,7 @@
 
 			// Old and unused
 
-		if ("Admin who Sinned") //Former Shit Guy
+		if ("Badmin") //Former Shit Guy
 			// Settings
 			//src.verbs += /client/proc/colorooc 				// -- Urist
 			src.verbs += /obj/admins/proc/adjump				//toggle admin jumping
@@ -1626,7 +1626,7 @@
 
 			// Old and unused
 
-		if ("Admin Observer") //Former Moderator
+		if ("Moderator") //Former Moderator
 			// Settings
 			//src.verbs += /client/proc/colorooc 				// -- Urist
 			//src.verbs += /obj/admins/proc/adjump				//toggle admin jumping
@@ -1656,4 +1656,4 @@
 
 			// Old and unused
 
-		if ("Punished Admin") //Former Filthy Xeno
\ No newline at end of file
+		if ("Admin Observer") //Former Filthy Xeno
\ No newline at end of file
diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm
index 511b516a96a2..8bbec22a15b7 100644
--- a/code/modules/admin/verbs/adminsay.dm
+++ b/code/modules/admin/verbs/adminsay.dm
@@ -21,7 +21,7 @@
 
 	for (var/mob/M in world)
 		if (M.client && M.client.holder)
-			if (src.holder.rank == "Punished Admin")
+			if (src.holder.rank == "Admin Observer")
 				M << "<span class=\"gfartadmin\"><span class=\"prefix\">ADMIN:</span> <span class=\"name\">[key_name(usr, M)]:</span> <span class=\"message\">[msg]</span></span>"
 			else
 				M << "<span class=\"admin\"><span class=\"prefix\">ADMIN:</span> <span class=\"name\">[key_name(usr, M)]:</span> <span class=\"message\">[msg]</span></span>"
diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm
index b1af76c6d668..4530492721d3 100644
--- a/code/modules/admin/verbs/playsound.dm
+++ b/code/modules/admin/verbs/playsound.dm
@@ -11,7 +11,7 @@
 	uploaded_sound.priority = 255
 	uploaded_sound.wait = 1
 
-	if(src.holder.rank == "Game Master" || src.holder.rank == "Game Admin" || src.holder.rank == "Admin who Sinned")
+	if(src.holder.rank == "Game Master" || src.holder.rank == "Game Admin" || src.holder.rank == "Badmin")
 		log_admin("[key_name(src)] played sound [S]")
 		message_admins("[key_name_admin(src)] played sound [S]", 1)
 		for(var/mob/M in world)
@@ -80,7 +80,7 @@ client/proc/space_asshole()
 	uploaded_sound.priority = 255
 	uploaded_sound.wait = 1
 
-	if(src.holder.rank == "Game Master" || src.holder.rank == "Game Admin" || src.holder.rank == "Admin who Sinned")
+	if(src.holder.rank == "Game Master" || src.holder.rank == "Game Admin" || src.holder.rank == "Badmin")
 		log_admin("[key_name(src)] played sound [S]")
 		message_admins("[key_name_admin(src)] played sound [S]", 1)
 		world << uploaded_sound