diff --git a/_maps/RandomZLevels/maintsroom.dmm b/_maps/RandomZLevels/maintsroom.dmm
index 7ebb2cb5ebe..205c58b7e19 100644
--- a/_maps/RandomZLevels/maintsroom.dmm
+++ b/_maps/RandomZLevels/maintsroom.dmm
@@ -2747,7 +2747,7 @@
 /turf/open/floor/iron/smooth,
 /area/awaymission/caves/maintsroom)
 "iR" = (
-/mob/living/simple_animal/bot/secbot/beepsky/ofitser{
+/mob/living/basic/bot/secbot/beepsky/ofitser{
 	faction = list("hostile","cult")
 	},
 /turf/open/floor/mineral/plastitanium,
@@ -3632,7 +3632,7 @@
 /turf/open/floor/plating,
 /area/awaymission/caves/maintsroom)
 "lx" = (
-/mob/living/simple_animal/bot/secbot/beepsky{
+/mob/living/basic/bot/secbot/beepsky{
 	faction = list("hostile","cult")
 	},
 /turf/open/floor/circuit/red,
@@ -5856,7 +5856,7 @@
 /turf/open/misc/asteroid,
 /area/awaymission/caves/maintsroom)
 "sO" = (
-/mob/living/simple_animal/bot/secbot/grievous{
+/mob/living/basic/bot/secbot/beepsky/grievous{
 	faction = list("hostile","cult")
 	},
 /turf/open/floor/mineral/plastitanium,
@@ -7065,7 +7065,7 @@
 /turf/open/floor/plating,
 /area/awaymission/caves/maintsroom)
 "wP" = (
-/mob/living/simple_animal/bot/secbot/beepsky/jr{
+/mob/living/basic/bot/secbot/beepsky/jr{
 	faction = list("hostile","cult")
 	},
 /turf/open/floor/mineral/plastitanium,
@@ -12086,7 +12086,7 @@
 /turf/open/misc/asteroid/basalt,
 /area/awaymission/caves/maintsroom)
 "Nv" = (
-/mob/living/simple_animal/bot/secbot/ed209{
+/mob/living/basic/bot/secbot/ed209{
 	name = "Commander Stun";
 	faction = list("hostile","cult")
 	},
@@ -14046,7 +14046,7 @@
 /turf/open/floor/plating,
 /area/awaymission/caves/maintsroom)
 "TN" = (
-/mob/living/simple_animal/bot/secbot/grievous/toy{
+/mob/living/basic/bot/secbot/beepsky/grievous/toy{
 	faction = list("hostile","cult")
 	},
 /turf/open/floor/mineral/plastitanium,
@@ -14491,7 +14491,7 @@
 /turf/open/floor/plating/rust,
 /area/awaymission/caves/maintsroom)
 "Vf" = (
-/mob/living/simple_animal/bot/secbot/beepsky{
+/mob/living/basic/bot/secbot/beepsky{
 	faction = list("hostile","cult")
 	},
 /turf/open/floor/mineral/plastitanium,
diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 548ee150b4a..39aaf23e746 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -56280,7 +56280,7 @@
 /turf/open/floor/iron/large,
 /area/station/cargo/office)
 "nTs" = (
-/mob/living/simple_animal/bot/secbot/grievous/toy,
+/mob/living/basic/bot/secbot/grievous/toy,
 /turf/open/floor/plating,
 /area/station/ai/satellite/maintenance)
 "nTA" = (
diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm
index 102c43c5571..a53dda9a18b 100644
--- a/_maps/map_files/NorthStar/north_star.dmm
+++ b/_maps/map_files/NorthStar/north_star.dmm
@@ -69298,7 +69298,7 @@
 	codes_txt = "patrol;next_patrol=4-0";
 	location = "4-3"
 	},
-/mob/living/simple_animal/bot/secbot/beepsky,
+/mob/living/basic/bot/secbot/beepsky,
 /turf/open/floor/iron/dark/side{
 	dir = 1
 	},
diff --git a/_maps/map_files/Ouroboros/Ouroboros.dmm b/_maps/map_files/Ouroboros/Ouroboros.dmm
index c5c20188154..58baf5a6034 100644
--- a/_maps/map_files/Ouroboros/Ouroboros.dmm
+++ b/_maps/map_files/Ouroboros/Ouroboros.dmm
@@ -65983,7 +65983,7 @@
 /obj/structure/cable,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
-/mob/living/simple_animal/bot/secbot/beepsky,
+/mob/living/basic/bot/secbot/beepsky,
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/fore)
 "tbm" = (
diff --git a/_maps/map_files/biodome/modules/cage_2_vibebot.dmm b/_maps/map_files/biodome/modules/cage_2_vibebot.dmm
index b68e46ecd2d..b5b1b6176b9 100644
--- a/_maps/map_files/biodome/modules/cage_2_vibebot.dmm
+++ b/_maps/map_files/biodome/modules/cage_2_vibebot.dmm
@@ -29,7 +29,7 @@
 /turf/open/floor/circuit,
 /area/station/maintenance/aft/upper)
 "M" = (
-/mob/living/simple_animal/bot/secbot/grievous/toy,
+/mob/living/basic/bot/secbot/grievous/toy,
 /turf/open/floor/circuit,
 /area/station/maintenance/aft/upper)
 "V" = (
diff --git a/_maps/map_files/moonstation/moonstation.dmm b/_maps/map_files/moonstation/moonstation.dmm
index 725116d165f..d1fbb49c97c 100644
--- a/_maps/map_files/moonstation/moonstation.dmm
+++ b/_maps/map_files/moonstation/moonstation.dmm
@@ -13592,7 +13592,7 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden,
 /obj/effect/turf_decal/caution/stand_clear/red,
-/mob/living/simple_animal/bot/secbot/pingsky,
+/mob/living/basic/bot/secbot/pingsky,
 /turf/open/floor/catwalk_floor/iron_dark,
 /area/station/ai/satellite/interior)
 "dyf" = (
@@ -13770,7 +13770,7 @@
 /turf/open/floor/iron/white,
 /area/station/science/xenobiology)
 "dAl" = (
-/mob/living/simple_animal/bot/secbot/beepsky{
+/mob/living/basic/bot/secbot/beepsky/ofitser{
 	desc = "Powered by the tears and sweat of laborers.";
 	name = "Prison Ofitser"
 	},
@@ -48406,7 +48406,7 @@
 /turf/open/floor/iron,
 /area/station/terminal/lobby)
 "mqk" = (
-/mob/living/simple_animal/bot/secbot/beepsky/officer,
+/mob/living/basic/bot/secbot/beepsky/officer,
 /obj/effect/turf_decal/plaque{
 	icon_state = "L7"
 	},
@@ -49187,7 +49187,7 @@
 /turf/open/floor/wood/tile,
 /area/station/terminal/lobby)
 "mBK" = (
-/mob/living/simple_animal/bot/secbot/beepsky/armsky,
+/mob/living/basic/bot/secbot/beepsky/armsky/armsky,
 /obj/effect/turf_decal/trimline/red/filled/line{
 	dir = 4
 	},
@@ -64969,7 +64969,7 @@
 	pixel_x = 3;
 	pixel_y = -3
 	},
-/mob/living/simple_animal/bot/secbot/beepsky/jr{
+/mob/living/basic/bot/secbot/beepsky/jr{
 	name = "Officer Eepy";
 	bot_cover_flags = 6;
 	bot_mode_flags = 1;
diff --git a/bubber_archive/Limastation/LimaStation.dmm b/bubber_archive/Limastation/LimaStation.dmm
index f86a0e22e8d..f238adcf815 100644
--- a/bubber_archive/Limastation/LimaStation.dmm
+++ b/bubber_archive/Limastation/LimaStation.dmm
@@ -38019,7 +38019,7 @@
 /area/station/service/abandoned_gambling_den)
 "ooh" = (
 /obj/effect/decal/cleanable/generic,
-/mob/living/simple_animal/bot/secbot/beepsky{
+/mob/living/basic/bot/secbot/beepsky{
 	name = "Officer Beepsky"
 	},
 /turf/open/floor/plating,