diff --git a/src/company_cmd.cpp b/src/company_cmd.cpp
index 91e2cd70a9..1a6d96583c 100644
--- a/src/company_cmd.cpp
+++ b/src/company_cmd.cpp
@@ -405,7 +405,7 @@ static void GenerateCompanyName(Company *c)
 	StringID str;
 	uint32_t strp;
 	std::string name;
-	if (t->name.empty() && IsInsideMM(t->townnametype, SPECSTR_TOWNNAME_START, SPECSTR_TOWNNAME_LAST + 1)) {
+	if (t->name.empty() && IsInsideMM(t->townnametype, SPECSTR_TOWNNAME_START, SPECSTR_TOWNNAME_END)) {
 		str = t->townnametype - SPECSTR_TOWNNAME_START + SPECSTR_COMPANY_NAME_START;
 		strp = t->townnameparts;
 
diff --git a/src/saveload/company_sl.cpp b/src/saveload/company_sl.cpp
index 7bc7f8bc8f..bccb22a8be 100644
--- a/src/saveload/company_sl.cpp
+++ b/src/saveload/company_sl.cpp
@@ -562,7 +562,7 @@ struct PLYRChunkHandler : ChunkHandler {
 				}
 			}
 
-			if (cprops->name.empty() && !IsInsideMM(cprops->name_1, SPECSTR_COMPANY_NAME_START, SPECSTR_COMPANY_NAME_LAST + 1) &&
+			if (cprops->name.empty() && !IsInsideMM(cprops->name_1, SPECSTR_COMPANY_NAME_START, SPECSTR_COMPANY_NAME_END) &&
 				cprops->name_1 != STR_GAME_SAVELOAD_NOT_AVAILABLE && cprops->name_1 != STR_SV_UNNAMED &&
 				cprops->name_1 != SPECSTR_ANDCO_NAME && cprops->name_1 != SPECSTR_PRESIDENT_NAME &&
 				cprops->name_1 != SPECSTR_SILLY_NAME) {
diff --git a/src/saveload/town_sl.cpp b/src/saveload/town_sl.cpp
index 32f2cd8520..ace50e43e5 100644
--- a/src/saveload/town_sl.cpp
+++ b/src/saveload/town_sl.cpp
@@ -303,7 +303,7 @@ struct CITYChunkHandler : ChunkHandler {
 			Town *t = new (index) Town();
 			SlObject(t, slt);
 
-			if (t->townnamegrfid == 0 && !IsInsideMM(t->townnametype, SPECSTR_TOWNNAME_START, SPECSTR_TOWNNAME_LAST + 1) && GetStringTab(t->townnametype) != TEXT_TAB_OLD_CUSTOM) {
+			if (t->townnamegrfid == 0 && !IsInsideMM(t->townnametype, SPECSTR_TOWNNAME_START, SPECSTR_TOWNNAME_END) && GetStringTab(t->townnametype) != TEXT_TAB_OLD_CUSTOM) {
 				SlErrorCorrupt("Invalid town name generator");
 			}
 		}
diff --git a/src/strings.cpp b/src/strings.cpp
index ef5e6be1b5..3bdbed12bb 100644
--- a/src/strings.cpp
+++ b/src/strings.cpp
@@ -1890,7 +1890,7 @@ static void GetSpecialNameString(StringBuilder &builder, int ind, StringParamete
 	}
 
 	/* town name? */
-	if (IsInsideMM(ind - 6, 0, SPECSTR_TOWNNAME_LAST - SPECSTR_TOWNNAME_START + 1)) {
+	if (IsInsideMM(ind - 6, 0, SPECSTR_TOWNNAME_END - SPECSTR_TOWNNAME_START)) {
 		GetSpecialTownNameString(builder, ind - 6, args.GetNextParameter<uint32_t>());
 		builder += " Transport";
 		return;
diff --git a/src/strings_type.h b/src/strings_type.h
index c99ea09580..7e8d60dab9 100644
--- a/src/strings_type.h
+++ b/src/strings_type.h
@@ -82,11 +82,11 @@ enum SpecialStrings {
 	SPECSTR_TOWNNAME_TURKISH,
 	SPECSTR_TOWNNAME_ITALIAN,
 	SPECSTR_TOWNNAME_CATALAN,
-	SPECSTR_TOWNNAME_LAST      = SPECSTR_TOWNNAME_CATALAN,
+	SPECSTR_TOWNNAME_END = SPECSTR_TOWNNAME_CATALAN + 1,
 
 	/* special strings for company names on the form "TownName transport". */
 	SPECSTR_COMPANY_NAME_START = 0x70EA,
-	SPECSTR_COMPANY_NAME_LAST  = SPECSTR_COMPANY_NAME_START + SPECSTR_TOWNNAME_LAST - SPECSTR_TOWNNAME_START,
+	SPECSTR_COMPANY_NAME_END = SPECSTR_COMPANY_NAME_START + SPECSTR_TOWNNAME_END - SPECSTR_TOWNNAME_START,
 
 	SPECSTR_SILLY_NAME         = 0x70E5,
 	SPECSTR_ANDCO_NAME         = 0x70E6,
diff --git a/src/townname_type.h b/src/townname_type.h
index 0384a7ca0a..cdabc20539 100644
--- a/src/townname_type.h
+++ b/src/townname_type.h
@@ -19,7 +19,7 @@
 
 typedef std::set<std::string> TownNames;
 
-static constexpr uint BUILTIN_TOWNNAME_GENERATOR_COUNT = SPECSTR_TOWNNAME_LAST - SPECSTR_TOWNNAME_START + 1; ///< Number of built-in town name generators.
+static constexpr uint BUILTIN_TOWNNAME_GENERATOR_COUNT = SPECSTR_TOWNNAME_END - SPECSTR_TOWNNAME_START; ///< Number of built-in town name generators.
 
 /**
  * Struct holding parameters used to generate town name.