diff --git a/data/core/images/portraits/dunefolk/hakim.png b/data/core/images/portraits/dunefolk/herbalist.png
similarity index 100%
rename from data/core/images/portraits/dunefolk/hakim.png
rename to data/core/images/portraits/dunefolk/herbalist.png
diff --git a/data/core/images/units/dunefolk/tabib.png b/data/core/images/units/dunefolk/apothecary.png
similarity index 100%
rename from data/core/images/units/dunefolk/tabib.png
rename to data/core/images/units/dunefolk/apothecary.png
diff --git a/data/core/images/units/dunefolk/shuja.png b/data/core/images/units/dunefolk/blademaster.png
similarity index 100%
rename from data/core/images/units/dunefolk/shuja.png
rename to data/core/images/units/dunefolk/blademaster.png
diff --git a/data/core/images/units/dunefolk/naffat.png b/data/core/images/units/dunefolk/burner.png
similarity index 100%
rename from data/core/images/units/dunefolk/naffat.png
rename to data/core/images/units/dunefolk/burner.png
diff --git a/data/core/images/units/dunefolk/mufariq.png b/data/core/images/units/dunefolk/cataphract.png
similarity index 100%
rename from data/core/images/units/dunefolk/mufariq.png
rename to data/core/images/units/dunefolk/cataphract.png
diff --git a/data/core/images/units/dunefolk/muharib.png b/data/core/images/units/dunefolk/explorer.png
similarity index 100%
rename from data/core/images/units/dunefolk/muharib.png
rename to data/core/images/units/dunefolk/explorer.png
diff --git a/data/core/images/units/dunefolk/tineen.png b/data/core/images/units/dunefolk/firetrooper.png
similarity index 100%
rename from data/core/images/units/dunefolk/tineen.png
rename to data/core/images/units/dunefolk/firetrooper.png
diff --git a/data/core/images/units/dunefolk/mighwar.png b/data/core/images/units/dunefolk/harrier.png
similarity index 100%
rename from data/core/images/units/dunefolk/mighwar.png
rename to data/core/images/units/dunefolk/harrier.png
diff --git a/data/core/images/units/dunefolk/hakim.png b/data/core/images/units/dunefolk/herbalist.png
similarity index 100%
rename from data/core/images/units/dunefolk/hakim.png
rename to data/core/images/units/dunefolk/herbalist.png
diff --git a/data/core/images/units/dunefolk/hadaf.png b/data/core/images/units/dunefolk/marauder.png
similarity index 100%
rename from data/core/images/units/dunefolk/hadaf.png
rename to data/core/images/units/dunefolk/marauder.png
diff --git a/data/core/images/units/dunefolk/khaiyal.png b/data/core/images/units/dunefolk/piercer.png
similarity index 100%
rename from data/core/images/units/dunefolk/khaiyal.png
rename to data/core/images/units/dunefolk/piercer.png
diff --git a/data/core/images/units/dunefolk/qanas.png b/data/core/images/units/dunefolk/raider.png
similarity index 100%
rename from data/core/images/units/dunefolk/qanas.png
rename to data/core/images/units/dunefolk/raider.png
diff --git a/data/core/images/units/dunefolk/batal.png b/data/core/images/units/dunefolk/ranger.png
similarity index 100%
rename from data/core/images/units/dunefolk/batal.png
rename to data/core/images/units/dunefolk/ranger.png
diff --git a/data/core/images/units/dunefolk/rami.png b/data/core/images/units/dunefolk/rider.png
similarity index 100%
rename from data/core/images/units/dunefolk/rami.png
rename to data/core/images/units/dunefolk/rider.png
diff --git a/data/core/images/units/dunefolk/jundi.png b/data/core/images/units/dunefolk/rover.png
similarity index 100%
rename from data/core/images/units/dunefolk/jundi.png
rename to data/core/images/units/dunefolk/rover.png
diff --git a/data/core/images/units/dunefolk/qatif-al-nar.png b/data/core/images/units/dunefolk/scorcher.png
similarity index 100%
rename from data/core/images/units/dunefolk/qatif-al-nar.png
rename to data/core/images/units/dunefolk/scorcher.png
diff --git a/data/core/images/units/dunefolk/monawish.png b/data/core/images/units/dunefolk/skirmisher.png
similarity index 100%
rename from data/core/images/units/dunefolk/monawish.png
rename to data/core/images/units/dunefolk/skirmisher.png
diff --git a/data/core/images/units/dunefolk/arif.png b/data/core/images/units/dunefolk/soldier.png
similarity index 100%
rename from data/core/images/units/dunefolk/arif.png
rename to data/core/images/units/dunefolk/soldier.png
diff --git a/data/core/images/units/dunefolk/mudafi.png b/data/core/images/units/dunefolk/spearguard.png
similarity index 100%
rename from data/core/images/units/dunefolk/mudafi.png
rename to data/core/images/units/dunefolk/spearguard.png
diff --git a/data/core/images/units/dunefolk/rasikh.png b/data/core/images/units/dunefolk/spearmaster.png
similarity index 100%
rename from data/core/images/units/dunefolk/rasikh.png
rename to data/core/images/units/dunefolk/spearmaster.png
diff --git a/data/core/images/units/dunefolk/faris.png b/data/core/images/units/dunefolk/sunderer.png
similarity index 100%
rename from data/core/images/units/dunefolk/faris.png
rename to data/core/images/units/dunefolk/sunderer.png
diff --git a/data/core/images/units/dunefolk/saree.png b/data/core/images/units/dunefolk/swiftrider.png
similarity index 100%
rename from data/core/images/units/dunefolk/saree.png
rename to data/core/images/units/dunefolk/swiftrider.png
diff --git a/data/core/images/units/dunefolk/ghazi.png b/data/core/images/units/dunefolk/swordsman.png
similarity index 100%
rename from data/core/images/units/dunefolk/ghazi.png
rename to data/core/images/units/dunefolk/swordsman.png
diff --git a/data/core/images/units/dunefolk/khalid.png b/data/core/images/units/dunefolk/warmaster.png
similarity index 100%
rename from data/core/images/units/dunefolk/khalid.png
rename to data/core/images/units/dunefolk/warmaster.png
diff --git a/data/core/images/units/dunefolk/jawal.png b/data/core/images/units/dunefolk/windrider.png
similarity index 100%
rename from data/core/images/units/dunefolk/jawal.png
rename to data/core/images/units/dunefolk/windrider.png
diff --git a/data/core/units/dunefolk/Tabib.cfg b/data/core/units/dunefolk/Apothecary.cfg
similarity index 100%
rename from data/core/units/dunefolk/Tabib.cfg
rename to data/core/units/dunefolk/Apothecary.cfg
diff --git a/data/core/units/dunefolk/Shuja.cfg b/data/core/units/dunefolk/Blademaster.cfg
similarity index 100%
rename from data/core/units/dunefolk/Shuja.cfg
rename to data/core/units/dunefolk/Blademaster.cfg
diff --git a/data/core/units/dunefolk/Naffat.cfg b/data/core/units/dunefolk/Burner.cfg
similarity index 100%
rename from data/core/units/dunefolk/Naffat.cfg
rename to data/core/units/dunefolk/Burner.cfg
diff --git a/data/core/units/dunefolk/Mufariq.cfg b/data/core/units/dunefolk/Cataphract.cfg
similarity index 100%
rename from data/core/units/dunefolk/Mufariq.cfg
rename to data/core/units/dunefolk/Cataphract.cfg
diff --git a/data/core/units/dunefolk/Muharib.cfg b/data/core/units/dunefolk/Explorer.cfg
similarity index 100%
rename from data/core/units/dunefolk/Muharib.cfg
rename to data/core/units/dunefolk/Explorer.cfg
diff --git a/data/core/units/dunefolk/Tineen.cfg b/data/core/units/dunefolk/Firetrooper.cfg
similarity index 100%
rename from data/core/units/dunefolk/Tineen.cfg
rename to data/core/units/dunefolk/Firetrooper.cfg
diff --git a/data/core/units/dunefolk/Mighwar.cfg b/data/core/units/dunefolk/Harrier.cfg
similarity index 100%
rename from data/core/units/dunefolk/Mighwar.cfg
rename to data/core/units/dunefolk/Harrier.cfg
diff --git a/data/core/units/dunefolk/Hakim.cfg b/data/core/units/dunefolk/Herbalist.cfg
similarity index 100%
rename from data/core/units/dunefolk/Hakim.cfg
rename to data/core/units/dunefolk/Herbalist.cfg
diff --git a/data/core/units/dunefolk/Hadaf.cfg b/data/core/units/dunefolk/Marauder.cfg
similarity index 100%
rename from data/core/units/dunefolk/Hadaf.cfg
rename to data/core/units/dunefolk/Marauder.cfg
diff --git a/data/core/units/dunefolk/Khaiyal.cfg b/data/core/units/dunefolk/Piercer.cfg
similarity index 100%
rename from data/core/units/dunefolk/Khaiyal.cfg
rename to data/core/units/dunefolk/Piercer.cfg
diff --git a/data/core/units/dunefolk/Qanas.cfg b/data/core/units/dunefolk/Raider.cfg
similarity index 100%
rename from data/core/units/dunefolk/Qanas.cfg
rename to data/core/units/dunefolk/Raider.cfg
diff --git a/data/core/units/dunefolk/Batal.cfg b/data/core/units/dunefolk/Ranger.cfg
similarity index 100%
rename from data/core/units/dunefolk/Batal.cfg
rename to data/core/units/dunefolk/Ranger.cfg
diff --git a/data/core/units/dunefolk/Rami.cfg b/data/core/units/dunefolk/Rider.cfg
similarity index 100%
rename from data/core/units/dunefolk/Rami.cfg
rename to data/core/units/dunefolk/Rider.cfg
diff --git a/data/core/units/dunefolk/Jundi.cfg b/data/core/units/dunefolk/Rover.cfg
similarity index 100%
rename from data/core/units/dunefolk/Jundi.cfg
rename to data/core/units/dunefolk/Rover.cfg
diff --git a/data/core/units/dunefolk/Qatif-al-nar.cfg b/data/core/units/dunefolk/Scorcher.cfg
similarity index 100%
rename from data/core/units/dunefolk/Qatif-al-nar.cfg
rename to data/core/units/dunefolk/Scorcher.cfg
diff --git a/data/core/units/dunefolk/Monawish.cfg b/data/core/units/dunefolk/Skirmisher.cfg
similarity index 100%
rename from data/core/units/dunefolk/Monawish.cfg
rename to data/core/units/dunefolk/Skirmisher.cfg
diff --git a/data/core/units/dunefolk/Arif.cfg b/data/core/units/dunefolk/Soldier.cfg
similarity index 100%
rename from data/core/units/dunefolk/Arif.cfg
rename to data/core/units/dunefolk/Soldier.cfg
diff --git a/data/core/units/dunefolk/Mudafi.cfg b/data/core/units/dunefolk/Spearguard.cfg
similarity index 100%
rename from data/core/units/dunefolk/Mudafi.cfg
rename to data/core/units/dunefolk/Spearguard.cfg
diff --git a/data/core/units/dunefolk/Rasikh.cfg b/data/core/units/dunefolk/Spearmaster.cfg
similarity index 100%
rename from data/core/units/dunefolk/Rasikh.cfg
rename to data/core/units/dunefolk/Spearmaster.cfg
diff --git a/data/core/units/dunefolk/Faris.cfg b/data/core/units/dunefolk/Sunderer.cfg
similarity index 100%
rename from data/core/units/dunefolk/Faris.cfg
rename to data/core/units/dunefolk/Sunderer.cfg
diff --git a/data/core/units/dunefolk/Saree.cfg b/data/core/units/dunefolk/Swiftrider.cfg
similarity index 100%
rename from data/core/units/dunefolk/Saree.cfg
rename to data/core/units/dunefolk/Swiftrider.cfg
diff --git a/data/core/units/dunefolk/Ghazi.cfg b/data/core/units/dunefolk/Swordsman.cfg
similarity index 100%
rename from data/core/units/dunefolk/Ghazi.cfg
rename to data/core/units/dunefolk/Swordsman.cfg
diff --git a/data/core/units/dunefolk/Khalid.cfg b/data/core/units/dunefolk/Warmaster.cfg
similarity index 100%
rename from data/core/units/dunefolk/Khalid.cfg
rename to data/core/units/dunefolk/Warmaster.cfg
diff --git a/data/core/units/dunefolk/Jawal.cfg b/data/core/units/dunefolk/Windrider.cfg
similarity index 100%
rename from data/core/units/dunefolk/Jawal.cfg
rename to data/core/units/dunefolk/Windrider.cfg
diff --git a/data/multiplayer/factions/dunefolk-aoh.cfg b/data/multiplayer/factions/dunefolk-aoh.cfg
index ed39105bd146..a4ef426b7d08 100644
--- a/data/multiplayer/factions/dunefolk-aoh.cfg
+++ b/data/multiplayer/factions/dunefolk-aoh.cfg
@@ -2,14 +2,14 @@
 [multiplayer_side]
     id=Dunefolk
     name= _"Dunefolk"
