diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm
index f77b25aa032..da340d0302d 100644
--- a/code/modules/awaymissions/capture_the_flag.dm
+++ b/code/modules/awaymissions/capture_the_flag.dm
@@ -105,13 +105,11 @@
 	var/control_points_to_win = 180
 	var/list/team_members = list()
 	var/ctf_enabled = FALSE
-	var/normal_gear = /datum/outfit/ctf
-	var/current_gear
+	var/ctf_gear = /datum/outfit/ctf
 	var/instagib_gear = /datum/outfit/ctf/instagib
 
 /obj/machinery/capture_the_flag/New()
 	..()
-	current_gear = normal_gear
 	poi_list |= src
 
 /obj/machinery/capture_the_flag/Destroy()
@@ -122,14 +120,14 @@
 	name = "Red CTF Controller"
 	icon_state = "syndbeacon"
 	team = RED_TEAM
-	normal_gear = /datum/outfit/ctf/red
+	ctf_gear = /datum/outfit/ctf/red
 	instagib_gear = /datum/outfit/ctf/red/instagib
 
 /obj/machinery/capture_the_flag/blue
 	name = "Blue CTF Controller"
 	icon_state = "bluebeacon"
 	team = BLUE_TEAM
-	normal_gear = /datum/outfit/ctf/blue
+	ctf_gear = /datum/outfit/ctf/blue
 	instagib_gear = /datum/outfit/ctf/blue/instagib
 
 /obj/machinery/capture_the_flag/attack_ghost(mob/user)
@@ -172,7 +170,7 @@
 	new_team_member.prefs.copy_to(M)
 	M.key = new_team_member.key
 	M.faction += team
-	M.equipOutfit(current_gear)
+	M.equipOutfit(ctf_gear)
 
 /obj/machinery/capture_the_flag/proc/TellGhost()
 	if(ctf_enabled)
@@ -223,13 +221,13 @@
 /obj/machinery/capture_the_flag/proc/instagib_mode()
 	for(var/obj/machinery/capture_the_flag/CTF in machines)
 		if(CTF.ctf_enabled == TRUE)
-			CTF.current_gear = CTF.instagib_gear
+			CTF.ctf_gear = CTF.instagib_gear
 			CTF.respawn_cooldown = INSTAGIB_RESPAWN
 
 /obj/machinery/capture_the_flag/proc/normal_mode()
 	for(var/obj/machinery/capture_the_flag/CTF in machines)
 		if(CTF.ctf_enabled == TRUE)
-			CTF.current_gear = CTF.normal_gear
+			CTF.ctf_gear = initial(ctf_gear)
 			CTF.respawn_cooldown = DEFAULT_RESPAWN
 
 /obj/item/weapon/gun/projectile/automatic/pistol/deagle/CTF