diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg
index 31c909ce701..e1f25762ece 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg
@@ -55,14 +55,11 @@
         id=Konrad
         name= _ "Konrad"
         unrenamable=yes
-        hitpoints=45
-        experience=0
         side=1
         canrecruit=yes
-        recruit=Elvish Scout,Elvish Fighter,Elvish Archer,Horseman,Elvish Shaman
-        gold=100
         team_name=elves
         user_team_name=_"Rebels"
+        gold=100
         controller=human
     [/side]
 
@@ -234,6 +231,10 @@
             speaker=Delfador
             message= _ "Konrad, note that Haldiel does not seek gold upkeep; as a loyal unit he fights for us solely out of loyalty to our cause. Such units are extremely valuable. Take care to use them cautiously in battle, lest they fall."
         [/message]
+        [allow_recruit]
+            side=1
+            type=Horseman
+        [/allow_recruit]
     [/event]
 
     [event]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg
index 91902f2b9a9..33ad93484c1 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg
@@ -47,14 +47,12 @@
         type=Commander
         id=Konrad
         name= _ "Konrad"
-        hitpoints=45
-        experience=0
         unrenamable=yes
         side=1
         canrecruit=yes
-        recruit=Elvish Scout,Elvish Fighter,Elvish Archer,Horseman,Elvish Shaman
+        team_name=elves
+        user_team_name=_"Rebels"
         gold=140
-        enemy=2
         controller=human
     [/side]
 
@@ -64,10 +62,11 @@
         type=Orcish Warrior
         id="Usadar Q'kai"
         name= _ "Usadar Q'kai"
-        experience=0
         side=2
         canrecruit=yes
         recruit=Orcish Grunt,Wolf Rider,Orcish Archer,Troll Whelp,Goblin Spearman
+        team_name=orcs
+        user_team_name=_"Orcs"
         {GOLD 30 60 100}
         enemy=1
         [ai]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg
index 21d36c2f5c7..c461e87c611 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg
@@ -47,7 +47,8 @@
         unrenamable=yes
         side=1
         canrecruit=yes
-        recruit=Elvish Scout,Elvish Fighter,Elvish Archer,Horseman,Mage,Elvish Shaman
+        team_name=elves
+        user_team_name=_"Rebels"
         gold=140
         controller=human
     [/side]
@@ -675,6 +676,10 @@
         image="wesnoth-icon.png"
         message= _ "You may now recruit the noble merfolk!"
     [/message]
+    [allow_recruit]
+        side=1
+        type=Merman Fighter
+    [/allow_recruit]
     [message]
         speaker=Konrad
         message= _ "Now where is Delfador? I hope he's safe!"
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/05a_Muff_Malal_Peninsula.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/05a_Muff_Malal_Peninsula.cfg
index 3a85810fdcd..a3106866fb0 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/05a_Muff_Malal_Peninsula.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/05a_Muff_Malal_Peninsula.cfg
@@ -49,10 +49,10 @@
         unrenamable=yes
         side=1
         canrecruit=yes
+        team_name=elves
+        user_team_name=_"Rebels"
         controller=human
-        recruit=Elvish Scout,Elvish Fighter,Elvish Archer,Horseman,Mage,Elvish Shaman,Merman Fighter
         gold=140
-        enemy=2
     [/side]
 
     [side]
@@ -80,7 +80,8 @@
         [/ai]
         {GOLD 20 50 100}
         {INCOME 20 25 40}
-        enemy=1
+        team_name=undead
+        user_team_name=_"Undead"
     [/side]
 
     {RECRUIT_UNIT_VARIATIONS 2 "Walking Corpse" none,none,none,none,swimmer,swimmer,mounted,bat}
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
index 165efceaec6..f0c288de979 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
@@ -52,13 +52,14 @@
     {BIGMAP_ISLE_OF_THE_DAMNED_2}
 
     [side]
+        type=Commander
         id=Konrad
         name= _ "Konrad"
-        type=Commander
         unrenamable=yes
         side=1
         canrecruit=yes
-        recruit=Thug,Poacher,Footpad
+        team_name=elves
+        user_team_name=_"Rebels"
         controller=human
         gold=0
 #ifdef HARD
@@ -126,30 +127,10 @@
             gold=0
         [/modify_side]
 
-        [disallow_recruit]
+        [set_recruit]
             side=1
