diff --git a/binaries/data/mods/public/art/actors/props/special/common/germ_waypoint_flag.xml b/binaries/data/mods/public/art/actors/props/special/common/germ_waypoint_flag.xml
index 5e4e11ae66..2d5b0d3534 100644
--- a/binaries/data/mods/public/art/actors/props/special/common/germ_waypoint_flag.xml
+++ b/binaries/data/mods/public/art/actors/props/special/common/germ_waypoint_flag.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <float/>
   <group>
-    <variant file="others/waypoints/base.xml" frequency="1" name="German Waypoint Flag">
+    <variant file="others/waypoints/base.xml" frequency="1" name="Germanic Waypoint Flag">
       <textures>
         <texture file="props/banner_germans.png" name="baseTex"/>
         <texture file="default_norm.png" name="normTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/germans/boat_head.xml b/binaries/data/mods/public/art/actors/props/structures/germans/boat_head.xml
index 529f75b419..37127f2fd9 100644
--- a/binaries/data/mods/public/art/actors/props/structures/germans/boat_head.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/germans/boat_head.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <float/>
   <group>
-    <variant frequency="1" name="German Longboat">
+    <variant frequency="1" name="Germanic Longboat">
       <mesh>props/germ_boat_head.dae</mesh>
       <textures>
         <texture file="structural/germ_boat.png" name="baseTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/germans/boat_props.xml b/binaries/data/mods/public/art/actors/props/structures/germans/boat_props.xml
index b88b668a92..300353e7b7 100644
--- a/binaries/data/mods/public/art/actors/props/structures/germans/boat_props.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/germans/boat_props.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <float/>
   <group>
-    <variant frequency="1" name="German Longboat">
+    <variant frequency="1" name="Germanic Longboat">
       <mesh>props/germ_boat_props.dae</mesh>
       <textures>
         <texture file="structural/germ_boat.png" name="baseTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/germans/boat_sail.xml b/binaries/data/mods/public/art/actors/props/structures/germans/boat_sail.xml
index ec23bea979..5ba32d7e3e 100644
--- a/binaries/data/mods/public/art/actors/props/structures/germans/boat_sail.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/germans/boat_sail.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <float/>
   <group>
-    <variant name="German Karvi sail">
+    <variant name="Germanic Karvi sail">
       <mesh>props/germ_karvi_sail.dae</mesh>
       <animations>
         <animation file="other/germ_sail_idle.dae" name="idle" speed="50"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/germans/dock_boat.xml b/binaries/data/mods/public/art/actors/props/structures/germans/dock_boat.xml
index 3762738369..a8c5bee714 100644
--- a/binaries/data/mods/public/art/actors/props/structures/germans/dock_boat.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/germans/dock_boat.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <float/>
   <group>
-    <variant frequency="1" name="German fishing boat prop">
+    <variant frequency="1" name="Germanic fishing boat prop">
       <mesh>props/germ_dock_boat.dae</mesh>
       <textures>
         <texture file="structural/germ_fishing_boat.png" name="baseTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/germans/karvi_props.xml b/binaries/data/mods/public/art/actors/props/structures/germans/karvi_props.xml
index 7608e4e0c8..334a0fc17d 100644
--- a/binaries/data/mods/public/art/actors/props/structures/germans/karvi_props.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/germans/karvi_props.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <float/>
   <group>
-    <variant frequency="1" name="German Karvi">
+    <variant frequency="1" name="Germanic Karvi">
       <mesh>props/germ_karvi_props.dae</mesh>
       <textures>
         <texture file="structural/germ_snekkja.png" name="baseTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/germans/karvi_sail.xml b/binaries/data/mods/public/art/actors/props/structures/germans/karvi_sail.xml
index 18c129154a..e95d642ff7 100644
--- a/binaries/data/mods/public/art/actors/props/structures/germans/karvi_sail.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/germans/karvi_sail.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <float/>
   <group>
-    <variant frequency="1" name="German Karvi sail">
+    <variant frequency="1" name="Germanic Karvi sail">
       <mesh>props/germ_karvi_sail.dae</mesh>
       <animations>
         <animation file="other/germ_sail_idle.dae" name="idle" speed="50"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/germans/knarr_props.xml b/binaries/data/mods/public/art/actors/props/structures/germans/knarr_props.xml
