diff --git a/sku.0/sys.server/compiled/game/object/draft_schematic/clothing/clothing_jacket_ace_imperial_craft.tpf b/sku.0/sys.server/compiled/game/object/draft_schematic/clothing/clothing_jacket_ace_imperial_craft.tpf
index 794748448..25d51b5a1 100755
--- a/sku.0/sys.server/compiled/game/object/draft_schematic/clothing/clothing_jacket_ace_imperial_craft.tpf
+++ b/sku.0/sys.server/compiled/game/object/draft_schematic/clothing/clothing_jacket_ace_imperial_craft.tpf
@@ -13,10 +13,10 @@ itemsPerContainer = 0
 craftedObjectTemplate = "object/tangible/wearables/jacket/jacket_ace_imperial_craft.iff"
 slots = [
 	[
-	optional = false,
-	name = "craft_clothing_ingredients_n" "liner",
+	optional=false,
+	name = "craft_clothing_ingredients_n" "heavy_shell",
 	options = [
-		[ingredientType=IT_template, ingredients = [[name="craft_clothing_ingredients_n" "liner", ingredient="object/tangible/component/clothing/synthetic_cloth.iff", count=1]], complexity = 0, skillCommand = "unskilled"]],
+		[ingredientType=IT_template, ingredients = [[name="craft_clothing_ingredients_n" "heavy_shell", ingredient="object/tangible/component/clothing/synthetic_cloth.iff", count=1]], complexity = 0, skillCommand = "unskilled"]],
 	optionalSkillCommand = "",
 	complexity = 0,
 	appearance = "" ],
@@ -29,26 +29,18 @@ slots = [
 	complexity = 0,
 	appearance = "" ],
 	[
-	optional = false,
-	name = "craft_clothing_ingredients_n" "leather",
+	optional=false,
+	name = "craft_clothing_ingredients_n" "hardware",
 	options = [
-		[ingredientType=IT_template, ingredients = [[name="craft_clothing_ingredients_n" "leather", ingredient="object/tangible/component/clothing/leather_heavy_duty.iff", count=1]], complexity = 0, skillCommand = "unskilled"]],
+		[ingredientType=IT_template, ingredients = [[name="craft_clothing_ingredients_n" "hardware", ingredient="object/tangible/component/clothing/metal_fasteners.iff", count=1]], complexity = 0, skillCommand = "unskilled"]],
 	optionalSkillCommand = "",
 	complexity = 0,
 	appearance = "" ],
 	[
 	optional = false,
-	name = "craft_clothing_ingredients_n" "reinforcement",
+	name = "craft_clothing_ingredients_n" "liner",
 	options = [
-		[ingredientType=IT_resourceClass, ingredients = [[name="craft_clothing_ingredients_n" "reinforcement", ingredient="space_metal_obsidian", count=35]], complexity = 0, skillCommand = "unskilled"]],
-	optionalSkillCommand = "",
-	complexity = 0,
-	appearance = "" ],
-	[
-	optional = false,
-	name = "craft_clothing_ingredients_n" "trim",
-	options = [
-		[ingredientType=IT_template, ingredients = [[name="craft_clothing_ingredients_n" "trim", ingredient="object/tangible/component/clothing/trim.iff", count=1]], complexity = 0, skillCommand = "unskilled"]],
+		[ingredientType=IT_template, ingredients = [[name="craft_clothing_ingredients_n" "liner", ingredient="object/tangible/component/clothing/synthetic_cloth.iff", count=1]], complexity = 0, skillCommand = "unskilled"]],
 	optionalSkillCommand = "",
 	complexity = 0,
 	appearance = "" ]]
