diff --git a/data/test/scenarios/ai/config/simple_aspect.cfg b/data/test/scenarios/ai/config/simple_aspect.cfg
index 8d95470df3b1..e266e7b36f8a 100644
--- a/data/test/scenarios/ai/config/simple_aspect.cfg
+++ b/data/test/scenarios/ai/config/simple_aspect.cfg
@@ -1,48 +1,48 @@
 
-{AI_ASPECT_UNIT_TEST test_basic_simplified_aspect attack_depth
-{SPLIT 3,5,5,3,7,7,5,3,5,5,7,7 ,}
+{AI_ASPECT_UNIT_TEST test_basic_simplified_aspect leader_value
+{SPLIT 9,3,3,9,7,7,3,9,3,3,7,7 ,}
 (
     [ai]
         time_of_day=first_watch,second_watch
-        attack_depth=7
+        leader_value=7
     [/ai]
     [ai]
         turns=1,4,8
-        attack_depth=3
+        leader_value=9
     [/ai]
 ) ()}
 
-{AI_ASPECT_UNIT_TEST test_basic_abbreviated_aspect attack_depth
-{SPLIT 7,7,7,7,7,7,5,5,5,5,9,9 ,}
+{AI_ASPECT_UNIT_TEST test_basic_abbreviated_aspect leader_value
+{SPLIT 7,7,7,7,7,7,3,3,3,3,9,9 ,}
 (
     [ai]
         time_of_day=first_watch,second_watch
-        attack_depth=9
-        [attack_depth]
+        leader_value=9
+        [leader_value]
             turns=1-6
             value=7
-        [/attack_depth]
+        [/leader_value]
     [/ai]
 ) ()}
 
-{AI_ASPECT_UNIT_TEST test_basic_standard_aspect attack_depth
+{AI_ASPECT_UNIT_TEST test_basic_standard_aspect leader_value
 {SPLIT 7,7,7,7,7,7,7,7,7,7,7,7 ,
 } (
     [ai]
         [aspect]
-            id=attack_depth
+            id=leader_value
             name=standard_aspect
             value=7
         [/aspect]
     [/ai]
 ) ()}
 
-{AI_ASPECT_UNIT_TEST test_basic_composite_aspect attack_depth
-{SPLIT 5,5,14,14,14,14,5,5,5,5,12,12 ,}
+{AI_ASPECT_UNIT_TEST test_basic_composite_aspect leader_value
+{SPLIT 3,3,14,14,14,14,3,3,3,3,12,12 ,}
 (
     [ai]
         [aspect]
-            id=attack_depth
+            id=leader_value
             [facet]
                 time_of_day=first_watch,second_watch
                 value=12
@@ -55,24 +55,24 @@
     [/ai]
 ) ()}
 
-{AI_ASPECT_UNIT_TEST test_basic_lua_aspect attack_depth
+{AI_ASPECT_UNIT_TEST test_basic_lua_aspect leader_value
 {SPLIT 2,4,6,8,10,12,14,16,18,20,22,24 ,}
 (
     [ai]
         [aspect]
-            id=attack_depth
+            id=leader_value
             engine=lua
             code=<<return wesnoth.current.turn * 2>>
         [/aspect]
     [/ai]
 ) ()}
 
-{AI_ASPECT_UNIT_TEST test_basic_composite_facet attack_depth
-{SPLIT 5,5,5,5,5,5,7,7,7,14,14,14 ,}
+{AI_ASPECT_UNIT_TEST test_basic_composite_facet leader_value
+{SPLIT 3,3,3,3,3,3,7,7,7,14,14,14 ,}
 (
     [ai]
         [aspect]
-            id=attack_depth
+            id=leader_value
             [facet]
                 name=composite_aspect
                 turns=7-12
@@ -88,12 +88,12 @@
     [/ai]
 ) ()}
 
-{AI_ASPECT_UNIT_TEST test_basic_lua_facet attack_depth
+{AI_ASPECT_UNIT_TEST test_basic_lua_facet leader_value
 {SPLIT 2,7,7,2,7,7,14,7,7,5,7,7 ,}
 (
     [ai]
         [aspect]
-            id=attack_depth
+            id=leader_value
             [facet]
                 engine=lua
                 time_of_day=dusk
@@ -111,33 +111,33 @@
     [/ai]
 ) ()}
 
-{AI_ASPECT_UNIT_TEST test_basic_composite_default_facet attack_depth
-{SPLIT 10,5,5,5,5,5,10,5,5,5,5,5 ,}
+{AI_ASPECT_UNIT_TEST test_basic_composite_default_facet leader_value
+{SPLIT 10,3,3,3,3,3,10,3,3,3,3,3 ,}
 (
     [ai]
         [aspect]
-            id=attack_depth
+            id=leader_value
             [default]
                 name=composite_aspect
                 [facet]
-                    id=my_composite_default_attack_depth
+                    id=my_composite_default_leader_value
                     time_of_day=dawn
                     value=10
                 [/facet]
                 [default]
-                    value=5
+                    value=3
                 [/default]
             [/default]
         [/aspect]
     [/ai]
 ) ()}
 
-{AI_ASPECT_UNIT_TEST test_basic_lua_default_facet attack_depth
+{AI_ASPECT_UNIT_TEST test_basic_lua_default_facet leader_value
 {SPLIT 1,2,3,4,5,6,7,8,9,10,11,12 ,}
 (
     [ai]
         [aspect]
-            id=attack_depth
+            id=leader_value
             [default]
                 engine=lua
                 code=<<return wesnoth.current.turn>>
diff --git a/data/test/scenarios/ai/modify/aspects.cfg b/data/test/scenarios/ai/modify/aspects.cfg
index 654ca6a74bbd..bf5f892bcf74 100644
--- a/data/test/scenarios/ai/modify/aspects.cfg
+++ b/data/test/scenarios/ai/modify/aspects.cfg
@@ -1,38 +1,38 @@
 
-{AI_ASPECT_UNIT_TEST test_modify_ai_delete_facet attack_depth
-{SPLIT 7,7,7,7,7,7,5,5,5,5,5,5 ,}
+{AI_ASPECT_UNIT_TEST test_modify_ai_delete_facet leader_value
+{SPLIT 7,7,7,7,7,7,3,3,3,3,3,3 ,}
 (
     [ai]
-        [attack_depth]
-            id=custom_depth
+        [leader_value]
+            id=custom_value
             value=7
-        [/attack_depth]
+        [/leader_value]
     [/ai]
 ) (
     [event]
         name=turn 6 end
         [modify_ai]
             action=delete
-            path=aspect[attack_depth].facet[custom_depth]
+            path=aspect[leader_value].facet[custom_value]
         [/modify_ai]
     [/event]
 )}
 
-{AI_ASPECT_UNIT_TEST test_modify_ai_change_facet attack_depth
+{AI_ASPECT_UNIT_TEST test_modify_ai_change_facet leader_value
 {SPLIT 7,7,7,7,7,7,8,8,8,8,8,8 ,}
 (
     [ai]
-        [attack_depth]
-            id=custom_depth
+        [leader_value]
+            id=custom_value
             value=7
-        [/attack_depth]
+        [/leader_value]
     [/ai]
 ) (
     [event]
         name=turn 6 end
         [modify_ai]
             action=change
-            path=aspect[attack_depth].facet[custom_depth]
+            path=aspect[leader_value].facet[custom_value]
             [facet]
                 value=8
             [/facet]
@@ -40,23 +40,23 @@
     [/event]
 )}
 
-{AI_ASPECT_UNIT_TEST test_modify_ai_replace_facet attack_depth
-{SPLIT 7,7,7,7,8,8,8,8,5,5,5,5 ,}
+{AI_ASPECT_UNIT_TEST test_modify_ai_replace_facet leader_value
+{SPLIT 7,7,7,7,8,8,8,8,3,3,3,3 ,}
 (
     [ai]
-        [attack_depth]
-            id=custom_depth
+        [leader_value]
+            id=custom_value
             value=7
-        [/attack_depth]
+        [/leader_value]
     [/ai]
 ) (
     [event]
         name=turn 4 end
         [modify_ai]
             action=add
-            path=aspect[attack_depth].facet[]
+            path=aspect[leader_value].facet[]
             [facet]
-                id=custom_depth
+                id=custom_value
                 value=8
             [/facet]
         [/modify_ai]
@@ -65,28 +65,28 @@
         name=turn 8 end
         [modify_ai]
             action=delete
-            path=aspect[attack_depth].facet[custom_depth]
+            path=aspect[leader_value].facet[custom_value]
         [/modify_ai]
     [/event]
 )}
 
-{AI_ASPECT_UNIT_TEST test_modify_ai_add_facet attack_depth
+{AI_ASPECT_UNIT_TEST test_modify_ai_add_facet leader_value
 {SPLIT 7,7,7,7,8,8,8,8,7,7,7,7 ,}
 (
     [ai]
-        [attack_depth]
-            id=custom_depth
+        [leader_value]
+            id=custom_value
             value=7
-        [/attack_depth]
+        [/leader_value]
     [/ai]
 ) (
     [event]
         name=turn 4 end
         [modify_ai]
             action=add
-            path=aspect[attack_depth].facet[]
+            path=aspect[leader_value].facet[]
             [facet]
-                id=custom_depth2
+                id=custom_value2
                 value=8
             [/facet]
         [/modify_ai]
@@ -95,27 +95,27 @@
         name=turn 8 end
         [modify_ai]
             action=delete
-            path=aspect[attack_depth].facet[custom_depth2]
+            path=aspect[leader_value].facet[custom_value2]
         [/modify_ai]
     [/event]
 )}
 
-{AI_ASPECT_UNIT_TEST test_modify_ai_change_default_facet attack_depth
-{SPLIT 5,5,5,5,7,7,7,7,8,8,8,8 ,}
+{AI_ASPECT_UNIT_TEST test_modify_ai_change_default_facet leader_value
+{SPLIT 3,3,3,3,7,7,7,7,8,8,8,8 ,}
 (
     [ai]
-        [attack_depth]
+        [leader_value]
             turns=5-8
-            id=custom_depth
+            id=custom_value
             value=7
-        [/attack_depth]
+        [/leader_value]
     [/ai]
 ) (
     [event]
         name=turn 6 end
         [modify_ai]
             action=change
-            path=aspect[attack_depth].facet[default_facet]
+            path=aspect[leader_value].facet[default_facet]
             [facet]
                 value=8
             [/facet]
@@ -123,23 +123,23 @@
     [/event]
 )}
 
-{AI_ASPECT_UNIT_TEST test_modify_ai_nested_facets attack_depth
-{SPLIT 5,7,7,14,14,14,12,7,7,14,14,5 ,}
+{AI_ASPECT_UNIT_TEST test_modify_ai_nested_facets leader_value
+{SPLIT 3,7,7,14,14,14,12,7,7,14,14,3 ,}
 (
     [ai]
         [aspect]
-            id=attack_depth
+            id=leader_value
             [facet]
-                id=composite_depth
+                id=composite_value
                 name=composite_aspect
                 turns=2-11
                 [facet]
-                    id=night_depth
+                    id=night_value
                     time_of_day=dusk,first_watch,second_watch
                     value=14
                 [/facet]
                 [default]
-                    id=my_default_attack_depth
+                    id=my_default_leader_value
                     value=7
                 [/default]
             [/facet]
@@ -150,9 +150,9 @@
         name=turn 4 end
         [modify_ai]
             action=add
-            path=aspect[attack_depth].facet[composite_depth].facet[]
+            path=aspect[leader_value].facet[composite_value].facet[]
             [facet]
-                id=twilight_depth
+                id=twilight_value
                 time_of_day=dawn,dusk
                 value=12
             [/facet]
@@ -162,17 +162,17 @@
         name=turn 8 end
         [modify_ai]
             action=delete
-            path=aspect[attack_depth].facet[composite_depth].facet[twilight_depth]
+            path=aspect[leader_value].facet[composite_value].facet[twilight_value]
         [/modify_ai]
     [/event]
 )}
 
-{AI_ASPECT_UNIT_TEST test_modify_ai_composite_default_facets attack_depth
-{SPLIT 10,5,5,5,5,5,5,5,12,12,12,12 ,}
+{AI_ASPECT_UNIT_TEST test_modify_ai_composite_default_facets leader_value
+{SPLIT 10,3,3,3,3,3,3,3,12,12,12,12 ,}
 (
     [ai]
         [aspect]
-            id=attack_depth
+            id=leader_value
             [default]
                 name=composite_aspect
                 [facet]
@@ -181,7 +181,7 @@
                     value=10
                 [/facet]
                 [default]
-                    value=5
+                    value=3
                 [/default]
             [/default]
         [/aspect]
@@ -191,14 +191,14 @@
         name=turn 4 end
         [modify_ai]
             action=delete
-            path=aspect[attack_depth].facet[default_facet].facet[dawn_default]
+            path=aspect[leader_value].facet[default_facet].facet[dawn_default]
         [/modify_ai]
     [/event]
     [event]
         name=turn 8 end
         [modify_ai]
             action=add
-            path=aspect[attack_depth].facet[default_facet].facet[]
+            path=aspect[leader_value].facet[default_facet].facet[]
             [facet]
                 value=12
             [/facet]
@@ -206,14 +206,14 @@
     [/event]
 )}
 
-{AI_ASPECT_UNIT_TEST test_modify_ai_change_aspect attack_depth
-{SPLIT 5,5,5,5,5,5,3,4,4,5,5,6 ,}
+{AI_ASPECT_UNIT_TEST test_modify_ai_change_aspect leader_value
+{SPLIT 3,3,3,3,3,3,3,4,4,5,5,6 ,}
 () (
     [event]
         name=turn 6 end
         [modify_ai]
             action=change
-            path=aspect[attack_depth]
+            path=aspect[leader_value]
             [aspect]
                 engine=lua
                 code=<<return math.floor(wesnoth.current.turn / 2)>>