diff --git a/mpq/arr/flingy.txt b/mpq/arr/flingy.txt
index 439f9a19..88fd432d 100644
--- a/mpq/arr/flingy.txt
+++ b/mpq/arr/flingy.txt
@@ -89,7 +89,7 @@ Seraph (Turret)
 Vulture
 Spider Mine
 Fountainhead
-Barracks
+Stockade
 Atelier
 Comsat Station
 Ministry
@@ -342,7 +342,7 @@ Iron Foundry
 Mineral Field 1 Christmas
 Mineral Field 2 Christmas
 Mineral Field 3 Christmas
-Medbay
+Vestry
 Heracles
 Pazuzu
 Astral Blaster Impact
diff --git a/mpq/arr/images.txt b/mpq/arr/images.txt
index 15d73380..c6d584aa 100644
--- a/mpq/arr/images.txt
+++ b/mpq/arr/images.txt
@@ -264,8 +264,8 @@ Seraph Shadow
 Fountainhead
 Fountainhead Overlay
 Fountainhead Shadow
-Barracks
-Barracks Shadow
+Stockade
+Stockade Shadow
 Atelier
 Atelier Overlay
 Atelier Shadow
@@ -1322,9 +1322,9 @@ Mineral Field 3 Christmas
 Mineral Field 3 Christmas Shadow
 Mineral Chunk Christmas
 Mineral Chunk Depleted Christmas
-Medbay
-Medbay Shadow
-Medbay Connector
+Vestry
+Vestry Shadow
+Vestry Connector
 Protoss Warp Fade
 Heracles
 Heracles Shadow
diff --git a/mpq/arr/sprites.txt b/mpq/arr/sprites.txt
index ae9450ec..8cf86274 100644
--- a/mpq/arr/sprites.txt
+++ b/mpq/arr/sprites.txt
@@ -247,7 +247,7 @@ Spider Mine
 Seraph (Base)
 Seraph (Turret)
 Fountainhead
-Barracks
+Stockade
 Atelier
 Comsat Station
 Ministry
@@ -673,7 +673,7 @@ Iron Foundry
 Mineral Field 01 (Christmas)
 Mineral Field 02 (Christmas)
 Mineral Field 03 (Christmas)
-Medbay
+Vestry
 Heracles
 Pazuzu
 Astral Blaster Hit
diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex
index 2b2c86ee..3d042d39 100644
Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ
diff --git a/mpq/arr/units.txt b/mpq/arr/units.txt
index 1adc458a..75846b9e 100644
--- a/mpq/arr/units.txt
+++ b/mpq/arr/units.txt
@@ -109,7 +109,7 @@ Terran Comsat Station
 Terran Missile Silo
 Terran Supply Depot
 Terran Reservoir
-Terran Barracks
+Terran Stockade
 Zerg Liiralisk
 Terran Fulcrum
 Terran Starport
@@ -117,8 +117,8 @@ Terran Commandment
 Terran Daedala
 Terran Covert Ops
 Terran Magnetar
-Terran Medbay
-Terran Machine Shop
+Terran Vestry
+Terran Palladium
 Terran Rotary
 Terran Atlas
 Zerg Sovroleth
diff --git a/mpq/rez/stat_txt.tbl b/mpq/rez/stat_txt.tbl
index 73ccda73..6982aeb2 100644
Binary files a/mpq/rez/stat_txt.tbl and b/mpq/rez/stat_txt.tbl differ
diff --git a/mpq/rez/unitnames.tbl b/mpq/rez/unitnames.tbl
index 485e777c..aafb1557 100644
Binary files a/mpq/rez/unitnames.tbl and b/mpq/rez/unitnames.tbl differ
diff --git a/mpq/samase/unitdef.txt b/mpq/samase/unitdef.txt
index cfb87633..b5f22df7 100644
--- a/mpq/samase/unitdef.txt
+++ b/mpq/samase/unitdef.txt
@@ -103,7 +103,7 @@ building comsat_station = 107
 building missile_silo = 108
 building supply_depot = 109
 building reservoir = 110
-building barracks = 111
+building stockade = 111
 building fulcrum = 113
 building starport = 114
 building commandment = 115
@@ -115,7 +115,7 @@ building watchdog = 124
 building anchor = 125
 
 # Terran NGS buildings
-building medbay = 119
+building vestry = 119
 building rotary = 121
 building diadem = 127
 building guildhall = 147
diff --git a/mpq/scripts/aiscript.bin b/mpq/scripts/aiscript.bin
index 589fd5e4..1969a387 100644
Binary files a/mpq/scripts/aiscript.bin and b/mpq/scripts/aiscript.bin differ
diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt
index b0f09837..d314d0eb 100644
--- a/mpq/scripts/iscript.txt
+++ b/mpq/scripts/iscript.txt
@@ -47976,7 +47976,7 @@ SpecialState1 	[NONE]
 # ----------------------------------------------------------------------------- #
 
 CyprianInit:
-	imgul             	1587 0 0 # Cyprian Shadow (cm\terran\cyprian.grp)
+	imgul             	1587 0 -2 # Cyprian Shadow (cm\terran\cyprian.grp)
 CyprianWalkingToIdle:
 	playfram			0x00
 	goto				CyprianLocal00
diff --git a/mpq/tileset/badlands.cv5 b/mpq/tileset/badlands.cv5
index a84dcc27..961d4d4d 100644
Binary files a/mpq/tileset/badlands.cv5 and b/mpq/tileset/badlands.cv5 differ
diff --git a/mpq/tileset/badlands.vf4 b/mpq/tileset/badlands.vf4
index 92b10f22..03df7753 100644
Binary files a/mpq/tileset/badlands.vf4 and b/mpq/tileset/badlands.vf4 differ
diff --git a/mpq/tileset/badlands.vr4 b/mpq/tileset/badlands.vr4
index 51b11da0..bae0a054 100644
Binary files a/mpq/tileset/badlands.vr4 and b/mpq/tileset/badlands.vr4 differ
diff --git a/mpq/tileset/badlands.vx4ex b/mpq/tileset/badlands.vx4ex
index f3cc7794..8c0ae5d8 100644
Binary files a/mpq/tileset/badlands.vx4ex and b/mpq/tileset/badlands.vx4ex differ
diff --git a/patchnotes.md b/patchnotes.md
index 83340cc7..3462787f 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -28,7 +28,12 @@ Much of this update is targeted at bringing AI back up to snuff, to complement t
 	- Madrigal (Imperioso weaponhit)
 	- Aion (weaponhit)
 - New names for:
+	- Stockade (formerly Barracks)
+	- Vestry (formerly Medbay)
 	- Covenant (formerly Covert Ops)
+- Improved collision for:
+	- Scrapyard
+	- Palladium
 
 ## Factions
 - Futurist Federation now enables:
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index 31c6a2c2..17c6b34a 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