-            type=Elvish Fighter
-        [/disallow_recruit]
-        [disallow_recruit]
-            side=1
-            type=Elvish Archer
-        [/disallow_recruit]
-        [disallow_recruit]
-            side=1
-            type=Elvish Scout
-        [/disallow_recruit]
-        [disallow_recruit]
-            side=1
-            type=Elvish Shaman
-        [/disallow_recruit]
-        [disallow_recruit]
-            side=1
-            type=Horseman
-        [/disallow_recruit]
-        [disallow_recruit]
-            side=1
-            type=Mage
-        [/disallow_recruit]
+            recruit=Thug,Poacher,Footpad
+        [/set_recruit]
 
         # Kill the recall list except for merfolk
         [store_unit]
@@ -423,42 +404,10 @@
 
     {PLACE_IMAGE units/transport/galleon.png 27 8}
 
-    [allow_recruit]
+    [set_recruit]
         side=1
-        type=Elvish Fighter
-    [/allow_recruit]
-    [allow_recruit]
-        side=1
-        type=Elvish Archer
-    [/allow_recruit]
-    [allow_recruit]
-        side=1
-        type=Elvish Scout
-    [/allow_recruit]
-    [allow_recruit]
-        side=1
-        type=Elvish Shaman
-    [/allow_recruit]
-    [allow_recruit]
-        side=1
-        type=Horseman
-    [/allow_recruit]
-    [allow_recruit]
-        side=1
-        type=Mage
-    [/allow_recruit]
-    [disallow_recruit]
-        side=1
-        type=Thug
-    [/disallow_recruit]
-    [disallow_recruit]
-        side=1
-        type=Poacher
-    [/disallow_recruit]
-    [disallow_recruit]
-        side=1
-        type=Footpad
-    [/disallow_recruit]
+        recruit=Elvish Fighter,Elvish Archer,Elvish Scout,Elvish Shaman,Horseman,Mage
+    [/set_recruit]
 #enddef
 
 #define RESTORE_RECALL_LIST
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
index ee28e702b3c..f6c3d18a927 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
@@ -48,7 +48,6 @@
         side=1
         canrecruit=yes
         controller=human
-        recruit=Elvish Scout,Elvish Fighter,Elvish Archer,Horseman,Mage,Elvish Shaman,Merman Fighter
         team_name=elves
         user_team_name=_"Rebels"
         {GOLD 180 120 120}
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg
index f205b05f884..fdd523f00eb 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg
@@ -71,8 +71,9 @@
         unrenamable=yes
         side=1
         canrecruit=yes
+        team_name=elves
+        user_team_name=_"Rebels"
         controller=human
-        enemy=2
         {GOLD 300 200 200}
     [/side]
 
@@ -117,7 +118,8 @@
             [/target]
             leader_value=6.0
         [/ai]
-        enemy=1
+        team_name=asheviere
+        user_team_name=_"Asheviere"
     [/side]
 
     [event]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg
index d631ce4c40e..eb68154aa4e 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg
@@ -50,6 +50,8 @@
         unrenamable=yes
         side=1
         canrecruit=yes
+        team_name=elves
+        user_team_name=_"Rebels"
         controller=human
         {GOLD 300 200 200}
     [/side]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg
index 06aaa95292b..be1789417a4 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg
@@ -55,6 +55,8 @@
         unrenamable=yes
         side=1
         canrecruit=yes
+        team_name=elves
+        user_team_name=_"Rebels"
         controller=human
         gold=200
     [/side]
@@ -73,6 +75,8 @@
             recruitment_pattern=scout,fighter,fighter,fighter,archer,mixed fighter
         [/ai]
         {GOLD 160 270 350}
+        team_name=asheviere
+        user_team_name=_"Asheviere"
     [/side]
 
     {STARTING_VILLAGES 2 8}
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 45cd61a67de..827dbe08f51 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
@@ -45,9 +45,9 @@
         unrenamable=yes
         side=1
         canrecruit=yes
-        controller=human
-        team_name=good
+        team_name=elves
         user_team_name=_"Rebels"
+        controller=human
         gold=200
     [/side]
 
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg
index 5968fa3da8e..35e5ca8c203 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg
@@ -60,11 +60,11 @@
         type=Commander
         id=Konrad
         name= _ "Konrad"
-        hitpoints=45
-        experience=0
         unrenamable=yes
         side=1
         canrecruit=yes
+        team_name=elves
+        user_team_name=_"Rebels"
         controller=human
         gold=200
     [/side]
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 bf5022dc2e5..05ba1467e5c 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
@@ -52,9 +52,11 @@
         type=Commander
         id=Konrad
         name= _ "Konrad"
-        side=1
         unrenamable=yes
+        side=1
         canrecruit=yes
+        team_name=elves
+        user_team_name=_"Rebels"
         controller=human
         gold=200
     [/side]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg
