diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg
index b1b4b52ac31..f10106a63c5 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg
@@ -421,10 +421,10 @@
     [event]
         name=turn 5
 
-        {NAMED_LOYAL_UNIT 4 (Water Serpent) 1 15 (Water Serpent) ( _ "Water Serpent")}
+        {LOYAL_UNIT 4 (Water Serpent) 1 15}
 
 #define SEA_CREATURE
-    {NAMED_LOYAL_UNIT 4 (Cuttle Fish) 1 15 () ( _ "Cuttle Fish")}
+    {LOYAL_UNIT 4 (Cuttle Fish) 1 15}
 #enddef
 
         {SEA_CREATURE}
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg
index a71c01a235b..a2a6b776387 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg
@@ -705,10 +705,10 @@ end
             y=10-15
         [/filter]
 
-        {NAMED_LOYAL_UNIT 5 (Cuttle Fish) 13 13 (Cuttle Fish) ( _ "Cuttle Fish")}
+        {LOYAL_UNIT 5 (Cuttle Fish) 13 13}
 
         [message]
-            speaker=Cuttle Fish
+            type=Cuttle Fish
             message= _ "Ruarrrrr!!!"    # wmllint: no spellcheck
         [/message]
         [message]