diff --git a/1.5/Defs/CharacterDefs/FCP_NCR_CharacterDefs.xml b/1.5/Defs/CharacterDefs/FCP_NCR_CharacterDefs.xml
index e60c5a3..ec05430 100644
--- a/1.5/Defs/CharacterDefs/FCP_NCR_CharacterDefs.xml
+++ b/1.5/Defs/CharacterDefs/FCP_NCR_CharacterDefs.xml
@@ -9,7 +9,7 @@
 
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Kimball</defName>
-        <pawnKind>FCP_NCR_President_Kimball</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_President_Kimball</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <roles>
@@ -42,7 +42,7 @@
 
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Crocker</defName>
-        <pawnKind>FCP_NCR_Ambassador_Crocker</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Ambassador_Crocker</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <roles>
@@ -78,7 +78,7 @@
 
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Oliver</defName>
-        <pawnKind>FCP_NCR_General_Oliver</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_General_Oliver</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -106,7 +106,7 @@
 
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Hsu</defName>
-        <pawnKind>FCP_NCR_Colonel_Hsu</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Colonel_Hsu</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -134,7 +134,7 @@
 
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Moore</defName>
-        <pawnKind>FCP_NCR_Colonel_Moore</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Colonel_Moore</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -162,7 +162,7 @@
 
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Dhatri</defName>
-        <pawnKind>FCP_NCR_Major_Dhatri</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Major_Dhatri</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -190,7 +190,7 @@
 
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Knight</defName>
-        <pawnKind>FCP_NCR_Major_Knight</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Major_Knight</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -218,7 +218,7 @@
 
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Polatli</defName>
-        <pawnKind>FCP_NCR_Major_Polatli</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Major_Polatli</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -246,7 +246,7 @@
     
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Kieran</defName>
-        <pawnKind>FCP_NCR_Major_Kieran</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Major_Kieran</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -274,7 +274,7 @@
     
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Parker</defName>
-        <pawnKind>FCP_NCR_Captain_Parker</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Captain_Parker</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -302,7 +302,7 @@
     
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Gilles</defName>
-        <pawnKind>FCP_NCR_Captain_Gilles</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Captain_Gilles</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -334,7 +334,7 @@
     
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Hayes</defName>
-        <pawnKind>FCP_NCR_Lieutenant_Hayes</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Lieutenant_Hayes</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -364,7 +364,7 @@
     
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Gorobets</defName>
-        <pawnKind>FCP_NCR_Lieutenant_Gorobets</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Lieutenant_Gorobets</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -394,7 +394,7 @@
     
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Boyd</defName>
-        <pawnKind>FCP_NCR_Lieutenant_Boyd</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Lieutenant_Boyd</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -428,7 +428,7 @@
     
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Bitter_Root</defName>
-        <pawnKind>FCP_NCR_Sergeant_Bitter_Root</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Sergeant_Bitter_Root</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -456,7 +456,7 @@
     
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Betsy</defName>
-        <pawnKind>FCP_NCR_Corporal_Betsy</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Corporal_Betsy</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -484,7 +484,7 @@
     
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Sterling</defName>
-        <pawnKind>FCP_NCR_Corporal_Sterling</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Corporal_Sterling</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -512,7 +512,7 @@
     
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_10_of_Spades</defName>
-        <pawnKind>FCP_NCR_Private_10_of_Spades</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Private_10_of_Spades</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -544,7 +544,7 @@
     
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Mags</defName>
-        <pawnKind>FCP_NCR_Corporal_Mags</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Corporal_Mags</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -572,7 +572,7 @@
     
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_O_Hanahan</defName>
-        <pawnKind>FCP_NCR_Private_O_Hanahan</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Private_O_Hanahan</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -600,7 +600,7 @@
     
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Poindexter</defName>
-        <pawnKind>FCP_NCR_Private_Poindexter</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Private_Poindexter</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -628,7 +628,7 @@
     
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Razz</defName>
-        <pawnKind>FCP_NCR_Private_Razz</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Private_Razz</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -658,7 +658,7 @@
     
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Halford</defName>
-        <pawnKind>FCP_NCR_Private_Halford</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Private_Halford</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -686,7 +686,7 @@
     
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Seamer</defName>
-        <pawnKind>FCP_NCR_Private_Seamer</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Private_Seamer</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -714,7 +714,7 @@
     
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Hornsby</defName>
-        <pawnKind>FCP_NCR_Corporal_Hornsby</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Corporal_Hornsby</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -746,7 +746,7 @@
 
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Hanlon</defName>
-        <pawnKind>FCP_NCR_Chief_Hanlon</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Chief_Hanlon</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -776,7 +776,7 @@
 
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Castillo</defName>
-        <pawnKind>FCP_NCR_Ranger_Castillo</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Ranger_Castillo</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -804,7 +804,7 @@
 
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Ghost</defName>
-        <pawnKind>FCP_NCR_Ranger_Ghost</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Ranger_Ghost</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -832,7 +832,7 @@
 
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Green</defName>
-        <pawnKind>FCP_NCR_Ranger_Green</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Ranger_Green</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -860,7 +860,7 @@
 
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_A_Jackson</defName>
-        <pawnKind>FCP_NCR_Ranger_A_Jackson</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Ranger_A_Jackson</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -888,7 +888,7 @@
 
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Lenk</defName>
-        <pawnKind>FCP_NCR_Ranger_Lenk</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Ranger_Lenk</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -916,7 +916,7 @@
 
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Scheffer</defName>
-        <pawnKind>FCP_NCR_Ranger_Scheffer</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Ranger_Scheffer</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -944,7 +944,7 @@
 
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Stepinac</defName>
-        <pawnKind>FCP_NCR_Ranger_Stepinac</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Ranger_Stepinac</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -972,7 +972,7 @@
 
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Tilden</defName>
-        <pawnKind>FCP_NCR_Ranger_Tilden</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Ranger_Tilden</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
@@ -1002,7 +1002,7 @@
 
     <FCP.Core.CharacterDef>
         <defName>FCP_Character_NCR_Anders</defName>