index 4d16013125..f472a816ae 100644
--- a/binaries/data/mods/public/art/actors/props/structures/germans/knarr_props.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/germans/knarr_props.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <float/>
   <group>
-    <variant frequency="1" name="German Knarr Props">
+    <variant frequency="1" name="Germanic Knarr Props">
       <mesh>props/germ_knarr_props.dae</mesh>
       <textures>
         <texture file="structural/germ_snekkja.png" name="baseTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/germans/snekkja_head.xml b/binaries/data/mods/public/art/actors/props/structures/germans/snekkja_head.xml
index e9239f6def..97cf132fc3 100644
--- a/binaries/data/mods/public/art/actors/props/structures/germans/snekkja_head.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/germans/snekkja_head.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <float/>
   <group>
-    <variant frequency="1" name="German Longboat">
+    <variant frequency="1" name="Germanic Longboat">
       <mesh>props/germ_snekkja_head.dae</mesh>
       <textures>
         <texture file="structural/germ_snekkja.png" name="baseTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/germans/snekkja_props.xml b/binaries/data/mods/public/art/actors/props/structures/germans/snekkja_props.xml
index 55bd40f9c4..b8a15610ed 100644
--- a/binaries/data/mods/public/art/actors/props/structures/germans/snekkja_props.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/germans/snekkja_props.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <float/>
   <group>
-    <variant frequency="1" name="German Longboat">
+    <variant frequency="1" name="Germanic Longboat">
       <mesh>props/germ_snekkja_props.dae</mesh>
       <textures>
         <texture file="structural/germ_snekkja.png" name="baseTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/germans/snekkja_sail.xml b/binaries/data/mods/public/art/actors/props/structures/germans/snekkja_sail.xml
index 9b8ebd455e..e76f2fe39d 100644
--- a/binaries/data/mods/public/art/actors/props/structures/germans/snekkja_sail.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/germans/snekkja_sail.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <float/>
   <group>
-    <variant name="German Snekkja Sail">
+    <variant name="Germanic Snekkja Sail">
       <mesh>props/germ_snekkja_sail.dae</mesh>
       <animations>
         <animation file="other/germ_sail_idle.dae" name="idle" speed="50"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/germans/wagon_unyoked.xml b/binaries/data/mods/public/art/actors/props/structures/germans/wagon_unyoked.xml
index 689fee437f..577f5b3fb1 100644
--- a/binaries/data/mods/public/art/actors/props/structures/germans/wagon_unyoked.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/germans/wagon_unyoked.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant name="German wagon_unyoked">
+    <variant name="Germanic wagon_unyoked">
       <mesh>props/germ_wagon_cc.dae</mesh>
       <textures>
         <texture file="structural/germ_struct.png" name="baseTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/germans/wagon_unyoked_a.xml b/binaries/data/mods/public/art/actors/props/structures/germans/wagon_unyoked_a.xml
index 0bd065aebd..7c474393cf 100644
--- a/binaries/data/mods/public/art/actors/props/structures/germans/wagon_unyoked_a.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/germans/wagon_unyoked_a.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant name="German wagon_unyoked">
+    <variant name="Germanic wagon_unyoked">
       <mesh>props/germ_wagon_cc.dae</mesh>
       <textures>
         <texture file="structural/germ_struct.png" name="baseTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/germans/wagon_unyoked_b.xml b/binaries/data/mods/public/art/actors/props/structures/germans/wagon_unyoked_b.xml
index 23594fdae9..56d1488e3f 100644
--- a/binaries/data/mods/public/art/actors/props/structures/germans/wagon_unyoked_b.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/germans/wagon_unyoked_b.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant name="German wagon_unyoked">
+    <variant name="Germanic wagon_unyoked">
       <mesh>props/germ_wagon_cc.dae</mesh>
       <textures>
         <texture file="structural/germ_struct.png" name="baseTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/germans/wagon_unyoked_c.xml b/binaries/data/mods/public/art/actors/props/structures/germans/wagon_unyoked_c.xml
