diff --git a/data/core/images/units/nagas/slasher.png b/data/core/images/units/nagas/dirkfang.png
similarity index 100%
rename from data/core/images/units/nagas/slasher.png
rename to data/core/images/units/nagas/dirkfang.png
diff --git a/data/core/images/units/nagas/bladewhirler.png b/data/core/images/units/nagas/ophidian.png
similarity index 100%
rename from data/core/images/units/nagas/bladewhirler.png
rename to data/core/images/units/nagas/ophidian.png
diff --git a/data/core/units/nagas/Slasher.cfg b/data/core/units/nagas/Dirkfang.cfg
similarity index 85%
rename from data/core/units/nagas/Slasher.cfg
rename to data/core/units/nagas/Dirkfang.cfg
index 5b24dcb42f59..d6d4d5ad733c 100644
--- a/data/core/units/nagas/Slasher.cfg
+++ b/data/core/units/nagas/Dirkfang.cfg
@@ -1,10 +1,10 @@
 #textdomain wesnoth-units
 [unit_type]
-    id=Naga Slasher
-    name= _ "Naga Slasher"
+    id=Naga Dirkfang
+    name= _ "Naga Dirkfang"
     race=naga
     gender=male
-    image="units/nagas/slasher.png"
+    image="units/nagas/dirkfang.png"
     profile="portraits/nagas/naga-hunter.png"
     hitpoints=31
     movement_type=naga
@@ -12,12 +12,12 @@
     experience=38
     level=1
     alignment=liminal
-    advances_to=Naga Bladewhirler,Naga Ringcaster
+    advances_to=Naga Ophidian,Naga Ringcaster
     cost=15
     usage=fighter
     description= _ "In contrast to the heavily melee-focused style of their northern brethren, young Naga of the southern tribes prefer to carry small bows, with which they used to pepper their prey with arrows. While finishing off any water-based enemies usually must be done at close range, softening foes with ranged attacks is usually much less dangerous than rushing headlong directly into the fray. Sometimes viewed as cowardly by more proper Naga warriors, these fighters are nonetheless effective when it comes time to engage in warfare."
     die_sound=naga-die.ogg
-    {DEFENSE_ANIM "units/nagas/slasher.png" "units/nagas/slasher.png" {SOUND_LIST:NAGA_HIT} }
+    {DEFENSE_ANIM "units/nagas/dirkfang.png" "units/nagas/dirkfang.png" {SOUND_LIST:NAGA_HIT} }
 
     [attack]
         name=dagger
@@ -44,7 +44,7 @@
         [/filter_attack]
         start_time=-200
         [frame]
-            image="units/nagas/slasher.png:300"
+            image="units/nagas/dirkfang.png:300"
         [/frame]
         {SOUND:HIT_AND_MISS dagger-swish.wav dagger-swish.wav -150}
     [/attack_anim]
@@ -63,7 +63,7 @@
                 offset=0~0.8
             [/missile_frame]
             [frame]
-                image="units/nagas/slasher.png:300"
+                image="units/nagas/dirkfang.png:300"
                 sound=bow.ogg
             [/frame]
         [/if]
@@ -75,7 +75,7 @@
                 image_diagonal="projectiles/missile-ne.png"
             [/missile_frame]
             [frame]
-                image="units/nagas/slasher.png:300"
+                image="units/nagas/dirkfang.png:300"
                 sound=bow-miss.ogg
             [/frame]
         [/else]
diff --git a/data/core/units/nagas/Bladewhirler.cfg b/data/core/units/nagas/Ophidian.cfg
similarity index 74%
rename from data/core/units/nagas/Bladewhirler.cfg
rename to data/core/units/nagas/Ophidian.cfg
index 79f9bef582e8..ab097f0b52d8 100644
--- a/data/core/units/nagas/Bladewhirler.cfg
+++ b/data/core/units/nagas/Ophidian.cfg
@@ -1,10 +1,10 @@
 #textdomain wesnoth-units
 [unit_type]
-    id=Naga Bladewhirler
-    name= _ "Naga Bladewhirler"
+    id=Naga Ophidian
+    name= _ "Naga Ophidian"
     race=naga
     gender=male
-    image="units/nagas/bladewhirler.png"
+    image="units/nagas/ophidian.png"
     profile="portraits/nagas/naga-hunter.png"
     hitpoints=46
     movement_type=naga
@@ -15,9 +15,9 @@
     advances_to=Naga Dervish
     cost=24
     usage=fighter
-    description= _ "Experienced warriors of the Southern Naga often find work as mercenaries, usually hired by neighboring Dunefolk to control key waterways near the coastline. Though generally amicable with their wealthy employers, this friendliness should not be mistaken for loyalty. Bladewhirlers, in particular, are known for readily switching between rival city-state factions at the start of each shipping season, when demand for water-based protection is the highest. By encouraging a healthy amount of competition, these nagas ensure that their services are always sought after by one tribe or another."
+    description= _ "Experienced warriors of the Southern Naga often find work as mercenaries, usually hired by neighboring Dunefolk to control key waterways near the coastline. Though generally amicable with their wealthy employers, this friendliness should not be mistaken for loyalty. Ophidian, in particular, are known for readily switching between rival city-state factions at the start of each shipping season, when demand for water-based protection is the highest. By encouraging a healthy amount of competition, these nagas ensure that their services are always sought after by one tribe or another."
     die_sound=naga-die.ogg
-    {DEFENSE_ANIM "units/nagas/bladewhirler.png" "units/nagas/bladewhirler.png" {SOUND_LIST:NAGA_HIT} }
+    {DEFENSE_ANIM "units/nagas/ophidian.png" "units/nagas/ophidian.png" {SOUND_LIST:NAGA_HIT} }
     [defense]
         flat=60
         sand=50
@@ -48,7 +48,7 @@
         [/filter_attack]
         start_time=-200
         [frame]
-            image="units/nagas/bladewhirler.png:300"
+            image="units/nagas/ophidian.png:300"
         [/frame]
         {SOUND:HIT_AND_MISS {SOUND_LIST:SWORD_SWISH} {SOUND_LIST:MISS} -150}
     [/attack_anim]
@@ -67,7 +67,7 @@
                 offset=0~0.8
             [/missile_frame]
             [frame]
-                image="units/nagas/bladewhirler.png:300"
+                image="units/nagas/ophidian.png:300"
                 sound=bow.ogg
             [/frame]
         [/if]
@@ -79,7 +79,7 @@
                 image_diagonal="projectiles/missile-ne.png"
             [/missile_frame]
             [frame]
-                image="units/nagas/bladewhirler.png:300"
+                image="units/nagas/ophidian.png:300"
                 sound=bow-miss.ogg
             [/frame]
         [/else]