-        <pawnKind>FCP_NCR_Patrol_Ranger_Anders</pawnKind>
+        <pawnKind>FCP_Pawnkind_NCR_Patrol_Ranger_Anders</pawnKind>
         <faction>FCP_Faction_NCR</faction>
         <xenotype>Baseliner</xenotype>
         <definitions>
diff --git a/1.5/Defs/PawnKindDefs/PawnKinds.xml b/1.5/Defs/PawnKindDefs/PawnKinds.xml
index 7786a9f..0031b5e 100644
--- a/1.5/Defs/PawnKindDefs/PawnKinds.xml
+++ b/1.5/Defs/PawnKindDefs/PawnKinds.xml
@@ -3,8 +3,10 @@
 
     <!--__________ Pawnkinds __________-->
 
+
     <!--_____ NCR Pawnkinds _____-->
 
+
     <!--___ Characters ___-->
 
     <!-- Character Military Base -->
@@ -172,6 +174,16 @@
         </weaponTags>
         <initialWillRange>3~5</initialWillRange>
         <initialResistanceRange>18~30</initialResistanceRange>
+        <backstoryFiltersOverride>
+            <li>
+                <categoriesChildhood>
+                    <li>FCP_Backstory_NCR_Child</li>
+                </categoriesChildhood>
+                <categoriesAdulthood>
+                    <li>FCP_Backstory_NCR_Chief_Hanlon</li>
+                </categoriesAdulthood>
+            </li>
+        </backstoryFiltersOverride>
     </PawnKindDef>
 
     <!-- Major Dhatri -->
@@ -340,7 +352,7 @@
         <backstoryFiltersOverride>
             <li>
                 <categoriesChildhood>
-                    <li>FCP_NCR_Child</li>
+                    <li>FCP_Backstory_NCR_Child</li>
                 </categoriesChildhood>
                 <categoriesAdulthood>
                     <li>FCP_Backstory_NCR_Lieutenant_Gorobets</li>
@@ -888,6 +900,7 @@
         </backstoryFiltersOverride>
     </PawnKindDef>
 
+
     <!--___ Civilians ___-->
 
     <!-- Engineer -->
@@ -1033,8 +1046,10 @@
         <pawnGroupDevelopmentStage>Adult</pawnGroupDevelopmentStage>
     </PawnKindDef>
 
+
     <!--___ Traders ___-->
 
+
     <!-- NCR Quartermaster -->
 
     <PawnKindDef ParentName="FCP_NCRkindBase">
@@ -1135,8 +1150,10 @@
         <pawnGroupDevelopmentStage>Adult</pawnGroupDevelopmentStage>
     </PawnKindDef>
 
+
     <!--___ Politicians ___-->
 
+
     <!-- Tax Collector -->
 
     <PawnKindDef ParentName="FCP_NCRkindBase">
@@ -1207,19 +1224,21 @@
         <backstoryFiltersOverride>
             <li>
                 <categoriesChildhood>
-                    <li>FCP_NCR_Child</li>
-                    <li>FCP_Wastelander_Child</li>
+                    <li>FCP_Backstory_NCR_Child</li>
+                    <li>FCP_Backstory_Wastelander_Child</li>
                 </categoriesChildhood>
                 <categoriesAdulthood>
-                    <li>FCP_NCR_Ambassador</li>
+                    <li>FCP_Backstory_NCR_Ambassador</li>
                 </categoriesAdulthood>
             </li>
         </backstoryFiltersOverride>
         <pawnGroupDevelopmentStage>Adult</pawnGroupDevelopmentStage>
     </PawnKindDef> -->
 
+
     <!--___ Military ___-->
 
+
     <!-- NCR Trooper -->
 
     <PawnKindDef ParentName="FCP_NCRkindBase">
@@ -1483,7 +1502,7 @@
 
     <PawnKindDef ParentName="FCP_NCRkindBase">
         <defName>FCP_Pawnkind_NCR_Ranger_Volunteer</defName>
-        <label>NCR Ranger</label>
+        <label>NCR ranger</label>
         <combatPower>75</combatPower>
         <gearHealthRange>0.5~1.8</gearHealthRange>
         <apparelTags>