@@ -61,5 +53,5 @@ manufactureScripts = [ "systems.crafting.clothing.skill.crafting_clothing_tailor
 @class object_template 8
 
 complexity = 21
-sharedTemplate = "object/draft_schematic/clothing/shared_clothing_jacket_ace_imperial.iff"
+sharedTemplate = "object/draft_schematic/clothing/shared_clothing_jacket_imp_ace.iff"
 volume = 1
diff --git a/sku.0/sys.server/compiled/game/object/draft_schematic/clothing/clothing_jacket_ace_privateer_craft.tpf b/sku.0/sys.server/compiled/game/object/draft_schematic/clothing/clothing_jacket_ace_privateer_craft.tpf
index ba8a08c9a..53890116e 100755
--- a/sku.0/sys.server/compiled/game/object/draft_schematic/clothing/clothing_jacket_ace_privateer_craft.tpf
+++ b/sku.0/sys.server/compiled/game/object/draft_schematic/clothing/clothing_jacket_ace_privateer_craft.tpf
@@ -13,10 +13,10 @@ itemsPerContainer = 0
 craftedObjectTemplate = "object/tangible/wearables/jacket/jacket_ace_privateer_craft.iff"
 slots = [
 	[
-	optional = false,
-	name = "craft_clothing_ingredients_n" "liner",
+	optional=false,
+	name = "craft_clothing_ingredients_n" "heavy_shell",
 	options = [
-		[ingredientType=IT_template, ingredients = [[name="craft_clothing_ingredients_n" "liner", ingredient="object/tangible/component/clothing/synthetic_cloth.iff", count=1]], complexity = 0, skillCommand = "unskilled"]],
+		[ingredientType=IT_template, ingredients = [[name="craft_clothing_ingredients_n" "heavy_shell", ingredient="object/tangible/component/clothing/synthetic_cloth.iff", count=1]], complexity = 0, skillCommand = "unskilled"]],
 	optionalSkillCommand = "",
 	complexity = 0,
 	appearance = "" ],
@@ -29,26 +29,18 @@ slots = [
 	complexity = 0,
 	appearance = "" ],
 	[
-	optional = false,
-	name = "craft_clothing_ingredients_n" "leather",
+	optional=false,
+	name = "craft_clothing_ingredients_n" "hardware",
 	options = [
-		[ingredientType=IT_template, ingredients = [[name="craft_clothing_ingredients_n" "leather", ingredient="object/tangible/component/clothing/leather_heavy_duty.iff", count=1]], complexity = 0, skillCommand = "unskilled"]],
+		[ingredientType=IT_template, ingredients = [[name="craft_clothing_ingredients_n" "hardware", ingredient="object/tangible/component/clothing/metal_fasteners.iff", count=1]], complexity = 0, skillCommand = "unskilled"]],
 	optionalSkillCommand = "",
 	complexity = 0,
 	appearance = "" ],
 	[
 	optional = false,
-	name = "craft_clothing_ingredients_n" "reinforcement",
+	name = "craft_clothing_ingredients_n" "liner",
 	options = [
-		[ingredientType=IT_resourceClass, ingredients = [[name="craft_clothing_ingredients_n" "reinforcement", ingredient="space_metal_obsidian", count=35]], complexity = 0, skillCommand = "unskilled"]],
-	optionalSkillCommand = "",
-	complexity = 0,
-	appearance = "" ],
-	[
-	optional = false,
-	name = "craft_clothing_ingredients_n" "trim",
-	options = [
-		[ingredientType=IT_template, ingredients = [[name="craft_clothing_ingredients_n" "trim", ingredient="object/tangible/component/clothing/trim.iff", count=1]], complexity = 0, skillCommand = "unskilled"]],
+		[ingredientType=IT_template, ingredients = [[name="craft_clothing_ingredients_n" "liner", ingredient="object/tangible/component/clothing/synthetic_cloth.iff", count=1]], complexity = 0, skillCommand = "unskilled"]],
 	optionalSkillCommand = "",
 	complexity = 0,
 	appearance = "" ]]
