diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 0bd004a08a..f8cd17ce08 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -574,9 +574,9 @@
 	if(stam > DAMAGE_PRECISION)
 		var/total_health = (health - stam)
 		if(total_health <= crit_threshold && !stat)
-			if(!IsKnockdown())
+			if(CHECK_BITFIELD(mobility_flags, MOBILITY_STAND))
 				to_chat(src, "<span class='notice'>You're too exhausted to keep going...</span>")
-			DefaultCombatKnockdown(100)
+			KnockToFloor(TRUE)
 			update_health_hud()
 
 /mob/living/carbon/update_sight()
diff --git a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm
index 2900c89967..6280097026 100644
--- a/code/modules/mob/living/silicon/ai/death.dm
+++ b/code/modules/mob/living/silicon/ai/death.dm
@@ -15,7 +15,7 @@
 	cameraFollow = null
 
 	anchored = FALSE //unbolt floorbolts
-	update_canmove()
+	update_mobility()
 	if(eyeobj)
 		eyeobj.setLoc(get_turf(src))
 		set_eyeobj_visible(FALSE)
diff --git a/code/modules/mob/living/silicon/pai/update_icon.dm b/code/modules/mob/living/silicon/pai/update_icon.dm
index 9e40b71c5d..3ef5a6cae9 100644
--- a/code/modules/mob/living/silicon/pai/update_icon.dm
+++ b/code/modules/mob/living/silicon/pai/update_icon.dm
@@ -21,7 +21,7 @@
 		rotate_on_lying = TRUE
 	else
 		icon = initial(icon)
-		icon_state = "[chassis][resting? "_rest" : (stat == DEAD? "_dead" : "")]"
+		icon_state = "[chassis][_REFACTORING_resting? "_rest" : (stat == DEAD? "_dead" : "")]"
 		rotate_on_lying = FALSE
 	pixel_x = ((chassis == "dynamic") && chassis_pixel_offsets_x[dynamic_chassis]) || 0
 	update_transform()
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index a5fa2a3c25..825bae00ba 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -1271,7 +1271,7 @@
 /mob/living/silicon/robot/update_mobility()
 	. = ..()
 	if(client && stat != DEAD && dogborg == FALSE)
-		if(resting)
+		if(_REFACTORING_resting)
 			cut_overlays()
 			icon_state = "[module.cyborg_base_icon]-rest"
 		else
diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm
index fed770d0b0..41c1e31dd1 100644
--- a/code/modules/mob/living/simple_animal/bot/medbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/medbot.dm
@@ -86,7 +86,7 @@
 	if(!on)
 		icon_state = "medibot0"
 		return
-	if(IsStun())
+	if(_REFACTORING_IsStun())
 		icon_state = "medibota"
 		return
 	if(mode == BOT_HEALING)
@@ -278,7 +278,7 @@
 	if(mode == BOT_HEALING)
 		return
 
-	if(IsStun())
+	if(_REFACTORING_IsStun())
 		oldpatient = patient
 		patient = null
 		mode = BOT_IDLE
diff --git a/code/modules/mob/living/simple_animal/slime/death.dm b/code/modules/mob/living/simple_animal/slime/death.dm
index 52c9210263..5cac0c630c 100644
--- a/code/modules/mob/living/simple_animal/slime/death.dm
+++ b/code/modules/mob/living/simple_animal/slime/death.dm
@@ -24,7 +24,7 @@
 	stat = DEAD
 	cut_overlays()
 
-	update_canmove()
+	update_mobility()
 
 	if(SSticker.mode)
 		SSticker.mode.check_win()
diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm
index 439ea5b2bf..02434bbe7d 100644
--- a/code/modules/mob/living/simple_animal/slime/slime.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime.dm
@@ -457,13 +457,13 @@
 
 	SStun = world.time + rand(20,60)
 	spawn(0)
-		canmove = 0
+		DISABLE_BITFIELD(mobility_flags, MOBILITY_MOVE)
 		if(user)
 			step_away(src,user,15)
 		sleep(3)
 		if(user)
 			step_away(src,user,15)
-		update_canmove()
+		update_mobility()
 
 /mob/living/simple_animal/slime/pet
 	docile = 1
diff --git a/code/modules/mob/status_procs.dm b/code/modules/mob/status_procs.dm
index 3ae8094a80..23f6b9615f 100644
--- a/code/modules/mob/status_procs.dm
+++ b/code/modules/mob/status_procs.dm
@@ -60,14 +60,14 @@
 /mob/proc/blur_eyes(amount)
 	if(amount>0)
 		eye_blurry = max(amount, eye_blurry)
-	update_eye_blur()
+	update_eyeblur()
 
 /**
   * Adjust the current blurriness of the mobs vision by amount
   */
 /mob/proc/adjust_blurriness(amount)
 	eye_blurry = max(eye_blurry+amount, 0)
-	update_eye_blur()
+	update_eyeblur()
 
 ///Set the mobs blurriness of vision to an amount
 /mob/proc/set_blurriness(amount)