diff --git a/lords_of_ash/history/characters/00_mistborn_characters.txt b/lords_of_ash/history/characters/00_mistborn_characters.txt
index 61de77a..9422096 100644
--- a/lords_of_ash/history/characters/00_mistborn_characters.txt
+++ b/lords_of_ash/history/characters/00_mistborn_characters.txt
@@ -18,11 +18,11 @@
 	culture = "terris"
 	trait = trait_mistborn
 	trait = trait_feruchemist
-	trait = trait_allomantic_strength_strong
+	trait = trait_allomantic_strong
 	trait = callous
 	trait = ambitious
 	trait = paranoid
-	trait = education_learning_4
+	trait = education_keeper_4
 	trait = beauty_good_3
 	health = 10
 	diplomacy = 10
@@ -57,7 +57,7 @@
 	trait = callous
 	trait = ambitious
 	trait = paranoid
-	trait = education_stewardship_4
+	trait = education_noble_court_4
 
 	970.1.1 = {
 		birth = "970.1.1"
@@ -76,7 +76,7 @@
 	trait = just
 	trait = honest
 	trait = shy
-	trait = education_learning_4
+	trait = education_noble_court_4
 
 	1000.1.1 = {
 		birth = "1000.1.1"
@@ -95,7 +95,7 @@
 
 	trait = trait_misting_soother
 	trait = beauty_good_3
-	trait = education_diplomacy_3
+	trait = education_noble_court_3
 	trait = gregarious
 
 	1004.3.8 = {
@@ -114,7 +114,7 @@
 	trait = trait_misting_thug
 	trait = brave
 	trait = wrathful
-	trait = education_martial_3
+	trait = education_allomantic_3
 
 	972.9.20 = {
 		birth = "972.9.20"
@@ -132,7 +132,7 @@
 
 	trait = trait_misting_rioter
 	trait = diligent
-	trait = education_stewardship_2
+	trait = education_noble_court_2
 
 	975.11.3 = {
 		birth = "975.11.3"
@@ -157,7 +157,7 @@
 	trait = trait_misting_thug
 	trait = wrathful
 	trait = brave
-	trait = education_martial_4
+	trait = education_allomantic_4
 
 	975.2.12 = {
 		birth = "975.2.12"
@@ -175,7 +175,7 @@
 
 	trait = trait_misting_coinshot
 	trait = ambitious
-	trait = education_martial_3
+	trait = education_allomantic_3
 
 	998.8.22 = {
 		birth = "998.8.22"
@@ -194,7 +194,7 @@
 	trait = trait_misting_lurcher
 	trait = brave
 	trait = patient
-	trait = education_martial_3
+	trait = education_allomantic_3
 
 	1000.4.5 = {
 		birth = "1000.4.5"
@@ -211,7 +211,7 @@
 	father = 900010
 
 	trait = trait_allomantic_potential
-	trait = education_diplomacy_2
+	trait = education_noble_court_2
 	trait = brave
 
 	1003.7.14 = {
@@ -234,7 +234,7 @@
 	trait = trait_misting_smoker
 	trait = deceitful
 	trait = patient
-	trait = education_intrigue_4
+	trait = education_noble_court_4
 
 	973.6.18 = {
 		birth = "973.6.18"
@@ -256,7 +256,7 @@
 	trait = beauty_good_3
 	trait = deceitful
 	trait = callous
-	trait = education_intrigue_3
+	trait = education_noble_court_3
 
 	998.1.28 = {
 		birth = "998.1.28"
@@ -273,7 +273,7 @@
 
 	trait = trait_misting_seeker
 	trait = paranoid
-	trait = education_intrigue_3
+	trait = education_noble_court_3
 
 	990.11.7 = {
 		birth = "990.11.7"
@@ -291,7 +291,7 @@
 
 	trait = trait_misting_tineye
 	trait = shy
-	trait = education_learning_2
+	trait = education_noble_court_2
 
 	999.5.3 = {
 		birth = "999.5.3"
@@ -313,7 +313,7 @@
 	trait = trait_misting_soother
 	trait = greedy
 	trait = diligent
-	trait = education_stewardship_4
+	trait = education_noble_court_4
 
 	970.3.25 = {
 		birth = "970.3.25"
@@ -331,7 +331,7 @@
 
 	trait = trait_misting_rioter
 	trait = greedy
-	trait = education_stewardship_3
+	trait = education_noble_court_3
 
 	995.10.14 = {
 		birth = "995.10.14"
@@ -347,7 +347,7 @@
 	culture = "noble_scadrian"
 	father = 900030
 
-	trait = education_learning_4
+	trait = education_ministry_4
 	trait = temperate
 	trait = diligent
 
@@ -366,7 +366,7 @@
 	father = 900030
 
 	trait = trait_allomantic_potential
-	trait = education_stewardship_2
+	trait = education_noble_court_2
 	trait = diligent
 
 	1003.2.19 = {
@@ -389,7 +389,7 @@
 	trait = trait_misting_rioter
 	trait = gregarious
 	trait = honest
-	trait = education_diplomacy_4
+	trait = education_noble_court_4
 
 	977.8.4 = {
 		birth = "977.8.4"
@@ -407,7 +407,7 @@
 
 	trait = trait_misting_soother
 	trait = just
-	trait = education_diplomacy_3
+	trait = education_noble_court_3
 
 	1000.5.11 = {
 		birth = "1000.5.11"
@@ -425,7 +425,7 @@
 
 	trait = trait_misting_smoker
 	trait = patient
-	trait = education_intrigue_2
+	trait = education_noble_court_2
 
 	1002.9.23 = {
 		birth = "1002.9.23"
@@ -447,7 +447,7 @@
 	trait = trait_misting_coinshot
 	trait = ambitious
 	trait = arrogant
-	trait = education_martial_3
+	trait = education_allomantic_3
 
 	982.4.16 = {
 		birth = "982.4.16"
@@ -463,7 +463,7 @@
 	father = 900050
 
 	trait = trait_allomantic_potential
-	trait = education_diplomacy_2
+	trait = education_noble_court_2
 
 	1004.1.28 = {
 		birth = "1004.1.28"
@@ -485,7 +485,7 @@
 	trait = trait_misting_smoker
 	trait = content
 	trait = zealous
-	trait = education_stewardship_3
+	trait = education_noble_court_3
 
 	968.7.9 = {
 		birth = "968.7.9"
@@ -502,7 +502,7 @@
 
 	trait = trait_misting_tineye
 	trait = content
-	trait = education_learning_2
+	trait = education_noble_court_2
 
 	994.3.15 = {
 		birth = "994.3.15"
@@ -519,7 +519,7 @@
 	father = 900055
 
 	trait = trait_allomantic_potential
-	trait = education_diplomacy_2
+	trait = education_noble_court_2
 
 	997.10.2 = {
 		birth = "997.10.2"
@@ -541,7 +541,7 @@
 	trait = trait_misting_thug
 	trait = brave
 	trait = cynical
-	trait = education_martial_3
+	trait = education_allomantic_3
 
 	979.12.22 = {
 		birth = "979.12.22"
@@ -558,7 +558,7 @@
 
 	trait = trait_allomantic_potential
 	trait = brave
-	trait = education_martial_2
+	trait = education_allomantic_2
 
 	1002.8.17 = {
 		birth = "1002.8.17"
@@ -580,7 +580,7 @@
 	trait = trait_misting_seeker
 	trait = paranoid
 	trait = diligent
-	trait = education_stewardship_3
+	trait = education_noble_court_3
 
 	976.5.8 = {
 		birth = "976.5.8"
@@ -596,7 +596,7 @@
 	father = 900065
 
 	trait = trait_misting_coinshot
-	trait = education_martial_2
+	trait = education_allomantic_2
 
 	1001.11.14 = {
 		birth = "1001.11.14"
@@ -613,7 +613,7 @@
 	father = 900065
 
 	trait = trait_allomantic_potential
-	trait = education_diplomacy_2
+	trait = education_noble_court_2
 
 	1004.6.30 = {
 		birth = "1004.6.30"
@@ -635,7 +635,7 @@
 	trait = trait_misting_soother
 	trait = greedy
 	trait = ambitious
-	trait = education_stewardship_3
+	trait = education_noble_court_3
 
 	981.9.3 = {
 		birth = "981.9.3"
@@ -651,7 +651,7 @@
 	father = 900070
 
 	trait = trait_misting_rioter
-	trait = education_stewardship_2
+	trait = education_noble_court_2
 
 	1005.2.7 = {
 		birth = "1005.2.7"
@@ -673,7 +673,7 @@
 	trait = trait_feruchemist
 	trait = patient
 	trait = temperate
-	trait = education_learning_4
+	trait = education_keeper_4
 
 	978.4.12 = {
 		birth = "978.4.12"
@@ -692,7 +692,7 @@
 	trait = trait_feruchemy_potential
 	trait = diligent
 	trait = temperate
-	trait = education_learning_3
+	trait = education_keeper_3
 
 	985.7.19 = {
 		birth = "985.7.19"
@@ -710,7 +710,7 @@
 	trait = trait_feruchemist
 	trait = shy
 	trait = just
-	trait = education_learning_3
+	trait = education_keeper_3
 
 	988.1.5 = {
 		birth = "988.1.5"
@@ -731,7 +731,7 @@
 	trait = trait_misting_coinshot
 	trait = brave
 	trait = deceitful
-	trait = education_intrigue_3
+	trait = education_skaa_3
 
 	992.8.14 = {
 		birth = "992.8.14"
@@ -749,7 +749,7 @@
 	trait = trait_allomantic_potential
 	trait = brave
 	trait = ambitious
-	trait = education_martial_2
+	trait = education_skaa_2
 
 	997.3.26 = {
 		birth = "997.3.26"
@@ -804,7 +804,7 @@
 	trait = ambitious
 	trait = wrathful
 	trait = gregarious
-	trait = education_intrigue_4
+	trait = education_skaa_4
 
 	982.1.1 = {
 		birth = "982.1.1"
@@ -828,7 +828,7 @@
 	trait = paranoid
 	trait = shy
 	trait = brave
-	trait = education_intrigue_3
+	trait = education_skaa_3
 
 	1004.1.1 = {
 		birth = "1004.1.1"
@@ -846,7 +846,7 @@
 	trait = patient
 	trait = compassionate
 	trait = temperate
-	trait = education_learning_4
+	trait = education_keeper_4
 
 	985.1.1 = {
 		birth = "985.1.1"
@@ -864,7 +864,7 @@
 	trait = gregarious
 	trait = lazy
 	trait = deceitful
-	trait = education_diplomacy_4
+	trait = education_noble_court_4
 
 	980.1.1 = {
 		birth = "980.1.1"
@@ -882,7 +882,7 @@
 	trait = brave
 	trait = honest
 	trait = gregarious
-	trait = education_martial_3
+	trait = education_allomantic_3
 
 	985.1.1 = {
 		birth = "985.1.1"
@@ -900,7 +900,7 @@
 	trait = cynical
 	trait = diligent
 	trait = content
-	trait = education_stewardship_3
+	trait = education_skaa_3
 
 	965.1.1 = {
 		birth = "965.1.1"
@@ -917,7 +917,7 @@
 	trait = diligent
 	trait = just
 	trait = cynical
-	trait = education_stewardship_4
+	trait = education_skaa_4
 
 	980.1.1 = {
 		birth = "980.1.1"
@@ -936,7 +936,7 @@
 	trait = just
 	trait = ambitious
 	trait = patient
-	trait = education_intrigue_4
+	trait = education_skaa_4
 
 	978.1.1 = {
 		birth = "978.1.1"
@@ -953,7 +953,7 @@
 	trait = zealous
 	trait = craven
 	trait = ambitious
-	trait = education_martial_1
+	trait = education_skaa_1
 
 	975.1.1 = {
 		birth = "975.1.1"
@@ -971,7 +971,7 @@
 	trait = patient
 	trait = deceitful
 	trait = arrogant
-	trait = education_intrigue_4
+	trait = education_skaa_4
 
 	500.1.1 = {
 		birth = "500.1.1"
@@ -999,7 +999,7 @@
 	trait = zealous
 	trait = callous
 	trait = patient
-	trait = education_martial_4
+	trait = education_ministry_4
 
 	900.1.1 = {
 		birth = "900.1.1"
@@ -1026,7 +1026,7 @@
 	trait = disfigured
 	trait = brave
 	trait = callous
-	trait = education_martial_4
+	trait = education_ministry_4
 
 	910.1.1 = {
 		birth = "910.1.1"
@@ -1053,7 +1053,7 @@
 	trait = disfigured
 	trait = zealous
 	trait = brave
-	trait = education_martial_4
+	trait = education_ministry_4
 
 	950.1.1 = {
 		birth = "950.1.1"