diff --git a/_maps/map_files/SmolStation/SmolStation.dmm b/_maps/map_files/SmolStation/SmolStation.dmm
index d0a6cbfdea..555d1b337d 100644
--- a/_maps/map_files/SmolStation/SmolStation.dmm
+++ b/_maps/map_files/SmolStation/SmolStation.dmm
@@ -3763,7 +3763,7 @@
 	height = 5;
 	id = "perma_station";
 	name = "Station Dock";
-	roundstart_template = /datum/map_template/shuttle/sandcode/permabrig;
+	roundstart_template = /datum/map_template/shuttle/modular_sand/permabrig;
 	width = 8
 	},
 /turf/open/space/basic,
@@ -9255,7 +9255,7 @@
 	height = 5;
 	id = "sciout_station";
 	name = "Science Shuttle Dock";
-	roundstart_template = /datum/map_template/shuttle/sandcode/scioutpost;
+	roundstart_template = /datum/map_template/shuttle/modular_sand/scioutpost;
 	width = 7
 	},
 /turf/open/floor/plasteel/elevatorshaft{
@@ -23207,7 +23207,7 @@
 	height = 5;
 	id = "ai_station";
 	name = "Station Access";
-	roundstart_template = /datum/map_template/shuttle/sandcode/satshuttle;
+	roundstart_template = /datum/map_template/shuttle/modular_sand/satshuttle;
 	width = 7
 	},
 /turf/open/space/basic,
diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm
index 69bb424a69..2f97d6c058 100644
--- a/code/__DEFINES/misc.dm
+++ b/code/__DEFINES/misc.dm
@@ -555,4 +555,4 @@ GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_S
 
 #define WANTED_FILE "wanted_message.json"
 
-#define UTF8HEADER "<meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /><meta http-equiv='X-UA-Compatible' content='IE=edge' />" //I WOULD LOVE TO DEFINE THIS IN SANDCODE BUT FREAKING CODE DOESN'T GET IT THEN
+#define UTF8HEADER "<meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /><meta http-equiv='X-UA-Compatible' content='IE=edge' />" //I WOULD LOVE TO DEFINE THIS IN MODULAR_SAND BUT FREAKING CODE DOESN'T GET IT THEN
diff --git a/code/__DEFINES/sandcode/loadout.dm b/code/__DEFINES/sandcode/loadout.dm
index 0a17bf96d5..d9fb2b5c1b 100644
--- a/code/__DEFINES/sandcode/loadout.dm
+++ b/code/__DEFINES/sandcode/loadout.dm
@@ -1,5 +1,5 @@
 //Special thing that i had to make it myself because skyrat uses old loadout
-//Underwear Sandcode changes
+//Underwear modular_sand changes
 #define LOADOUT_CATEGORY_GENERAL_UNDER			"General Underwear"
 #define LOADOUT_SUBCATEGORY_UNDERWEAR		"Underwear"
 #define LOADOUT_SUBCATEGORY_SHIRT		"Shirt"
diff --git a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm
index b74198900a..305832474e 100644
--- a/code/__DEFINES/sound.dm
+++ b/code/__DEFINES/sound.dm
@@ -15,13 +15,13 @@
 #define CHANNEL_DIGEST 1009
 #define CHANNEL_PREYLOOP 1008
 
-//SANDCODE CHANNELS - SEND HELP
+//MODULAR_SAND CHANNELS - SEND HELP
 #define CHANNEL_BOSSMUSIC 1007
 
 //THIS SHOULD ALWAYS BE THE LOWEST ONE!
 //KEEP IT UPDATED
 
-#define CHANNEL_HIGHEST_AVAILABLE 1007 //CIT CHANGE - COMPENSATES FOR VORESOUND CHANNELS(oopsie, sandcode mod)
+#define CHANNEL_HIGHEST_AVAILABLE 1007 //CIT CHANGE - COMPENSATES FOR VORESOUND CHANNELS(oopsie, modular_sand mod)
 
 #define MAX_INSTRUMENT_CHANNELS (128 * 6)
 
diff --git a/code/game/objects/items/airlock_painter.dm b/code/game/objects/items/airlock_painter.dm
index d895448655..635152ec0b 100644
--- a/code/game/objects/items/airlock_painter.dm
+++ b/code/game/objects/items/airlock_painter.dm
@@ -166,7 +166,7 @@
 		return
 	. = ..()
 
