diff --git a/binaries/data/mods/public/civs/celt.json b/binaries/data/mods/public/civs/celt.json
index 983ac04053..eb7336ac16 100644
--- a/binaries/data/mods/public/civs/celt.json
+++ b/binaries/data/mods/public/civs/celt.json
@@ -4,7 +4,7 @@
 	"Emblem": "session/portraits/emblems/emblem_celts.png",
 	"History": "At its peak (around 200 B.C.), the massive Celtic Empire spanned from Spain to Romania and Northern Italy to Scotland; although it wasnt a true empire because the Celtic people were not united by any form of government, but only in language and various social aspects. Their lack of any cohesion was probably the largest contributing factor to their ultimate submission to Rome by 100 A.D. The other contributing factors were their lack of armour and their inability to counter the mighty legions and siege weapons of Rome.",
 	"Music":[
-			{"File":"celts_peace_1.ogg", "Type":"peace"}
+			{"File":"Highland_Mist.ogg", "Type":"peace"}
 		],
 	"Factions":
 	[
diff --git a/binaries/data/mods/public/civs/iber.json b/binaries/data/mods/public/civs/iber.json
index 1b3b4ad176..a42560b1ea 100644
--- a/binaries/data/mods/public/civs/iber.json
+++ b/binaries/data/mods/public/civs/iber.json
@@ -4,7 +4,7 @@
 	"Emblem": "session/portraits/emblems/emblem_iberians.png",
 	"History": "No one really knows when the Iberians appeared as a people, though first contact with them came in 1100 B.C.  with the establishment of a trading post by the Phoenicians. They were a relatively peaceful culture, and when they fought it fighting in other's battles as mercenaries. When they fought their won battle, they proved tenacious when Rome sought to take their land and freedom away from them. Yet, the Iberians were put in submission once and for all by the Romans in 18 B.C.",
 	"Music":[
-			{"File":"iberians_peace_1.ogg", "Type":"peace"}
+			{"File":"An Old Warhorse Goes to Pasture.ogg", "Type":"peace"}
 		],
 	"Factions":
 	[
diff --git a/binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml b/binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml
index 30bc406c24..84df9061c3 100644
--- a/binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml
@@ -18,6 +18,7 @@
       units/iber_infantry_javelinist_b
       units/iber_infantry_slinger_b
       units/iber_cavalry_spearman_b
+      units/iber_cavalry_javelinist_b
     </Entities>
   </TrainingQueue>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_cavalry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/iber_cavalry_javelinist_b.xml
index cdc0204eeb..4590ef0f9c 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber_cavalry_javelinist_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber_cavalry_javelinist_b.xml
@@ -4,7 +4,7 @@
     <Civ>iber</Civ>
 	<SelectionGroupName>units/iber_cavalry_javelinist_b</SelectionGroupName>
     <GenericName>Cantabrian Cavalry</GenericName>
-    <SpecificName>Caballero Turdetano</SpecificName>
+    <SpecificName>Caballero Cantabri</SpecificName>
     <History></History>
     <Icon>units/iber_cavalry_javelinist.png</Icon>
   </Identity>