-    image="units/dunefolk/batal.png"
+    image="units/dunefolk/ranger.png"
     type=random
-    leader=Shuja,Rasikh,Mighwar,Batal,Mufariq,Tineen
-    random_leader=Shuja,Rasikh,Mighwar,Batal,Mufariq
-    recruit=Jundi,Arif,Khaiyal,Rami,Hakim,Naffat,Falcon,Ghazi,Mudafi,Tabib,Monawish,Muharib,Faris,Qanas,Saree,Qatif_al_nar,Elder Falcon
+    leader=Dune Blademaster,Dune Spearmaster,Dune Harrier,Dune Ranger,Dune Cataphract,Dune Firetrooper
+    random_leader=Dune Blademaster,Dune Spearmaster,Dune Harrier,Dune Ranger,Dune Cataphract
+    recruit=Dune Rover,Dune Soldier,Dune Piercer,Dune Rider,Dune Herbalist,Dune Burner,Falcon,Dune Swordsman,Dune Spearguard,Dune Apothecary,Dune Skirmisher,Dune Explorer,Dune Sunderer,Dune Raider,Dune Swiftrider,Dune Scorcher,Elder Falcon
     terrain_liked=Ss, Hh, Ha, Ww
     # wmllint: markcheck off
-    description="<img>src='portraits/dunefolk/hakim.png~BG()' align='middle'</img>
+    description="<img>src='portraits/dunefolk/herbalist.png~BG()' align='middle'</img>
 
 "+_"The <bold>text='Dunefolk'</bold> are a faction of humans from the deserts and hills of the southern lands. The Dunefolk specialize in using terrain features to coordinate attacks at dawn or dusk. Their ranks boast lawful and liminal units, healers, high-accuracy melee fighters, and fearsome horse-mounted archers. While Dunefolk units tend to be more expensive than those of the Loyalist faction, they make up for this with high mobility — especially on hilly terrains."
     # wmllint: markcheck on
