diff --git a/src/locales/en_AU_ocker/location/city_prefix.ts b/src/locales/en_AU_ocker/location/city_name.ts
similarity index 100%
rename from src/locales/en_AU_ocker/location/city_prefix.ts
rename to src/locales/en_AU_ocker/location/city_name.ts
diff --git a/src/locales/en_AU_ocker/location/city_pattern.ts b/src/locales/en_AU_ocker/location/city_pattern.ts
index 16c4830e472..ad43b68fc5c 100644
--- a/src/locales/en_AU_ocker/location/city_pattern.ts
+++ b/src/locales/en_AU_ocker/location/city_pattern.ts
@@ -1 +1 @@
-export default ['{{location.city_prefix}}'];
+export default ['{{location.city_name}}'];
diff --git a/src/locales/en_AU_ocker/location/index.ts b/src/locales/en_AU_ocker/location/index.ts
index f30bec3a6ab..52ac6ba8217 100644
--- a/src/locales/en_AU_ocker/location/index.ts
+++ b/src/locales/en_AU_ocker/location/index.ts
@@ -4,8 +4,8 @@
  */
 import type { LocationDefinition } from '../../..';
 import building_number from './building_number';
+import city_name from './city_name';
 import city_pattern from './city_pattern';
-import city_prefix from './city_prefix';
 import default_country from './default_country';
 import postcode from './postcode';
 import region from './region';
@@ -17,8 +17,8 @@ import street_suffix from './street_suffix';
 
 const location: LocationDefinition = {
   building_number,
+  city_name,
   city_pattern,
-  city_prefix,
   default_country,
   postcode,
   region,
diff --git a/src/locales/en_NG/location/city_prefix.ts b/src/locales/en_NG/location/city_name.ts
similarity index 100%
rename from src/locales/en_NG/location/city_prefix.ts
rename to src/locales/en_NG/location/city_name.ts
diff --git a/src/locales/en_NG/location/city_pattern.ts b/src/locales/en_NG/location/city_pattern.ts
index 16c4830e472..ad43b68fc5c 100644
--- a/src/locales/en_NG/location/city_pattern.ts
+++ b/src/locales/en_NG/location/city_pattern.ts
@@ -1 +1 @@
-export default ['{{location.city_prefix}}'];
+export default ['{{location.city_name}}'];
diff --git a/src/locales/en_NG/location/index.ts b/src/locales/en_NG/location/index.ts
index ed7bb18f12f..4fd0e9be7c6 100644
--- a/src/locales/en_NG/location/index.ts
+++ b/src/locales/en_NG/location/index.ts
@@ -3,16 +3,16 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocationDefinition } from '../../..';
+import city_name from './city_name';
 import city_pattern from './city_pattern';
-import city_prefix from './city_prefix';
 import default_country from './default_country';
 import postcode from './postcode';
 import state from './state';
 import street_pattern from './street_pattern';
 
 const location: LocationDefinition = {
+  city_name,
   city_pattern,
-  city_prefix,
   default_country,
   postcode,
   state,
diff --git a/src/locales/en_ZA/location/city_prefix.ts b/src/locales/en_ZA/location/city_name.ts
similarity index 100%
rename from src/locales/en_ZA/location/city_prefix.ts
rename to src/locales/en_ZA/location/city_name.ts
diff --git a/src/locales/en_ZA/location/city_pattern.ts b/src/locales/en_ZA/location/city_pattern.ts
index 16c4830e472..ad43b68fc5c 100644
--- a/src/locales/en_ZA/location/city_pattern.ts
+++ b/src/locales/en_ZA/location/city_pattern.ts
@@ -1 +1 @@
-export default ['{{location.city_prefix}}'];
+export default ['{{location.city_name}}'];
diff --git a/src/locales/en_ZA/location/index.ts b/src/locales/en_ZA/location/index.ts
index ed7bb18f12f..4fd0e9be7c6 100644
--- a/src/locales/en_ZA/location/index.ts
+++ b/src/locales/en_ZA/location/index.ts
@@ -3,16 +3,16 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocationDefinition } from '../../..';
+import city_name from './city_name';
 import city_pattern from './city_pattern';
-import city_prefix from './city_prefix';
 import default_country from './default_country';
 import postcode from './postcode';
 import state from './state';
 import street_pattern from './street_pattern';
 
 const location: LocationDefinition = {
+  city_name,
   city_pattern,
-  city_prefix,
   default_country,
   postcode,
   state,