diff --git a/sku.0/sys.server/compiled/game/datatables/space_crafting/chassis_npc.tab b/sku.0/sys.server/compiled/game/datatables/space_crafting/chassis_npc.tab
index 6d1048da3..fd3f8a90d 100755
--- a/sku.0/sys.server/compiled/game/datatables/space_crafting/chassis_npc.tab
+++ b/sku.0/sys.server/compiled/game/datatables/space_crafting/chassis_npc.tab
@@ -44,4 +44,4 @@ naboo_n1	75000	Naboo N-1	pilot_neutral_starships_04
 tiedefender	100000	TIE Defender	pilot_imperial_navy_master
 havoc	75000	Havoc Starfighter	pilot_neutral_starships_04
 twing	75000	T-Wing	pilot_rebel_navy_starships_03
-blacksun_heavy_vaksai	75000	Blacksun Heavy Vaksai	pilot_neutral_starships_04
+blacksun_vaksai_s02	75000	Blacksun Heavy Vaksai	pilot_neutral_starships_04
diff --git a/sku.0/sys.server/compiled/game/object/draft_schematic/space/chassis/havoc.tpf b/sku.0/sys.server/compiled/game/object/draft_schematic/space/chassis/havoc.tpf
index ad8a12076..2ddd89c98 100755
--- a/sku.0/sys.server/compiled/game/object/draft_schematic/space/chassis/havoc.tpf
+++ b/sku.0/sys.server/compiled/game/object/draft_schematic/space/chassis/havoc.tpf
@@ -11,7 +11,7 @@
 
 itemsPerContainer = 0
 category = CT_space
-craftedObjectTemplate = "object/tangible/ship/components/chassis/tieadvanced_chassis_token.iff"
+craftedObjectTemplate = "object/tangible/ship/components/chassis/havoc_chassis_token.iff"
 slots = [
 	[
 	optional = false,
diff --git a/sku.0/sys.server/compiled/game/object/tangible/ship/components/chassis/player_blacksun_vaksai_s02_chassis_token.tpf b/sku.0/sys.server/compiled/game/object/tangible/ship/components/chassis/player_blacksun_vaksai_s02_chassis_token.tpf
index d893342f7..693fe5201 100755
--- a/sku.0/sys.server/compiled/game/object/tangible/ship/components/chassis/player_blacksun_vaksai_s02_chassis_token.tpf
+++ b/sku.0/sys.server/compiled/game/object/tangible/ship/components/chassis/player_blacksun_vaksai_s02_chassis_token.tpf
@@ -7,4 +7,4 @@
 
 sharedTemplate = "object/tangible/ship/components/chassis/shared_player_blacksun_vaksai_s02_chassis_token.iff"
 
-objvars =+ ["shiptype" = "blacksun_heavy_vaksai"]
\ No newline at end of file
+objvars =+ ["shiptype" = "blacksun_vaksai_s02"]
\ No newline at end of file
diff --git a/sku.0/sys.shared/compiled/game/object/draft_schematic/space/chassis/shared_havoc.tpf b/sku.0/sys.shared/compiled/game/object/draft_schematic/space/chassis/shared_havoc.tpf
index bc66345c6..6a6fc46dd 100755
--- a/sku.0/sys.shared/compiled/game/object/draft_schematic/space/chassis/shared_havoc.tpf
+++ b/sku.0/sys.shared/compiled/game/object/draft_schematic/space/chassis/shared_havoc.tpf
@@ -23,7 +23,7 @@ slots = [
 	[name = "craft_item_ingredients_n" "ship_skin", hardpoint = ""],
 	[name = "craft_item_ingredients_n" "cockpit_insulation", hardpoint = ""]]
 
-craftedSharedTemplate="object/tangible/ship/components/chassis/shared_tieadvanced_chassis_token.iff"
+craftedSharedTemplate="object/tangible/ship/components/chassis/shared_havoc_chassis_token.iff"
 
 @class intangible_object_template 0