diff --git a/data/multiplayer/factions/dunefolk-default.cfg b/data/multiplayer/factions/dunefolk-default.cfg
index 47cf87344674..5fdb164f636b 100644
--- a/data/multiplayer/factions/dunefolk-default.cfg
+++ b/data/multiplayer/factions/dunefolk-default.cfg
@@ -2,14 +2,14 @@
 [multiplayer_side]
     id=Dunefolk
     name= _"Dunefolk"
-    image="units/dunefolk/muharib.png"
+    image="units/dunefolk/explorer.png"
     type=random
-    leader=Muharib,Ghazi,Mudafi,Monawish,Tabib
-    random_leader=Muharib,Ghazi,Mudafi,Monawish,Tabib
-    recruit=Jundi,Arif,Khaiyal,Rami,Hakim,Naffat,Falcon
+    leader=Dune Explorer,Dune Swordsman,Dune Spearguard,Dune Skirmisher,Dune Apothecary,Saree
+    random_leader=Dune Explorer,Dune Swordsman,Dune Spearguard,Dune Skirmisher,Dune Apothecary
+    recruit=Dune Rover,Dune Soldier,Dune Piercer,Dune Rider,Dune Herbalist,Dune Burner,Falcon
     terrain_liked=Ss, Hh, Ha, Ww
     # wmllint: markcheck off