@@ -61,5 +53,5 @@ manufactureScripts = [ "systems.crafting.clothing.skill.crafting_clothing_tailor
 @class object_template 8
 
 complexity = 21
-sharedTemplate = "object/draft_schematic/clothing/shared_clothing_jacket_ace_privateer.iff"
+sharedTemplate = "object/draft_schematic/clothing/shared_clothing_jacket_neut_ace.iff"
 volume = 1
diff --git a/sku.0/sys.server/compiled/game/object/draft_schematic/clothing/clothing_jacket_ace_rebel_craft.tpf b/sku.0/sys.server/compiled/game/object/draft_schematic/clothing/clothing_jacket_ace_rebel_craft.tpf
index b26c7eb49..5163d1ae8 100755
--- a/sku.0/sys.server/compiled/game/object/draft_schematic/clothing/clothing_jacket_ace_rebel_craft.tpf
+++ b/sku.0/sys.server/compiled/game/object/draft_schematic/clothing/clothing_jacket_ace_rebel_craft.tpf
@@ -13,10 +13,10 @@ itemsPerContainer = 0
 craftedObjectTemplate = "object/tangible/wearables/jacket/jacket_ace_rebel_craft.iff"
 slots = [
 	[
-	optional = false,
-	name = "craft_clothing_ingredients_n" "liner",
+	optional=false,
+	name = "craft_clothing_ingredients_n" "heavy_shell",
 	options = [
-		[ingredientType=IT_template, ingredients = [[name="craft_clothing_ingredients_n" "liner", ingredient="object/tangible/component/clothing/synthetic_cloth.iff", count=1]], complexity = 0, skillCommand = "unskilled"]],
+		[ingredientType=IT_template, ingredients = [[name="craft_clothing_ingredients_n" "heavy_shell", ingredient="object/tangible/component/clothing/synthetic_cloth.iff", count=1]], complexity = 0, skillCommand = "unskilled"]],
 	optionalSkillCommand = "",
 	complexity = 0,
 	appearance = "" ],
@@ -29,26 +29,18 @@ slots = [
 	complexity = 0,
 	appearance = "" ],
 	[
-	optional = false,
-	name = "craft_clothing_ingredients_n" "leather",
+	optional=false,
+	name = "craft_clothing_ingredients_n" "hardware",
 	options = [
-		[ingredientType=IT_template, ingredients = [[name="craft_clothing_ingredients_n" "leather", ingredient="object/tangible/component/clothing/leather_heavy_duty.iff", count=1]], complexity = 0, skillCommand = "unskilled"]],
+		[ingredientType=IT_template, ingredients = [[name="craft_clothing_ingredients_n" "hardware", ingredient="object/tangible/component/clothing/metal_fasteners.iff", count=1]], complexity = 0, skillCommand = "unskilled"]],
 	optionalSkillCommand = "",
 	complexity = 0,
 	appearance = "" ],
 	[
 	optional = false,
-	name = "craft_clothing_ingredients_n" "reinforcement",
+	name = "craft_clothing_ingredients_n" "liner",
 	options = [
-		[ingredientType=IT_resourceClass, ingredients = [[name="craft_clothing_ingredients_n" "reinforcement", ingredient="space_metal_obsidian", count=35]], complexity = 0, skillCommand = "unskilled"]],
-	optionalSkillCommand = "",
-	complexity = 0,
-	appearance = "" ],
-	[
-	optional = false,
-	name = "craft_clothing_ingredients_n" "trim",
-	options = [
-		[ingredientType=IT_template, ingredients = [[name="craft_clothing_ingredients_n" "trim", ingredient="object/tangible/component/clothing/trim.iff", count=1]], complexity = 0, skillCommand = "unskilled"]],
+		[ingredientType=IT_template, ingredients = [[name="craft_clothing_ingredients_n" "liner", ingredient="object/tangible/component/clothing/synthetic_cloth.iff", count=1]], complexity = 0, skillCommand = "unskilled"]],
 	optionalSkillCommand = "",
 	complexity = 0,
 	appearance = "" ]]
@@ -61,5 +53,5 @@ manufactureScripts = [ "systems.crafting.clothing.skill.crafting_clothing_tailor
 @class object_template 8
 
 complexity = 16
-sharedTemplate = "object/draft_schematic/clothing/shared_clothing_jacket_ace_rebel.iff"
+sharedTemplate = "object/draft_schematic/clothing/shared_clothing_jacket_reb_ace.iff"
 volume = 1
diff --git a/sku.0/sys.shared/compiled/game/object/draft_schematic/clothing/shared_clothing_jacket_ace_imperial.tpf b/sku.0/sys.shared/compiled/game/object/draft_schematic/clothing/shared_clothing_jacket_imp_ace.tpf
similarity index 84%
rename from sku.0/sys.shared/compiled/game/object/draft_schematic/clothing/shared_clothing_jacket_ace_imperial.tpf
rename to sku.0/sys.shared/compiled/game/object/draft_schematic/clothing/shared_clothing_jacket_imp_ace.tpf
index f93f99d56..85046a14e 100755
--- a/sku.0/sys.shared/compiled/game/object/draft_schematic/clothing/shared_clothing_jacket_ace_imperial.tpf
+++ b/sku.0/sys.shared/compiled/game/object/draft_schematic/clothing/shared_clothing_jacket_imp_ace.tpf
@@ -1,6 +1,6 @@
 // ======================================================================
 //
-// shared_clothing_jacket_ace_imperial_craft.tpf
+// shared_clothing_jacket_imp_ace.tpf
 // generated with SwgDraftSchematicEditor -- DO NOT EDIT THIS FILE!
 //
 // ======================================================================
@@ -27,17 +27,16 @@ attributes = [
 	[name = "crafting" "mod_val_six", experiment = "" "", value = 0..0]]
 
 slots = [
-	[name = "craft_clothing_ingredients_n" "liner", hardpoint = ""],
+	[name = "craft_clothing_ingredients_n" "heavy_shell", hardpoint = ""],
 	[name = "craft_clothing_ingredients_n" "binding_and_weatherproofing", hardpoint = ""],
-	[name = "craft_clothing_ingredients_n" "leather", hardpoint = ""],
-	[name = "craft_clothing_ingredients_n" "reinforcement", hardpoint = ""],
-	[name = "craft_clothing_ingredients_n" "trim", hardpoint = ""]]
+	[name = "craft_clothing_ingredients_n" "hardware", hardpoint = ""],
+	[name = "craft_clothing_ingredients_n" "liner", hardpoint = ""]]
 