-/obj/item/airlock_painter/decal/AltClick(mob/user) //sandstorm change - everything that makes this work is on same path to this but on sandcode
+/obj/item/airlock_painter/decal/AltClick(mob/user) //sandstorm change - everything that makes this work is on same path to this but on modular_sand
 	. = ..()
 	var/decal_category = list(
 		"Decal" = image(icon = 'icons/turf/decals.dmi', icon_state = "[stored_decal]", dir = turn(stored_dir, 180)),
diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index bfc6b4296e..26f6ff752d 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -557,7 +557,7 @@ as performing this in action() will cause the upgrade to end up in the borg inst
 	desc = "A cyborg resizer, it makes a cyborg huge."
 	icon_state = "cyborg_upgrade3"
 
-/* moved to sandcode
+/* moved to modular_sand
 /obj/item/borg/upgrade/expand/action(mob/living/silicon/robot/R, user = usr)
 	. = ..()
 	if(.)
diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm
index 64036520e7..41bc28c3d9 100644
--- a/code/game/turfs/simulated/floor/plating/asteroid.dm
+++ b/code/game/turfs/simulated/floor/plating/asteroid.dm
@@ -382,7 +382,7 @@
 
 		new randumb(T)
 	return TRUE
-*/ //moved to sandcode
+*/ //moved to modular_sand
 #undef SPAWN_MEGAFAUNA
 #undef SPAWN_BUBBLEGUM
 
diff --git a/code/modules/language/language_holder.dm b/code/modules/language/language_holder.dm
index 8dfafe5be7..960235ac89 100644
--- a/code/modules/language/language_holder.dm
+++ b/code/modules/language/language_holder.dm
@@ -315,22 +315,22 @@ Key procs
 							/datum/language/machine = list(LANGUAGE_ATOM),
 							/datum/language/draconic = list(LANGUAGE_ATOM),
 							// SKYRAT EDIT - additional languages
-							/datum/language/sandcode/solcommon = list(LANGUAGE_ATOM),
-							/datum/language/sandcode/technorussian = list(LANGUAGE_ATOM),
-							/datum/language/sandcode/neokanji = list(LANGUAGE_ATOM),
-							/datum/language/sandcode/dunmeri = list(LANGUAGE_ATOM),
-							/datum/language/sandcode/sergal = list(LANGUAGE_ATOM),
+							/datum/language/modular_sand/solcommon = list(LANGUAGE_ATOM),
+							/datum/language/modular_sand/technorussian = list(LANGUAGE_ATOM),
+							/datum/language/modular_sand/neokanji = list(LANGUAGE_ATOM),
+							/datum/language/modular_sand/dunmeri = list(LANGUAGE_ATOM),
+							/datum/language/modular_sand/sergal = list(LANGUAGE_ATOM),
 							/datum/language/slime = list(LANGUAGE_ATOM),
 							/datum/language/dwarf = list(LANGUAGE_ATOM))
 	spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
 							/datum/language/machine = list(LANGUAGE_ATOM),
 							/datum/language/draconic = list(LANGUAGE_ATOM),
 							// SKYRAT EDIT - additional languages
-							/datum/language/sandcode/solcommon = list(LANGUAGE_ATOM),
-							/datum/language/sandcode/technorussian = list(LANGUAGE_ATOM),
-							/datum/language/sandcode/neokanji = list(LANGUAGE_ATOM),
-							/datum/language/sandcode/dunmeri = list(LANGUAGE_ATOM),
-							/datum/language/sandcode/sergal = list(LANGUAGE_ATOM),
+							/datum/language/modular_sand/solcommon = list(LANGUAGE_ATOM),
+							/datum/language/modular_sand/technorussian = list(LANGUAGE_ATOM),
+							/datum/language/modular_sand/neokanji = list(LANGUAGE_ATOM),
+							/datum/language/modular_sand/dunmeri = list(LANGUAGE_ATOM),
+							/datum/language/modular_sand/sergal = list(LANGUAGE_ATOM),
 							/datum/language/slime = list(LANGUAGE_ATOM),
 							/datum/language/dwarf = list(LANGUAGE_ATOM))
 
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 9cd203a7b9..600a862ebf 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -349,7 +349,7 @@
 		ADD_TRAIT(user, TRAIT_NODEATH, "memento_mori")
 		ADD_TRAIT(user, TRAIT_NOHARDCRIT, "memento_mori")
 		ADD_TRAIT(user, TRAIT_NOCRITDAMAGE, "memento_mori")
-		icon_state = "[initial(icon_state)]_active" //sandcode edit
+		icon_state = "[initial(icon_state)]_active" //modular_sand edit
 		active_owner = user
 
 /obj/item/clothing/neck/necklace/memento_mori/proc/mori()
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 23612dbfd7..3f0ca9c5e6 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -129,7 +129,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	//the icon state of the eyes this species has
 	var/eye_type = "normal"
 