index a0413dcb83..ccbad6fb91 100644
--- a/binaries/data/mods/public/art/actors/props/structures/germans/wagon_unyoked_c.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/germans/wagon_unyoked_c.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant name="German wagon_unyoked">
+    <variant name="Germanic wagon_unyoked">
       <mesh>props/germ_wagon_cc.dae</mesh>
       <textures>
         <texture file="structural/germ_struct.png" name="baseTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/germans/wagon_unyoked_d.xml b/binaries/data/mods/public/art/actors/props/structures/germans/wagon_unyoked_d.xml
index 262a2051c7..11952fee68 100644
--- a/binaries/data/mods/public/art/actors/props/structures/germans/wagon_unyoked_d.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/germans/wagon_unyoked_d.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant name="German wagon_unyoked">
+    <variant name="Germanic wagon_unyoked">
       <mesh>props/germ_wagon_cc.dae</mesh>
       <textures>
         <texture file="structural/germ_struct.png" name="baseTex"/>
diff --git a/binaries/data/mods/public/art/actors/props/structures/germans/wagon_unyoked_e.xml b/binaries/data/mods/public/art/actors/props/structures/germans/wagon_unyoked_e.xml
index feb1b1c3f7..5dc0144c4f 100644
--- a/binaries/data/mods/public/art/actors/props/structures/germans/wagon_unyoked_e.xml
+++ b/binaries/data/mods/public/art/actors/props/structures/germans/wagon_unyoked_e.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant name="German wagon_unyoked">
+    <variant name="Germanic wagon_unyoked">
       <mesh>props/germ_wagon_cc.dae</mesh>
       <textures>
         <texture file="structural/germ_struct.png" name="baseTex"/>
diff --git a/binaries/data/mods/public/art/actors/structures/germans/blacksmith.xml b/binaries/data/mods/public/art/actors/structures/germans/blacksmith.xml
index ec50c332f9..23be960fa8 100644
--- a/binaries/data/mods/public/art/actors/structures/germans/blacksmith.xml
+++ b/binaries/data/mods/public/art/actors/structures/germans/blacksmith.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant name="German Blacksmith">
+    <variant name="Germanic Blacksmith">
       <mesh>structural/germans/blacksmith.dae</mesh>
       <props>
         <prop actor="props/structures/decals/dirt_4x4.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/germans/civic_centre.xml b/binaries/data/mods/public/art/actors/structures/germans/civic_centre.xml
index 527f106a38..2bfdd0c168 100644
--- a/binaries/data/mods/public/art/actors/structures/germans/civic_centre.xml
+++ b/binaries/data/mods/public/art/actors/structures/germans/civic_centre.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="German Civic Center" file="structures/defensive_building.xml">
+    <variant frequency="1" name="Germanic Civic Center" file="structures/defensive_building.xml">
       <mesh>structural/germans/cc.dae</mesh>
       <props>
         <prop actor="props/structures/decals/spart_5x5.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/germans/fishing_boat.xml b/binaries/data/mods/public/art/actors/structures/germans/fishing_boat.xml
index 189235ce14..27206ba287 100644
--- a/binaries/data/mods/public/art/actors/structures/germans/fishing_boat.xml
+++ b/binaries/data/mods/public/art/actors/structures/germans/fishing_boat.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <float/>
   <group>
-    <variant frequency="100" name="German fishing boat">
+    <variant frequency="100" name="Germanic fishing boat">
       <mesh>structural/germans/fishing_boat.dae</mesh>
       <props>
         <prop actor="units/germans/fisherman.xml" attachpoint="fisherman"/>
diff --git a/binaries/data/mods/public/art/actors/structures/germans/house.xml b/binaries/data/mods/public/art/actors/structures/germans/house.xml
index 4963e990c1..8f44634171 100644
--- a/binaries/data/mods/public/art/actors/structures/germans/house.xml
+++ b/binaries/data/mods/public/art/actors/structures/germans/house.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="German House A">
+    <variant frequency="1" name="Germanic House A">
       <mesh>structural/germans/house_a.dae</mesh>
       <textures>
         <texture file="structural/germ_struct_03.png" name="baseTex"/>
@@ -38,7 +38,7 @@
         <prop actor="props/special/eyecandy/sack_1.xml" attachpoint="sack_2"/>
       </props>
     </variant>