@@ -1601,4 +1620,4 @@
         <pawnGroupDevelopmentStage>Adult</pawnGroupDevelopmentStage>
     </PawnKindDef>
 
-</Defs>
+</Defs>
\ No newline at end of file
diff --git a/1.5/Defs/QuestScriptDefs/FCP_Scripts_PawnRescueHumanlike.xml b/1.5/Defs/QuestScriptDefs/FCP_Scripts_PawnRescueHumanlike.xml
index 1650709..ee090c7 100644
--- a/1.5/Defs/QuestScriptDefs/FCP_Scripts_PawnRescueHumanlike.xml
+++ b/1.5/Defs/QuestScriptDefs/FCP_Scripts_PawnRescueHumanlike.xml
@@ -55,7 +55,7 @@
                 <li Class="FCP_RadiantQuests.QuestNode_GetPawnKind">
                     <!--Dont change storeAs its hardcoded in C#-->
                     <storeAs>prisonerPawnKind</storeAs>
-                    <pawnKindDef>FCP_NCR_Citizen</pawnKindDef>
+                    <pawnKindDef>FCP_Pawnkind_NCR_Citizen</pawnKindDef>
                 </li>
                 <li Class="QuestNode_GetRandomInRangeFloat">
                     <storeAs>chanceToJoinVal</storeAs>
@@ -204,7 +204,7 @@
                 <li Class="FCP_RadiantQuests.QuestNode_GetPawnKind">
                     <!--Dont change storeAs its hardcoded in C#-->
                     <storeAs>prisonerPawnKind</storeAs>
-                    <pawnKindDef>FCP_NCR_Trooper</pawnKindDef>
+                    <pawnKindDef>FCP_Pawnkind_NCR_Trooper</pawnKindDef>
                 </li>
                 <li Class="QuestNode_GetRandomInRangeFloat">
                     <storeAs>chanceToJoinVal</storeAs>
diff --git a/1.5/Defs/ScenarioDefs/StartingScenarios.xml b/1.5/Defs/ScenarioDefs/StartingScenarios.xml
index a38bad9..87cae2a 100644
--- a/1.5/Defs/ScenarioDefs/StartingScenarios.xml
+++ b/1.5/Defs/ScenarioDefs/StartingScenarios.xml
@@ -21,20 +21,20 @@
                 <li Class="ScenPart_ConfigPage_ConfigureStartingPawns_KindDefs">
                     <def>ConfigurePawnsKindDefs</def>
                     <pawnChoiceCount>8</pawnChoiceCount>
-                    <leftBehindPawnKind>FCP_NCR_Trooper</leftBehindPawnKind>
+                    <leftBehindPawnKind>FCP_Pawnkind_NCR_Trooper</leftBehindPawnKind>
                     <kindCounts>
                         <li>
-                            <kindDef>FCP_NCR_Officer</kindDef>
+                            <kindDef>FCP_Pawnkind_NCR_Officer</kindDef>
                             <count>1</count>
                             <requiredAtStart>true</requiredAtStart>
                         </li>
                         <li>
-                            <kindDef>FCP_NCR_Trooper</kindDef>
+                            <kindDef>FCP_Pawnkind_NCR_Trooper</kindDef>
                             <count>3</count>
                             <requiredAtStart>false</requiredAtStart>
                         </li>
                         <li>
-                            <kindDef>FCP_NCR_Scout_Recon</kindDef>
+                            <kindDef>FCP_Pawnkind_NCR_Scout_Recon</kindDef>
                             <count>1</count>
                             <requiredAtStart>false</requiredAtStart>
                         </li>
@@ -100,7 +100,7 @@
                 <li Class="ScenPart_GameStartDialog">
                     <def>GameStartDialog</def>
                     <text>The enemy relentless. They came in the night, silent with blades and spears. They cut through the outpost, slashing and killing troopers as if they were killing for fun.\n\nOnly you and your squad escaped, having been sent to gather reinfrocements.\n\nAfter wandering the wastes going in what appears to be circles you find your next spot to make camp. Do you rest for the night, or stay and create a new home for yourselves?</text>
-                    <closeSound>FCP_War_Never_Changes</closeSound>
+                    <closeSound>FCP_Sound_War_Never_Changes</closeSound>
                 </li>
 
             </parts>
diff --git a/1.5/Defs/TraderKindDefs/TraderKindDefs_NCR.xml b/1.5/Defs/TraderKindDefs/TraderKindDefs_NCR.xml
index cc6210d..6606001 100644
--- a/1.5/Defs/TraderKindDefs/TraderKindDefs_NCR.xml
+++ b/1.5/Defs/TraderKindDefs/TraderKindDefs_NCR.xml
@@ -53,7 +53,7 @@
                 <ignoreIdeoRequirements>true</ignoreIdeoRequirements>
                 <respectPopulationIntent>false</respectPopulationIntent>
                 <countRange>2~5</countRange>
-                <slaveKindDef>FCP_NCR_NCRCF_Inmate</slaveKindDef>
+                <slaveKindDef>FCP_Pawnkind_NCR_NCRCF_Inmate</slaveKindDef>
             </li>
 
             <!--__ Currency __-->