-    description="<img>src='portraits/dunefolk/hakim.png~BG()' align='middle'</img>
+    description="<img>src='portraits/dunefolk/herbalist.png~BG()' align='middle'</img>
 
 "+_"The <bold>text='Dunefolk'</bold> are a faction of humans from the deserts and hills of the southern lands. The Dunefolk specialize in using terrain features to coordinate attacks at dawn or dusk. Their ranks boast lawful and liminal units, healers, high-accuracy melee fighters, and fearsome horse-mounted archers. While Dunefolk units tend to be more expensive than those of the Loyalist faction, they make up for this with high mobility — especially on hilly terrains."
     # wmllint: markcheck on
diff --git a/data/tools/wmllint b/data/tools/wmllint
index e9c9cc090937..28be4022e435 100755
--- a/data/tools/wmllint
+++ b/data/tools/wmllint
@@ -869,7 +869,61 @@ linechanges = (
         ("units/khalifate/tabib.png", "units/dunefolk/tabib.png"),
         ("units/khalifate/tineen.png", "units/dunefolk/tineen.png"),
         ("era_khalifate", "era_dunefolk"),
-        ("era_khalifate_heroes", "era_dunefolk_heroes")
+        ("era_khalifate_heroes", "era_dunefolk_heroes"),
+        
+        # renamed dunefolk units
+        # images
+        ("units/dunefolk/arif.png", "units/dunefolk/soldier.png"),
+        ("units/dunefolk/batal.png", "units/dunefolk/ranger.png"),
+        ("units/dunefolk/faris.png", "units/dunefolk/sunderer.png"),
+        ("units/dunefolk/ghazi.png", "units/dunefolk/swordsman.png"),
+        ("units/dunefolk/hadaf.png", "units/dunefolk/marauder.png"),
+        ("units/dunefolk/hakim.png", "units/dunefolk/herbalist.png"),
+        ("units/dunefolk/jawal.png", "units/dunefolk/windrider.png"),
+        ("units/dunefolk/jundi.png", "units/dunefolk/rover.png"),
+        ("units/dunefolk/khaiyal.png", "units/dunefolk/piercer.png"),
+        ("units/dunefolk/khalid.png", "units/dunefolk/warmaster.png"),
+        ("units/dunefolk/mighwar.png", "units/dunefolk/harrier.png"),
+        ("units/dunefolk/monawish.png", "units/dunefolk/skirmisher.png"),
+        ("units/dunefolk/mudafi.png", "units/dunefolk/spearguard.png"),
+        ("units/dunefolk/mufariq.png", "units/dunefolk/cataphract.png"),
+        ("units/dunefolk/muharib.png", "units/dunefolk/explorer.png"),
+        ("units/dunefolk/naffat.png", "units/dunefolk/burner.png"),
+        ("units/dunefolk/qanas.png", "units/dunefolk/raider.png"),
+        ("units/dunefolk/qatif-al-nar.png", "units/dunefolk/scorcher.png"),
+        ("units/dunefolk/rami.png", "units/dunefolk/rider.png"),
+        ("units/dunefolk/rasikh.png", "units/dunefolk/spearmaster.png"),
+        ("units/dunefolk/saree.png", "units/dunefolk/swiftrider.png"),
+        ("units/dunefolk/shuja.png", "units/dunefolk/blademaster.png"),
+        ("units/dunefolk/tabib.png", "units/dunefolk/apothecary.png"),
+        ("units/dunefolk/tineen.png", "units/dunefolk/firetrooper.png"),
+        ("images/portraits/dunefolk/hakim.png", "images/portraits/dunefolk/herbalist.png"),
+        
+        # unit ids
+        ("Arif", "Dune Soldier"),
+        ("Ghazi", "Dune Swordsman"),
+        ("Shuja", "Dune Blademaster"),
+        ("Khalid", "Dune Warmaster"),
+        ("Mudafi", "Dune Spearguard"),
+        ("Rasikh", "Dune Spearmaster"),
+        ("Hakim", "Dune Herbalist"),
+        ("Tabib", "Dune Apothecary"),
+        ("Jundi", "Dune Rover"),
+        ("Monawish", "Dune Skirmisher"),
+        ("Mighwar", "Dune Harrier"),
+        ("Muharib", "Dune Explorer"),
+        ("Batal", "Dune Ranger"),
+        ("Khaiyal", "Dune Piercer"),
+        ("Faris", "Dune Sunderer"),
+        ("Mufariq", "Dune Cataphract"),
+        ("Qanas", "Dune Raider"),
+        ("Hadaf", "Dune Marauder"),
+        ("Naffat", "Dune Burner"),
+        ("Qatif-al-nar", "Dune Scorcher"),
+        ("Tineen", "Dune Firetrooper"),
+        ("Rami", "Dune Rider"),
+        ("Saree", "Dune Swiftrider"),
+        ("Jawal", "Dune Windrider")
 
         )