-    <variant frequency="1" name="German House A 2">
+    <variant frequency="1" name="Germanic House A 2">
       <mesh>structural/germans/house_a_2.dae</mesh>
       <textures>
         <texture file="structural/germ_struct.png" name="baseTex"/>
@@ -74,7 +74,7 @@
         <prop actor="props/special/eyecandy/sack_1.xml" attachpoint="sack_2"/>
       </props>
     </variant>
-    <variant frequency="1" name="German House B">
+    <variant frequency="1" name="Germanic House B">
       <mesh>structural/germans/house_b.dae</mesh>
       <textures>
         <texture file="structural/germ_struct_03.png" name="baseTex"/>
@@ -105,7 +105,7 @@
         <prop actor="particle/smoke_blacksmith.xml" attachpoint="smoke"/>
       </props>
     </variant>
-    <variant frequency="1" name="German House C">
+    <variant frequency="1" name="Germanic House C">
       <mesh>structural/germans/house_c.dae</mesh>
       <textures>
         <texture file="structural/germ_struct_03.png" name="baseTex"/>
diff --git a/binaries/data/mods/public/art/actors/structures/germans/sentry_tower.xml b/binaries/data/mods/public/art/actors/structures/germans/sentry_tower.xml
index 902550dd65..3da9d3bdb7 100644
--- a/binaries/data/mods/public/art/actors/structures/germans/sentry_tower.xml
+++ b/binaries/data/mods/public/art/actors/structures/germans/sentry_tower.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant frequency="1" name="German Sentry Tower" file="structures/defensive_building.xml">
+    <variant frequency="1" name="Germanic Sentry Tower" file="structures/defensive_building.xml">
       <mesh>structural/germans/wood_tower.dae</mesh>
       <props>
         <prop actor="props/structures/decals/dirt_1x1.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/germans/ship_arrow.xml b/binaries/data/mods/public/art/actors/structures/germans/ship_arrow.xml
index 06f58b587a..52c72ad032 100644
--- a/binaries/data/mods/public/art/actors/structures/germans/ship_arrow.xml
+++ b/binaries/data/mods/public/art/actors/structures/germans/ship_arrow.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <float/>
   <group>
-     <variant frequency="1" name="German Longboat">
+     <variant frequency="1" name="Germanic Longboat">
       <mesh>structural/germans/ship_arrow.dae</mesh>
       <props>
         <prop actor="props/structures/germans/boat_props.xml" attachpoint="mast"/>
diff --git a/binaries/data/mods/public/art/actors/structures/germans/ship_karvi.xml b/binaries/data/mods/public/art/actors/structures/germans/ship_karvi.xml
index 29cce12a91..7b9ae0fdda 100644
--- a/binaries/data/mods/public/art/actors/structures/germans/ship_karvi.xml
+++ b/binaries/data/mods/public/art/actors/structures/germans/ship_karvi.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <float/>
   <group>
-     <variant frequency="1" name="German Longboat">
+     <variant frequency="1" name="Germanic Longboat">
       <mesh>structural/germans/ship_karvi.dae</mesh>
       <props>
         <prop actor="props/units/weapons/bolt_tower.xml" attachpoint="projectile"/>
diff --git a/binaries/data/mods/public/art/actors/structures/germans/ship_knarr.xml b/binaries/data/mods/public/art/actors/structures/germans/ship_knarr.xml
index dd32bb949f..0451a639b8 100644
--- a/binaries/data/mods/public/art/actors/structures/germans/ship_knarr.xml
+++ b/binaries/data/mods/public/art/actors/structures/germans/ship_knarr.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <float/>
   <group>
-     <variant frequency="1" name="German Merchant Ship">
+     <variant frequency="1" name="Germanic Merchant Ship">
       <mesh>structural/germans/ship_knarr.dae</mesh>
       <props>
         <prop actor="props/structures/germans/knarr_props.xml" attachpoint="root"/>
diff --git a/binaries/data/mods/public/art/actors/structures/germans/ship_scout.xml b/binaries/data/mods/public/art/actors/structures/germans/ship_scout.xml
index fdbbce74d0..dd395dc0bb 100644
--- a/binaries/data/mods/public/art/actors/structures/germans/ship_scout.xml
+++ b/binaries/data/mods/public/art/actors/structures/germans/ship_scout.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <float/>
   <group>