index bb9e384e2ea..5f16ceeabad 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg
@@ -45,12 +45,11 @@
         unrenamable=yes
         side=1
         canrecruit=yes
-        controller=human
-        recruit=Dwarvish Fighter,Dwarvish Thunderer
-        shroud=yes
-        team_name=good
+        team_name=elves
         user_team_name=_"Rebels"
+        controller=human
         {GOLD 350 250 100}
+        shroud=yes
     [/side]
 
     [side]
@@ -119,6 +118,10 @@
             speaker=Delfador
             message= _ "Underground roads once led to the different parts of the complex, but now everything lies in ruins."
         [/message]
+        [allow_recruit]
+            side=1
+            type=Dwarvish Fighter,Dwarvish Thunderer
+        [/allow_recruit]
     [/event]
 
     [event]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg
index ea17ab397ab..0edd6196075 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg
@@ -60,24 +60,23 @@
     {BIGMAP_HASTY_ALLIANCE}
 
     [side]
-        side=1
-        canrecruit=yes
-        controller=human
-        shroud=yes
-        team_name=good
-        user_team_name=_"Humans"
         type=Commander
         id=Konrad
         name= _ "Konrad"
         unrenamable=yes
+        side=1
+        canrecruit=yes
+        team_name=elves
+        user_team_name=_"Humans"
+        controller=human
         gold=200
+        shroud=yes
     [/side]
 
     [side]
         side=2
         canrecruit=yes
         controller=ai
-
         type=Princess
         id="Li'sar"
         name= _ "Li'sar"
@@ -87,7 +86,7 @@
         [/ai]
         recruit=Swordsman,Heavy Infantryman,Pikeman,Red Mage,Ogre
         gold=400
-        team_name=good
+        team_name=elves
         user_team_name=_"Humans"
         experience=62
     [/side]
@@ -109,6 +108,8 @@
         [ai]
             {ATTACK_DEPTH 4 5 5}
         [/ai]
+        team_name=evil
+        user_team_name=_"Evil"
     [/side]
 
     [event]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
index 29bea302684..c56484a1b74 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
@@ -283,6 +283,8 @@
                     unrenamable=yes
                     side=1
                     canrecruit=yes
+                    team_name=elves
+                    user_team_name=_"Rebels"
                     controller=human
                     shroud=yes
                     gold=200
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg
index 5ec82613602..8deb28a9457 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg
@@ -66,10 +66,12 @@
         type=Commander
         id=Konrad
         name= _ "Konrad"
+        unrenamable=yes
         side=1
         canrecruit=yes
+        team_name=elves
+        user_team_name=_"Rebels"
         controller=human
-        unrenamable=yes
         gold=200
     [/side]
 
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/19a_Snow_Plains.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/19a_Snow_Plains.cfg
index dafcdc6de56..6784d8e100c 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/19a_Snow_Plains.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/19a_Snow_Plains.cfg
@@ -51,6 +51,8 @@
         unrenamable=yes
         side=1
         canrecruit=yes
+        team_name=elves
+        user_team_name=_"Rebels"
         controller=human
         gold=200
     [/side]
@@ -69,6 +71,8 @@
         [ai]
             {ATTACK_DEPTH 5 5 6}
         [/ai]
+        team_name=orcs
+        user_team_name=_"Orcs"
 #ifdef EASY
         recruit=Troll,Wolf Rider
 #endif
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg
index 4a155a11fb8..46a9aabc61f 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg
@@ -56,6 +56,8 @@
         unrenamable=yes
         side=1
         canrecruit=yes
+        team_name=elves
+        user_team_name=_"Rebels"
         controller=human
         gold=200
     [/side]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg
index c92cd1bd521..9bbe59254ba 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg
@@ -114,6 +114,8 @@
         [/ai]
         {GOLD 370 400 460}
         {INCOME 8 12 16}
+        team_name=orcs
+        user_team_name=_"Orcs"
     [/side]
 
     [side]
@@ -171,6 +173,8 @@
         [/ai]
         {GOLD 370 400 460}
         {INCOME 12 16 20}
+        team_name=asheviere
+        user_team_name=_"Asheviere"
     [/side]
 
     [side]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg
index 118631e40bb..e07e259fcf4 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/24_Battle_for_Wesnoth.cfg
@@ -96,10 +96,9 @@
         side=1
         canrecruit=yes
         controller=human
-        recruit=Elvish Scout,Elvish Fighter,Elvish Archer,Elvish Shaman
         gold=400
         team_name=elves
-        user_team_name=_"Orcs"
+        user_team_name=_"Rebels"
     [/side]
 
     [side]