-craftedSharedTemplate="object/tangible/wearables/jacket/shared_jacket_ace_imperial.iff"
+craftedSharedTemplate="object/tangible/wearables/jacket/shared_jacket_ace_imperial_craft.iff"
 
 @class intangible_object_template 0
 
-@class object_template 8
+@class object_template 10
 
 snapToTerrain = false
 containerType = CT_none
diff --git a/sku.0/sys.shared/compiled/game/object/draft_schematic/clothing/shared_clothing_jacket_ace_privateer.tpf b/sku.0/sys.shared/compiled/game/object/draft_schematic/clothing/shared_clothing_jacket_neut_ace.tpf
similarity index 85%
rename from sku.0/sys.shared/compiled/game/object/draft_schematic/clothing/shared_clothing_jacket_ace_privateer.tpf
rename to sku.0/sys.shared/compiled/game/object/draft_schematic/clothing/shared_clothing_jacket_neut_ace.tpf
index 4a603c5a4..a30b2c173 100755
--- a/sku.0/sys.shared/compiled/game/object/draft_schematic/clothing/shared_clothing_jacket_ace_privateer.tpf
+++ b/sku.0/sys.shared/compiled/game/object/draft_schematic/clothing/shared_clothing_jacket_neut_ace.tpf
@@ -1,6 +1,6 @@
 // ======================================================================
 //
-// shared_clothing_jacket_ace_privateer_craft.tpf
+// shared_clothing_jacket_neut_ace.tpf
 // generated with SwgDraftSchematicEditor -- DO NOT EDIT THIS FILE!
 //
 // ======================================================================
@@ -27,17 +27,16 @@ attributes = [
     [name = "crafting" "mod_val_six", experiment = "" "", value = 0..0]]
 
 slots = [
-	[name = "craft_clothing_ingredients_n" "liner", hardpoint = ""],
+	[name = "craft_clothing_ingredients_n" "heavy_shell", hardpoint = ""],
 	[name = "craft_clothing_ingredients_n" "binding_and_weatherproofing", hardpoint = ""],
-	[name = "craft_clothing_ingredients_n" "leather", hardpoint = ""],
-	[name = "craft_clothing_ingredients_n" "reinforcement", hardpoint = ""],
-	[name = "craft_clothing_ingredients_n" "trim", hardpoint = ""]]
+	[name = "craft_clothing_ingredients_n" "hardware", hardpoint = ""],
+	[name = "craft_clothing_ingredients_n" "liner", hardpoint = ""]]
 
 craftedSharedTemplate="object/tangible/wearables/jacket/shared_jacket_ace_privateer_craft.iff"
 
 @class intangible_object_template 0
 
-@class object_template 8
+@class object_template 10
 
 snapToTerrain = false
 containerType = CT_none
diff --git a/sku.0/sys.shared/compiled/game/object/draft_schematic/clothing/shared_clothing_jacket_ace_rebel.tpf b/sku.0/sys.shared/compiled/game/object/draft_schematic/clothing/shared_clothing_jacket_reb_ace.tpf
similarity index 91%
rename from sku.0/sys.shared/compiled/game/object/draft_schematic/clothing/shared_clothing_jacket_ace_rebel.tpf
rename to sku.0/sys.shared/compiled/game/object/draft_schematic/clothing/shared_clothing_jacket_reb_ace.tpf
index af13dabd2..da64ff012 100755
--- a/sku.0/sys.shared/compiled/game/object/draft_schematic/clothing/shared_clothing_jacket_ace_rebel.tpf
+++ b/sku.0/sys.shared/compiled/game/object/draft_schematic/clothing/shared_clothing_jacket_reb_ace.tpf
@@ -1,6 +1,6 @@
 // ======================================================================
 //
-// shared_clothing_jacket_ace_rebel_craft.tpf
+// shared_clothing_jacket_reb_ace.tpf
 // generated with SwgDraftSchematicEditor -- DO NOT EDIT THIS FILE!
 //
 // ======================================================================
@@ -30,14 +30,13 @@ slots = [
 	[name = "craft_clothing_ingredients_n" "heavy_shell", hardpoint = ""],
 	[name = "craft_clothing_ingredients_n" "binding_and_weatherproofing", hardpoint = ""],
 	[name = "craft_clothing_ingredients_n" "hardware", hardpoint = ""],
-	[name = "craft_clothing_ingredients_n" "liner", hardpoint = ""],
-	[name = "craft_clothing_ingredients_n" "trim", hardpoint = ""]]
+	[name = "craft_clothing_ingredients_n" "liner", hardpoint = ""]]
 
 craftedSharedTemplate="object/tangible/wearables/jacket/shared_jacket_ace_rebel_craft.iff"
 
 @class intangible_object_template 0
 
-@class object_template 8
+@class object_template 10
 
 snapToTerrain = false
 containerType = CT_none