-     <variant frequency="1" name="German Longboat">
+     <variant frequency="1" name="Germanic Longboat">
       <mesh>structural/germans/ship_scout.dae</mesh>
       <props>
         <prop actor="props/units/weapons/bolt_tower.xml" attachpoint="projectile"/>
diff --git a/binaries/data/mods/public/art/actors/structures/germans/ship_snekkja.xml b/binaries/data/mods/public/art/actors/structures/germans/ship_snekkja.xml
index 86312564cc..051d46b9f8 100644
--- a/binaries/data/mods/public/art/actors/structures/germans/ship_snekkja.xml
+++ b/binaries/data/mods/public/art/actors/structures/germans/ship_snekkja.xml
@@ -3,7 +3,7 @@
   <castshadow/>
   <float/>
   <group>
-     <variant frequency="1" name="German Longboat">
+     <variant frequency="1" name="Germanic Longboat">
       <mesh>structural/germans/ship_snekkja.dae</mesh>
       <props>
         <prop actor="props/units/weapons/bolt_tower.xml" attachpoint="projectile"/>
diff --git a/binaries/data/mods/public/art/actors/structures/germans/wooden_wall_tower.xml b/binaries/data/mods/public/art/actors/structures/germans/wooden_wall_tower.xml
index b6e3988f5c..aa15ecba80 100644
--- a/binaries/data/mods/public/art/actors/structures/germans/wooden_wall_tower.xml
+++ b/binaries/data/mods/public/art/actors/structures/germans/wooden_wall_tower.xml
@@ -2,7 +2,7 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant name="German Wall Tower" file="structures/defensive_building.xml">
+    <variant name="Germanic Wall Tower" file="structures/defensive_building.xml">
       <mesh>structural/germans/wooden_wall_tower.dae</mesh>
       <textures>
         <texture file="structural/germ_struct_03.png" name="baseTex"/>
diff --git a/binaries/data/mods/public/simulation/data/civs/germ.json b/binaries/data/mods/public/simulation/data/civs/germ.json
index e396a3f7fd..6242cc0ea9 100644
--- a/binaries/data/mods/public/simulation/data/civs/germ.json
+++ b/binaries/data/mods/public/simulation/data/civs/germ.json
@@ -27,7 +27,7 @@
 	"CivBonuses": [
 		{
 			"Name": "Seeresses",
-			"History": "Seeresses accompanied the German armies and envisioned prophecies of victory from sacrifices.",
+			"History": "Seeresses accompanied the Germanic armies and envisioned prophecies of victory from sacrifices.",
 			"Description": "Germans can access a Champion Healer unit in City Phase."
 		}
 	],
