diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
index 6637a8a759b..58c7b09b2e5 100644
--- a/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
+++ b/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
@@ -402,6 +402,7 @@
 
     # Birds reach Thursagan's (variable) location
 
+    # wmllint: recognize Thursagan
     [event]
         name=moveto
         [filter]
diff --git a/data/core/macros/side-utils.cfg b/data/core/macros/side-utils.cfg
index 52bf2cc9f8f..2ff3f290a89 100644
--- a/data/core/macros/side-utils.cfg
+++ b/data/core/macros/side-utils.cfg
@@ -176,12 +176,12 @@
     {CLEAR_VARIABLE temp_target_villages}
 #enddef
 
-#define CAPTURE_VILLAGES_OF_TYPE TYPE SIDE X Y RADIUS
+#define CAPTURE_VILLAGES_OF_TYPE TERRAIN SIDE X Y RADIUS
     # Change ownership of the villages on a specified terrain type
     # near a specified location.
     {CAPTURE_FILTERED_VILLAGES {SIDE}
     (
-        terrain={TYPE}
+        terrain={TERRAIN}
         [and]
             x,y={X},{Y}
             radius={RADIUS}
diff --git a/data/tools/wesnoth/wmltools.py b/data/tools/wesnoth/wmltools.py
index 1f4661a7c1a..d48f53da114 100644
--- a/data/tools/wesnoth/wmltools.py
+++ b/data/tools/wesnoth/wmltools.py
@@ -180,7 +180,7 @@ def actualtype(a):
         atype = None	# Can't tell -- it's a macro expansion
     elif re.match(image_reference, a):
         atype = "image"
-    elif re.match(r"(\*|[A-Z][a-z]+)\^[A-Z][a-z\\|/]+\Z", a):
+    elif re.match(r"(\*|[A-Z][a-z]+)\^([A-Z][a-z\\|/]+\Z)?", a):
         atype = "terrain_code"
     elif a.endswith(".wav") or a.endswith(".ogg"):
         atype = "sound"