-	//sandcode tg port, very special
+	//modular_sand tg port, very special
 	var/flying_species = FALSE //is a flying species, just a check for some things
 	var/datum/action/innate/flight/fly //the actual flying ability given to flying species
 	var/wings_icon = "Angel" //the icon used for the wings
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 378413efb7..d069c70216 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -141,7 +141,7 @@
 	if(requires_rebuild)
 		rebuild_modules()
 	return I
-*/ //replaced by the one in sandcode
+*/ //replaced by the one in modular_sand
 
 //Adds flavoursome dogborg items to dogborg variants optionally without mechanical benefits
 /obj/item/robot_module/proc/dogborg_equip()
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index c5098d6938..2de47e4a92 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -180,7 +180,7 @@
 /obj/item/gun/energy/kinetic_accelerator/emp_act(severity)
 	return
 
-/* moved to sandcode
+/* moved to modular_sand
 /obj/item/gun/energy/kinetic_accelerator/proc/reload()
 	cell.give(cell.maxcharge)
 	if(!suppressed)
diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm
index b863db4e46..b340b99ef5 100644
--- a/code/modules/research/designs/mechfabricator_designs.dm
+++ b/code/modules/research/designs/mechfabricator_designs.dm
@@ -796,7 +796,7 @@
 	construction_time = 120
 	category = list("Cyborg Upgrade Modules")
 
-/* moved to sandcode
+/* moved to modular_sand
 /datum/design/borg_upgrade_expand
 	name = "Cyborg Upgrade (Expand)"
 	id = "borg_upgrade_expand"
diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm
index 28acd89bc2..59f5693c8b 100644
--- a/code/modules/surgery/organs/tongue.dm
+++ b/code/modules/surgery/organs/tongue.dm
@@ -26,14 +26,14 @@
 		/datum/language/vampiric,
 		/datum/language/dwarf,
 		/datum/language/machine, //Skyrat change - adds machine language
-		/datum/language/sandcode/calcic, //Skyrat change - plasmaman language
-		/datum/language/sandcode/dunmeri, //Skyrat change - dunmer language
-		/datum/language/sandcode/moffic, //Skyrat change - insect language
-		/datum/language/sandcode/neokanji, //Skyrat change - generally asian language
-		/datum/language/sandcode/shadowtongue, //Skyrat change - shadowpeople language
-		/datum/language/sandcode/solcommon, //Skyrat change - sol common blah blah
-		/datum/language/sandcode/technorussian, //Skyrat change - russian stereotype language
-		/datum/language/sandcode/sergal,
+		/datum/language/modular_sand/calcic, //Skyrat change - plasmaman language
+		/datum/language/modular_sand/dunmeri, //Skyrat change - dunmer language
+		/datum/language/modular_sand/moffic, //Skyrat change - insect language
+		/datum/language/modular_sand/neokanji, //Skyrat change - generally asian language
+		/datum/language/modular_sand/shadowtongue, //Skyrat change - shadowpeople language
+		/datum/language/modular_sand/solcommon, //Skyrat change - sol common blah blah
+		/datum/language/modular_sand/technorussian, //Skyrat change - russian stereotype language
+		/datum/language/modular_sand/sergal,
 	))
 	healing_factor = STANDARD_ORGAN_HEALING*5 //Fast!!
 	decay_factor = STANDARD_ORGAN_DECAY/2
diff --git a/modular_sand/code/datums/shuttles.dm b/modular_sand/code/datums/shuttles.dm
index 590f2e1b02..f6b34d9ebe 100644
--- a/modular_sand/code/datums/shuttles.dm
+++ b/modular_sand/code/datums/shuttles.dm
@@ -1,9 +1,9 @@
-/datum/map_template/shuttle/sandcode
+/datum/map_template/shuttle/modular_sand
 	name = "Sandcode Base Shuttle Template"
 	prefix = "_maps/shuttles/"
 	can_be_bought = FALSE
 
-/datum/map_template/shuttle/sandcode/satshuttle
+/datum/map_template/shuttle/modular_sand/satshuttle
 	port_id = "access"
 	name = "Sattelite Access Shuttle"
 	suffix = "smol"
@@ -13,12 +13,12 @@
 	suffix = "smol"
 	name = "arrival shuttle (Smol)"
 
-/datum/map_template/shuttle/sandcode/permabrig
+/datum/map_template/shuttle/modular_sand/permabrig
 	port_id = "axsbrig"
 	name = "Perma Brig Access Shuttle"
 	suffix = "smol"
 
-/datum/map_template/shuttle/sandcode/scioutpost
+/datum/map_template/shuttle/modular_sand/scioutpost
 	port_id = "axsscioutpost"
 	name = "Science Outpost Access Shuttle"
 	suffix = "smol"
diff --git a/modular_sand/code/modules/language/language.dm b/modular_sand/code/modules/language/language.dm
index 3f3dce1a45..9f9b13ec02 100644
--- a/modular_sand/code/modules/language/language.dm
+++ b/modular_sand/code/modules/language/language.dm
@@ -1,10 +1,10 @@
 // And so, people started making weird sounds that only similar ones could understand and do them too.
 
-/datum/language/sandcode
+/datum/language/modular_sand
 	icon = 'modular_sand/icons/misc/language.dmi'
 	icon_state = null
 
-/datum/language/sandcode/sergal
+/datum/language/modular_sand/sergal
 	name = LANGUAGE_SERGAL
 	desc = "The dominant language of the Sergal homeworld, Tal. It consists of aggressive low-pitched hissing and throaty growling."
 	speech_verb = "snarls"
@@ -17,7 +17,7 @@
 	flags = TONGUELESS_SPEECH
 	restricted = FALSE
 
-/datum/language/sandcode/buggy
+/datum/language/modular_sand/buggy
 	name = "Buggy"
 	desc = "A barely comprehensible language, spoken by insectoid-like races."
 	speech_verb = "flutters"
@@ -34,7 +34,7 @@
 	default_priority = 94
 	restricted = TRUE
 
-/datum/language/sandcode/calcic
+/datum/language/modular_sand/calcic
 	name = "Calcic"
 	desc = "The disjointed and staccato language of plasmamen. Also understood by skeletons."
 	speech_verb = "rattles"
@@ -55,7 +55,7 @@
 	default_priority = 89
 	restricted = TRUE
 
-/datum/language/sandcode/dunmeri
+/datum/language/modular_sand/dunmeri
 	name = "Dunmeri"
 	desc = "The native language of the dark elves of lavaland."
 	speech_verb = "proclaims"
@@ -78,7 +78,7 @@
 	default_priority = 92
 	restricted = FALSE
 
-/datum/language/sandcode/moffic
+/datum/language/modular_sand/moffic
 	name = "Moffic"
 	desc = "The language of the Mothpeople borders on complete unintelligibility."
 	speech_verb = "flutters"
@@ -98,7 +98,7 @@
 	default_priority = 93
 	restricted = TRUE
 
-/datum/language/sandcode/neokanji
+/datum/language/modular_sand/neokanji
 	name = "Neo-Kanji"
 	desc = "A bastardized mixture of many old Earth asian dialects. Famously known as the official language of the spider clan."
 	speech_verb = "proclaims"
@@ -124,7 +124,7 @@
 	icon_state = "neokanji"
 	restricted = FALSE
 
-/datum/language/sandcode/shadowtongue
+/datum/language/modular_sand/shadowtongue
 	name = "Shadowtongue"
 	desc = "What a grand and intoxicating innocence."
 	speech_verb = "growls"
@@ -146,7 +146,7 @@
 	default_priority = 95
 	restricted = TRUE
 
-/datum/language/sandcode/solcommon
+/datum/language/modular_sand/solcommon
 	name = "Sol Common"
 	desc = "The old Earthen language of Latin, re-adopted into the modern day to offer more identity to Humanity."
 	speech_verb = "proclaims"
@@ -165,7 +165,7 @@
 	icon_state = "solcommon"
 	restricted = FALSE
 
-/datum/language/sandcode/technorussian
+/datum/language/modular_sand/technorussian
 	name = "Technorussian"
 	desc = "Ancient language of Russian colonists, rusted with time and bastardized with technical terms in everyday use."
 	speech_verb = "proclaims"
diff --git a/modular_sand/code/modules/ninja/outfit.dm b/modular_sand/code/modules/ninja/outfit.dm
index 1dd747f220..b9d03510bd 100644
--- a/modular_sand/code/modules/ninja/outfit.dm
+++ b/modular_sand/code/modules/ninja/outfit.dm
@@ -4,6 +4,6 @@
 		if(istype(H.belt, belt))
 			S.energyKatana = H.belt
 		S.randomize_param()
-	H.grant_language(/datum/language/sandcode/neokanji, TRUE, TRUE, LANGUAGE_NINJA)
+	H.grant_language(/datum/language/modular_sand/neokanji, TRUE, TRUE, LANGUAGE_NINJA)
 	var/datum/language_holder/LH = H.get_language_holder()
-	LH.selected_language = /datum/language/sandcode/neokanji
+	LH.selected_language = /datum/language/modular_sand/neokanji