diff --git a/binaries/data/mods/public/simulation/data/technologies/civbonuses/germ_meat.json b/binaries/data/mods/public/simulation/data/technologies/civbonuses/germ_meat.json
index 376cf2244e..ceaa43c922 100644
--- a/binaries/data/mods/public/simulation/data/technologies/civbonuses/germ_meat.json
+++ b/binaries/data/mods/public/simulation/data/technologies/civbonuses/germ_meat.json
@@ -1,7 +1,7 @@
 {
 	"genericName": "Bovine Tradition",
 	"autoResearch": true,
-	"description": "German convoys brought livestock, in particular cattle, and placed great importance on these animals for religious sacrifices.",
+	"description": "Germanic convoys brought livestock, in particular cattle, and placed great importance on these animals for religious sacrifices.",
 	"requirements": { "civ": "germ" },
 	"icon": "meat.png",
 	"tooltip": "Civilians +100% meat gather rate.",
diff --git a/binaries/data/mods/public/simulation/data/technologies/wagon_trains.json b/binaries/data/mods/public/simulation/data/technologies/wagon_trains.json
index 5052589fe5..b47d939a7f 100644
--- a/binaries/data/mods/public/simulation/data/technologies/wagon_trains.json
+++ b/binaries/data/mods/public/simulation/data/technologies/wagon_trains.json
@@ -1,6 +1,6 @@
 {
 	"genericName": "Wagon Trains",
-	"description": "Long trains of wagons accompanied the Cimbri and German peoples to provide shelter and transport goods",
+	"description": "Long trains of wagons accompanied the Cimbri and Germanic peoples to provide shelter and transport goods",
 	"cost": {
 		"wood": 400,
 		"metal": 100
@@ -14,7 +14,7 @@
 	"requirementsTooltip": "Unlocked in Town Phase.",
 	"icon": "population.png",
 	"researchTime": 40,
-	"tooltip": "Supply Wagons +5 population space and Wagon Encampments +10 population space. Training German Women unlocked from the Supply Wagon as well.",
+	"tooltip": "Supply Wagons +5 population space and Wagon Encampments +10 population space. Training Germanic Women unlocked from the Supply Wagon as well.",
 	"modifications": [
 		{ "value": "Promotion/RequiredXp", "replace": 0, "affects": "Wagon" },
 		{ "value": "Population/Bonus", "add": 10, "affects": "Colony" }
diff --git a/binaries/data/mods/public/simulation/templates/units/germ/cavalry_javelineer_b.xml b/binaries/data/mods/public/simulation/templates/units/germ/cavalry_javelineer_b.xml
index 77dec2dfd8..76c898975d 100644
--- a/binaries/data/mods/public/simulation/templates/units/germ/cavalry_javelineer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/germ/cavalry_javelineer_b.xml
@@ -3,7 +3,7 @@
   <Identity>
     <Civ>germ</Civ>
     <SelectionGroupName>units/germ/cavalry_javelineer_b</SelectionGroupName>
-    <SpecificName>Tigurinian Light Cavalry</SpecificName>
+    <GenericName>Tigurinian Light Cavalry</GenericName>
     <Icon>units/germ/cavalry_javelineer.png</Icon>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/germ/champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/units/germ/champion_cavalry.xml
index 6845511f92..13188b16f4 100644
--- a/binaries/data/mods/public/simulation/templates/units/germ/champion_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/germ/champion_cavalry.xml
@@ -2,7 +2,7 @@
 <Entity parent="spec_champ|template_unit_champion_cavalry_swordsman">
   <Identity>
     <Civ>germ</Civ>
-    <SpecificName>Cimbrian Noble Cavalry</SpecificName>
+    <GenericName>Cimbrian Noble Cavalry</GenericName>
     <SelectionGroupName>units/germ/champion_cavalry</SelectionGroupName>
     <Icon>units/germ/champion_cavalry.png</Icon>
     <Requirements>
diff --git a/binaries/data/mods/public/simulation/templates/units/germ/infantry_slinger_b.xml b/binaries/data/mods/public/simulation/templates/units/germ/infantry_slinger_b.xml
index b3e88ee156..48a5384b4f 100644
--- a/binaries/data/mods/public/simulation/templates/units/germ/infantry_slinger_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/germ/infantry_slinger_b.xml
@@ -3,7 +3,7 @@
   <Identity>
     <Civ>germ</Civ>
     <SelectionGroupName>units/germ/infantry_slinger_b</SelectionGroupName>
-    <SpecificName>Celto-German Slinger</SpecificName>
+    <GenericName>Celto-Germanic Slinger</GenericName>
     <Icon>units/germ/infantry_slinger.png</Icon>
   </Identity>
   <Promotion>
diff --git a/binaries/data/mods/public/simulation/templates/units/germ/infantry_spearman_b.xml b/binaries/data/mods/public/simulation/templates/units/germ/infantry_spearman_b.xml
index 27ac0f4279..07bf964cba 100644
--- a/binaries/data/mods/public/simulation/templates/units/germ/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/germ/infantry_spearman_b.xml
@@ -3,7 +3,7 @@
   <Identity>
     <Civ>germ</Civ>
     <SelectionGroupName>units/germ/infantry_spearman_b</SelectionGroupName>
-    <SpecificName>Cimbrian Spearman</SpecificName>
+    <GenericName>Cimbrian Spearman</GenericName>
     <VisibleClasses datatype="tokens">Guerilla</VisibleClasses>
     <Icon>units/germ/infantry_spearman.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/germ/infantry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/germ/infantry_swordsman_b.xml
index de850abeb5..926fdf3a82 100644
--- a/binaries/data/mods/public/simulation/templates/units/germ/infantry_swordsman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/germ/infantry_swordsman_b.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_infantry_melee_swordsman">
   <Identity>
     <Civ>germ</Civ>
-    <SpecificName>Teutonic Swordsman</SpecificName>
+    <GenericName>Teutonic Swordsman</GenericName>
     <SelectionGroupName>units/germ/infantry_swordsman_b</SelectionGroupName>
     <Requirements>
       <Techs datatype="tokens">phase_town</Techs>
diff --git a/binaries/data/mods/public/simulation/templates/units/germ/ship_fire.xml b/binaries/data/mods/public/simulation/templates/units/germ/ship_fire.xml
index 603fdd27b1..d1b30e65ac 100644
--- a/binaries/data/mods/public/simulation/templates/units/germ/ship_fire.xml
+++ b/binaries/data/mods/public/simulation/templates/units/germ/ship_fire.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_ship_fire">
   <Identity>
     <Civ>germ</Civ>
-    <SpecificName>German Fire Ship</SpecificName>
+    <GenericName>Germanic Fire Ship</GenericName>
     <Icon>units/iber/ship_fire.png</Icon>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/germ/ship_fishing.xml b/binaries/data/mods/public/simulation/templates/units/germ/ship_fishing.xml
index cc6dbef675..a4dfc6ba18 100644
--- a/binaries/data/mods/public/simulation/templates/units/germ/ship_fishing.xml
+++ b/binaries/data/mods/public/simulation/templates/units/germ/ship_fishing.xml
@@ -6,7 +6,7 @@
   </Footprint>
   <Identity>
     <Civ>germ</Civ>
-    <SpecificName>German Fisherman</SpecificName>
+    <GenericName>Germanic Fisherman</GenericName>
     <Icon>units/germ/ship_fishing.png</Icon>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/germ/ship_merchant.xml b/binaries/data/mods/public/simulation/templates/units/germ/ship_merchant.xml
index 71b82fe807..1de1716356 100644
--- a/binaries/data/mods/public/simulation/templates/units/germ/ship_merchant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/germ/ship_merchant.xml
@@ -6,7 +6,7 @@
   </Footprint>
   <Identity>
     <Civ>germ</Civ>
-    <SpecificName>Rhineland Merchantman</SpecificName>
+    <GenericName>Rhineland Merchantman</GenericName>
     <Icon>units/germ/ship_merchant.png</Icon>
   </Identity>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/germ/support_civilian.xml b/binaries/data/mods/public/simulation/templates/units/germ/support_civilian.xml
index 9713bceb82..3628d1d18b 100644
--- a/binaries/data/mods/public/simulation/templates/units/germ/support_civilian.xml
+++ b/binaries/data/mods/public/simulation/templates/units/germ/support_civilian.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_support_civilian">
   <Identity>
     <Civ>germ</Civ>
-    <SpecificName>German Worker</SpecificName>
+    <GenericName>Germanic Worker</GenericName>
     <Icon>units/celt/support_civilian.png</Icon>
     <SelectionGroupName>units/{civ}/support_civilian</SelectionGroupName>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/germ/support_healer_b.xml b/binaries/data/mods/public/simulation/templates/units/germ/support_healer_b.xml
index 34bd5a1e78..2f2372cc50 100644
--- a/binaries/data/mods/public/simulation/templates/units/germ/support_healer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/germ/support_healer_b.xml
@@ -3,7 +3,7 @@
   <Identity>
     <Civ>germ</Civ>
     <SelectionGroupName>units/germ/support_healer_b</SelectionGroupName>
-    <SpecificName>German Priest</SpecificName>
+    <GenericName>Germanic Priest</GenericName>
     <Icon>units/germ/support_healer.png</Icon>
     <Rank>Basic</Rank>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/units/germ/support_trader.xml b/binaries/data/mods/public/simulation/templates/units/germ/support_trader.xml
index cbf9914880..4aacaa6b6d 100644
--- a/binaries/data/mods/public/simulation/templates/units/germ/support_trader.xml
+++ b/binaries/data/mods/public/simulation/templates/units/germ/support_trader.xml
@@ -2,7 +2,7 @@
 <Entity parent="template_unit_support_trader">
   <Identity>
     <Civ>germ</Civ>
-    <SpecificName>German Trader</SpecificName>
+    <GenericName>Germanic Trader</GenericName>
     <Icon>units/celt/support_trader.png</Icon>
   </Identity>
   <VisualActor>