diff --git a/src/newgrf_extension.cpp b/src/newgrf_extension.cpp
index 7c5a4d6898..492a3a23d8 100644
--- a/src/newgrf_extension.cpp
+++ b/src/newgrf_extension.cpp
@@ -177,11 +177,11 @@ extern const GRFVariableMapDefinition _grf_action2_remappable_variables[] = {
 	GRFVariableMapDefinition(GSF_SIGNALS, A2VRI_SIGNALS_SIGNAL_VERTICAL_CLEARANCE, "signals_signal_vertical_clearance"),
 	GRFVariableMapDefinition(GSF_FAKE_TOWNS, A2VRI_TOWNS_HOUSE_COUNT, "town_house_count"),
 	GRFVariableMapDefinition(GSF_FAKE_TOWNS, A2VRI_TOWNS_POPULATION, "town_population"),
-	GRFVariableMapDefinition(GSF_FAKE_TOWNS, A2VRI_ZONE_0, "town_zone_0_radius_square"),
-	GRFVariableMapDefinition(GSF_FAKE_TOWNS, A2VRI_ZONE_1, "town_zone_1_radius_square"),
-	GRFVariableMapDefinition(GSF_FAKE_TOWNS, A2VRI_ZONE_2, "town_zone_2_radius_square"),
-	GRFVariableMapDefinition(GSF_FAKE_TOWNS, A2VRI_ZONE_3, "town_zone_3_radius_square"),
-	GRFVariableMapDefinition(GSF_FAKE_TOWNS, A2VRI_ZONE_4, "town_zone_4_radius_square"),
+	GRFVariableMapDefinition(GSF_FAKE_TOWNS, A2VRI_TOWNS_ZONE_0, "town_zone_0_radius_square"),
+	GRFVariableMapDefinition(GSF_FAKE_TOWNS, A2VRI_TOWNS_ZONE_1, "town_zone_1_radius_square"),
+	GRFVariableMapDefinition(GSF_FAKE_TOWNS, A2VRI_TOWNS_ZONE_2, "town_zone_2_radius_square"),
+	GRFVariableMapDefinition(GSF_FAKE_TOWNS, A2VRI_TOWNS_ZONE_3, "town_zone_3_radius_square"),
+	GRFVariableMapDefinition(GSF_FAKE_TOWNS, A2VRI_TOWNS_ZONE_4, "town_zone_4_radius_square"),
 	GRFVariableMapDefinition(GSF_NEWLANDSCAPE, 0x40, "newlandscape_terrain_type"),
 	GRFVariableMapDefinition(GSF_NEWLANDSCAPE, 0x41, "newlandscape_tile_slope"),
 	GRFVariableMapDefinition(GSF_NEWLANDSCAPE, 0x42, "newlandscape_tile_height"),
diff --git a/src/newgrf_extension.h b/src/newgrf_extension.h
index 037804510c..ee0afc5a38 100644
--- a/src/newgrf_extension.h
+++ b/src/newgrf_extension.h
@@ -91,11 +91,11 @@ enum Action2VariableRemapIds {
 	A2VRI_SIGNALS_SIGNAL_VERTICAL_CLEARANCE,
 	A2VRI_TOWNS_HOUSE_COUNT,
 	A2VRI_TOWNS_POPULATION,
-	A2VRI_ZONE_0,
-	A2VRI_ZONE_1,
-	A2VRI_ZONE_2,
-	A2VRI_ZONE_3,
-	A2VRI_ZONE_4,
+	A2VRI_TOWNS_ZONE_0,
+	A2VRI_TOWNS_ZONE_1,
+	A2VRI_TOWNS_ZONE_2,
+	A2VRI_TOWNS_ZONE_3,
+	A2VRI_TOWNS_ZONE_4,
 };
 
 enum GRFFeatureTestObservationFlag : uint8 {
diff --git a/src/newgrf_town.cpp b/src/newgrf_town.cpp
index 77e70cb50f..bea32ffd18 100644
--- a/src/newgrf_town.cpp
+++ b/src/newgrf_town.cpp
@@ -113,12 +113,12 @@
 		case A2VRI_TOWNS_HOUSE_COUNT: return this->t->cache.num_houses;
 		case A2VRI_TOWNS_POPULATION: return this->t->cache.population;
 
-		case A2VRI_ZONE_0:
-		case A2VRI_ZONE_1:
-		case A2VRI_ZONE_2:
-		case A2VRI_ZONE_3:
-		case A2VRI_ZONE_4:
-			return this->t->cache.squared_town_zone_radius[variable - A2VRI_ZONE_0];
+		case A2VRI_TOWNS_ZONE_0:
+		case A2VRI_TOWNS_ZONE_1:
+		case A2VRI_TOWNS_ZONE_2:
+		case A2VRI_TOWNS_ZONE_3:
+		case A2VRI_TOWNS_ZONE_4:
+			return this->t->cache.squared_town_zone_radius[variable - A2VRI_TOWNS_ZONE_0];
 	}
 
 	DEBUG(grf, 1, "Unhandled town variable 0x%X", variable);
@@ -175,11 +175,11 @@
 		case 0xD3: case 0xD4: case 0xD5:
 		case A2VRI_TOWNS_HOUSE_COUNT:
 		case A2VRI_TOWNS_POPULATION:
-		case A2VRI_ZONE_0:
-		case A2VRI_ZONE_1:
-		case A2VRI_ZONE_2:
-		case A2VRI_ZONE_3:
-		case A2VRI_ZONE_4:
+		case A2VRI_TOWNS_ZONE_0:
+		case A2VRI_TOWNS_ZONE_1:
+		case A2VRI_TOWNS_ZONE_2:
+		case A2VRI_TOWNS_ZONE_3:
+		case A2VRI_TOWNS_ZONE_4:
 			return 0;
 	}
 
diff --git a/src/table/newgrf_debug_data.h b/src/table/newgrf_debug_data.h
index fa68baab1f..342de61ee1 100644
--- a/src/table/newgrf_debug_data.h
+++ b/src/table/newgrf_debug_data.h
@@ -1634,11 +1634,11 @@ static const NIVariable _niv_towns[] = {
 	NIV(0xB6, "number of buildings"),
 	NIV(A2VRI_TOWNS_HOUSE_COUNT, "number of buildings (uncapped)"),
 	NIV(A2VRI_TOWNS_POPULATION, "population (uncapped)"),
-	NIV(A2VRI_ZONE_0, "zone radius 0 (uncapped)"),
-	NIV(A2VRI_ZONE_1, "zone radius 1 (uncapped)"),
-	NIV(A2VRI_ZONE_2, "zone radius 2 (uncapped)"),
-	NIV(A2VRI_ZONE_3, "zone radius 3 (uncapped)"),
-	NIV(A2VRI_ZONE_4, "zone radius 4 (uncapped)"),
+	NIV(A2VRI_TOWNS_ZONE_0, "zone radius 0 (uncapped)"),
+	NIV(A2VRI_TOWNS_ZONE_1, "zone radius 1 (uncapped)"),
+	NIV(A2VRI_TOWNS_ZONE_2, "zone radius 2 (uncapped)"),
+	NIV(A2VRI_TOWNS_ZONE_3, "zone radius 3 (uncapped)"),
+	NIV(A2VRI_TOWNS_ZONE_4, "zone radius 4 (uncapped)"),
 	NIV_END()
 };