diff --git a/_maps/shuttles/hunter_bounty.dmm b/_maps/shuttles/hunter_bounty.dmm
index abb2753ec87..0b53877e1d9 100644
--- a/_maps/shuttles/hunter_bounty.dmm
+++ b/_maps/shuttles/hunter_bounty.dmm
@@ -193,7 +193,7 @@
 /obj/docking_port/stationary{
 	dwidth = 11;
 	height = 16;
-	shuttle_id = "pirateship_home";
+	shuttle_id = "pirate_home";
 	name = "Deep Space";
 	width = 17
 	},
diff --git a/_maps/shuttles/hunter_russian.dmm b/_maps/shuttles/hunter_russian.dmm
index 5e001b3a4db..7125eeb3bdc 100644
--- a/_maps/shuttles/hunter_russian.dmm
+++ b/_maps/shuttles/hunter_russian.dmm
@@ -507,7 +507,7 @@
 /obj/docking_port/stationary{
 	dwidth = 11;
 	height = 16;
-	shuttle_id = "pirateship_home";
+	shuttle_id = "pirate_home";
 	name = "Deep Space";
 	width = 17
 	},
diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm
index 2a7a77a9760..29331303c8b 100644
--- a/_maps/shuttles/pirate_default.dmm
+++ b/_maps/shuttles/pirate_default.dmm
@@ -762,7 +762,7 @@
 /obj/docking_port/stationary{
 	dwidth = 11;
 	height = 16;
-	shuttle_id = "pirateship_home";
+	shuttle_id = "pirate_home";
 	name = "Deep Space";
 	width = 17
 	},
diff --git a/_maps/shuttles/pirate_dutchman.dmm b/_maps/shuttles/pirate_dutchman.dmm
index 863caf2da31..44ada242e05 100644
--- a/_maps/shuttles/pirate_dutchman.dmm
+++ b/_maps/shuttles/pirate_dutchman.dmm
@@ -754,7 +754,7 @@
 	dir = 8;
 	dwidth = 11;
 	height = 16;
-	shuttle_id = "pirateship_home";
+	shuttle_id = "pirate_home";
 	name = "Deep Space";
 	width = 17
 	},
diff --git a/_maps/shuttles/pirate_silverscale.dmm b/_maps/shuttles/pirate_silverscale.dmm
index af56343c351..11597f7072a 100644
--- a/_maps/shuttles/pirate_silverscale.dmm
+++ b/_maps/shuttles/pirate_silverscale.dmm
@@ -187,7 +187,7 @@
 	dir = 4;
 	dwidth = 13;
 	height = 3;
-	shuttle_id = "pirateship_home";
+	shuttle_id = "pirate_home";
 	name = "Deep Space";
 	width = 26
 	},
diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm
index 1173b6aa8a9..ba1ff7b302b 100644
--- a/code/modules/events/pirates.dm
+++ b/code/modules/events/pirates.dm
@@ -234,18 +234,18 @@
 
 /obj/machinery/computer/shuttle/pirate
 	name = "pirate shuttle console"
-	shuttleId = "pirateship"
+	shuttleId = "pirate"
 	icon_screen = "syndishuttle"
 	icon_keyboard = "syndie_key"
 	light_color = COLOR_SOFT_RED
-	possible_destinations = "pirateship_away;pirateship_home;pirateship_custom;whiteship_home" //SKYRAT EDIT CHANGE
+	possible_destinations = "pirate_away;pirate_home;pirate_custom"
 
 /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate/pirate
 	name = "pirate shuttle navigation computer"
 	desc = "Used to designate a precise transit location for the pirate shuttle."
-	shuttleId = "pirateship"
+	shuttleId = "pirate"
 	lock_override = CAMERA_LOCK_STATION
-	shuttlePortId = "pirateship_custom"
+	shuttlePortId = "pirate_custom"
 	x_offset = 9
 	y_offset = 0
 	see_hidden = FALSE