Avoid a name clash.

data/campaigns/An_Orcish_Incursion/_main.cfg

@@ -5,7 +5,7 @@
 [campaign]
     id="orcish_incursion"
     icon="units/elves-wood/elvish-lord.png~TC(1,magenta)"
-    image="portraits/kalenz.png"
+    image="portraits/erlornas.png"
     name=_"An Orcish Incursion"
     rank=15
     first_scenario="1_Defend_the_Forest"
@@ -40,18 +40,8 @@ wxpython="2.6.3.2"
     [/about]
 
 #ifdef CAMPAIGN_AN_ORCISH_INCURSION
-    [+units]
-	# Temporary -- we need this for Elvish Lord and Elvish High Lord
-	# until they're moved into core
-        {campaigns/Heir_To_The_Throne/units}
-    [/units]
     [binary_path]
         path="data/campaigns/An_Orcish_Incursion"
     [/binary_path]
     {campaigns/An_Orcish_Incursion/scenarios}
 #endif
-# Temporary -- we need this for the Elvish Lord and Elvish High Lord
-# icons until they're moved into core
-[binary_path]
-    path="data/campaigns/Heir_To_The_Throne"
-[/binary_path]

data/core/units/Elvish_Lady.cfg

@@ -5,7 +5,7 @@
     name= _ "female^Elvish Lady"
     gender=female
     race=elf
-    image="elvish-lady.png"
+    image="elvish-noble-lady.png"
     profile=portraits/Other/elvish-lady.png
     hitpoints=30
     movement_type=fly