refactor(location)!: rename address module (#1469)

Co-authored-by: ST-DDT <[email protected]>

847 files changed, 871 insertions, 843 deletions

diff --git a/src/definitions/definitions.ts b/src/definitions/definitions.ts
index 7d8113da..59c133eb 100644
--- a/src/definitions/definitions.ts
+++ b/src/definitions/definitions.ts
@@ -1,4 +1,3 @@
-import type { AddressDefinitions } from './address';
 import type { AnimalDefinitions } from './animal';
 import type { ColorDefinitions } from './color';
 import type { CommerceDefinitions } from './commerce';
@@ -8,6 +7,7 @@ import type { DateDefinitions } from './date';
 import type { FinanceDefinitions } from './finance';
 import type { HackerDefinitions } from './hacker';
 import type { InternetDefinitions } from './internet';
+import type { LocationDefinitions } from './location';
 import type { LoremDefinitions } from './lorem';
 import type { MusicDefinitions } from './music';
 import type { PersonDefinitions } from './person';
@@ -26,7 +26,6 @@ export type LocaleEntry<T> = Partial<T> &
  * The definitions as used by the Faker modules.
  */
 export interface Definitions {
-  address: AddressDefinitions;
   animal: AnimalDefinitions;
   color: ColorDefinitions;
   commerce: CommerceDefinitions;
@@ -36,6 +35,7 @@ export interface Definitions {
   finance: FinanceDefinitions;
   hacker: HackerDefinitions;
   internet: InternetDefinitions;
+  location: LocationDefinitions;
   lorem: LoremDefinitions;
   music: MusicDefinitions;
   person: PersonDefinitions;
diff --git a/src/definitions/index.ts b/src/definitions/index.ts
index fc27ba8f..230a19fb 100644
--- a/src/definitions/index.ts
+++ b/src/definitions/index.ts
@@ -1,4 +1,3 @@
-export type { AddressDefinitions } from './address';
 export type { AnimalDefinitions } from './animal';
 export type { ColorDefinitions } from './color';
 export type {
@@ -15,6 +14,7 @@ export type {
 } from './finance';
 export type { HackerDefinitions } from './hacker';
 export type { InternetDefinitions } from './internet';
+export type { LocationDefinitions } from './location';
 export type { LoremDefinitions } from './lorem';
 export type { MusicDefinitions } from './music';
 export type { PersonDefinitions, PersonTitleDefinitions } from './person';
diff --git a/src/definitions/address.ts b/src/definitions/location.ts
index ad3bd319..95362edd 100644
--- a/src/definitions/address.ts
+++ b/src/definitions/location.ts
@@ -1,9 +1,9 @@
 import type { LocaleEntry } from './definitions';
 
 /**
- * The possible definitions related to addresses.
+ * The possible definitions related to addresses and locations.
  */
-export type AddressDefinitions = LocaleEntry<{
+export type LocationDefinitions = LocaleEntry<{
   /**
    * Postcodes patterns by state
    */
diff --git a/src/faker.ts b/src/faker.ts
index 3452ae49..f8a46511 100644
--- a/src/faker.ts
+++ b/src/faker.ts
@@ -3,7 +3,6 @@ import { FakerError } from './errors/faker-error';
 import { deprecated } from './internal/deprecated';
 import { MersenneModule } from './internal/mersenne/mersenne';
 import type { KnownLocale } from './locales';
-import { AddressModule } from './modules/address';
 import { AnimalModule } from './modules/animal';
 import { ColorModule } from './modules/color';
 import { CommerceModule } from './modules/commerce';
@@ -17,6 +16,8 @@ import { HackerModule } from './modules/hacker';
 import { HelpersModule } from './modules/helpers';
 import { ImageModule } from './modules/image';
 import { InternetModule } from './modules/internet';
+import type { LocationModule as AddressModule } from './modules/location';
+import { LocationModule } from './modules/location';
 import { LoremModule } from './modules/lorem';
 import { MusicModule } from './modules/music';
 import type { PersonModule as NameModule } from './modules/person';
@@ -86,7 +87,6 @@ export class Faker {
 
   readonly datatype: DatatypeModule = new DatatypeModule(this);
 
-  readonly address: AddressModule = new AddressModule(this);
   readonly animal: AnimalModule = new AnimalModule(this);
   readonly color: ColorModule = new ColorModule(this);
   readonly commerce: CommerceModule = new CommerceModule(this);
@@ -98,6 +98,7 @@ export class Faker {
   readonly hacker: HackerModule = new HackerModule(this);
   readonly image: ImageModule = new ImageModule(this);
   readonly internet: InternetModule = new InternetModule(this);
+  readonly location: LocationModule = new LocationModule(this);
   readonly lorem: LoremModule = new LoremModule(this);
   readonly music: MusicModule = new MusicModule(this);
   readonly person: PersonModule = new PersonModule(this);
@@ -109,13 +110,24 @@ export class Faker {
   readonly word: WordModule = new WordModule(this);
 
   // Aliases
+  /** @deprecated Use {@link location} instead */
+  get address(): AddressModule {
+    deprecated({
+      deprecated: 'faker.address',
+      proposed: 'faker.location',
+      since: '8.0',
+      until: '10.0',
+    });
+    return this.location;
+  }
+
   /** @deprecated Use {@link person} instead */
   get name(): NameModule {
     deprecated({
       deprecated: 'faker.name',
       proposed: 'faker.person',
-      since: '8.0.0',
-      until: '10.0.0',
+      since: '8.0',
+      until: '10.0',
     });
     return this.person;
   }
@@ -175,13 +187,21 @@ export class Faker {
     return new Proxy({} as LocaleDefinition, {
       get(target: LocaleDefinition, module: string): unknown {
         // Support aliases
-        if (module === 'name') {
+        if (module === 'address') {
+          module = 'location';
+          deprecated({
+            deprecated: `faker.helpers.fake('{{address.*}}') or faker.definitions.address`,
+            proposed: `faker.helpers.fake('{{location.*}}') or faker.definitions.location`,
+            since: '8.0',
+            until: '10.0',
+          });
+        } else if (module === 'name') {
           module = 'person';
           deprecated({
             deprecated: `faker.helpers.fake('{{name.*}}') or faker.definitions.name`,
             proposed: `faker.helpers.fake('{{person.*}}') or faker.definitions.person`,
-            since: '8.0.0',
-            until: '10.0.0',
+            since: '8.0',
+            until: '10.0',
           });
         }
 
diff --git a/src/index.ts b/src/index.ts
index f0b87953..9589c257 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -2,7 +2,6 @@ import { Faker } from './faker';
 import allLocales from './locales';
 
 export type {
-  AddressDefinitions,
   AnimalDefinitions,
   ColorDefinitions,
   CommerceDefinitions,
@@ -16,6 +15,9 @@ export type {
   HackerDefinitions,
   InternetDefinitions,
   LocaleDefinition,
+  /** @deprecated Use LocationDefinitions instead */
+  LocationDefinitions as AddressDefinitions,
+  LocationDefinitions,
   LoremDefinitions,
   MusicDefinitions,
   /** @deprecated Use PersonDefinitions instead */
@@ -33,7 +35,6 @@ export type {
 } from './definitions';
 export { FakerError } from './errors/faker-error';
 export type { FakerOptions, UsableLocale, UsedLocales } from './faker';
-export type { AddressModule } from './modules/address';
 export type { AnimalModule } from './modules/animal';
 export type {
   Casing,
@@ -55,6 +56,11 @@ export type { HackerModule } from './modules/hacker';
 export type { HelpersModule } from './modules/helpers';
 export type { ImageModule } from './modules/image';
 export type { InternetModule } from './modules/internet';
+export type {
+  /** @deprecated Use LocationModule instead */
+  LocationModule as AddressModule,
+  LocationModule,
+} from './modules/location';
 export type { LoremModule } from './modules/lorem';
 export type { MusicModule } from './modules/music';
 export { Sex } from './modules/person';
diff --git a/src/locales/af_ZA/address/city.ts b/src/locales/af_ZA/address/city.ts
deleted file mode 100644
index ea6ea950..00000000
--- a/src/locales/af_ZA/address/city.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export default [
-  '{{address.city_prefix}} {{person.firstName}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{person.firstName}}',
-  '{{person.firstName}}{{address.city_suffix}}',
-  '{{person.lastName}}{{address.city_suffix}}',
-];
diff --git a/src/locales/af_ZA/address/street.ts b/src/locales/af_ZA/address/street.ts
deleted file mode 100644
index f7dd9d3b..00000000
--- a/src/locales/af_ZA/address/street.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{person.firstName}} {{address.street_suffix}}',
-  '{{person.lastName}} {{address.street_suffix}}',
-];
diff --git a/src/locales/af_ZA/index.ts b/src/locales/af_ZA/index.ts
index f0829959..884b9469 100644
--- a/src/locales/af_ZA/index.ts
+++ b/src/locales/af_ZA/index.ts
@@ -3,19 +3,19 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import cell_phone from './cell_phone';
 import company from './company';
 import internet from './internet';
+import location from './location';
 import person from './person';
 import phone_number from './phone_number';
 
 const af_ZA: LocaleDefinition = {
   title: 'Afrikaans',
-  address,
   cell_phone,
   company,
   internet,
+  location,
   person,
   phone_number,
 };
diff --git a/src/locales/af_ZA/location/city.ts b/src/locales/af_ZA/location/city.ts
new file mode 100644
index 00000000..7375aa83
--- /dev/null
+++ b/src/locales/af_ZA/location/city.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{location.city_prefix}} {{person.firstName}}{{location.city_suffix}}',
+  '{{location.city_prefix}} {{person.firstName}}',
+  '{{person.firstName}}{{location.city_suffix}}',
+  '{{person.lastName}}{{location.city_suffix}}',
+];
diff --git a/src/locales/af_ZA/address/default_country.ts b/src/locales/af_ZA/location/default_country.ts
index d74180a7..d74180a7 100644
--- a/src/locales/af_ZA/address/default_country.ts
+++ b/src/locales/af_ZA/location/default_country.ts
diff --git a/src/locales/zu_ZA/address/index.ts b/src/locales/af_ZA/location/index.ts
index c1739ea5..112133b4 100644
--- a/src/locales/zu_ZA/address/index.ts
+++ b/src/locales/af_ZA/location/index.ts
@@ -2,17 +2,17 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import city from './city';
 import default_country from './default_country';
 import postcode from './postcode';
 import street from './street';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   city,
   default_country,
   postcode,
   street,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/af_ZA/address/postcode.ts b/src/locales/af_ZA/location/postcode.ts
index c97754f0..c97754f0 100644
--- a/src/locales/af_ZA/address/postcode.ts
+++ b/src/locales/af_ZA/location/postcode.ts
diff --git a/src/locales/af_ZA/location/street.ts b/src/locales/af_ZA/location/street.ts
new file mode 100644
index 00000000..af32d0c4
--- /dev/null
+++ b/src/locales/af_ZA/location/street.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{person.firstName}} {{location.street_suffix}}',
+  '{{person.lastName}} {{location.street_suffix}}',
+];
diff --git a/src/locales/ar/address/city.ts b/src/locales/ar/address/city.ts
deleted file mode 100644
index e3da346b..00000000
--- a/src/locales/ar/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_name}}'];
diff --git a/src/locales/ar/address/street.ts b/src/locales/ar/address/street.ts
deleted file mode 100644
index 5db4f5be..00000000
--- a/src/locales/ar/address/street.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{address.street_prefix}} {{person.first_name}}',
-  '{{address.street_prefix}} {{person.last_name}}',
-];
diff --git a/src/locales/ar/address/street_address.ts b/src/locales/ar/address/street_address.ts
deleted file mode 100644
index 55bed362..00000000
--- a/src/locales/ar/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.buildingNumber}} {{address.street}}',
-  full: '{{address.buildingNumber}} {{address.street}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/ar/index.ts b/src/locales/ar/index.ts
index c052dc37..7b81efd8 100644
--- a/src/locales/ar/index.ts
+++ b/src/locales/ar/index.ts
@@ -3,11 +3,11 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import cell_phone from './cell_phone';
 import color from './color';
 import commerce from './commerce';
 import date from './date';
+import location from './location';
 import person from './person';
 import phone_number from './phone_number';
 import team from './team';
@@ -16,11 +16,11 @@ import vehicle from './vehicle';
 const ar: LocaleDefinition = {
   title: 'Arabic',
   separator: ' & ',
-  address,
   cell_phone,
   color,
   commerce,
   date,
+  location,
   person,
   phone_number,
   team,
diff --git a/src/locales/ar/address/building_number.ts b/src/locales/ar/location/building_number.ts
index 50c31ccb..50c31ccb 100644
--- a/src/locales/ar/address/building_number.ts
+++ b/src/locales/ar/location/building_number.ts
diff --git a/src/locales/ar/location/city.ts b/src/locales/ar/location/city.ts
new file mode 100644
index 00000000..ad43b68f
--- /dev/null
+++ b/src/locales/ar/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_name}}'];
diff --git a/src/locales/ar/address/city_name.ts b/src/locales/ar/location/city_name.ts
index 0f2fe86f..0f2fe86f 100644
--- a/src/locales/ar/address/city_name.ts
+++ b/src/locales/ar/location/city_name.ts
diff --git a/src/locales/ar/address/country.ts b/src/locales/ar/location/country.ts
index d8a21a97..d8a21a97 100644
--- a/src/locales/ar/address/country.ts
+++ b/src/locales/ar/location/country.ts
diff --git a/src/locales/ar/address/default_country.ts b/src/locales/ar/location/default_country.ts
index 2a8aa99c..2a8aa99c 100644
--- a/src/locales/ar/address/default_country.ts
+++ b/src/locales/ar/location/default_country.ts
diff --git a/src/locales/ar/address/index.ts b/src/locales/ar/location/index.ts
index c67148a7..c24a8ac5 100644
--- a/src/locales/ar/address/index.ts
+++ b/src/locales/ar/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_name from './city_name';
@@ -15,7 +15,7 @@ import street from './street';
 import street_address from './street_address';
 import street_prefix from './street_prefix';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_name,
@@ -29,4 +29,4 @@ const address: AddressDefinitions = {
   street_prefix,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/ar/address/postcode.ts b/src/locales/ar/location/postcode.ts
index 4433f068..4433f068 100644
--- a/src/locales/ar/address/postcode.ts
+++ b/src/locales/ar/location/postcode.ts
diff --git a/src/locales/ar/address/secondary_address.ts b/src/locales/ar/location/secondary_address.ts
index b9adf239..b9adf239 100644
--- a/src/locales/ar/address/secondary_address.ts
+++ b/src/locales/ar/location/secondary_address.ts
diff --git a/src/locales/ar/address/state.ts b/src/locales/ar/location/state.ts
index 6cf0555e..6cf0555e 100644
--- a/src/locales/ar/address/state.ts
+++ b/src/locales/ar/location/state.ts
diff --git a/src/locales/ar/location/street.ts b/src/locales/ar/location/street.ts
new file mode 100644
index 00000000..c182e837
--- /dev/null
+++ b/src/locales/ar/location/street.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{location.street_prefix}} {{person.first_name}}',
+  '{{location.street_prefix}} {{person.last_name}}',
+];
diff --git a/src/locales/ar/location/street_address.ts b/src/locales/ar/location/street_address.ts
new file mode 100644
index 00000000..2e1a661d
--- /dev/null
+++ b/src/locales/ar/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.buildingNumber}} {{location.street}}',
+  full: '{{location.buildingNumber}} {{location.street}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/ar/address/street_prefix.ts b/src/locales/ar/location/street_prefix.ts
index 736c5050..736c5050 100644
--- a/src/locales/ar/address/street_prefix.ts
+++ b/src/locales/ar/location/street_prefix.ts
diff --git a/src/locales/ar/team/name.ts b/src/locales/ar/team/name.ts
index ed2bdbb5..bdd4f123 100644
--- a/src/locales/ar/team/name.ts
+++ b/src/locales/ar/team/name.ts
@@ -1 +1 @@
-export default ['{{address.state}} {{team.creature}}'];
+export default ['{{location.state}} {{team.creature}}'];
diff --git a/src/locales/az/address/city.ts b/src/locales/az/address/city.ts
deleted file mode 100644
index e3da346b..00000000
--- a/src/locales/az/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_name}}'];
diff --git a/src/locales/az/address/street.ts b/src/locales/az/address/street.ts
deleted file mode 100644
index bddea6b0..00000000
--- a/src/locales/az/address/street.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{address.street_suffix}} {{address.street_name}}',
-  '{{address.street_name}} {{address.street_suffix}}',
-];
diff --git a/src/locales/az/address/street_address.ts b/src/locales/az/address/street_address.ts
deleted file mode 100644
index 9a8e4da4..00000000
--- a/src/locales/az/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.street}}, {{address.buildingNumber}}',
-  full: '{{address.street}}, {{address.buildingNumber}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/az/company/name_patterns.ts b/src/locales/az/company/name_patterns.ts
index 9db05dce..b9374d22 100644
--- a/src/locales/az/company/name_patterns.ts
+++ b/src/locales/az/company/name_patterns.ts
@@ -4,7 +4,7 @@ export default [
   '{{company.prefix}} {{person.male_last_name}}',
   '{{company.prefix}} {{company.suffix}}{{company.suffix}}',
   '{{company.prefix}} {{company.suffix}}{{company.suffix}}{{company.suffix}}',
-  '{{company.prefix}} {{address.city_name}}{{company.suffix}}',
-  '{{company.prefix}} {{address.city_name}}{{company.suffix}}{{company.suffix}}',
-  '{{company.prefix}} {{address.city_name}}{{company.suffix}}{{company.suffix}}{{company.suffix}}',
+  '{{company.prefix}} {{location.city_name}}{{company.suffix}}',
+  '{{company.prefix}} {{location.city_name}}{{company.suffix}}{{company.suffix}}',
+  '{{company.prefix}} {{location.city_name}}{{company.suffix}}{{company.suffix}}{{company.suffix}}',
 ];
diff --git a/src/locales/az/index.ts b/src/locales/az/index.ts
index b48e7235..fe89852b 100644
--- a/src/locales/az/index.ts
+++ b/src/locales/az/index.ts
@@ -3,24 +3,24 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import color from './color';
 import commerce from './commerce';
 import company from './company';
 import date from './date';
 import internet from './internet';
+import location from './location';
 import person from './person';
 import phone_number from './phone_number';
 
 const az: LocaleDefinition = {
   title: 'Azerbaijani',
   separator: ' və ',
-  address,
   color,
   commerce,
   company,
   date,
   internet,
+  location,
   person,
   phone_number,
 };
diff --git a/src/locales/az/address/building_number.ts b/src/locales/az/location/building_number.ts
index fd93542d..fd93542d 100644
--- a/src/locales/az/address/building_number.ts
+++ b/src/locales/az/location/building_number.ts
diff --git a/src/locales/az/location/city.ts b/src/locales/az/location/city.ts
new file mode 100644
index 00000000..ad43b68f
--- /dev/null
+++ b/src/locales/az/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_name}}'];
diff --git a/src/locales/az/address/city_name.ts b/src/locales/az/location/city_name.ts
index 85b45d22..85b45d22 100644
--- a/src/locales/az/address/city_name.ts
+++ b/src/locales/az/location/city_name.ts
diff --git a/src/locales/az/address/country.ts b/src/locales/az/location/country.ts
index 41d6793e..41d6793e 100644
--- a/src/locales/az/address/country.ts
+++ b/src/locales/az/location/country.ts
diff --git a/src/locales/az/address/default_country.ts b/src/locales/az/location/default_country.ts
index dfd0000e..dfd0000e 100644
--- a/src/locales/az/address/default_country.ts
+++ b/src/locales/az/location/default_country.ts
diff --git a/src/locales/lv/address/index.ts b/src/locales/az/location/index.ts
index 3c37ba5f..b28b0dfb 100644
--- a/src/locales/lv/address/index.ts
+++ b/src/locales/az/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_name from './city_name';
@@ -16,7 +16,7 @@ import street_address from './street_address';
 import street_name from './street_name';
 import street_suffix from './street_suffix';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_name,
@@ -31,4 +31,4 @@ const address: AddressDefinitions = {
   street_suffix,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/az/address/postcode.ts b/src/locales/az/location/postcode.ts
index 23911060..23911060 100644
--- a/src/locales/az/address/postcode.ts
+++ b/src/locales/az/location/postcode.ts
diff --git a/src/locales/az/address/secondary_address.ts b/src/locales/az/location/secondary_address.ts
index 8adcf747..8adcf747 100644
--- a/src/locales/az/address/secondary_address.ts
+++ b/src/locales/az/location/secondary_address.ts
diff --git a/src/locales/az/address/state.ts b/src/locales/az/location/state.ts
index d6d1738d..d6d1738d 100644
--- a/src/locales/az/address/state.ts
+++ b/src/locales/az/location/state.ts
diff --git a/src/locales/az/location/street.ts b/src/locales/az/location/street.ts
new file mode 100644
index 00000000..523f8165
--- /dev/null
+++ b/src/locales/az/location/street.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{location.street_suffix}} {{location.street_name}}',
+  '{{location.street_name}} {{location.street_suffix}}',
+];
diff --git a/src/locales/az/location/street_address.ts b/src/locales/az/location/street_address.ts
new file mode 100644
index 00000000..3394fef6
--- /dev/null
+++ b/src/locales/az/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.street}}, {{location.buildingNumber}}',
+  full: '{{location.street}}, {{location.buildingNumber}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/az/address/street_name.ts b/src/locales/az/location/street_name.ts
index 3519eab5..3519eab5 100644
--- a/src/locales/az/address/street_name.ts
+++ b/src/locales/az/location/street_name.ts
diff --git a/src/locales/az/address/street_suffix.ts b/src/locales/az/location/street_suffix.ts
index 4d941468..4d941468 100644
--- a/src/locales/az/address/street_suffix.ts
+++ b/src/locales/az/location/street_suffix.ts
diff --git a/src/locales/cz/address/city.ts b/src/locales/cz/address/city.ts
deleted file mode 100644
index e3da346b..00000000
--- a/src/locales/cz/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_name}}'];
diff --git a/src/locales/cz/address/street.ts b/src/locales/cz/address/street.ts
deleted file mode 100644
index 30ba73fc..00000000
--- a/src/locales/cz/address/street.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.street_name}}'];
diff --git a/src/locales/cz/address/street_address.ts b/src/locales/cz/address/street_address.ts
deleted file mode 100644
index d1e8da38..00000000
--- a/src/locales/cz/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.street}} {{address.buildingNumber}}',
-  full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/cz/index.ts b/src/locales/cz/index.ts
index c9c7ab54..bfac022c 100644
--- a/src/locales/cz/index.ts
+++ b/src/locales/cz/index.ts
@@ -3,20 +3,20 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import company from './company';
 import date from './date';
 import internet from './internet';
+import location from './location';
 import lorem from './lorem';
 import person from './person';
 import phone_number from './phone_number';
 
 const cz: LocaleDefinition = {
   title: 'Czech',
-  address,
   company,
   date,
   internet,
+  location,
   lorem,
   person,
   phone_number,
diff --git a/src/locales/cz/address/building_number.ts b/src/locales/cz/location/building_number.ts
index 4b74b7de..4b74b7de 100644
--- a/src/locales/cz/address/building_number.ts
+++ b/src/locales/cz/location/building_number.ts
diff --git a/src/locales/cz/location/city.ts b/src/locales/cz/location/city.ts
new file mode 100644
index 00000000..ad43b68f
--- /dev/null
+++ b/src/locales/cz/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_name}}'];
diff --git a/src/locales/cz/address/city_name.ts b/src/locales/cz/location/city_name.ts
index de71b716..de71b716 100644
--- a/src/locales/cz/address/city_name.ts
+++ b/src/locales/cz/location/city_name.ts
diff --git a/src/locales/cz/address/country.ts b/src/locales/cz/location/country.ts
index 9ac6fede..9ac6fede 100644
--- a/src/locales/cz/address/country.ts
+++ b/src/locales/cz/location/country.ts
diff --git a/src/locales/cz/address/default_country.ts b/src/locales/cz/location/default_country.ts
index 6ae65adc..6ae65adc 100644
--- a/src/locales/cz/address/default_country.ts
+++ b/src/locales/cz/location/default_country.ts
diff --git a/src/locales/de_AT/address/index.ts b/src/locales/cz/location/index.ts
index 8222f809..7dd25913 100644
--- a/src/locales/de_AT/address/index.ts
+++ b/src/locales/cz/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_name from './city_name';
@@ -16,7 +16,7 @@ import street from './street';
 import street_address from './street_address';
 import street_name from './street_name';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_name,
@@ -31,4 +31,4 @@ const address: AddressDefinitions = {
   street_name,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/cz/address/postcode.ts b/src/locales/cz/location/postcode.ts
index a1ffc2d1..a1ffc2d1 100644
--- a/src/locales/cz/address/postcode.ts
+++ b/src/locales/cz/location/postcode.ts
diff --git a/src/locales/cz/address/secondary_address.ts b/src/locales/cz/location/secondary_address.ts
index 6f2a5cc8..6f2a5cc8 100644
--- a/src/locales/cz/address/secondary_address.ts
+++ b/src/locales/cz/location/secondary_address.ts
diff --git a/src/locales/cz/address/state.ts b/src/locales/cz/location/state.ts
index d6d1738d..d6d1738d 100644
--- a/src/locales/cz/address/state.ts
+++ b/src/locales/cz/location/state.ts
diff --git a/src/locales/cz/address/state_abbr.ts b/src/locales/cz/location/state_abbr.ts
index d6d1738d..d6d1738d 100644
--- a/src/locales/cz/address/state_abbr.ts
+++ b/src/locales/cz/location/state_abbr.ts
diff --git a/src/locales/cz/location/street.ts b/src/locales/cz/location/street.ts
new file mode 100644
index 00000000..30a9a5dd
--- /dev/null
+++ b/src/locales/cz/location/street.ts
@@ -0,0 +1 @@
+export default ['{{location.street_name}}'];
diff --git a/src/locales/cz/location/street_address.ts b/src/locales/cz/location/street_address.ts
new file mode 100644
index 00000000..437f20dd
--- /dev/null
+++ b/src/locales/cz/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.street}} {{location.buildingNumber}}',
+  full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/cz/address/street_name.ts b/src/locales/cz/location/street_name.ts
index a71e4da2..a71e4da2 100644
--- a/src/locales/cz/address/street_name.ts
+++ b/src/locales/cz/location/street_name.ts
diff --git a/src/locales/de/address/city.ts b/src/locales/de/address/city.ts
deleted file mode 100644
index 27a932f1..00000000
--- a/src/locales/de/address/city.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export default [
-  '{{address.city_prefix}} {{person.first_name}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{person.first_name}}',
-  '{{person.first_name}}{{address.city_suffix}}',
-  '{{person.last_name}}{{address.city_suffix}}',
-];
diff --git a/src/locales/de/address/street.ts b/src/locales/de/address/street.ts
deleted file mode 100644
index 30ba73fc..00000000
--- a/src/locales/de/address/street.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.street_name}}'];
diff --git a/src/locales/de/address/street_address.ts b/src/locales/de/address/street_address.ts
deleted file mode 100644
index d1e8da38..00000000
--- a/src/locales/de/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.street}} {{address.buildingNumber}}',
-  full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/de/index.ts b/src/locales/de/index.ts
index 49b98452..4961854c 100644
--- a/src/locales/de/index.ts
+++ b/src/locales/de/index.ts
@@ -3,11 +3,11 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import cell_phone from './cell_phone';
 import company from './company';
 import date from './date';
 import internet from './internet';
+import location from './location';
 import lorem from './lorem';
 import person from './person';
 import phone_number from './phone_number';
@@ -15,11 +15,11 @@ import word from './word';
 
 const de: LocaleDefinition = {
   title: 'German',
-  address,
   cell_phone,
   company,
   date,
   internet,
+  location,
   lorem,
   person,
   phone_number,
diff --git a/src/locales/de/address/building_number.ts b/src/locales/de/location/building_number.ts
index 2fe49c1c..2fe49c1c 100644
--- a/src/locales/de/address/building_number.ts
+++ b/src/locales/de/location/building_number.ts
diff --git a/src/locales/de/location/city.ts b/src/locales/de/location/city.ts
new file mode 100644
index 00000000..d744d882
--- /dev/null
+++ b/src/locales/de/location/city.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{location.city_prefix}} {{person.first_name}}{{location.city_suffix}}',
+  '{{location.city_prefix}} {{person.first_name}}',
+  '{{person.first_name}}{{location.city_suffix}}',
+  '{{person.last_name}}{{location.city_suffix}}',
+];
diff --git a/src/locales/de/address/city_name.ts b/src/locales/de/location/city_name.ts
index ac8970cf..ac8970cf 100644
--- a/src/locales/de/address/city_name.ts
+++ b/src/locales/de/location/city_name.ts
diff --git a/src/locales/de/address/city_prefix.ts b/src/locales/de/location/city_prefix.ts
index ebbe413e..ebbe413e 100644
--- a/src/locales/de/address/city_prefix.ts
+++ b/src/locales/de/location/city_prefix.ts
diff --git a/src/locales/de/address/city_suffix.ts b/src/locales/de/location/city_suffix.ts
index 9a2c4388..9a2c4388 100644
--- a/src/locales/de/address/city_suffix.ts
+++ b/src/locales/de/location/city_suffix.ts
diff --git a/src/locales/de/address/country.ts b/src/locales/de/location/country.ts
index e44a0536..e44a0536 100644
--- a/src/locales/de/address/country.ts
+++ b/src/locales/de/location/country.ts
diff --git a/src/locales/de/address/default_country.ts b/src/locales/de/location/default_country.ts
index cb601be2..cb601be2 100644
--- a/src/locales/de/address/default_country.ts
+++ b/src/locales/de/location/default_country.ts
diff --git a/src/locales/sk/address/index.ts b/src/locales/de/location/index.ts
index 2551894c..93f5515e 100644
--- a/src/locales/sk/address/index.ts
+++ b/src/locales/de/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_name from './city_name';
@@ -18,7 +18,7 @@ import street from './street';
 import street_address from './street_address';
 import street_name from './street_name';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_name,
@@ -35,4 +35,4 @@ const address: AddressDefinitions = {
   street_name,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/de/address/postcode.ts b/src/locales/de/location/postcode.ts
index db2bcfed..db2bcfed 100644
--- a/src/locales/de/address/postcode.ts
+++ b/src/locales/de/location/postcode.ts
diff --git a/src/locales/de/address/secondary_address.ts b/src/locales/de/location/secondary_address.ts
index 5c120827..5c120827 100644
--- a/src/locales/de/address/secondary_address.ts
+++ b/src/locales/de/location/secondary_address.ts
diff --git a/src/locales/de/address/state.ts b/src/locales/de/location/state.ts
index ef595c1d..ef595c1d 100644
--- a/src/locales/de/address/state.ts
+++ b/src/locales/de/location/state.ts
diff --git a/src/locales/de/address/state_abbr.ts b/src/locales/de/location/state_abbr.ts
index dfe50712..dfe50712 100644
--- a/src/locales/de/address/state_abbr.ts
+++ b/src/locales/de/location/state_abbr.ts
diff --git a/src/locales/de/location/street.ts b/src/locales/de/location/street.ts
new file mode 100644
index 00000000..30a9a5dd
--- /dev/null
+++ b/src/locales/de/location/street.ts
@@ -0,0 +1 @@
+export default ['{{location.street_name}}'];
diff --git a/src/locales/de/location/street_address.ts b/src/locales/de/location/street_address.ts
new file mode 100644
index 00000000..437f20dd
--- /dev/null
+++ b/src/locales/de/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.street}} {{location.buildingNumber}}',
+  full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/de/address/street_name.ts b/src/locales/de/location/street_name.ts
index 6a8dd850..6a8dd850 100644
--- a/src/locales/de/address/street_name.ts
+++ b/src/locales/de/location/street_name.ts
diff --git a/src/locales/de_AT/address/city.ts b/src/locales/de_AT/address/city.ts
deleted file mode 100644
index e3da346b..00000000
--- a/src/locales/de_AT/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_name}}'];
diff --git a/src/locales/de_AT/address/street.ts b/src/locales/de_AT/address/street.ts
deleted file mode 100644
index 30ba73fc..00000000
--- a/src/locales/de_AT/address/street.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.street_name}}'];
diff --git a/src/locales/de_AT/address/street_address.ts b/src/locales/de_AT/address/street_address.ts
deleted file mode 100644
index d1e8da38..00000000
--- a/src/locales/de_AT/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.street}} {{address.buildingNumber}}',
-  full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/de_AT/index.ts b/src/locales/de_AT/index.ts
index 3789ea88..8fdfae13 100644
--- a/src/locales/de_AT/index.ts
+++ b/src/locales/de_AT/index.ts
@@ -3,20 +3,20 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import cell_phone from './cell_phone';
 import company from './company';
 import internet from './internet';
+import location from './location';
 import person from './person';
 import phone_number from './phone_number';
 import word from './word';
 
 const de_AT: LocaleDefinition = {
   title: 'German (Austria)',
-  address,
   cell_phone,
   company,
   internet,
+  location,
   person,
   phone_number,
   word,
diff --git a/src/locales/de_AT/address/building_number.ts b/src/locales/de_AT/location/building_number.ts
index 2fe49c1c..2fe49c1c 100644
--- a/src/locales/de_AT/address/building_number.ts
+++ b/src/locales/de_AT/location/building_number.ts
diff --git a/src/locales/de_AT/location/city.ts b/src/locales/de_AT/location/city.ts
new file mode 100644
index 00000000..ad43b68f
--- /dev/null
+++ b/src/locales/de_AT/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_name}}'];
diff --git a/src/locales/de_AT/address/city_name.ts b/src/locales/de_AT/location/city_name.ts
index 722bb2d3..722bb2d3 100644
--- a/src/locales/de_AT/address/city_name.ts
+++ b/src/locales/de_AT/location/city_name.ts
diff --git a/src/locales/de_AT/address/country.ts b/src/locales/de_AT/location/country.ts
index e44a0536..e44a0536 100644
--- a/src/locales/de_AT/address/country.ts
+++ b/src/locales/de_AT/location/country.ts
diff --git a/src/locales/de_AT/address/default_country.ts b/src/locales/de_AT/location/default_country.ts
index 89b67294..89b67294 100644
--- a/src/locales/de_AT/address/default_country.ts
+++ b/src/locales/de_AT/location/default_country.ts
diff --git a/src/locales/cz/address/index.ts b/src/locales/de_AT/location/index.ts
index 8222f809..7dd25913 100644
--- a/src/locales/cz/address/index.ts
+++ b/src/locales/de_AT/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_name from './city_name';
@@ -16,7 +16,7 @@ import street from './street';
 import street_address from './street_address';
 import street_name from './street_name';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_name,
@@ -31,4 +31,4 @@ const address: AddressDefinitions = {
   street_name,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/de_AT/address/postcode.ts b/src/locales/de_AT/location/postcode.ts
index a8235678..a8235678 100644
--- a/src/locales/de_AT/address/postcode.ts
+++ b/src/locales/de_AT/location/postcode.ts
diff --git a/src/locales/de_AT/address/secondary_address.ts b/src/locales/de_AT/location/secondary_address.ts
index 5c120827..5c120827 100644
--- a/src/locales/de_AT/address/secondary_address.ts
+++ b/src/locales/de_AT/location/secondary_address.ts
diff --git a/src/locales/de_AT/address/state.ts b/src/locales/de_AT/location/state.ts
index 5d60dcef..5d60dcef 100644
--- a/src/locales/de_AT/address/state.ts
+++ b/src/locales/de_AT/location/state.ts
diff --git a/src/locales/de_AT/address/state_abbr.ts b/src/locales/de_AT/location/state_abbr.ts
index b336f366..b336f366 100644
--- a/src/locales/de_AT/address/state_abbr.ts
+++ b/src/locales/de_AT/location/state_abbr.ts
diff --git a/src/locales/de_AT/location/street.ts b/src/locales/de_AT/location/street.ts
new file mode 100644
index 00000000..30a9a5dd
--- /dev/null
+++ b/src/locales/de_AT/location/street.ts
@@ -0,0 +1 @@
+export default ['{{location.street_name}}'];
diff --git a/src/locales/de_AT/location/street_address.ts b/src/locales/de_AT/location/street_address.ts
new file mode 100644
index 00000000..437f20dd
--- /dev/null
+++ b/src/locales/de_AT/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.street}} {{location.buildingNumber}}',
+  full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/de_AT/address/street_name.ts b/src/locales/de_AT/location/street_name.ts
index aa8f6502..aa8f6502 100644
--- a/src/locales/de_AT/address/street_name.ts
+++ b/src/locales/de_AT/location/street_name.ts
diff --git a/src/locales/de_CH/address/city.ts b/src/locales/de_CH/address/city.ts
deleted file mode 100644
index e3da346b..00000000
--- a/src/locales/de_CH/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_name}}'];
diff --git a/src/locales/de_CH/address/street.ts b/src/locales/de_CH/address/street.ts
deleted file mode 100644
index f7dd9d3b..00000000
--- a/src/locales/de_CH/address/street.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{person.firstName}} {{address.street_suffix}}',
-  '{{person.lastName}} {{address.street_suffix}}',
-];
diff --git a/src/locales/de_CH/index.ts b/src/locales/de_CH/index.ts
index 4abc4e32..bb6d4972 100644
--- a/src/locales/de_CH/index.ts
+++ b/src/locales/de_CH/index.ts
@@ -3,17 +3,17 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import company from './company';
 import internet from './internet';
+import location from './location';
 import person from './person';
 import phone_number from './phone_number';
 
 const de_CH: LocaleDefinition = {
   title: 'German (Switzerland)',
-  address,
   company,
   internet,
+  location,
   person,
   phone_number,
 };
diff --git a/src/locales/de_CH/location/city.ts b/src/locales/de_CH/location/city.ts
new file mode 100644
index 00000000..ad43b68f
--- /dev/null
+++ b/src/locales/de_CH/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_name}}'];
diff --git a/src/locales/de_CH/address/city_name.ts b/src/locales/de_CH/location/city_name.ts
index 7c2f8bae..7c2f8bae 100644
--- a/src/locales/de_CH/address/city_name.ts
+++ b/src/locales/de_CH/location/city_name.ts
diff --git a/src/locales/de_CH/address/country_code.ts b/src/locales/de_CH/location/country_code.ts
index 4f084d96..4f084d96 100644
--- a/src/locales/de_CH/address/country_code.ts
+++ b/src/locales/de_CH/location/country_code.ts
diff --git a/src/locales/de_CH/address/default_country.ts b/src/locales/de_CH/location/default_country.ts
index 1e7df052..1e7df052 100644
--- a/src/locales/de_CH/address/default_country.ts
+++ b/src/locales/de_CH/location/default_country.ts
diff --git a/src/locales/de_CH/address/index.ts b/src/locales/de_CH/location/index.ts
index 217b2cf6..6b6259fc 100644
--- a/src/locales/de_CH/address/index.ts
+++ b/src/locales/de_CH/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import city from './city';
 import city_name from './city_name';
 import country_code from './country_code';
@@ -12,7 +12,7 @@ import state from './state';
 import state_abbr from './state_abbr';
 import street from './street';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   city,
   city_name,
   country_code,
@@ -23,4 +23,4 @@ const address: AddressDefinitions = {
   street,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/de_CH/address/postcode.ts b/src/locales/de_CH/location/postcode.ts
index ca8a62b0..ca8a62b0 100644
--- a/src/locales/de_CH/address/postcode.ts
+++ b/src/locales/de_CH/location/postcode.ts
diff --git a/src/locales/de_CH/address/state.ts b/src/locales/de_CH/location/state.ts
index 767e4df6..767e4df6 100644
--- a/src/locales/de_CH/address/state.ts
+++ b/src/locales/de_CH/location/state.ts
diff --git a/src/locales/de_CH/address/state_abbr.ts b/src/locales/de_CH/location/state_abbr.ts
index 37e3535f..37e3535f 100644
--- a/src/locales/de_CH/address/state_abbr.ts
+++ b/src/locales/de_CH/location/state_abbr.ts
diff --git a/src/locales/de_CH/location/street.ts b/src/locales/de_CH/location/street.ts
new file mode 100644
index 00000000..af32d0c4
--- /dev/null
+++ b/src/locales/de_CH/location/street.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{person.firstName}} {{location.street_suffix}}',
+  '{{person.lastName}} {{location.street_suffix}}',
+];
diff --git a/src/locales/el/address/city.ts b/src/locales/el/address/city.ts
deleted file mode 100644
index ea6ea950..00000000
--- a/src/locales/el/address/city.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export default [
-  '{{address.city_prefix}} {{person.firstName}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{person.firstName}}',
-  '{{person.firstName}}{{address.city_suffix}}',
-  '{{person.lastName}}{{address.city_suffix}}',
-];
diff --git a/src/locales/el/address/street.ts b/src/locales/el/address/street.ts
deleted file mode 100644
index f7dd9d3b..00000000
--- a/src/locales/el/address/street.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{person.firstName}} {{address.street_suffix}}',
-  '{{person.lastName}} {{address.street_suffix}}',
-];
diff --git a/src/locales/el/index.ts b/src/locales/el/index.ts
index aea4beed..4c235730 100644
--- a/src/locales/el/index.ts
+++ b/src/locales/el/index.ts
@@ -3,7 +3,6 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import app from './app';
 import business from './business';
 import cell_phone from './cell_phone';
@@ -13,6 +12,7 @@ import company from './company';
 import finance from './finance';
 import hacker from './hacker';
 import internet from './internet';
+import location from './location';
 import lorem from './lorem';
 import person from './person';
 import phone_number from './phone_number';
@@ -21,7 +21,6 @@ import team from './team';
 const el: LocaleDefinition = {
   title: 'Greek',
   separator: ' & ',
-  address,
   app,
   business,
   cell_phone,
@@ -31,6 +30,7 @@ const el: LocaleDefinition = {
   finance,
   hacker,
   internet,
+  location,
   lorem,
   person,
   phone_number,
diff --git a/src/locales/el/location/city.ts b/src/locales/el/location/city.ts
new file mode 100644
index 00000000..7375aa83
--- /dev/null
+++ b/src/locales/el/location/city.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{location.city_prefix}} {{person.firstName}}{{location.city_suffix}}',
+  '{{location.city_prefix}} {{person.firstName}}',
+  '{{person.firstName}}{{location.city_suffix}}',
+  '{{person.lastName}}{{location.city_suffix}}',
+];
diff --git a/src/locales/el/address/county.ts b/src/locales/el/location/county.ts
index 05570a24..05570a24 100644
--- a/src/locales/el/address/county.ts
+++ b/src/locales/el/location/county.ts
diff --git a/src/locales/el/address/default_country.ts b/src/locales/el/location/default_country.ts
index 11162d61..11162d61 100644
--- a/src/locales/el/address/default_country.ts
+++ b/src/locales/el/location/default_country.ts
diff --git a/src/locales/el/address/index.ts b/src/locales/el/location/index.ts
index 4fa3a9ba..8db1a9fb 100644
--- a/src/locales/el/address/index.ts
+++ b/src/locales/el/location/index.ts
@@ -2,17 +2,17 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import city from './city';
 import county from './county';
 import default_country from './default_country';
 import street from './street';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   city,
   county,
   default_country,
   street,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/el/location/street.ts b/src/locales/el/location/street.ts
new file mode 100644
index 00000000..af32d0c4
--- /dev/null
+++ b/src/locales/el/location/street.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{person.firstName}} {{location.street_suffix}}',
+  '{{person.lastName}} {{location.street_suffix}}',
+];
diff --git a/src/locales/el/team/name.ts b/src/locales/el/team/name.ts
index ed2bdbb5..bdd4f123 100644
--- a/src/locales/el/team/name.ts
+++ b/src/locales/el/team/name.ts
@@ -1 +1 @@
-export default ['{{address.state}} {{team.creature}}'];
+export default ['{{location.state}} {{team.creature}}'];
diff --git a/src/locales/en/address/city.ts b/src/locales/en/address/city.ts
deleted file mode 100644
index 9a277b6f..00000000
--- a/src/locales/en/address/city.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export default [
-  '{{address.city_prefix}} {{person.first_name}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{person.first_name}}',
-  '{{person.first_name}}{{address.city_suffix}}',
-  '{{person.last_name}}{{address.city_suffix}}',
-  '{{address.city_name}}',
-];
diff --git a/src/locales/en/address/street.ts b/src/locales/en/address/street.ts
deleted file mode 100644
index 5e9ca117..00000000
--- a/src/locales/en/address/street.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{person.first_name}} {{address.street_suffix}}',
-  '{{person.last_name}} {{address.street_suffix}}',
-];
diff --git a/src/locales/en/address/street_address.ts b/src/locales/en/address/street_address.ts
deleted file mode 100644
index 55bed362..00000000
--- a/src/locales/en/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.buildingNumber}} {{address.street}}',
-  full: '{{address.buildingNumber}} {{address.street}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/en/index.ts b/src/locales/en/index.ts
index 242b4cd9..3cd7a1b6 100644
--- a/src/locales/en/index.ts
+++ b/src/locales/en/index.ts
@@ -3,7 +3,6 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import animal from './animal';
 import app from './app';
 import business from './business';
@@ -16,6 +15,7 @@ import date from './date';
 import finance from './finance';
 import hacker from './hacker';
 import internet from './internet';
+import location from './location';
 import lorem from './lorem';
 import music from './music';
 import person from './person';
@@ -29,7 +29,6 @@ import word from './word';
 const en: LocaleDefinition = {
   title: 'English',
   separator: ' & ',
-  address,
   animal,
   app,
   business,
@@ -42,6 +41,7 @@ const en: LocaleDefinition = {
   finance,
   hacker,
   internet,
+  location,
   lorem,
   music,
   person,
diff --git a/src/locales/en/address/building_number.ts b/src/locales/en/location/building_number.ts
index 50c31ccb..50c31ccb 100644
--- a/src/locales/en/address/building_number.ts
+++ b/src/locales/en/location/building_number.ts
diff --git a/src/locales/en/location/city.ts b/src/locales/en/location/city.ts
new file mode 100644
index 00000000..8d70128e
--- /dev/null
+++ b/src/locales/en/location/city.ts
@@ -0,0 +1,7 @@
+export default [
+  '{{location.city_prefix}} {{person.first_name}}{{location.city_suffix}}',
+  '{{location.city_prefix}} {{person.first_name}}',
+  '{{person.first_name}}{{location.city_suffix}}',
+  '{{person.last_name}}{{location.city_suffix}}',
+  '{{location.city_name}}',
+];
diff --git a/src/locales/en/address/city_name.ts b/src/locales/en/location/city_name.ts
index 4a03907b..4a03907b 100644
--- a/src/locales/en/address/city_name.ts
+++ b/src/locales/en/location/city_name.ts
diff --git a/src/locales/en/address/city_prefix.ts b/src/locales/en/location/city_prefix.ts
index 1b76009e..1b76009e 100644
--- a/src/locales/en/address/city_prefix.ts
+++ b/src/locales/en/location/city_prefix.ts
diff --git a/src/locales/en/address/city_suffix.ts b/src/locales/en/location/city_suffix.ts
index f0774138..f0774138 100644
--- a/src/locales/en/address/city_suffix.ts
+++ b/src/locales/en/location/city_suffix.ts
diff --git a/src/locales/en/address/country.ts b/src/locales/en/location/country.ts
index a1bbe717..a1bbe717 100644
--- a/src/locales/en/address/country.ts
+++ b/src/locales/en/location/country.ts
diff --git a/src/locales/en/address/country_code.ts b/src/locales/en/location/country_code.ts
index 325a7ff8..325a7ff8 100644
--- a/src/locales/en/address/country_code.ts
+++ b/src/locales/en/location/country_code.ts
diff --git a/src/locales/en/address/country_code_alpha_3.ts b/src/locales/en/location/country_code_alpha_3.ts
index 20708d64..20708d64 100644
--- a/src/locales/en/address/country_code_alpha_3.ts
+++ b/src/locales/en/location/country_code_alpha_3.ts
diff --git a/src/locales/en/address/county.ts b/src/locales/en/location/county.ts
index ed4d7ba0..ed4d7ba0 100644
--- a/src/locales/en/address/county.ts
+++ b/src/locales/en/location/county.ts
diff --git a/src/locales/en/address/default_country.ts b/src/locales/en/location/default_country.ts
index 6ae05a91..6ae05a91 100644
--- a/src/locales/en/address/default_country.ts
+++ b/src/locales/en/location/default_country.ts
diff --git a/src/locales/en/address/direction.ts b/src/locales/en/location/direction.ts
index 07712e80..07712e80 100644
--- a/src/locales/en/address/direction.ts
+++ b/src/locales/en/location/direction.ts
diff --git a/src/locales/en/address/direction_abbr.ts b/src/locales/en/location/direction_abbr.ts
index 03f085ad..03f085ad 100644
--- a/src/locales/en/address/direction_abbr.ts
+++ b/src/locales/en/location/direction_abbr.ts
diff --git a/src/locales/en/address/index.ts b/src/locales/en/location/index.ts
index 6bc94e09..5fd8af21 100644
--- a/src/locales/en/address/index.ts
+++ b/src/locales/en/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_name from './city_name';
@@ -24,7 +24,7 @@ import street_address from './street_address';
 import street_suffix from './street_suffix';
 import time_zone from './time_zone';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_name,
@@ -47,4 +47,4 @@ const address: AddressDefinitions = {
   time_zone,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/en/address/postcode.ts b/src/locales/en/location/postcode.ts
index 4433f068..4433f068 100644
--- a/src/locales/en/address/postcode.ts
+++ b/src/locales/en/location/postcode.ts
diff --git a/src/locales/en/address/secondary_address.ts b/src/locales/en/location/secondary_address.ts
index 6f2a5cc8..6f2a5cc8 100644
--- a/src/locales/en/address/secondary_address.ts
+++ b/src/locales/en/location/secondary_address.ts
diff --git a/src/locales/en/address/state.ts b/src/locales/en/location/state.ts
index 899a2ed3..899a2ed3 100644
--- a/src/locales/en/address/state.ts
+++ b/src/locales/en/location/state.ts
diff --git a/src/locales/en/address/state_abbr.ts b/src/locales/en/location/state_abbr.ts
index 8c00eb20..8c00eb20 100644
--- a/src/locales/en/address/state_abbr.ts
+++ b/src/locales/en/location/state_abbr.ts
diff --git a/src/locales/en/location/street.ts b/src/locales/en/location/street.ts
new file mode 100644
index 00000000..b5fcd9fe
--- /dev/null
+++ b/src/locales/en/location/street.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{person.first_name}} {{location.street_suffix}}',
+  '{{person.last_name}} {{location.street_suffix}}',
+];
diff --git a/src/locales/en/location/street_address.ts b/src/locales/en/location/street_address.ts
new file mode 100644
index 00000000..2e1a661d
--- /dev/null
+++ b/src/locales/en/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.buildingNumber}} {{location.street}}',
+  full: '{{location.buildingNumber}} {{location.street}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/en/address/street_suffix.ts b/src/locales/en/location/street_suffix.ts
index dd54b6fb..dd54b6fb 100644
--- a/src/locales/en/address/street_suffix.ts
+++ b/src/locales/en/location/street_suffix.ts
diff --git a/src/locales/en/address/time_zone.ts b/src/locales/en/location/time_zone.ts
index 932c7e24..932c7e24 100644
--- a/src/locales/en/address/time_zone.ts
+++ b/src/locales/en/location/time_zone.ts
diff --git a/src/locales/en/team/name.ts b/src/locales/en/team/name.ts
index ed2bdbb5..bdd4f123 100644
--- a/src/locales/en/team/name.ts
+++ b/src/locales/en/team/name.ts
@@ -1 +1 @@
-export default ['{{address.state}} {{team.creature}}'];
+export default ['{{location.state}} {{team.creature}}'];
diff --git a/src/locales/en_AU/address/city.ts b/src/locales/en_AU/address/city.ts
deleted file mode 100644
index ea6ea950..00000000
--- a/src/locales/en_AU/address/city.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export default [
-  '{{address.city_prefix}} {{person.firstName}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{person.firstName}}',
-  '{{person.firstName}}{{address.city_suffix}}',
-  '{{person.lastName}}{{address.city_suffix}}',
-];
diff --git a/src/locales/en_AU/address/street.ts b/src/locales/en_AU/address/street.ts
deleted file mode 100644
index f7dd9d3b..00000000
--- a/src/locales/en_AU/address/street.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{person.firstName}} {{address.street_suffix}}',
-  '{{person.lastName}} {{address.street_suffix}}',
-];
diff --git a/src/locales/en_AU/index.ts b/src/locales/en_AU/index.ts
index 82f106d0..18643c85 100644
--- a/src/locales/en_AU/index.ts
+++ b/src/locales/en_AU/index.ts
@@ -3,17 +3,17 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import company from './company';
 import internet from './internet';
+import location from './location';
 import person from './person';
 import phone_number from './phone_number';
 
 const en_AU: LocaleDefinition = {
   title: 'English (Australia)',
-  address,
   company,
   internet,
+  location,
   person,
   phone_number,
 };
diff --git a/src/locales/en_AU/address/building_number.ts b/src/locales/en_AU/location/building_number.ts
index 41ff5013..41ff5013 100644
--- a/src/locales/en_AU/address/building_number.ts
+++ b/src/locales/en_AU/location/building_number.ts
diff --git a/src/locales/en_AU/location/city.ts b/src/locales/en_AU/location/city.ts
new file mode 100644
index 00000000..7375aa83
--- /dev/null
+++ b/src/locales/en_AU/location/city.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{location.city_prefix}} {{person.firstName}}{{location.city_suffix}}',
+  '{{location.city_prefix}} {{person.firstName}}',
+  '{{person.firstName}}{{location.city_suffix}}',
+  '{{person.lastName}}{{location.city_suffix}}',
+];
diff --git a/src/locales/en_AU/address/default_country.ts b/src/locales/en_AU/location/default_country.ts
index 22b61281..22b61281 100644
--- a/src/locales/en_AU/address/default_country.ts
+++ b/src/locales/en_AU/location/default_country.ts
diff --git a/src/locales/en_AU/address/index.ts b/src/locales/en_AU/location/index.ts
index dabc415d..35b03195 100644
--- a/src/locales/en_AU/address/index.ts
+++ b/src/locales/en_AU/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import default_country from './default_country';
@@ -12,7 +12,7 @@ import state_abbr from './state_abbr';
 import street from './street';
 import street_suffix from './street_suffix';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   default_country,
@@ -23,4 +23,4 @@ const address: AddressDefinitions = {
   street_suffix,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/en_AU/address/postcode.ts b/src/locales/en_AU/location/postcode.ts
index a8235678..a8235678 100644
--- a/src/locales/en_AU/address/postcode.ts
+++ b/src/locales/en_AU/location/postcode.ts
diff --git a/src/locales/en_AU/address/state.ts b/src/locales/en_AU/location/state.ts
index 8118aead..8118aead 100644
--- a/src/locales/en_AU/address/state.ts
+++ b/src/locales/en_AU/location/state.ts
diff --git a/src/locales/en_AU/address/state_abbr.ts b/src/locales/en_AU/location/state_abbr.ts
index 9dc54f3a..9dc54f3a 100644
--- a/src/locales/en_AU/address/state_abbr.ts
+++ b/src/locales/en_AU/location/state_abbr.ts
diff --git a/src/locales/en_AU/location/street.ts b/src/locales/en_AU/location/street.ts
new file mode 100644
index 00000000..af32d0c4
--- /dev/null
+++ b/src/locales/en_AU/location/street.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{person.firstName}} {{location.street_suffix}}',
+  '{{person.lastName}} {{location.street_suffix}}',
+];
diff --git a/src/locales/en_AU/address/street_suffix.ts b/src/locales/en_AU/location/street_suffix.ts
index e51a81d3..e51a81d3 100644
--- a/src/locales/en_AU/address/street_suffix.ts
+++ b/src/locales/en_AU/location/street_suffix.ts
diff --git a/src/locales/en_AU_ocker/address/city.ts b/src/locales/en_AU_ocker/address/city.ts
deleted file mode 100644
index db6c26cc..00000000
--- a/src/locales/en_AU_ocker/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_prefix}}'];
diff --git a/src/locales/en_AU_ocker/address/street.ts b/src/locales/en_AU_ocker/address/street.ts
deleted file mode 100644
index 30ba73fc..00000000
--- a/src/locales/en_AU_ocker/address/street.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.street_name}}'];
diff --git a/src/locales/en_AU_ocker/index.ts b/src/locales/en_AU_ocker/index.ts
index 9dab70cb..df9313ca 100644
--- a/src/locales/en_AU_ocker/index.ts
+++ b/src/locales/en_AU_ocker/index.ts
@@ -3,17 +3,17 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import company from './company';
 import internet from './internet';
+import location from './location';
 import person from './person';
 import phone_number from './phone_number';
 
 const en_AU_ocker: LocaleDefinition = {
   title: 'English (Australia Ocker)',
-  address,
   company,
   internet,
+  location,
   person,
   phone_number,
 };
diff --git a/src/locales/en_AU_ocker/address/building_number.ts b/src/locales/en_AU_ocker/location/building_number.ts
index 41ff5013..41ff5013 100644
--- a/src/locales/en_AU_ocker/address/building_number.ts
+++ b/src/locales/en_AU_ocker/location/building_number.ts
diff --git a/src/locales/en_AU_ocker/location/city.ts b/src/locales/en_AU_ocker/location/city.ts
new file mode 100644
index 00000000..16c4830e
--- /dev/null
+++ b/src/locales/en_AU_ocker/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_prefix}}'];
diff --git a/src/locales/en_AU_ocker/address/city_prefix.ts b/src/locales/en_AU_ocker/location/city_prefix.ts
index c59b8f91..c59b8f91 100644
--- a/src/locales/en_AU_ocker/address/city_prefix.ts
+++ b/src/locales/en_AU_ocker/location/city_prefix.ts
diff --git a/src/locales/en_AU_ocker/address/default_country.ts b/src/locales/en_AU_ocker/location/default_country.ts
index 22b61281..22b61281 100644
--- a/src/locales/en_AU_ocker/address/default_country.ts
+++ b/src/locales/en_AU_ocker/location/default_country.ts
diff --git a/src/locales/en_AU_ocker/address/index.ts b/src/locales/en_AU_ocker/location/index.ts
index 5522e6c7..1699c653 100644
--- a/src/locales/en_AU_ocker/address/index.ts
+++ b/src/locales/en_AU_ocker/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_prefix from './city_prefix';
@@ -15,7 +15,7 @@ import street from './street';
 import street_name from './street_name';
 import street_suffix from './street_suffix';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_prefix,
@@ -29,4 +29,4 @@ const address: AddressDefinitions = {
   street_suffix,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/en_AU_ocker/address/postcode.ts b/src/locales/en_AU_ocker/location/postcode.ts
index 16b30103..16b30103 100644
--- a/src/locales/en_AU_ocker/address/postcode.ts
+++ b/src/locales/en_AU_ocker/location/postcode.ts
diff --git a/src/locales/en_AU_ocker/address/region.ts b/src/locales/en_AU_ocker/location/region.ts
index 975c6b72..975c6b72 100644
--- a/src/locales/en_AU_ocker/address/region.ts
+++ b/src/locales/en_AU_ocker/location/region.ts
diff --git a/src/locales/en_AU_ocker/address/state.ts b/src/locales/en_AU_ocker/location/state.ts
index 8118aead..8118aead 100644
--- a/src/locales/en_AU_ocker/address/state.ts
+++ b/src/locales/en_AU_ocker/location/state.ts
diff --git a/src/locales/en_AU_ocker/address/state_abbr.ts b/src/locales/en_AU_ocker/location/state_abbr.ts
index 9dc54f3a..9dc54f3a 100644
--- a/src/locales/en_AU_ocker/address/state_abbr.ts
+++ b/src/locales/en_AU_ocker/location/state_abbr.ts
diff --git a/src/locales/en_AU_ocker/location/street.ts b/src/locales/en_AU_ocker/location/street.ts
new file mode 100644
index 00000000..30a9a5dd
--- /dev/null
+++ b/src/locales/en_AU_ocker/location/street.ts
@@ -0,0 +1 @@
+export default ['{{location.street_name}}'];
diff --git a/src/locales/en_AU_ocker/address/street_name.ts b/src/locales/en_AU_ocker/location/street_name.ts
index 5d730806..5d730806 100644
--- a/src/locales/en_AU_ocker/address/street_name.ts
+++ b/src/locales/en_AU_ocker/location/street_name.ts
diff --git a/src/locales/en_AU_ocker/address/street_suffix.ts b/src/locales/en_AU_ocker/location/street_suffix.ts
index e51a81d3..e51a81d3 100644
--- a/src/locales/en_AU_ocker/address/street_suffix.ts
+++ b/src/locales/en_AU_ocker/location/street_suffix.ts
diff --git a/src/locales/en_CA/address/city.ts b/src/locales/en_CA/address/city.ts
deleted file mode 100644
index ea6ea950..00000000
--- a/src/locales/en_CA/address/city.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export default [
-  '{{address.city_prefix}} {{person.firstName}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{person.firstName}}',
-  '{{person.firstName}}{{address.city_suffix}}',
-  '{{person.lastName}}{{address.city_suffix}}',
-];
diff --git a/src/locales/en_CA/address/street.ts b/src/locales/en_CA/address/street.ts
deleted file mode 100644
index f7dd9d3b..00000000
--- a/src/locales/en_CA/address/street.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{person.firstName}} {{address.street_suffix}}',
-  '{{person.lastName}} {{address.street_suffix}}',
-];
diff --git a/src/locales/en_CA/index.ts b/src/locales/en_CA/index.ts
index dd400c7f..e4ea807f 100644
--- a/src/locales/en_CA/index.ts
+++ b/src/locales/en_CA/index.ts
@@ -3,14 +3,14 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import internet from './internet';
+import location from './location';
 import phone_number from './phone_number';
 
 const en_CA: LocaleDefinition = {
   title: 'English (Canada)',
-  address,
   internet,
+  location,
   phone_number,
 };
 
diff --git a/src/locales/en_CA/location/city.ts b/src/locales/en_CA/location/city.ts
new file mode 100644
index 00000000..7375aa83
--- /dev/null
+++ b/src/locales/en_CA/location/city.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{location.city_prefix}} {{person.firstName}}{{location.city_suffix}}',
+  '{{location.city_prefix}} {{person.firstName}}',
+  '{{person.firstName}}{{location.city_suffix}}',
+  '{{person.lastName}}{{location.city_suffix}}',
+];
diff --git a/src/locales/en_CA/address/city_name.ts b/src/locales/en_CA/location/city_name.ts
index cf08ec9f..cf08ec9f 100644
--- a/src/locales/en_CA/address/city_name.ts
+++ b/src/locales/en_CA/location/city_name.ts
diff --git a/src/locales/en_CA/address/default_country.ts b/src/locales/en_CA/location/default_country.ts
index 1e2794ff..1e2794ff 100644
--- a/src/locales/en_CA/address/default_country.ts
+++ b/src/locales/en_CA/location/default_country.ts
diff --git a/src/locales/en_CA/address/index.ts b/src/locales/en_CA/location/index.ts
index 25d1a047..840bad87 100644
--- a/src/locales/en_CA/address/index.ts
+++ b/src/locales/en_CA/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import city from './city';
 import city_name from './city_name';
 import default_country from './default_country';
@@ -11,7 +11,7 @@ import state from './state';
 import state_abbr from './state_abbr';
 import street from './street';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   city,
   city_name,
   default_country,
@@ -21,4 +21,4 @@ const address: AddressDefinitions = {
   street,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/en_CA/address/postcode.ts b/src/locales/en_CA/location/postcode.ts
index 5d4f9f27..5d4f9f27 100644
--- a/src/locales/en_CA/address/postcode.ts
+++ b/src/locales/en_CA/location/postcode.ts
diff --git a/src/locales/en_CA/address/state.ts b/src/locales/en_CA/location/state.ts
index 7b228e50..7b228e50 100644
--- a/src/locales/en_CA/address/state.ts
+++ b/src/locales/en_CA/location/state.ts
diff --git a/src/locales/en_CA/address/state_abbr.ts b/src/locales/en_CA/location/state_abbr.ts
index d3ba5187..d3ba5187 100644
--- a/src/locales/en_CA/address/state_abbr.ts
+++ b/src/locales/en_CA/location/state_abbr.ts
diff --git a/src/locales/en_CA/location/street.ts b/src/locales/en_CA/location/street.ts
new file mode 100644
index 00000000..af32d0c4
--- /dev/null
+++ b/src/locales/en_CA/location/street.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{person.firstName}} {{location.street_suffix}}',
+  '{{person.lastName}} {{location.street_suffix}}',
+];
diff --git a/src/locales/en_GB/address/city.ts b/src/locales/en_GB/address/city.ts
deleted file mode 100644
index ea6ea950..00000000
--- a/src/locales/en_GB/address/city.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export default [
-  '{{address.city_prefix}} {{person.firstName}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{person.firstName}}',
-  '{{person.firstName}}{{address.city_suffix}}',
-  '{{person.lastName}}{{address.city_suffix}}',
-];
diff --git a/src/locales/en_GB/address/street.ts b/src/locales/en_GB/address/street.ts
deleted file mode 100644
index f7dd9d3b..00000000
--- a/src/locales/en_GB/address/street.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{person.firstName}} {{address.street_suffix}}',
-  '{{person.lastName}} {{address.street_suffix}}',
-];
diff --git a/src/locales/en_GB/index.ts b/src/locales/en_GB/index.ts
index f138a612..d800b976 100644
--- a/src/locales/en_GB/index.ts
+++ b/src/locales/en_GB/index.ts
@@ -3,16 +3,16 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import cell_phone from './cell_phone';
 import internet from './internet';
+import location from './location';
 import phone_number from './phone_number';
 
 const en_GB: LocaleDefinition = {
   title: 'English (Great Britain)',
-  address,
   cell_phone,
   internet,
+  location,
   phone_number,
 };
 
diff --git a/src/locales/en_GB/location/city.ts b/src/locales/en_GB/location/city.ts
new file mode 100644
index 00000000..7375aa83
--- /dev/null
+++ b/src/locales/en_GB/location/city.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{location.city_prefix}} {{person.firstName}}{{location.city_suffix}}',
+  '{{location.city_prefix}} {{person.firstName}}',
+  '{{person.firstName}}{{location.city_suffix}}',
+  '{{person.lastName}}{{location.city_suffix}}',
+];
diff --git a/src/locales/en_GB/address/county.ts b/src/locales/en_GB/location/county.ts
index 11a30b0a..11a30b0a 100644
--- a/src/locales/en_GB/address/county.ts
+++ b/src/locales/en_GB/location/county.ts
diff --git a/src/locales/en_GB/address/default_country.ts b/src/locales/en_GB/location/default_country.ts
index 7aabd725..7aabd725 100644
--- a/src/locales/en_GB/address/default_country.ts
+++ b/src/locales/en_GB/location/default_country.ts
diff --git a/src/locales/en_GB/address/index.ts b/src/locales/en_GB/location/index.ts
index f31585ce..6a7064fa 100644
--- a/src/locales/en_GB/address/index.ts
+++ b/src/locales/en_GB/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import city from './city';
 import county from './county';
 import default_country from './default_country';
@@ -10,7 +10,7 @@ import postcode from './postcode';
 import street from './street';
 import uk_country from './uk_country';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   city,
   county,
   default_country,
@@ -19,4 +19,4 @@ const address: AddressDefinitions = {
   uk_country,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/en_GB/address/postcode.ts b/src/locales/en_GB/location/postcode.ts
index f3bc7fa7..f3bc7fa7 100644
--- a/src/locales/en_GB/address/postcode.ts
+++ b/src/locales/en_GB/location/postcode.ts
diff --git a/src/locales/en_GB/location/street.ts b/src/locales/en_GB/location/street.ts
new file mode 100644
index 00000000..af32d0c4
--- /dev/null
+++ b/src/locales/en_GB/location/street.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{person.firstName}} {{location.street_suffix}}',
+  '{{person.lastName}} {{location.street_suffix}}',
+];
diff --git a/src/locales/en_GB/address/uk_country.ts b/src/locales/en_GB/location/uk_country.ts
index 7aabd725..7aabd725 100644
--- a/src/locales/en_GB/address/uk_country.ts
+++ b/src/locales/en_GB/location/uk_country.ts
diff --git a/src/locales/en_GH/address/city.ts b/src/locales/en_GH/address/city.ts
deleted file mode 100644
index e3da346b..00000000
--- a/src/locales/en_GH/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_name}}'];
diff --git a/src/locales/en_GH/address/street.ts b/src/locales/en_GH/address/street.ts
deleted file mode 100644
index 0c511a22..00000000
--- a/src/locales/en_GH/address/street.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{person.last_name}} {{address.street_suffix}}',
-  '{{address.street_prefix}} {{address.street_suffix}}',
-];
diff --git a/src/locales/en_GH/address/street_address.ts b/src/locales/en_GH/address/street_address.ts
deleted file mode 100644
index 55bed362..00000000
--- a/src/locales/en_GH/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.buildingNumber}} {{address.street}}',
-  full: '{{address.buildingNumber}} {{address.street}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/en_GH/index.ts b/src/locales/en_GH/index.ts
index 0769e50a..e6126eb8 100644
--- a/src/locales/en_GH/index.ts
+++ b/src/locales/en_GH/index.ts
@@ -3,17 +3,17 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import company from './company';
 import internet from './internet';
+import location from './location';
 import person from './person';
 import phone_number from './phone_number';
 
 const en_GH: LocaleDefinition = {
   title: 'English (Ghana)',
-  address,
   company,
   internet,
+  location,
   person,
   phone_number,
 };
diff --git a/src/locales/en_GH/address/building_number.ts b/src/locales/en_GH/location/building_number.ts
index 20cefab6..20cefab6 100644
--- a/src/locales/en_GH/address/building_number.ts
+++ b/src/locales/en_GH/location/building_number.ts
diff --git a/src/locales/en_GH/location/city.ts b/src/locales/en_GH/location/city.ts
new file mode 100644
index 00000000..ad43b68f
--- /dev/null
+++ b/src/locales/en_GH/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_name}}'];
diff --git a/src/locales/en_GH/address/city_name.ts b/src/locales/en_GH/location/city_name.ts
index 9e7059fd..9e7059fd 100644
--- a/src/locales/en_GH/address/city_name.ts
+++ b/src/locales/en_GH/location/city_name.ts
diff --git a/src/locales/en_GH/address/default_country.ts b/src/locales/en_GH/location/default_country.ts
index e88964ea..e88964ea 100644
--- a/src/locales/en_GH/address/default_country.ts
+++ b/src/locales/en_GH/location/default_country.ts
diff --git a/src/locales/en_GH/address/index.ts b/src/locales/en_GH/location/index.ts
index 4cec2154..32b659eb 100644
--- a/src/locales/en_GH/address/index.ts
+++ b/src/locales/en_GH/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_name from './city_name';
@@ -14,7 +14,7 @@ import street_address from './street_address';
 import street_prefix from './street_prefix';
 import street_suffix from './street_suffix';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_name,
@@ -27,4 +27,4 @@ const address: AddressDefinitions = {
   street_suffix,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/en_GH/address/postcode.ts b/src/locales/en_GH/location/postcode.ts
index 0e099220..0e099220 100644
--- a/src/locales/en_GH/address/postcode.ts
+++ b/src/locales/en_GH/location/postcode.ts
diff --git a/src/locales/en_GH/address/state.ts b/src/locales/en_GH/location/state.ts
index c077656e..c077656e 100644
--- a/src/locales/en_GH/address/state.ts
+++ b/src/locales/en_GH/location/state.ts
diff --git a/src/locales/en_GH/location/street.ts b/src/locales/en_GH/location/street.ts
new file mode 100644
index 00000000..94323faf
--- /dev/null
+++ b/src/locales/en_GH/location/street.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{person.last_name}} {{location.street_suffix}}',
+  '{{location.street_prefix}} {{location.street_suffix}}',
+];
diff --git a/src/locales/en_GH/location/street_address.ts b/src/locales/en_GH/location/street_address.ts
new file mode 100644
index 00000000..2e1a661d
--- /dev/null
+++ b/src/locales/en_GH/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.buildingNumber}} {{location.street}}',
+  full: '{{location.buildingNumber}} {{location.street}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/en_GH/address/street_prefix.ts b/src/locales/en_GH/location/street_prefix.ts
index 38c234e9..38c234e9 100644
--- a/src/locales/en_GH/address/street_prefix.ts
+++ b/src/locales/en_GH/location/street_prefix.ts
diff --git a/src/locales/en_GH/address/street_suffix.ts b/src/locales/en_GH/location/street_suffix.ts
index 725acb4f..725acb4f 100644
--- a/src/locales/en_GH/address/street_suffix.ts
+++ b/src/locales/en_GH/location/street_suffix.ts
diff --git a/src/locales/en_IE/address/city.ts b/src/locales/en_IE/address/city.ts
deleted file mode 100644
index ea6ea950..00000000
--- a/src/locales/en_IE/address/city.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export default [
-  '{{address.city_prefix}} {{person.firstName}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{person.firstName}}',
-  '{{person.firstName}}{{address.city_suffix}}',
-  '{{person.lastName}}{{address.city_suffix}}',
-];
diff --git a/src/locales/en_IE/address/street.ts b/src/locales/en_IE/address/street.ts
deleted file mode 100644
index f7dd9d3b..00000000
--- a/src/locales/en_IE/address/street.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{person.firstName}} {{address.street_suffix}}',
-  '{{person.lastName}} {{address.street_suffix}}',
-];
diff --git a/src/locales/en_IE/index.ts b/src/locales/en_IE/index.ts
index 84527b0e..5181faef 100644
--- a/src/locales/en_IE/index.ts
+++ b/src/locales/en_IE/index.ts
@@ -3,16 +3,16 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import cell_phone from './cell_phone';
 import internet from './internet';
+import location from './location';
 import phone_number from './phone_number';
 
 const en_IE: LocaleDefinition = {
   title: 'English (Ireland)',
-  address,
   cell_phone,
   internet,
+  location,
   phone_number,
 };
 
diff --git a/src/locales/en_IE/location/city.ts b/src/locales/en_IE/location/city.ts
new file mode 100644
index 00000000..7375aa83
--- /dev/null
+++ b/src/locales/en_IE/location/city.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{location.city_prefix}} {{person.firstName}}{{location.city_suffix}}',
+  '{{location.city_prefix}} {{person.firstName}}',
+  '{{person.firstName}}{{location.city_suffix}}',
+  '{{person.lastName}}{{location.city_suffix}}',
+];
diff --git a/src/locales/en_IE/address/county.ts b/src/locales/en_IE/location/county.ts
index b709bed3..b709bed3 100644
--- a/src/locales/en_IE/address/county.ts
+++ b/src/locales/en_IE/location/county.ts
diff --git a/src/locales/en_IE/address/default_country.ts b/src/locales/en_IE/location/default_country.ts
index 32ba70b6..32ba70b6 100644
--- a/src/locales/en_IE/address/default_country.ts
+++ b/src/locales/en_IE/location/default_country.ts
diff --git a/src/locales/en_IE/address/index.ts b/src/locales/en_IE/location/index.ts
index 4fa3a9ba..8db1a9fb 100644
--- a/src/locales/en_IE/address/index.ts
+++ b/src/locales/en_IE/location/index.ts
@@ -2,17 +2,17 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import city from './city';
 import county from './county';
 import default_country from './default_country';
 import street from './street';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   city,
   county,
   default_country,
   street,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/en_IE/location/street.ts b/src/locales/en_IE/location/street.ts
new file mode 100644
index 00000000..af32d0c4
--- /dev/null
+++ b/src/locales/en_IE/location/street.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{person.firstName}} {{location.street_suffix}}',
+  '{{person.lastName}} {{location.street_suffix}}',
+];
diff --git a/src/locales/en_IN/address/city.ts b/src/locales/en_IN/address/city.ts
deleted file mode 100644
index e3da346b..00000000
--- a/src/locales/en_IN/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_name}}'];
diff --git a/src/locales/en_IN/address/street.ts b/src/locales/en_IN/address/street.ts
deleted file mode 100644
index f7dd9d3b..00000000
--- a/src/locales/en_IN/address/street.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{person.firstName}} {{address.street_suffix}}',
-  '{{person.lastName}} {{address.street_suffix}}',
-];
diff --git a/src/locales/en_IN/index.ts b/src/locales/en_IN/index.ts
index 8e92298c..3a99b423 100644
--- a/src/locales/en_IN/index.ts
+++ b/src/locales/en_IN/index.ts
@@ -3,17 +3,17 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import company from './company';
 import internet from './internet';
+import location from './location';
 import person from './person';
 import phone_number from './phone_number';
 
 const en_IN: LocaleDefinition = {
   title: 'English (India)',
-  address,
   company,
   internet,
+  location,
   person,
   phone_number,
 };
diff --git a/src/locales/en_IN/location/city.ts b/src/locales/en_IN/location/city.ts
new file mode 100644
index 00000000..ad43b68f
--- /dev/null
+++ b/src/locales/en_IN/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_name}}'];
diff --git a/src/locales/en_IN/address/city_name.ts b/src/locales/en_IN/location/city_name.ts
index 23310da8..23310da8 100644
--- a/src/locales/en_IN/address/city_name.ts
+++ b/src/locales/en_IN/location/city_name.ts
diff --git a/src/locales/en_IN/address/default_country.ts b/src/locales/en_IN/location/default_country.ts
index 87bdc7a2..87bdc7a2 100644
--- a/src/locales/en_IN/address/default_country.ts
+++ b/src/locales/en_IN/location/default_country.ts
diff --git a/src/locales/en_IN/address/index.ts b/src/locales/en_IN/location/index.ts
index 25d1a047..840bad87 100644
--- a/src/locales/en_IN/address/index.ts
+++ b/src/locales/en_IN/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import city from './city';
 import city_name from './city_name';
 import default_country from './default_country';
@@ -11,7 +11,7 @@ import state from './state';
 import state_abbr from './state_abbr';
 import street from './street';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   city,
   city_name,
   default_country,
@@ -21,4 +21,4 @@ const address: AddressDefinitions = {
   street,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/en_IN/address/postcode.ts b/src/locales/en_IN/location/postcode.ts
index e9ac838b..e9ac838b 100644
--- a/src/locales/en_IN/address/postcode.ts
+++ b/src/locales/en_IN/location/postcode.ts
diff --git a/src/locales/en_IN/address/state.ts b/src/locales/en_IN/location/state.ts
index d1827ad2..d1827ad2 100644
--- a/src/locales/en_IN/address/state.ts
+++ b/src/locales/en_IN/location/state.ts
diff --git a/src/locales/en_IN/address/state_abbr.ts b/src/locales/en_IN/location/state_abbr.ts
index 27d5e61b..27d5e61b 100644
--- a/src/locales/en_IN/address/state_abbr.ts
+++ b/src/locales/en_IN/location/state_abbr.ts
diff --git a/src/locales/en_IN/location/street.ts b/src/locales/en_IN/location/street.ts
new file mode 100644
index 00000000..af32d0c4
--- /dev/null
+++ b/src/locales/en_IN/location/street.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{person.firstName}} {{location.street_suffix}}',
+  '{{person.lastName}} {{location.street_suffix}}',
+];
diff --git a/src/locales/en_NG/address/city.ts b/src/locales/en_NG/address/city.ts
deleted file mode 100644
index db6c26cc..00000000
--- a/src/locales/en_NG/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_prefix}}'];
diff --git a/src/locales/en_NG/address/street.ts b/src/locales/en_NG/address/street.ts
deleted file mode 100644
index f7dd9d3b..00000000
--- a/src/locales/en_NG/address/street.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{person.firstName}} {{address.street_suffix}}',
-  '{{person.lastName}} {{address.street_suffix}}',
-];
diff --git a/src/locales/en_NG/index.ts b/src/locales/en_NG/index.ts
index 7ae85c95..91c1c64f 100644
--- a/src/locales/en_NG/index.ts
+++ b/src/locales/en_NG/index.ts
@@ -3,17 +3,17 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import company from './company';
 import internet from './internet';
+import location from './location';
 import person from './person';
 import phone_number from './phone_number';
 
 const en_NG: LocaleDefinition = {
   title: 'Nigeria (English)',
-  address,
   company,
   internet,
+  location,
   person,
   phone_number,
 };
diff --git a/src/locales/en_NG/location/city.ts b/src/locales/en_NG/location/city.ts
new file mode 100644
index 00000000..16c4830e
--- /dev/null
+++ b/src/locales/en_NG/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_prefix}}'];
diff --git a/src/locales/en_NG/address/city_prefix.ts b/src/locales/en_NG/location/city_prefix.ts
index f55528ce..f55528ce 100644
--- a/src/locales/en_NG/address/city_prefix.ts
+++ b/src/locales/en_NG/location/city_prefix.ts
diff --git a/src/locales/en_NG/address/default_country.ts b/src/locales/en_NG/location/default_country.ts
index b51d4b34..b51d4b34 100644
--- a/src/locales/en_NG/address/default_country.ts
+++ b/src/locales/en_NG/location/default_country.ts
diff --git a/src/locales/en_NG/address/index.ts b/src/locales/en_NG/location/index.ts
index 69de53aa..2c76e591 100644
--- a/src/locales/en_NG/address/index.ts
+++ b/src/locales/en_NG/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import city from './city';
 import city_prefix from './city_prefix';
 import default_country from './default_country';
@@ -10,7 +10,7 @@ import postcode from './postcode';
 import state from './state';
 import street from './street';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   city,
   city_prefix,
   default_country,
@@ -19,4 +19,4 @@ const address: AddressDefinitions = {
   street,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/en_NG/address/postcode.ts b/src/locales/en_NG/location/postcode.ts
index c97754f0..c97754f0 100644
--- a/src/locales/en_NG/address/postcode.ts
+++ b/src/locales/en_NG/location/postcode.ts
diff --git a/src/locales/en_NG/address/state.ts b/src/locales/en_NG/location/state.ts
index c5ca8b7a..c5ca8b7a 100644
--- a/src/locales/en_NG/address/state.ts
+++ b/src/locales/en_NG/location/state.ts
diff --git a/src/locales/en_NG/location/street.ts b/src/locales/en_NG/location/street.ts
new file mode 100644
index 00000000..af32d0c4
--- /dev/null
+++ b/src/locales/en_NG/location/street.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{person.firstName}} {{location.street_suffix}}',
+  '{{person.lastName}} {{location.street_suffix}}',
+];
diff --git a/src/locales/en_US/address/city.ts b/src/locales/en_US/address/city.ts
deleted file mode 100644
index ea6ea950..00000000
--- a/src/locales/en_US/address/city.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export default [
-  '{{address.city_prefix}} {{person.firstName}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{person.firstName}}',
-  '{{person.firstName}}{{address.city_suffix}}',
-  '{{person.lastName}}{{address.city_suffix}}',
-];
diff --git a/src/locales/en_US/address/street.ts b/src/locales/en_US/address/street.ts
deleted file mode 100644
index f7dd9d3b..00000000
--- a/src/locales/en_US/address/street.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{person.firstName}} {{address.street_suffix}}',
-  '{{person.lastName}} {{address.street_suffix}}',
-];
diff --git a/src/locales/en_US/index.ts b/src/locales/en_US/index.ts
index 9714a45d..727b1f28 100644
--- a/src/locales/en_US/index.ts
+++ b/src/locales/en_US/index.ts
@@ -3,14 +3,14 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import internet from './internet';
+import location from './location';
 import phone_number from './phone_number';
 
 const en_US: LocaleDefinition = {
   title: 'English (United States)',
-  address,
   internet,
+  location,
   phone_number,
 };
 
diff --git a/src/locales/en_US/location/city.ts b/src/locales/en_US/location/city.ts
new file mode 100644
index 00000000..7375aa83
--- /dev/null
+++ b/src/locales/en_US/location/city.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{location.city_prefix}} {{person.firstName}}{{location.city_suffix}}',
+  '{{location.city_prefix}} {{person.firstName}}',
+  '{{person.firstName}}{{location.city_suffix}}',
+  '{{person.lastName}}{{location.city_suffix}}',
+];
diff --git a/src/locales/en_US/address/default_country.ts b/src/locales/en_US/location/default_country.ts
index 569943f7..569943f7 100644
--- a/src/locales/en_US/address/default_country.ts
+++ b/src/locales/en_US/location/default_country.ts
diff --git a/src/locales/en_US/address/index.ts b/src/locales/en_US/location/index.ts
index 7f09f5ac..a2415a8c 100644
--- a/src/locales/en_US/address/index.ts
+++ b/src/locales/en_US/location/index.ts
@@ -2,17 +2,17 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import city from './city';
 import default_country from './default_country';
 import postcode_by_state from './postcode_by_state';
 import street from './street';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   city,
   default_country,
   postcode_by_state,
   street,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/en_US/address/postcode_by_state.ts b/src/locales/en_US/location/postcode_by_state.ts
index 1c49baf3..1c49baf3 100644
--- a/src/locales/en_US/address/postcode_by_state.ts
+++ b/src/locales/en_US/location/postcode_by_state.ts
diff --git a/src/locales/en_US/location/street.ts b/src/locales/en_US/location/street.ts
new file mode 100644
index 00000000..af32d0c4
--- /dev/null
+++ b/src/locales/en_US/location/street.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{person.firstName}} {{location.street_suffix}}',
+  '{{person.lastName}} {{location.street_suffix}}',
+];
diff --git a/src/locales/en_ZA/address/city.ts b/src/locales/en_ZA/address/city.ts
deleted file mode 100644
index db6c26cc..00000000
--- a/src/locales/en_ZA/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_prefix}}'];
diff --git a/src/locales/en_ZA/address/street.ts b/src/locales/en_ZA/address/street.ts
deleted file mode 100644
index f7dd9d3b..00000000
--- a/src/locales/en_ZA/address/street.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{person.firstName}} {{address.street_suffix}}',
-  '{{person.lastName}} {{address.street_suffix}}',
-];
diff --git a/src/locales/en_ZA/index.ts b/src/locales/en_ZA/index.ts
index 114c9c0c..17da07a9 100644
--- a/src/locales/en_ZA/index.ts
+++ b/src/locales/en_ZA/index.ts
@@ -3,19 +3,19 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import cell_phone from './cell_phone';
 import company from './company';
 import internet from './internet';
+import location from './location';
 import person from './person';
 import phone_number from './phone_number';
 
 const en_ZA: LocaleDefinition = {
   title: 'English (South Africa)',
-  address,
   cell_phone,
   company,
   internet,
+  location,
   person,
   phone_number,
 };
diff --git a/src/locales/en_ZA/location/city.ts b/src/locales/en_ZA/location/city.ts
new file mode 100644
index 00000000..16c4830e
--- /dev/null
+++ b/src/locales/en_ZA/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_prefix}}'];
diff --git a/src/locales/en_ZA/address/city_prefix.ts b/src/locales/en_ZA/location/city_prefix.ts
index fe888a28..fe888a28 100644
--- a/src/locales/en_ZA/address/city_prefix.ts
+++ b/src/locales/en_ZA/location/city_prefix.ts
diff --git a/src/locales/en_ZA/address/default_country.ts b/src/locales/en_ZA/location/default_country.ts
index df5e4c54..df5e4c54 100644
--- a/src/locales/en_ZA/address/default_country.ts
+++ b/src/locales/en_ZA/location/default_country.ts
diff --git a/src/locales/en_ZA/address/index.ts b/src/locales/en_ZA/location/index.ts
index 69de53aa..2c76e591 100644
--- a/src/locales/en_ZA/address/index.ts
+++ b/src/locales/en_ZA/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import city from './city';
 import city_prefix from './city_prefix';
 import default_country from './default_country';
@@ -10,7 +10,7 @@ import postcode from './postcode';
 import state from './state';
 import street from './street';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   city,
   city_prefix,
   default_country,
@@ -19,4 +19,4 @@ const address: AddressDefinitions = {
   street,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/en_ZA/address/postcode.ts b/src/locales/en_ZA/location/postcode.ts
index c97754f0..c97754f0 100644
--- a/src/locales/en_ZA/address/postcode.ts
+++ b/src/locales/en_ZA/location/postcode.ts
diff --git a/src/locales/en_ZA/address/state.ts b/src/locales/en_ZA/location/state.ts
index d81a9698..d81a9698 100644
--- a/src/locales/en_ZA/address/state.ts
+++ b/src/locales/en_ZA/location/state.ts
diff --git a/src/locales/en_ZA/location/street.ts b/src/locales/en_ZA/location/street.ts
new file mode 100644
index 00000000..af32d0c4
--- /dev/null
+++ b/src/locales/en_ZA/location/street.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{person.firstName}} {{location.street_suffix}}',
+  '{{person.lastName}} {{location.street_suffix}}',
+];
diff --git a/src/locales/es/address/city.ts b/src/locales/es/address/city.ts
deleted file mode 100644
index db6c26cc..00000000
--- a/src/locales/es/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_prefix}}'];
diff --git a/src/locales/es/address/street.ts b/src/locales/es/address/street.ts
deleted file mode 100644
index 36db82de..00000000
--- a/src/locales/es/address/street.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{address.street_suffix}} {{person.first_name}}',
-  '{{address.street_suffix}} {{person.first_name}} {{person.last_name}}',
-];
diff --git a/src/locales/es/address/street_address.ts b/src/locales/es/address/street_address.ts
deleted file mode 100644
index 23d3d2c1..00000000
--- a/src/locales/es/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.street}}{{address.buildingNumber}}',
-  full: '{{address.street}}{{address.buildingNumber}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/es/index.ts b/src/locales/es/index.ts
index 04b72f8e..4d583dfa 100644
--- a/src/locales/es/index.ts
+++ b/src/locales/es/index.ts
@@ -3,25 +3,25 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import cell_phone from './cell_phone';
 import color from './color';
 import commerce from './commerce';
 import company from './company';
 import date from './date';
 import internet from './internet';
+import location from './location';
 import person from './person';
 import phone_number from './phone_number';
 
 const es: LocaleDefinition = {
   title: 'Spanish',
-  address,
   cell_phone,
   color,
   commerce,
   company,
   date,
   internet,
+  location,
   person,
   phone_number,
 };
diff --git a/src/locales/es/address/building_number.ts b/src/locales/es/location/building_number.ts
index 27ad1122..27ad1122 100644
--- a/src/locales/es/address/building_number.ts
+++ b/src/locales/es/location/building_number.ts
diff --git a/src/locales/es/location/city.ts b/src/locales/es/location/city.ts
new file mode 100644
index 00000000..16c4830e
--- /dev/null
+++ b/src/locales/es/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_prefix}}'];
diff --git a/src/locales/es/address/city_prefix.ts b/src/locales/es/location/city_prefix.ts
index b887664b..b887664b 100644
--- a/src/locales/es/address/city_prefix.ts
+++ b/src/locales/es/location/city_prefix.ts
diff --git a/src/locales/es/address/country.ts b/src/locales/es/location/country.ts
index e29dd2b7..e29dd2b7 100644
--- a/src/locales/es/address/country.ts
+++ b/src/locales/es/location/country.ts
diff --git a/src/locales/es/address/default_country.ts b/src/locales/es/location/default_country.ts
index 00bdb1cd..00bdb1cd 100644
--- a/src/locales/es/address/default_country.ts
+++ b/src/locales/es/location/default_country.ts
diff --git a/src/locales/es/address/index.ts b/src/locales/es/location/index.ts
index db958157..5d589f9c 100644
--- a/src/locales/es/address/index.ts
+++ b/src/locales/es/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_prefix from './city_prefix';
@@ -18,7 +18,7 @@ import street_address from './street_address';
 import street_suffix from './street_suffix';
 import time_zone from './time_zone';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_prefix,
@@ -35,4 +35,4 @@ const address: AddressDefinitions = {
   time_zone,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/es/address/postcode.ts b/src/locales/es/location/postcode.ts
index db2bcfed..db2bcfed 100644
--- a/src/locales/es/address/postcode.ts
+++ b/src/locales/es/location/postcode.ts
diff --git a/src/locales/es/address/province.ts b/src/locales/es/location/province.ts
index ac6cb1ac..ac6cb1ac 100644
--- a/src/locales/es/address/province.ts
+++ b/src/locales/es/location/province.ts
diff --git a/src/locales/es/address/secondary_address.ts b/src/locales/es/location/secondary_address.ts
index 268b0420..268b0420 100644
--- a/src/locales/es/address/secondary_address.ts
+++ b/src/locales/es/location/secondary_address.ts
diff --git a/src/locales/es/address/state.ts b/src/locales/es/location/state.ts
index 15ebd757..15ebd757 100644
--- a/src/locales/es/address/state.ts
+++ b/src/locales/es/location/state.ts
diff --git a/src/locales/es/address/state_abbr.ts b/src/locales/es/location/state_abbr.ts
index 9a1dca1a..9a1dca1a 100644
--- a/src/locales/es/address/state_abbr.ts
+++ b/src/locales/es/location/state_abbr.ts
diff --git a/src/locales/es/location/street.ts b/src/locales/es/location/street.ts
new file mode 100644
index 00000000..8454afa1
--- /dev/null
+++ b/src/locales/es/location/street.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{location.street_suffix}} {{person.first_name}}',
+  '{{location.street_suffix}} {{person.first_name}} {{person.last_name}}',
+];
diff --git a/src/locales/es/location/street_address.ts b/src/locales/es/location/street_address.ts
new file mode 100644
index 00000000..1b8de3d3
--- /dev/null
+++ b/src/locales/es/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.street}}{{location.buildingNumber}}',
+  full: '{{location.street}}{{location.buildingNumber}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/es/address/street_suffix.ts b/src/locales/es/location/street_suffix.ts
index e4b51df6..e4b51df6 100644
--- a/src/locales/es/address/street_suffix.ts
+++ b/src/locales/es/location/street_suffix.ts
diff --git a/src/locales/es/address/time_zone.ts b/src/locales/es/location/time_zone.ts
index e5a7b192..e5a7b192 100644
--- a/src/locales/es/address/time_zone.ts
+++ b/src/locales/es/location/time_zone.ts
diff --git a/src/locales/es_MX/address/city.ts b/src/locales/es_MX/address/city.ts
deleted file mode 100644
index db6c26cc..00000000
--- a/src/locales/es_MX/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_prefix}}'];
diff --git a/src/locales/es_MX/address/street.ts b/src/locales/es_MX/address/street.ts
deleted file mode 100644
index c831c985..00000000
--- a/src/locales/es_MX/address/street.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export default [
-  '{{address.street_suffix}} {{person.first_name}}',
-  '{{address.street_suffix}} {{person.first_name}} {{person.last_name}}',
-  '{{address.street_suffix}} {{address.street_name}}',
-];
diff --git a/src/locales/es_MX/address/street_address.ts b/src/locales/es_MX/address/street_address.ts
deleted file mode 100644
index 23d3d2c1..00000000
--- a/src/locales/es_MX/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.street}}{{address.buildingNumber}}',
-  full: '{{address.street}}{{address.buildingNumber}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/es_MX/index.ts b/src/locales/es_MX/index.ts
index 27d43de0..ef6ac63b 100644
--- a/src/locales/es_MX/index.ts
+++ b/src/locales/es_MX/index.ts
@@ -3,12 +3,12 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import cell_phone from './cell_phone';
 import color from './color';
 import commerce from './commerce';
 import company from './company';
 import internet from './internet';
+import location from './location';
 import lorem from './lorem';
 import person from './person';
 import phone_number from './phone_number';
@@ -17,12 +17,12 @@ import team from './team';
 const es_MX: LocaleDefinition = {
   title: 'Spanish (Mexico)',
   separator: ' & ',
-  address,
   cell_phone,
   color,
   commerce,
   company,
   internet,
+  location,
   lorem,
   person,
   phone_number,
diff --git a/src/locales/es_MX/address/building_number.ts b/src/locales/es_MX/location/building_number.ts
index a958361a..a958361a 100644
--- a/src/locales/es_MX/address/building_number.ts
+++ b/src/locales/es_MX/location/building_number.ts
diff --git a/src/locales/es_MX/location/city.ts b/src/locales/es_MX/location/city.ts
new file mode 100644
index 00000000..16c4830e
--- /dev/null
+++ b/src/locales/es_MX/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_prefix}}'];
diff --git a/src/locales/es_MX/address/city_prefix.ts b/src/locales/es_MX/location/city_prefix.ts
index 096b4cb9..096b4cb9 100644
--- a/src/locales/es_MX/address/city_prefix.ts
+++ b/src/locales/es_MX/location/city_prefix.ts
diff --git a/src/locales/es_MX/address/city_suffix.ts b/src/locales/es_MX/location/city_suffix.ts
index 97d1bc27..97d1bc27 100644
--- a/src/locales/es_MX/address/city_suffix.ts
+++ b/src/locales/es_MX/location/city_suffix.ts
diff --git a/src/locales/es_MX/address/country.ts b/src/locales/es_MX/location/country.ts
index 8b0ca27c..8b0ca27c 100644
--- a/src/locales/es_MX/address/country.ts
+++ b/src/locales/es_MX/location/country.ts
diff --git a/src/locales/es_MX/address/default_country.ts b/src/locales/es_MX/location/default_country.ts
index bb0fd48c..bb0fd48c 100644
--- a/src/locales/es_MX/address/default_country.ts
+++ b/src/locales/es_MX/location/default_country.ts
diff --git a/src/locales/es_MX/address/index.ts b/src/locales/es_MX/location/index.ts
index a23b1609..c0728fac 100644
--- a/src/locales/es_MX/address/index.ts
+++ b/src/locales/es_MX/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_prefix from './city_prefix';
@@ -19,7 +19,7 @@ import street_name from './street_name';
 import street_suffix from './street_suffix';
 import time_zone from './time_zone';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_prefix,
@@ -37,4 +37,4 @@ const address: AddressDefinitions = {
   time_zone,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/es_MX/address/postcode.ts b/src/locales/es_MX/location/postcode.ts
index db2bcfed..db2bcfed 100644
--- a/src/locales/es_MX/address/postcode.ts
+++ b/src/locales/es_MX/location/postcode.ts
diff --git a/src/locales/es_MX/address/secondary_address.ts b/src/locales/es_MX/location/secondary_address.ts
index 1636fb04..1636fb04 100644
--- a/src/locales/es_MX/address/secondary_address.ts
+++ b/src/locales/es_MX/location/secondary_address.ts
diff --git a/src/locales/es_MX/address/state.ts b/src/locales/es_MX/location/state.ts
index 0c1ab782..0c1ab782 100644
--- a/src/locales/es_MX/address/state.ts
+++ b/src/locales/es_MX/location/state.ts
diff --git a/src/locales/es_MX/address/state_abbr.ts b/src/locales/es_MX/location/state_abbr.ts
index cebadd4f..cebadd4f 100644
--- a/src/locales/es_MX/address/state_abbr.ts
+++ b/src/locales/es_MX/location/state_abbr.ts
diff --git a/src/locales/es_MX/location/street.ts b/src/locales/es_MX/location/street.ts
new file mode 100644
index 00000000..a5b7686e
--- /dev/null
+++ b/src/locales/es_MX/location/street.ts
@@ -0,0 +1,5 @@
+export default [
+  '{{location.street_suffix}} {{person.first_name}}',
+  '{{location.street_suffix}} {{person.first_name}} {{person.last_name}}',
+  '{{location.street_suffix}} {{location.street_name}}',
+];
diff --git a/src/locales/es_MX/location/street_address.ts b/src/locales/es_MX/location/street_address.ts
new file mode 100644
index 00000000..1b8de3d3
--- /dev/null
+++ b/src/locales/es_MX/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.street}}{{location.buildingNumber}}',
+  full: '{{location.street}}{{location.buildingNumber}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/es_MX/address/street_name.ts b/src/locales/es_MX/location/street_name.ts
index b2ac105e..b2ac105e 100644
--- a/src/locales/es_MX/address/street_name.ts
+++ b/src/locales/es_MX/location/street_name.ts
diff --git a/src/locales/es_MX/address/street_suffix.ts b/src/locales/es_MX/location/street_suffix.ts
index e4b51df6..e4b51df6 100644
--- a/src/locales/es_MX/address/street_suffix.ts
+++ b/src/locales/es_MX/location/street_suffix.ts
diff --git a/src/locales/es_MX/address/time_zone.ts b/src/locales/es_MX/location/time_zone.ts
index e5a7b192..e5a7b192 100644
--- a/src/locales/es_MX/address/time_zone.ts
+++ b/src/locales/es_MX/location/time_zone.ts
diff --git a/src/locales/es_MX/team/name.ts b/src/locales/es_MX/team/name.ts
index ed2bdbb5..bdd4f123 100644
--- a/src/locales/es_MX/team/name.ts
+++ b/src/locales/es_MX/team/name.ts
@@ -1 +1 @@
-export default ['{{address.state}} {{team.creature}}'];
+export default ['{{location.state}} {{team.creature}}'];
diff --git a/src/locales/fa/address/city.ts b/src/locales/fa/address/city.ts
deleted file mode 100644
index e3da346b..00000000
--- a/src/locales/fa/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_name}}'];
diff --git a/src/locales/fa/address/street.ts b/src/locales/fa/address/street.ts
deleted file mode 100644
index 249fca86..00000000
--- a/src/locales/fa/address/street.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.street_prefix}} {{address.street_suffix}}'];
diff --git a/src/locales/fa/address/street_address.ts b/src/locales/fa/address/street_address.ts
deleted file mode 100644
index a7f306b5..00000000
--- a/src/locales/fa/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.street}}, پلاک {{address.buildingNumber}}',
-  full: '{{address.street}}, پلاک {{address.buildingNumber}}  {{address.secondaryAddress}}',
-};
diff --git a/src/locales/fa/index.ts b/src/locales/fa/index.ts
index 27755669..cb3e8f80 100644
--- a/src/locales/fa/index.ts
+++ b/src/locales/fa/index.ts
@@ -3,7 +3,6 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import cell_phone from './cell_phone';
 import color from './color';
 import commerce from './commerce';
@@ -11,6 +10,7 @@ import company from './company';
 import date from './date';
 import finance from './finance';
 import internet from './internet';
+import location from './location';
 import lorem from './lorem';
 import person from './person';
 import phone_number from './phone_number';
@@ -18,7 +18,6 @@ import vehicle from './vehicle';
 
 const fa: LocaleDefinition = {
   title: 'Farsi',
-  address,
   cell_phone,
   color,
   commerce,
@@ -26,6 +25,7 @@ const fa: LocaleDefinition = {
   date,
   finance,
   internet,
+  location,
   lorem,
   person,
   phone_number,
diff --git a/src/locales/fa/address/building_number.ts b/src/locales/fa/location/building_number.ts
index c35ab227..c35ab227 100644
--- a/src/locales/fa/address/building_number.ts
+++ b/src/locales/fa/location/building_number.ts
diff --git a/src/locales/fa/location/city.ts b/src/locales/fa/location/city.ts
new file mode 100644
index 00000000..ad43b68f
--- /dev/null
+++ b/src/locales/fa/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_name}}'];
diff --git a/src/locales/fa/address/city_name.ts b/src/locales/fa/location/city_name.ts
index 8ed5c23b..8ed5c23b 100644
--- a/src/locales/fa/address/city_name.ts
+++ b/src/locales/fa/location/city_name.ts
diff --git a/src/locales/fa/address/city_prefix.ts b/src/locales/fa/location/city_prefix.ts
index 5a76c627..5a76c627 100644
--- a/src/locales/fa/address/city_prefix.ts
+++ b/src/locales/fa/location/city_prefix.ts
diff --git a/src/locales/fa/address/city_suffix.ts b/src/locales/fa/location/city_suffix.ts
index c9f3a94e..c9f3a94e 100644
--- a/src/locales/fa/address/city_suffix.ts
+++ b/src/locales/fa/location/city_suffix.ts
diff --git a/src/locales/fa/address/country.ts b/src/locales/fa/location/country.ts
index a67b2b63..a67b2b63 100644
--- a/src/locales/fa/address/country.ts
+++ b/src/locales/fa/location/country.ts
diff --git a/src/locales/fa/address/default_country.ts b/src/locales/fa/location/default_country.ts
index 2a2419ee..2a2419ee 100644
--- a/src/locales/fa/address/default_country.ts
+++ b/src/locales/fa/location/default_country.ts
diff --git a/src/locales/fa/address/direction.ts b/src/locales/fa/location/direction.ts
index 2fe64b35..2fe64b35 100644
--- a/src/locales/fa/address/direction.ts
+++ b/src/locales/fa/location/direction.ts
diff --git a/src/locales/fa/address/index.ts b/src/locales/fa/location/index.ts
index e6b93a65..9b50f3a0 100644
--- a/src/locales/fa/address/index.ts
+++ b/src/locales/fa/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_name from './city_name';
@@ -19,7 +19,7 @@ import street_address from './street_address';
 import street_prefix from './street_prefix';
 import street_suffix from './street_suffix';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_name,
@@ -37,4 +37,4 @@ const address: AddressDefinitions = {
   street_suffix,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/fa/address/postcode.ts b/src/locales/fa/location/postcode.ts
index baa3f8b8..baa3f8b8 100644
--- a/src/locales/fa/address/postcode.ts
+++ b/src/locales/fa/location/postcode.ts
diff --git a/src/locales/fa/address/secondary_address.ts b/src/locales/fa/location/secondary_address.ts
index 04aaa420..04aaa420 100644
--- a/src/locales/fa/address/secondary_address.ts
+++ b/src/locales/fa/location/secondary_address.ts
diff --git a/src/locales/fa/address/state.ts b/src/locales/fa/location/state.ts
index 15415ffb..15415ffb 100644
--- a/src/locales/fa/address/state.ts
+++ b/src/locales/fa/location/state.ts
diff --git a/src/locales/fa/location/street.ts b/src/locales/fa/location/street.ts
new file mode 100644
index 00000000..f62f53f0
--- /dev/null
+++ b/src/locales/fa/location/street.ts
@@ -0,0 +1 @@
+export default ['{{location.street_prefix}} {{location.street_suffix}}'];
diff --git a/src/locales/fa/location/street_address.ts b/src/locales/fa/location/street_address.ts
new file mode 100644
index 00000000..eec0e199
--- /dev/null
+++ b/src/locales/fa/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.street}}, پلاک {{location.buildingNumber}}',
+  full: '{{location.street}}, پلاک {{location.buildingNumber}}  {{location.secondaryAddress}}',
+};
diff --git a/src/locales/fa/address/street_prefix.ts b/src/locales/fa/location/street_prefix.ts
index 6c6061f6..6c6061f6 100644
--- a/src/locales/fa/address/street_prefix.ts
+++ b/src/locales/fa/location/street_prefix.ts
diff --git a/src/locales/fa/address/street_suffix.ts b/src/locales/fa/location/street_suffix.ts
index dd262ac3..dd262ac3 100644
--- a/src/locales/fa/address/street_suffix.ts
+++ b/src/locales/fa/location/street_suffix.ts
diff --git a/src/locales/fr/address/city.ts b/src/locales/fr/address/city.ts
deleted file mode 100644
index e3da346b..00000000
--- a/src/locales/fr/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_name}}'];
diff --git a/src/locales/fr/address/street.ts b/src/locales/fr/address/street.ts
deleted file mode 100644
index 249fca86..00000000
--- a/src/locales/fr/address/street.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.street_prefix}} {{address.street_suffix}}'];
diff --git a/src/locales/fr/address/street_address.ts b/src/locales/fr/address/street_address.ts
deleted file mode 100644
index 55bed362..00000000
--- a/src/locales/fr/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.buildingNumber}} {{address.street}}',
-  full: '{{address.buildingNumber}} {{address.street}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/fr/index.ts b/src/locales/fr/index.ts
index 9beebf7f..102d680c 100644
--- a/src/locales/fr/index.ts
+++ b/src/locales/fr/index.ts
@@ -3,7 +3,6 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import animal from './animal';
 import color from './color';
 import commerce from './commerce';
@@ -11,6 +10,7 @@ import company from './company';
 import date from './date';
 import finance from './finance';
 import internet from './internet';
+import location from './location';
 import lorem from './lorem';
 import music from './music';
 import person from './person';
@@ -20,7 +20,6 @@ import word from './word';
 
 const fr: LocaleDefinition = {
   title: 'French',
-  address,
   animal,
   color,
   commerce,
@@ -28,6 +27,7 @@ const fr: LocaleDefinition = {
   date,
   finance,
   internet,
+  location,
   lorem,
   music,
   person,
diff --git a/src/locales/fr/address/building_number.ts b/src/locales/fr/location/building_number.ts
index b875f685..b875f685 100644
--- a/src/locales/fr/address/building_number.ts
+++ b/src/locales/fr/location/building_number.ts
diff --git a/src/locales/fr/location/city.ts b/src/locales/fr/location/city.ts
new file mode 100644
index 00000000..ad43b68f
--- /dev/null
+++ b/src/locales/fr/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_name}}'];
diff --git a/src/locales/fr/address/city_name.ts b/src/locales/fr/location/city_name.ts
index acbc0f88..acbc0f88 100644
--- a/src/locales/fr/address/city_name.ts
+++ b/src/locales/fr/location/city_name.ts
diff --git a/src/locales/fr/address/country.ts b/src/locales/fr/location/country.ts
index 2abebcf9..2abebcf9 100644
--- a/src/locales/fr/address/country.ts
+++ b/src/locales/fr/location/country.ts
diff --git a/src/locales/fr/address/default_country.ts b/src/locales/fr/location/default_country.ts
index b6a445ac..b6a445ac 100644
--- a/src/locales/fr/address/default_country.ts
+++ b/src/locales/fr/location/default_country.ts
diff --git a/src/locales/fr/address/direction.ts b/src/locales/fr/location/direction.ts
index b58942c3..b58942c3 100644
--- a/src/locales/fr/address/direction.ts
+++ b/src/locales/fr/location/direction.ts
diff --git a/src/locales/fr/address/index.ts b/src/locales/fr/location/index.ts
index c88d26dc..9beb335b 100644
--- a/src/locales/fr/address/index.ts
+++ b/src/locales/fr/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_name from './city_name';
@@ -17,7 +17,7 @@ import street_address from './street_address';
 import street_prefix from './street_prefix';
 import street_suffix from './street_suffix';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_name,
@@ -33,4 +33,4 @@ const address: AddressDefinitions = {
   street_suffix,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/fr/address/postcode.ts b/src/locales/fr/location/postcode.ts
index db2bcfed..db2bcfed 100644
--- a/src/locales/fr/address/postcode.ts
+++ b/src/locales/fr/location/postcode.ts
diff --git a/src/locales/fr/address/secondary_address.ts b/src/locales/fr/location/secondary_address.ts
index 776ec151..776ec151 100644
--- a/src/locales/fr/address/secondary_address.ts
+++ b/src/locales/fr/location/secondary_address.ts
diff --git a/src/locales/fr/address/state.ts b/src/locales/fr/location/state.ts
index 7bc1369b..7bc1369b 100644
--- a/src/locales/fr/address/state.ts
+++ b/src/locales/fr/location/state.ts
diff --git a/src/locales/fr/location/street.ts b/src/locales/fr/location/street.ts
new file mode 100644
index 00000000..f62f53f0
--- /dev/null
+++ b/src/locales/fr/location/street.ts
@@ -0,0 +1 @@
+export default ['{{location.street_prefix}} {{location.street_suffix}}'];
diff --git a/src/locales/fr/location/street_address.ts b/src/locales/fr/location/street_address.ts
new file mode 100644
index 00000000..2e1a661d
--- /dev/null
+++ b/src/locales/fr/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.buildingNumber}} {{location.street}}',
+  full: '{{location.buildingNumber}} {{location.street}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/fr/address/street_prefix.ts b/src/locales/fr/location/street_prefix.ts
index 221a72f5..221a72f5 100644
--- a/src/locales/fr/address/street_prefix.ts
+++ b/src/locales/fr/location/street_prefix.ts
diff --git a/src/locales/fr/address/street_suffix.ts b/src/locales/fr/location/street_suffix.ts
index f25af5f6..f25af5f6 100644
--- a/src/locales/fr/address/street_suffix.ts
+++ b/src/locales/fr/location/street_suffix.ts
diff --git a/src/locales/fr_BE/address/city.ts b/src/locales/fr_BE/address/city.ts
deleted file mode 100644
index 5eaa0e41..00000000
--- a/src/locales/fr_BE/address/city.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{address.city_prefix}}',
-  '{{address.city_prefix}}{{address.city_suffix}}',
-];
diff --git a/src/locales/fr_BE/address/street.ts b/src/locales/fr_BE/address/street.ts
deleted file mode 100644
index 00c17d59..00000000
--- a/src/locales/fr_BE/address/street.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export default [
-  '{{address.street_prefix}} {{person.first_name}}',
-  '{{address.street_prefix}} {{person.last_name}}',
-  '{{address.street_prefix}} {{address.street_suffix}}',
-];
diff --git a/src/locales/fr_BE/address/street_address.ts b/src/locales/fr_BE/address/street_address.ts
deleted file mode 100644
index d1e8da38..00000000
--- a/src/locales/fr_BE/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.street}} {{address.buildingNumber}}',
-  full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/fr_BE/index.ts b/src/locales/fr_BE/index.ts
index ed7167df..cfbcf64b 100644
--- a/src/locales/fr_BE/index.ts
+++ b/src/locales/fr_BE/index.ts
@@ -3,17 +3,17 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import cell_phone from './cell_phone';
 import internet from './internet';
+import location from './location';
 import person from './person';
 import phone_number from './phone_number';
 
 const fr_BE: LocaleDefinition = {
   title: 'Français (Belgique)',
-  address,
   cell_phone,
   internet,
+  location,
   person,
   phone_number,
 };
diff --git a/src/locales/fr_BE/address/building_number.ts b/src/locales/fr_BE/location/building_number.ts
index 137bb5d3..137bb5d3 100644
--- a/src/locales/fr_BE/address/building_number.ts
+++ b/src/locales/fr_BE/location/building_number.ts
diff --git a/src/locales/fr_BE/location/city.ts b/src/locales/fr_BE/location/city.ts
new file mode 100644
index 00000000..2bddf0f5
--- /dev/null
+++ b/src/locales/fr_BE/location/city.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{location.city_prefix}}',
+  '{{location.city_prefix}}{{location.city_suffix}}',
+];
diff --git a/src/locales/fr_BE/address/city_prefix.ts b/src/locales/fr_BE/location/city_prefix.ts
index 7ec6ce4a..7ec6ce4a 100644
--- a/src/locales/fr_BE/address/city_prefix.ts
+++ b/src/locales/fr_BE/location/city_prefix.ts
diff --git a/src/locales/fr_BE/address/city_suffix.ts b/src/locales/fr_BE/location/city_suffix.ts
index c406f378..c406f378 100644
--- a/src/locales/fr_BE/address/city_suffix.ts
+++ b/src/locales/fr_BE/location/city_suffix.ts
diff --git a/src/locales/fr_BE/address/default_country.ts b/src/locales/fr_BE/location/default_country.ts
index 45acdc5a..45acdc5a 100644
--- a/src/locales/fr_BE/address/default_country.ts
+++ b/src/locales/fr_BE/location/default_country.ts
diff --git a/src/locales/fr_BE/address/index.ts b/src/locales/fr_BE/location/index.ts
index 4c7a5896..3ce44af5 100644
--- a/src/locales/fr_BE/address/index.ts
+++ b/src/locales/fr_BE/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_prefix from './city_prefix';
@@ -16,7 +16,7 @@ import street_address from './street_address';
 import street_prefix from './street_prefix';
 import street_suffix from './street_suffix';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_prefix,
@@ -31,4 +31,4 @@ const address: AddressDefinitions = {
   street_suffix,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/fr_BE/address/postcode.ts b/src/locales/fr_BE/location/postcode.ts
index a8235678..a8235678 100644
--- a/src/locales/fr_BE/address/postcode.ts
+++ b/src/locales/fr_BE/location/postcode.ts
diff --git a/src/locales/fr_BE/address/state.ts b/src/locales/fr_BE/location/state.ts
index b0dc14e1..b0dc14e1 100644
--- a/src/locales/fr_BE/address/state.ts
+++ b/src/locales/fr_BE/location/state.ts
diff --git a/src/locales/fr_BE/address/state_abbr.ts b/src/locales/fr_BE/location/state_abbr.ts
index 3aa14493..3aa14493 100644
--- a/src/locales/fr_BE/address/state_abbr.ts
+++ b/src/locales/fr_BE/location/state_abbr.ts
diff --git a/src/locales/fr_BE/location/street.ts b/src/locales/fr_BE/location/street.ts
new file mode 100644
index 00000000..47e60b56
--- /dev/null
+++ b/src/locales/fr_BE/location/street.ts
@@ -0,0 +1,5 @@
+export default [
+  '{{location.street_prefix}} {{person.first_name}}',
+  '{{location.street_prefix}} {{person.last_name}}',
+  '{{location.street_prefix}} {{location.street_suffix}}',
+];
diff --git a/src/locales/fr_BE/location/street_address.ts b/src/locales/fr_BE/location/street_address.ts
new file mode 100644
index 00000000..437f20dd
--- /dev/null
+++ b/src/locales/fr_BE/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.street}} {{location.buildingNumber}}',
+  full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/fr_BE/address/street_prefix.ts b/src/locales/fr_BE/location/street_prefix.ts
index f70ebb01..f70ebb01 100644
--- a/src/locales/fr_BE/address/street_prefix.ts
+++ b/src/locales/fr_BE/location/street_prefix.ts
diff --git a/src/locales/fr_BE/address/street_suffix.ts b/src/locales/fr_BE/location/street_suffix.ts
index 7c625d5e..7c625d5e 100644
--- a/src/locales/fr_BE/address/street_suffix.ts
+++ b/src/locales/fr_BE/location/street_suffix.ts
diff --git a/src/locales/fr_CA/address/city.ts b/src/locales/fr_CA/address/city.ts
deleted file mode 100644
index ea6ea950..00000000
--- a/src/locales/fr_CA/address/city.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export default [
-  '{{address.city_prefix}} {{person.firstName}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{person.firstName}}',
-  '{{person.firstName}}{{address.city_suffix}}',
-  '{{person.lastName}}{{address.city_suffix}}',
-];
diff --git a/src/locales/fr_CA/address/street.ts b/src/locales/fr_CA/address/street.ts
deleted file mode 100644
index f7dd9d3b..00000000
--- a/src/locales/fr_CA/address/street.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{person.firstName}} {{address.street_suffix}}',
-  '{{person.lastName}} {{address.street_suffix}}',
-];
diff --git a/src/locales/fr_CA/index.ts b/src/locales/fr_CA/index.ts
index e093f895..fff977a9 100644
--- a/src/locales/fr_CA/index.ts
+++ b/src/locales/fr_CA/index.ts
@@ -3,14 +3,14 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import internet from './internet';
+import location from './location';
 import phone_number from './phone_number';
 
 const fr_CA: LocaleDefinition = {
   title: 'French (Canada)',
-  address,
   internet,
+  location,
   phone_number,
 };
 
diff --git a/src/locales/fr_CA/location/city.ts b/src/locales/fr_CA/location/city.ts
new file mode 100644
index 00000000..7375aa83
--- /dev/null
+++ b/src/locales/fr_CA/location/city.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{location.city_prefix}} {{person.firstName}}{{location.city_suffix}}',
+  '{{location.city_prefix}} {{person.firstName}}',
+  '{{person.firstName}}{{location.city_suffix}}',
+  '{{person.lastName}}{{location.city_suffix}}',
+];
diff --git a/src/locales/fr_CA/address/default_country.ts b/src/locales/fr_CA/location/default_country.ts
index 1e2794ff..1e2794ff 100644
--- a/src/locales/fr_CA/address/default_country.ts
+++ b/src/locales/fr_CA/location/default_country.ts
diff --git a/src/locales/fr_CA/address/index.ts b/src/locales/fr_CA/location/index.ts
index f606bbc3..c685ad07 100644
--- a/src/locales/fr_CA/address/index.ts
+++ b/src/locales/fr_CA/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import city from './city';
 import default_country from './default_country';
 import postcode from './postcode';
@@ -10,7 +10,7 @@ import state from './state';
 import state_abbr from './state_abbr';
 import street from './street';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   city,
   default_country,
   postcode,
@@ -19,4 +19,4 @@ const address: AddressDefinitions = {
   street,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/fr_CA/address/postcode.ts b/src/locales/fr_CA/location/postcode.ts
index 5d4f9f27..5d4f9f27 100644
--- a/src/locales/fr_CA/address/postcode.ts
+++ b/src/locales/fr_CA/location/postcode.ts
diff --git a/src/locales/fr_CA/address/state.ts b/src/locales/fr_CA/location/state.ts
index 37815626..37815626 100644
--- a/src/locales/fr_CA/address/state.ts
+++ b/src/locales/fr_CA/location/state.ts
diff --git a/src/locales/fr_CA/address/state_abbr.ts b/src/locales/fr_CA/location/state_abbr.ts
index 6faae35c..6faae35c 100644
--- a/src/locales/fr_CA/address/state_abbr.ts
+++ b/src/locales/fr_CA/location/state_abbr.ts
diff --git a/src/locales/fr_CA/location/street.ts b/src/locales/fr_CA/location/street.ts
new file mode 100644
index 00000000..af32d0c4
--- /dev/null
+++ b/src/locales/fr_CA/location/street.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{person.firstName}} {{location.street_suffix}}',
+  '{{person.lastName}} {{location.street_suffix}}',
+];
diff --git a/src/locales/fr_CH/address/city.ts b/src/locales/fr_CH/address/city.ts
deleted file mode 100644
index e3da346b..00000000
--- a/src/locales/fr_CH/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_name}}'];
diff --git a/src/locales/fr_CH/address/street.ts b/src/locales/fr_CH/address/street.ts
deleted file mode 100644
index 249fca86..00000000
--- a/src/locales/fr_CH/address/street.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.street_prefix}} {{address.street_suffix}}'];
diff --git a/src/locales/fr_CH/address/street_address.ts b/src/locales/fr_CH/address/street_address.ts
deleted file mode 100644
index d6c5878a..00000000
--- a/src/locales/fr_CH/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.buildingNumber}} {{address.streetName}}',
-  full: '{{address.buildingNumber}} {{address.streetName}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/fr_CH/index.ts b/src/locales/fr_CH/index.ts
index 39f607f6..1543c8c2 100644
--- a/src/locales/fr_CH/index.ts
+++ b/src/locales/fr_CH/index.ts
@@ -3,7 +3,6 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import animal from './animal';
 import cell_phone from './cell_phone';
 import color from './color';
@@ -11,6 +10,7 @@ import commerce from './commerce';
 import date from './date';
 import finance from './finance';
 import internet from './internet';
+import location from './location';
 import lorem from './lorem';
 import music from './music';
 import person from './person';
@@ -20,7 +20,6 @@ import word from './word';
 
 const fr_CH: LocaleDefinition = {
   title: 'French (Switzerland)',
-  address,
   animal,
   cell_phone,
   color,
@@ -28,6 +27,7 @@ const fr_CH: LocaleDefinition = {
   date,
   finance,
   internet,
+  location,
   lorem,
   music,
   person,
diff --git a/src/locales/fr_CH/address/building_number.ts b/src/locales/fr_CH/location/building_number.ts
index b875f685..b875f685 100644
--- a/src/locales/fr_CH/address/building_number.ts
+++ b/src/locales/fr_CH/location/building_number.ts
diff --git a/src/locales/fr_CH/location/city.ts b/src/locales/fr_CH/location/city.ts
new file mode 100644
index 00000000..ad43b68f
--- /dev/null
+++ b/src/locales/fr_CH/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_name}}'];
diff --git a/src/locales/fr_CH/address/city_name.ts b/src/locales/fr_CH/location/city_name.ts
index 547779b9..547779b9 100644
--- a/src/locales/fr_CH/address/city_name.ts
+++ b/src/locales/fr_CH/location/city_name.ts
diff --git a/src/locales/fr_CH/address/country.ts b/src/locales/fr_CH/location/country.ts
index 2abebcf9..2abebcf9 100644
--- a/src/locales/fr_CH/address/country.ts
+++ b/src/locales/fr_CH/location/country.ts
diff --git a/src/locales/fr_CH/address/country_code.ts b/src/locales/fr_CH/location/country_code.ts
index ce14a4ed..ce14a4ed 100644
--- a/src/locales/fr_CH/address/country_code.ts
+++ b/src/locales/fr_CH/location/country_code.ts
diff --git a/src/locales/fr_CH/address/default_country.ts b/src/locales/fr_CH/location/default_country.ts
index e3615f33..e3615f33 100644
--- a/src/locales/fr_CH/address/default_country.ts
+++ b/src/locales/fr_CH/location/default_country.ts
diff --git a/src/locales/fr_CH/address/direction.ts b/src/locales/fr_CH/location/direction.ts
index b58942c3..b58942c3 100644
--- a/src/locales/fr_CH/address/direction.ts
+++ b/src/locales/fr_CH/location/direction.ts
diff --git a/src/locales/fr_CH/address/index.ts b/src/locales/fr_CH/location/index.ts
index f8e6849e..fd3b57e9 100644
--- a/src/locales/fr_CH/address/index.ts
+++ b/src/locales/fr_CH/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_name from './city_name';
@@ -19,7 +19,7 @@ import street_address from './street_address';
 import street_prefix from './street_prefix';
 import street_suffix from './street_suffix';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_name,
@@ -37,4 +37,4 @@ const address: AddressDefinitions = {
   street_suffix,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/fr_CH/address/postcode.ts b/src/locales/fr_CH/location/postcode.ts
index ca8a62b0..ca8a62b0 100644
--- a/src/locales/fr_CH/address/postcode.ts
+++ b/src/locales/fr_CH/location/postcode.ts
diff --git a/src/locales/fr_CH/address/secondary_address.ts b/src/locales/fr_CH/location/secondary_address.ts
index 776ec151..776ec151 100644
--- a/src/locales/fr_CH/address/secondary_address.ts
+++ b/src/locales/fr_CH/location/secondary_address.ts
diff --git a/src/locales/fr_CH/address/state.ts b/src/locales/fr_CH/location/state.ts
index 58c15031..58c15031 100644
--- a/src/locales/fr_CH/address/state.ts
+++ b/src/locales/fr_CH/location/state.ts
diff --git a/src/locales/fr_CH/address/state_abbr.ts b/src/locales/fr_CH/location/state_abbr.ts
index b599580e..b599580e 100644
--- a/src/locales/fr_CH/address/state_abbr.ts
+++ b/src/locales/fr_CH/location/state_abbr.ts
diff --git a/src/locales/fr_CH/location/street.ts b/src/locales/fr_CH/location/street.ts
new file mode 100644
index 00000000..f62f53f0
--- /dev/null
+++ b/src/locales/fr_CH/location/street.ts
@@ -0,0 +1 @@
+export default ['{{location.street_prefix}} {{location.street_suffix}}'];
diff --git a/src/locales/fr_CH/location/street_address.ts b/src/locales/fr_CH/location/street_address.ts
new file mode 100644
index 00000000..3ee966e2
--- /dev/null
+++ b/src/locales/fr_CH/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.buildingNumber}} {{location.streetName}}',
+  full: '{{location.buildingNumber}} {{location.streetName}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/fr_CH/address/street_prefix.ts b/src/locales/fr_CH/location/street_prefix.ts
index 9d00a91a..9d00a91a 100644
--- a/src/locales/fr_CH/address/street_prefix.ts
+++ b/src/locales/fr_CH/location/street_prefix.ts
diff --git a/src/locales/fr_CH/address/street_suffix.ts b/src/locales/fr_CH/location/street_suffix.ts
index 0a26b23d..0a26b23d 100644
--- a/src/locales/fr_CH/address/street_suffix.ts
+++ b/src/locales/fr_CH/location/street_suffix.ts
diff --git a/src/locales/ge/address/city.ts b/src/locales/ge/address/city.ts
deleted file mode 100644
index 27a932f1..00000000
--- a/src/locales/ge/address/city.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export default [
-  '{{address.city_prefix}} {{person.first_name}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{person.first_name}}',
-  '{{person.first_name}}{{address.city_suffix}}',
-  '{{person.last_name}}{{address.city_suffix}}',
-];
diff --git a/src/locales/ge/address/street.ts b/src/locales/ge/address/street.ts
deleted file mode 100644
index 75ceb113..00000000
--- a/src/locales/ge/address/street.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.street_name}} {{address.street_suffix}}'];
diff --git a/src/locales/ge/address/street_address.ts b/src/locales/ge/address/street_address.ts
deleted file mode 100644
index d1e8da38..00000000
--- a/src/locales/ge/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.street}} {{address.buildingNumber}}',
-  full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/ge/index.ts b/src/locales/ge/index.ts
index 4b98ece6..2b7b332d 100644
--- a/src/locales/ge/index.ts
+++ b/src/locales/ge/index.ts
@@ -3,20 +3,20 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import cell_phone from './cell_phone';
 import company from './company';
 import internet from './internet';
+import location from './location';
 import person from './person';
 import phone_number from './phone_number';
 
 const ge: LocaleDefinition = {
   title: 'Georgian',
   separator: ' და ',
-  address,
   cell_phone,
   company,
   internet,
+  location,
   person,
   phone_number,
 };
diff --git a/src/locales/ge/address/building_number.ts b/src/locales/ge/location/building_number.ts
index 20cefab6..20cefab6 100644
--- a/src/locales/ge/address/building_number.ts
+++ b/src/locales/ge/location/building_number.ts
diff --git a/src/locales/ge/location/city.ts b/src/locales/ge/location/city.ts
new file mode 100644
index 00000000..d744d882
--- /dev/null
+++ b/src/locales/ge/location/city.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{location.city_prefix}} {{person.first_name}}{{location.city_suffix}}',
+  '{{location.city_prefix}} {{person.first_name}}',
+  '{{person.first_name}}{{location.city_suffix}}',
+  '{{person.last_name}}{{location.city_suffix}}',
+];
diff --git a/src/locales/ge/address/city_name.ts b/src/locales/ge/location/city_name.ts
index aee6b123..aee6b123 100644
--- a/src/locales/ge/address/city_name.ts
+++ b/src/locales/ge/location/city_name.ts
diff --git a/src/locales/ge/address/city_prefix.ts b/src/locales/ge/location/city_prefix.ts
index a97330f3..a97330f3 100644
--- a/src/locales/ge/address/city_prefix.ts
+++ b/src/locales/ge/location/city_prefix.ts
diff --git a/src/locales/ge/address/city_suffix.ts b/src/locales/ge/location/city_suffix.ts
index d596353d..d596353d 100644
--- a/src/locales/ge/address/city_suffix.ts
+++ b/src/locales/ge/location/city_suffix.ts
diff --git a/src/locales/ge/address/country.ts b/src/locales/ge/location/country.ts
index 3461d6f2..3461d6f2 100644
--- a/src/locales/ge/address/country.ts
+++ b/src/locales/ge/location/country.ts
diff --git a/src/locales/ge/address/default_country.ts b/src/locales/ge/location/default_country.ts
index 9e5a8f57..9e5a8f57 100644
--- a/src/locales/ge/address/default_country.ts
+++ b/src/locales/ge/location/default_country.ts
diff --git a/src/locales/ge/address/index.ts b/src/locales/ge/location/index.ts
index 9ab559a8..82632185 100644
--- a/src/locales/ge/address/index.ts
+++ b/src/locales/ge/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_name from './city_name';
@@ -17,7 +17,7 @@ import street_address from './street_address';
 import street_name from './street_name';
 import street_suffix from './street_suffix';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_name,
@@ -33,4 +33,4 @@ const address: AddressDefinitions = {
   street_suffix,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/ge/address/postcode.ts b/src/locales/ge/location/postcode.ts
index 695bc368..695bc368 100644
--- a/src/locales/ge/address/postcode.ts
+++ b/src/locales/ge/location/postcode.ts
diff --git a/src/locales/ge/address/secondary_address.ts b/src/locales/ge/location/secondary_address.ts
index 1371dcd0..1371dcd0 100644
--- a/src/locales/ge/address/secondary_address.ts
+++ b/src/locales/ge/location/secondary_address.ts
diff --git a/src/locales/ge/location/street.ts b/src/locales/ge/location/street.ts
new file mode 100644
index 00000000..afbdb76e
--- /dev/null
+++ b/src/locales/ge/location/street.ts
@@ -0,0 +1 @@
+export default ['{{location.street_name}} {{location.street_suffix}}'];
diff --git a/src/locales/ge/location/street_address.ts b/src/locales/ge/location/street_address.ts
new file mode 100644
index 00000000..437f20dd
--- /dev/null
+++ b/src/locales/ge/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.street}} {{location.buildingNumber}}',
+  full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/ge/address/street_name.ts b/src/locales/ge/location/street_name.ts
index 8f44d72c..8f44d72c 100644
--- a/src/locales/ge/address/street_name.ts
+++ b/src/locales/ge/location/street_name.ts
diff --git a/src/locales/ge/address/street_suffix.ts b/src/locales/ge/location/street_suffix.ts
index 0571a9f6..0571a9f6 100644
--- a/src/locales/ge/address/street_suffix.ts
+++ b/src/locales/ge/location/street_suffix.ts
diff --git a/src/locales/he/address/city.ts b/src/locales/he/address/city.ts
deleted file mode 100644
index e3da346b..00000000
--- a/src/locales/he/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_name}}'];
diff --git a/src/locales/he/address/street.ts b/src/locales/he/address/street.ts
deleted file mode 100644
index 86e124a5..00000000
--- a/src/locales/he/address/street.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.street_prefix}} {{address.street_name}}'];
diff --git a/src/locales/he/address/street_address.ts b/src/locales/he/address/street_address.ts
deleted file mode 100644
index d1e8da38..00000000
--- a/src/locales/he/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.street}} {{address.buildingNumber}}',
-  full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/he/index.ts b/src/locales/he/index.ts
index e17ddc73..9720dce8 100644
--- a/src/locales/he/index.ts
+++ b/src/locales/he/index.ts
@@ -3,11 +3,11 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import cell_phone from './cell_phone';
 import color from './color';
 import commerce from './commerce';
 import date from './date';
+import location from './location';
 import lorem from './lorem';
 import music from './music';
 import person from './person';
@@ -16,11 +16,11 @@ import phone_number from './phone_number';
 const he: LocaleDefinition = {
   title: 'Hebrew',
   separator: 'ו ',
-  address,
   cell_phone,
   color,
   commerce,
   date,
+  location,
   lorem,
   music,
   person,
diff --git a/src/locales/he/address/building_number.ts b/src/locales/he/location/building_number.ts
index b3f0661d..b3f0661d 100644
--- a/src/locales/he/address/building_number.ts
+++ b/src/locales/he/location/building_number.ts
diff --git a/src/locales/he/location/city.ts b/src/locales/he/location/city.ts
new file mode 100644
index 00000000..ad43b68f
--- /dev/null
+++ b/src/locales/he/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_name}}'];
diff --git a/src/locales/he/address/city_name.ts b/src/locales/he/location/city_name.ts
index 53195338..53195338 100644
--- a/src/locales/he/address/city_name.ts
+++ b/src/locales/he/location/city_name.ts
diff --git a/src/locales/he/address/country.ts b/src/locales/he/location/country.ts
index c9ef01aa..c9ef01aa 100644
--- a/src/locales/he/address/country.ts
+++ b/src/locales/he/location/country.ts
diff --git a/src/locales/he/address/county.ts b/src/locales/he/location/county.ts
index d014c4a8..d014c4a8 100644
--- a/src/locales/he/address/county.ts
+++ b/src/locales/he/location/county.ts
diff --git a/src/locales/he/address/default_country.ts b/src/locales/he/location/default_country.ts
index 04807df0..04807df0 100644
--- a/src/locales/he/address/default_country.ts
+++ b/src/locales/he/location/default_country.ts
diff --git a/src/locales/he/address/direction.ts b/src/locales/he/location/direction.ts
index 3b610358..3b610358 100644
--- a/src/locales/he/address/direction.ts
+++ b/src/locales/he/location/direction.ts
diff --git a/src/locales/he/address/direction_abbr.ts b/src/locales/he/location/direction_abbr.ts
index eb5b022b..eb5b022b 100644
--- a/src/locales/he/address/direction_abbr.ts
+++ b/src/locales/he/location/direction_abbr.ts
diff --git a/src/locales/he/address/index.ts b/src/locales/he/location/index.ts
index a4cc4f87..2a4aa12d 100644
--- a/src/locales/he/address/index.ts
+++ b/src/locales/he/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_name from './city_name';
@@ -21,7 +21,7 @@ import street_name from './street_name';
 import street_prefix from './street_prefix';
 import time_zone from './time_zone';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_name,
@@ -41,4 +41,4 @@ const address: AddressDefinitions = {
   time_zone,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/he/address/postcode.ts b/src/locales/he/location/postcode.ts
index 2850dba4..2850dba4 100644
--- a/src/locales/he/address/postcode.ts
+++ b/src/locales/he/location/postcode.ts
diff --git a/src/locales/he/address/secondary_address.ts b/src/locales/he/location/secondary_address.ts
index fe3ca144..fe3ca144 100644
--- a/src/locales/he/address/secondary_address.ts
+++ b/src/locales/he/location/secondary_address.ts
diff --git a/src/locales/he/address/state.ts b/src/locales/he/location/state.ts
index 74bd3eef..74bd3eef 100644
--- a/src/locales/he/address/state.ts
+++ b/src/locales/he/location/state.ts
diff --git a/src/locales/he/address/state_abbr.ts b/src/locales/he/location/state_abbr.ts
index 8c00eb20..8c00eb20 100644
--- a/src/locales/he/address/state_abbr.ts
+++ b/src/locales/he/location/state_abbr.ts
diff --git a/src/locales/he/location/street.ts b/src/locales/he/location/street.ts
new file mode 100644
index 00000000..bfebd5b4
--- /dev/null
+++ b/src/locales/he/location/street.ts
@@ -0,0 +1 @@
+export default ['{{location.street_prefix}} {{location.street_name}}'];
diff --git a/src/locales/he/location/street_address.ts b/src/locales/he/location/street_address.ts
new file mode 100644
index 00000000..437f20dd
--- /dev/null
+++ b/src/locales/he/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.street}} {{location.buildingNumber}}',
+  full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/he/address/street_name.ts b/src/locales/he/location/street_name.ts
index 5c26cdeb..5c26cdeb 100644
--- a/src/locales/he/address/street_name.ts
+++ b/src/locales/he/location/street_name.ts
diff --git a/src/locales/he/address/street_prefix.ts b/src/locales/he/location/street_prefix.ts
index 6fa74e8a..6fa74e8a 100644
--- a/src/locales/he/address/street_prefix.ts
+++ b/src/locales/he/location/street_prefix.ts
diff --git a/src/locales/he/address/time_zone.ts b/src/locales/he/location/time_zone.ts
index 932c7e24..932c7e24 100644
--- a/src/locales/he/address/time_zone.ts
+++ b/src/locales/he/location/time_zone.ts
diff --git a/src/locales/hr/address/city.ts b/src/locales/hr/address/city.ts
deleted file mode 100644
index e3da346b..00000000
--- a/src/locales/hr/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_name}}'];
diff --git a/src/locales/hr/address/street.ts b/src/locales/hr/address/street.ts
deleted file mode 100644
index 30ba73fc..00000000
--- a/src/locales/hr/address/street.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.street_name}}'];
diff --git a/src/locales/hr/address/street_address.ts b/src/locales/hr/address/street_address.ts
deleted file mode 100644
index d1e8da38..00000000
--- a/src/locales/hr/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.street}} {{address.buildingNumber}}',
-  full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/hr/index.ts b/src/locales/hr/index.ts
index 619d3f3e..1ef899b5 100644
--- a/src/locales/hr/index.ts
+++ b/src/locales/hr/index.ts
@@ -3,19 +3,19 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import cell_phone from './cell_phone';
 import date from './date';
 import internet from './internet';
+import location from './location';
 import person from './person';
 import phone_number from './phone_number';
 
 const hr: LocaleDefinition = {
   title: 'Hrvatski',
-  address,
   cell_phone,
   date,
   internet,
+  location,
   person,
   phone_number,
 };
diff --git a/src/locales/hr/address/building_number.ts b/src/locales/hr/location/building_number.ts
index 4b74b7de..4b74b7de 100644
--- a/src/locales/hr/address/building_number.ts
+++ b/src/locales/hr/location/building_number.ts
diff --git a/src/locales/hr/location/city.ts b/src/locales/hr/location/city.ts
new file mode 100644
index 00000000..ad43b68f
--- /dev/null
+++ b/src/locales/hr/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_name}}'];
diff --git a/src/locales/hr/address/city_name.ts b/src/locales/hr/location/city_name.ts
index fbcd1edd..fbcd1edd 100644
--- a/src/locales/hr/address/city_name.ts
+++ b/src/locales/hr/location/city_name.ts
diff --git a/src/locales/hr/address/country.ts b/src/locales/hr/location/country.ts
index ce9f2308..ce9f2308 100644
--- a/src/locales/hr/address/country.ts
+++ b/src/locales/hr/location/country.ts
diff --git a/src/locales/hr/address/default_country.ts b/src/locales/hr/location/default_country.ts
index e1374812..e1374812 100644
--- a/src/locales/hr/address/default_country.ts
+++ b/src/locales/hr/location/default_country.ts
diff --git a/src/locales/hr/address/index.ts b/src/locales/hr/location/index.ts
index 895b8d98..28fdcbff 100644
--- a/src/locales/hr/address/index.ts
+++ b/src/locales/hr/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_name from './city_name';
@@ -15,7 +15,7 @@ import street_address from './street_address';
 import street_name from './street_name';
 import time_zone from './time_zone';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_name,
@@ -29,4 +29,4 @@ const address: AddressDefinitions = {
   time_zone,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/hr/address/postcode.ts b/src/locales/hr/location/postcode.ts
index db2bcfed..db2bcfed 100644
--- a/src/locales/hr/address/postcode.ts
+++ b/src/locales/hr/location/postcode.ts
diff --git a/src/locales/hr/address/secondary_address.ts b/src/locales/hr/location/secondary_address.ts
index 02a948da..02a948da 100644
--- a/src/locales/hr/address/secondary_address.ts
+++ b/src/locales/hr/location/secondary_address.ts
diff --git a/src/locales/hr/location/street.ts b/src/locales/hr/location/street.ts
new file mode 100644
index 00000000..30a9a5dd
--- /dev/null
+++ b/src/locales/hr/location/street.ts
@@ -0,0 +1 @@
+export default ['{{location.street_name}}'];
diff --git a/src/locales/hr/location/street_address.ts b/src/locales/hr/location/street_address.ts
new file mode 100644
index 00000000..437f20dd
--- /dev/null
+++ b/src/locales/hr/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.street}} {{location.buildingNumber}}',
+  full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/hr/address/street_name.ts b/src/locales/hr/location/street_name.ts
index 2061c797..2061c797 100644
--- a/src/locales/hr/address/street_name.ts
+++ b/src/locales/hr/location/street_name.ts
diff --git a/src/locales/hr/address/time_zone.ts b/src/locales/hr/location/time_zone.ts
index e2b05f6c..e2b05f6c 100644
--- a/src/locales/hr/address/time_zone.ts
+++ b/src/locales/hr/location/time_zone.ts
diff --git a/src/locales/hy/address/city.ts b/src/locales/hy/address/city.ts
deleted file mode 100644
index a441b2f7..00000000
--- a/src/locales/hy/address/city.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{address.city_prefix}} {{person.last_name}}',
-  '{{person.last_name}}{{address.city_suffix}}',
-];
diff --git a/src/locales/hy/address/street.ts b/src/locales/hy/address/street.ts
deleted file mode 100644
index 4b6c9f6f..00000000
--- a/src/locales/hy/address/street.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{person.last_name}} {{address.street_suffix}}'];
diff --git a/src/locales/hy/address/street_address.ts b/src/locales/hy/address/street_address.ts
deleted file mode 100644
index d1e8da38..00000000
--- a/src/locales/hy/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.street}} {{address.buildingNumber}}',
-  full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/hy/index.ts b/src/locales/hy/index.ts
index 8ee5b063..ae14d46d 100644
--- a/src/locales/hy/index.ts
+++ b/src/locales/hy/index.ts
@@ -3,10 +3,10 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import color from './color';
 import date from './date';
 import internet from './internet';
+import location from './location';
 import lorem from './lorem';
 import person from './person';
 import phone_number from './phone_number';
@@ -14,10 +14,10 @@ import phone_number from './phone_number';
 const hy: LocaleDefinition = {
   title: 'Armenian',
   separator: ' և ',
-  address,
   color,
   date,
   internet,
+  location,
   lorem,
   person,
   phone_number,
diff --git a/src/locales/hy/address/building_number.ts b/src/locales/hy/location/building_number.ts
index b07d496c..b07d496c 100644
--- a/src/locales/hy/address/building_number.ts
+++ b/src/locales/hy/location/building_number.ts
diff --git a/src/locales/hy/location/city.ts b/src/locales/hy/location/city.ts
new file mode 100644
index 00000000..3dbf4e11
--- /dev/null
+++ b/src/locales/hy/location/city.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{location.city_prefix}} {{person.last_name}}',
+  '{{person.last_name}}{{location.city_suffix}}',
+];
diff --git a/src/locales/hy/address/city_prefix.ts b/src/locales/hy/location/city_prefix.ts
index 7605fc30..7605fc30 100644
--- a/src/locales/hy/address/city_prefix.ts
+++ b/src/locales/hy/location/city_prefix.ts
diff --git a/src/locales/hy/address/city_suffix.ts b/src/locales/hy/location/city_suffix.ts
index 3efddd3b..3efddd3b 100644
--- a/src/locales/hy/address/city_suffix.ts
+++ b/src/locales/hy/location/city_suffix.ts
diff --git a/src/locales/hy/address/country.ts b/src/locales/hy/location/country.ts
index d01f676e..d01f676e 100644
--- a/src/locales/hy/address/country.ts
+++ b/src/locales/hy/location/country.ts
diff --git a/src/locales/hy/address/default_country.ts b/src/locales/hy/location/default_country.ts
index c028e639..c028e639 100644
--- a/src/locales/hy/address/default_country.ts
+++ b/src/locales/hy/location/default_country.ts
diff --git a/src/locales/hy/address/direction.ts b/src/locales/hy/location/direction.ts
index 07147e91..07147e91 100644
--- a/src/locales/hy/address/direction.ts
+++ b/src/locales/hy/location/direction.ts
diff --git a/src/locales/hy/address/index.ts b/src/locales/hy/location/index.ts
index 406b3bc3..9262f395 100644
--- a/src/locales/hy/address/index.ts
+++ b/src/locales/hy/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_prefix from './city_prefix';
@@ -16,7 +16,7 @@ import street from './street';
 import street_address from './street_address';
 import street_suffix from './street_suffix';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_prefix,
@@ -31,4 +31,4 @@ const address: AddressDefinitions = {
   street_suffix,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/hy/address/secondary_address.ts b/src/locales/hy/location/secondary_address.ts
index dbc2f594..dbc2f594 100644
--- a/src/locales/hy/address/secondary_address.ts
+++ b/src/locales/hy/location/secondary_address.ts
diff --git a/src/locales/hy/address/state.ts b/src/locales/hy/location/state.ts
index e64b606a..e64b606a 100644
--- a/src/locales/hy/address/state.ts
+++ b/src/locales/hy/location/state.ts
diff --git a/src/locales/hy/location/street.ts b/src/locales/hy/location/street.ts
new file mode 100644
index 00000000..08f3003b
--- /dev/null
+++ b/src/locales/hy/location/street.ts
@@ -0,0 +1 @@
+export default ['{{person.last_name}} {{location.street_suffix}}'];
diff --git a/src/locales/hy/location/street_address.ts b/src/locales/hy/location/street_address.ts
new file mode 100644
index 00000000..437f20dd
--- /dev/null
+++ b/src/locales/hy/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.street}} {{location.buildingNumber}}',
+  full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/hy/address/street_suffix.ts b/src/locales/hy/location/street_suffix.ts
index 9881ba3c..9881ba3c 100644
--- a/src/locales/hy/address/street_suffix.ts
+++ b/src/locales/hy/location/street_suffix.ts
diff --git a/src/locales/id_ID/address/city.ts b/src/locales/id_ID/address/city.ts
deleted file mode 100644
index e3da346b..00000000
--- a/src/locales/id_ID/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_name}}'];
diff --git a/src/locales/id_ID/address/street.ts b/src/locales/id_ID/address/street.ts
deleted file mode 100644
index 5db4f5be..00000000
--- a/src/locales/id_ID/address/street.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{address.street_prefix}} {{person.first_name}}',
-  '{{address.street_prefix}} {{person.last_name}}',
-];
diff --git a/src/locales/id_ID/address/street_address.ts b/src/locales/id_ID/address/street_address.ts
deleted file mode 100644
index 006c2a90..00000000
--- a/src/locales/id_ID/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.street}} no {{address.buildingNumber}}',
-  full: '{{address.street}} no {{address.buildingNumber}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/id_ID/index.ts b/src/locales/id_ID/index.ts
index 71ffec29..ec81b3f0 100644
--- a/src/locales/id_ID/index.ts
+++ b/src/locales/id_ID/index.ts
@@ -3,19 +3,19 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import company from './company';
 import date from './date';
 import internet from './internet';
+import location from './location';
 import person from './person';
 import phone_number from './phone_number';
 
 const id_ID: LocaleDefinition = {
   title: 'Indonesian',
-  address,
   company,
   date,
   internet,
+  location,
   person,
   phone_number,
 };
diff --git a/src/locales/id_ID/address/building_number.ts b/src/locales/id_ID/location/building_number.ts
index c35ab227..c35ab227 100644
--- a/src/locales/id_ID/address/building_number.ts
+++ b/src/locales/id_ID/location/building_number.ts
diff --git a/src/locales/id_ID/location/city.ts b/src/locales/id_ID/location/city.ts
new file mode 100644
index 00000000..ad43b68f
--- /dev/null
+++ b/src/locales/id_ID/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_name}}'];
diff --git a/src/locales/id_ID/address/city_name.ts b/src/locales/id_ID/location/city_name.ts
index 377ec0f4..377ec0f4 100644
--- a/src/locales/id_ID/address/city_name.ts
+++ b/src/locales/id_ID/location/city_name.ts
diff --git a/src/locales/id_ID/address/default_country.ts b/src/locales/id_ID/location/default_country.ts
index f73249aa..f73249aa 100644
--- a/src/locales/id_ID/address/default_country.ts
+++ b/src/locales/id_ID/location/default_country.ts
diff --git a/src/locales/id_ID/address/index.ts b/src/locales/id_ID/location/index.ts
index e8f3219c..a3f135fa 100644
--- a/src/locales/id_ID/address/index.ts
+++ b/src/locales/id_ID/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_name from './city_name';
@@ -13,7 +13,7 @@ import street from './street';
 import street_address from './street_address';
 import street_prefix from './street_prefix';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_name,
@@ -25,4 +25,4 @@ const address: AddressDefinitions = {
   street_prefix,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/id_ID/address/postcode.ts b/src/locales/id_ID/location/postcode.ts
index db2bcfed..db2bcfed 100644
--- a/src/locales/id_ID/address/postcode.ts
+++ b/src/locales/id_ID/location/postcode.ts
diff --git a/src/locales/id_ID/address/state.ts b/src/locales/id_ID/location/state.ts
index 6a055a50..6a055a50 100644
--- a/src/locales/id_ID/address/state.ts
+++ b/src/locales/id_ID/location/state.ts
diff --git a/src/locales/id_ID/location/street.ts b/src/locales/id_ID/location/street.ts
new file mode 100644
index 00000000..c182e837
--- /dev/null
+++ b/src/locales/id_ID/location/street.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{location.street_prefix}} {{person.first_name}}',
+  '{{location.street_prefix}} {{person.last_name}}',
+];
diff --git a/src/locales/id_ID/location/street_address.ts b/src/locales/id_ID/location/street_address.ts
new file mode 100644
index 00000000..4a12bddb
--- /dev/null
+++ b/src/locales/id_ID/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.street}} no {{location.buildingNumber}}',
+  full: '{{location.street}} no {{location.buildingNumber}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/id_ID/address/street_prefix.ts b/src/locales/id_ID/location/street_prefix.ts
index b6f0d9a9..b6f0d9a9 100644
--- a/src/locales/id_ID/address/street_prefix.ts
+++ b/src/locales/id_ID/location/street_prefix.ts
diff --git a/src/locales/it/address/city.ts b/src/locales/it/address/city.ts
deleted file mode 100644
index f1c33d47..00000000
--- a/src/locales/it/address/city.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export default [
-  '{{address.city_prefix}} {{person.first_name}} {{address.city_suffix}}',
-  '{{address.city_prefix}} {{person.first_name}}',
-  '{{person.first_name}} {{address.city_suffix}}',
-  '{{person.last_name}} {{address.city_suffix}}',
-];
diff --git a/src/locales/it/address/street.ts b/src/locales/it/address/street.ts
deleted file mode 100644
index 5d4a0900..00000000
--- a/src/locales/it/address/street.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{address.street_suffix}} {{person.first_name}}',
-  '{{address.street_suffix}} {{person.last_name}}',
-];
diff --git a/src/locales/it/address/street_address.ts b/src/locales/it/address/street_address.ts
deleted file mode 100644
index b198be88..00000000
--- a/src/locales/it/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.street}} {{address.buildingNumber}}',
-  full: '{{address.street}} {{address.buildingNumber}}, {{address.secondaryAddress}}',
-};
diff --git a/src/locales/it/index.ts b/src/locales/it/index.ts
index 09ce560d..a1fb9fc5 100644
--- a/src/locales/it/index.ts
+++ b/src/locales/it/index.ts
@@ -3,17 +3,17 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import company from './company';
 import internet from './internet';
+import location from './location';
 import person from './person';
 import phone_number from './phone_number';
 
 const it: LocaleDefinition = {
   title: 'Italian',
-  address,
   company,
   internet,
+  location,
   person,
   phone_number,
 };
diff --git a/src/locales/it/address/building_number.ts b/src/locales/it/location/building_number.ts
index 20cefab6..20cefab6 100644
--- a/src/locales/it/address/building_number.ts
+++ b/src/locales/it/location/building_number.ts
diff --git a/src/locales/it/location/city.ts b/src/locales/it/location/city.ts
new file mode 100644
index 00000000..b29e1252
--- /dev/null
+++ b/src/locales/it/location/city.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{location.city_prefix}} {{person.first_name}} {{location.city_suffix}}',
+  '{{location.city_prefix}} {{person.first_name}}',
+  '{{person.first_name}} {{location.city_suffix}}',
+  '{{person.last_name}} {{location.city_suffix}}',
+];
diff --git a/src/locales/it/address/city_name.ts b/src/locales/it/location/city_name.ts
index 53750bac..53750bac 100644
--- a/src/locales/it/address/city_name.ts
+++ b/src/locales/it/location/city_name.ts
diff --git a/src/locales/it/address/city_prefix.ts b/src/locales/it/location/city_prefix.ts
index 071c23c0..071c23c0 100644
--- a/src/locales/it/address/city_prefix.ts
+++ b/src/locales/it/location/city_prefix.ts
diff --git a/src/locales/it/address/city_suffix.ts b/src/locales/it/location/city_suffix.ts
index 4a3afa00..4a3afa00 100644
--- a/src/locales/it/address/city_suffix.ts
+++ b/src/locales/it/location/city_suffix.ts
diff --git a/src/locales/it/address/country.ts b/src/locales/it/location/country.ts
index 1e55b4bb..1e55b4bb 100644
--- a/src/locales/it/address/country.ts
+++ b/src/locales/it/location/country.ts
diff --git a/src/locales/it/address/default_country.ts b/src/locales/it/location/default_country.ts
index 5b217301..5b217301 100644
--- a/src/locales/it/address/default_country.ts
+++ b/src/locales/it/location/default_country.ts
diff --git a/src/locales/it/address/index.ts b/src/locales/it/location/index.ts
index 4222f87f..2b51af88 100644
--- a/src/locales/it/address/index.ts
+++ b/src/locales/it/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_name from './city_name';
@@ -18,7 +18,7 @@ import street from './street';
 import street_address from './street_address';
 import street_suffix from './street_suffix';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_name,
@@ -35,4 +35,4 @@ const address: AddressDefinitions = {
   street_suffix,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/it/address/postcode.ts b/src/locales/it/location/postcode.ts
index db2bcfed..db2bcfed 100644
--- a/src/locales/it/address/postcode.ts
+++ b/src/locales/it/location/postcode.ts
diff --git a/src/locales/it/address/secondary_address.ts b/src/locales/it/location/secondary_address.ts
index b256e038..b256e038 100644
--- a/src/locales/it/address/secondary_address.ts
+++ b/src/locales/it/location/secondary_address.ts
diff --git a/src/locales/it/address/state.ts b/src/locales/it/location/state.ts
index 2ae65de9..2ae65de9 100644
--- a/src/locales/it/address/state.ts
+++ b/src/locales/it/location/state.ts
diff --git a/src/locales/it/address/state_abbr.ts b/src/locales/it/location/state_abbr.ts
index b5dd8739..b5dd8739 100644
--- a/src/locales/it/address/state_abbr.ts
+++ b/src/locales/it/location/state_abbr.ts
diff --git a/src/locales/it/location/street.ts b/src/locales/it/location/street.ts
new file mode 100644
index 00000000..e2e1b0db
--- /dev/null
+++ b/src/locales/it/location/street.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{location.street_suffix}} {{person.first_name}}',
+  '{{location.street_suffix}} {{person.last_name}}',
+];
diff --git a/src/locales/it/location/street_address.ts b/src/locales/it/location/street_address.ts
new file mode 100644
index 00000000..15512f09
--- /dev/null
+++ b/src/locales/it/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.street}} {{location.buildingNumber}}',
+  full: '{{location.street}} {{location.buildingNumber}}, {{location.secondaryAddress}}',
+};
diff --git a/src/locales/it/address/street_suffix.ts b/src/locales/it/location/street_suffix.ts
index aacdc731..aacdc731 100644
--- a/src/locales/it/address/street_suffix.ts
+++ b/src/locales/it/location/street_suffix.ts
diff --git a/src/locales/ja/address/city.ts b/src/locales/ja/address/city.ts
deleted file mode 100644
index 2cb639cd..00000000
--- a/src/locales/ja/address/city.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export default [
-  '{{address.city_prefix}}{{person.first_name}}{{address.city_suffix}}',
-  '{{person.first_name}}{{address.city_suffix}}',
-  '{{address.city_prefix}}{{person.last_name}}{{address.city_suffix}}',
-  '{{person.last_name}}{{address.city_suffix}}',
-];
diff --git a/src/locales/ja/address/street.ts b/src/locales/ja/address/street.ts
deleted file mode 100644
index a32c95d3..00000000
--- a/src/locales/ja/address/street.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{person.first_name}}{{address.street_suffix}}',
-  '{{person.last_name}}{{address.street_suffix}}',
-];
diff --git a/src/locales/ja/index.ts b/src/locales/ja/index.ts
index c5c06758..8d2400d1 100644
--- a/src/locales/ja/index.ts
+++ b/src/locales/ja/index.ts
@@ -3,16 +3,16 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import cell_phone from './cell_phone';
+import location from './location';
 import lorem from './lorem';
 import person from './person';
 import phone_number from './phone_number';
 
 const ja: LocaleDefinition = {
   title: 'Japanese',
-  address,
   cell_phone,
+  location,
   lorem,
   person,
   phone_number,
diff --git a/src/locales/ja/location/city.ts b/src/locales/ja/location/city.ts
new file mode 100644
index 00000000..2c27e4fd
--- /dev/null
+++ b/src/locales/ja/location/city.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{location.city_prefix}}{{person.first_name}}{{location.city_suffix}}',
+  '{{person.first_name}}{{location.city_suffix}}',
+  '{{location.city_prefix}}{{person.last_name}}{{location.city_suffix}}',
+  '{{person.last_name}}{{location.city_suffix}}',
+];
diff --git a/src/locales/ja/address/city_prefix.ts b/src/locales/ja/location/city_prefix.ts
index 42c38d92..42c38d92 100644
--- a/src/locales/ja/address/city_prefix.ts
+++ b/src/locales/ja/location/city_prefix.ts
diff --git a/src/locales/ja/address/city_suffix.ts b/src/locales/ja/location/city_suffix.ts
index 0cff8406..0cff8406 100644
--- a/src/locales/ja/address/city_suffix.ts
+++ b/src/locales/ja/location/city_suffix.ts
diff --git a/src/locales/ja/address/country.ts b/src/locales/ja/location/country.ts
index 68582948..68582948 100644
--- a/src/locales/ja/address/country.ts
+++ b/src/locales/ja/location/country.ts
diff --git a/src/locales/ja/address/index.ts b/src/locales/ja/location/index.ts
index 6fd95c26..8911dd7a 100644
--- a/src/locales/ja/address/index.ts
+++ b/src/locales/ja/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import city from './city';
 import city_prefix from './city_prefix';
 import city_suffix from './city_suffix';
@@ -12,7 +12,7 @@ import state from './state';
 import state_abbr from './state_abbr';
 import street from './street';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   city,
   city_prefix,
   city_suffix,
@@ -23,4 +23,4 @@ const address: AddressDefinitions = {
   street,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/ja/address/postcode.ts b/src/locales/ja/location/postcode.ts
index 2dacfca1..2dacfca1 100644
--- a/src/locales/ja/address/postcode.ts
+++ b/src/locales/ja/location/postcode.ts
diff --git a/src/locales/ja/address/state.ts b/src/locales/ja/location/state.ts
index 0c2f2341..0c2f2341 100644
--- a/src/locales/ja/address/state.ts
+++ b/src/locales/ja/location/state.ts
diff --git a/src/locales/ja/address/state_abbr.ts b/src/locales/ja/location/state_abbr.ts
index 9c969587..9c969587 100644
--- a/src/locales/ja/address/state_abbr.ts
+++ b/src/locales/ja/location/state_abbr.ts
diff --git a/src/locales/ja/location/street.ts b/src/locales/ja/location/street.ts
new file mode 100644
index 00000000..06ca3a5e
--- /dev/null
+++ b/src/locales/ja/location/street.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{person.first_name}}{{location.street_suffix}}',
+  '{{person.last_name}}{{location.street_suffix}}',
+];
diff --git a/src/locales/ko/address/city.ts b/src/locales/ko/address/city.ts
deleted file mode 100644
index 67bd1b88..00000000
--- a/src/locales/ko/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_name}}{{address.city_suffix}}'];
diff --git a/src/locales/ko/address/street.ts b/src/locales/ko/address/street.ts
deleted file mode 100644
index 7b5320b5..00000000
--- a/src/locales/ko/address/street.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.street_name}}{{address.street_suffix}}'];
diff --git a/src/locales/ko/index.ts b/src/locales/ko/index.ts
index e3d69654..47bc6286 100644
--- a/src/locales/ko/index.ts
+++ b/src/locales/ko/index.ts
@@ -3,18 +3,18 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import company from './company';
 import internet from './internet';
+import location from './location';
 import lorem from './lorem';
 import person from './person';
 import phone_number from './phone_number';
 
 const ko: LocaleDefinition = {
   title: 'Korean',
-  address,
   company,
   internet,
+  location,
   lorem,
   person,
   phone_number,
diff --git a/src/locales/ko/location/city.ts b/src/locales/ko/location/city.ts
new file mode 100644
index 00000000..61f8d6f1
--- /dev/null
+++ b/src/locales/ko/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_name}}{{location.city_suffix}}'];
diff --git a/src/locales/ko/address/city_name.ts b/src/locales/ko/location/city_name.ts
index c90b09c0..c90b09c0 100644
--- a/src/locales/ko/address/city_name.ts
+++ b/src/locales/ko/location/city_name.ts
diff --git a/src/locales/ko/address/city_suffix.ts b/src/locales/ko/location/city_suffix.ts
index 9f5bdbab..9f5bdbab 100644
--- a/src/locales/ko/address/city_suffix.ts
+++ b/src/locales/ko/location/city_suffix.ts
diff --git a/src/locales/ko/address/index.ts b/src/locales/ko/location/index.ts
index 675240d2..1a954b76 100644
--- a/src/locales/ko/address/index.ts
+++ b/src/locales/ko/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import city from './city';
 import city_name from './city_name';
 import city_suffix from './city_suffix';
@@ -13,7 +13,7 @@ import street from './street';
 import street_name from './street_name';
 import street_suffix from './street_suffix';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   city,
   city_name,
   city_suffix,
@@ -25,4 +25,4 @@ const address: AddressDefinitions = {
   street_suffix,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/ko/address/postcode.ts b/src/locales/ko/location/postcode.ts
index 4d7ada5f..4d7ada5f 100644
--- a/src/locales/ko/address/postcode.ts
+++ b/src/locales/ko/location/postcode.ts
diff --git a/src/locales/ko/address/state.ts b/src/locales/ko/location/state.ts
index 38fda6a3..38fda6a3 100644
--- a/src/locales/ko/address/state.ts
+++ b/src/locales/ko/location/state.ts
diff --git a/src/locales/ko/address/state_abbr.ts b/src/locales/ko/location/state_abbr.ts
index 38fda6a3..38fda6a3 100644
--- a/src/locales/ko/address/state_abbr.ts
+++ b/src/locales/ko/location/state_abbr.ts
diff --git a/src/locales/ko/location/street.ts b/src/locales/ko/location/street.ts
new file mode 100644
index 00000000..b5dd696c
--- /dev/null
+++ b/src/locales/ko/location/street.ts
@@ -0,0 +1 @@
+export default ['{{location.street_name}}{{location.street_suffix}}'];
diff --git a/src/locales/ko/address/street_name.ts b/src/locales/ko/location/street_name.ts
index a1c055f3..a1c055f3 100644
--- a/src/locales/ko/address/street_name.ts
+++ b/src/locales/ko/location/street_name.ts
diff --git a/src/locales/ko/address/street_suffix.ts b/src/locales/ko/location/street_suffix.ts
index 2db9c192..2db9c192 100644
--- a/src/locales/ko/address/street_suffix.ts
+++ b/src/locales/ko/location/street_suffix.ts
diff --git a/src/locales/lv/address/city.ts b/src/locales/lv/address/city.ts
deleted file mode 100644
index e3da346b..00000000
--- a/src/locales/lv/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_name}}'];
diff --git a/src/locales/lv/address/street.ts b/src/locales/lv/address/street.ts
deleted file mode 100644
index 75ceb113..00000000
--- a/src/locales/lv/address/street.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.street_name}} {{address.street_suffix}}'];
diff --git a/src/locales/lv/address/street_address.ts b/src/locales/lv/address/street_address.ts
deleted file mode 100644
index d1e8da38..00000000
--- a/src/locales/lv/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.street}} {{address.buildingNumber}}',
-  full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/lv/index.ts b/src/locales/lv/index.ts
index 5ffc21f9..e38fa60f 100644
--- a/src/locales/lv/index.ts
+++ b/src/locales/lv/index.ts
@@ -3,13 +3,13 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import cell_phone from './cell_phone';
 import color from './color';
 import commerce from './commerce';
 import company from './company';
 import date from './date';
 import internet from './internet';
+import location from './location';
 import lorem from './lorem';
 import person from './person';
 import phone_number from './phone_number';
@@ -17,13 +17,13 @@ import phone_number from './phone_number';
 const lv: LocaleDefinition = {
   title: 'Latvian',
   separator: ' un ',
-  address,
   cell_phone,
   color,
   commerce,
   company,
   date,
   internet,
+  location,
   lorem,
   person,
   phone_number,
diff --git a/src/locales/lv/address/building_number.ts b/src/locales/lv/location/building_number.ts
index e2e68137..e2e68137 100644
--- a/src/locales/lv/address/building_number.ts
+++ b/src/locales/lv/location/building_number.ts
diff --git a/src/locales/lv/location/city.ts b/src/locales/lv/location/city.ts
new file mode 100644
index 00000000..ad43b68f
--- /dev/null
+++ b/src/locales/lv/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_name}}'];
diff --git a/src/locales/lv/address/city_name.ts b/src/locales/lv/location/city_name.ts
index 14536439..14536439 100644
--- a/src/locales/lv/address/city_name.ts
+++ b/src/locales/lv/location/city_name.ts
diff --git a/src/locales/lv/address/country.ts b/src/locales/lv/location/country.ts
index da657fb9..da657fb9 100644
--- a/src/locales/lv/address/country.ts
+++ b/src/locales/lv/location/country.ts
diff --git a/src/locales/lv/address/default_country.ts b/src/locales/lv/location/default_country.ts
index aef18df4..aef18df4 100644
--- a/src/locales/lv/address/default_country.ts
+++ b/src/locales/lv/location/default_country.ts
diff --git a/src/locales/az/address/index.ts b/src/locales/lv/location/index.ts
index 3c37ba5f..b28b0dfb 100644
--- a/src/locales/az/address/index.ts
+++ b/src/locales/lv/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_name from './city_name';
@@ -16,7 +16,7 @@ import street_address from './street_address';
 import street_name from './street_name';
 import street_suffix from './street_suffix';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_name,
@@ -31,4 +31,4 @@ const address: AddressDefinitions = {
   street_suffix,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/lv/address/postcode.ts b/src/locales/lv/location/postcode.ts
index 49fde7da..49fde7da 100644
--- a/src/locales/lv/address/postcode.ts
+++ b/src/locales/lv/location/postcode.ts
diff --git a/src/locales/lv/address/secondary_address.ts b/src/locales/lv/location/secondary_address.ts
index c5f18293..c5f18293 100644
--- a/src/locales/lv/address/secondary_address.ts
+++ b/src/locales/lv/location/secondary_address.ts
diff --git a/src/locales/lv/address/state.ts b/src/locales/lv/location/state.ts
index f6b96906..f6b96906 100644
--- a/src/locales/lv/address/state.ts
+++ b/src/locales/lv/location/state.ts
diff --git a/src/locales/lv/location/street.ts b/src/locales/lv/location/street.ts
new file mode 100644
index 00000000..afbdb76e
--- /dev/null
+++ b/src/locales/lv/location/street.ts
@@ -0,0 +1 @@
+export default ['{{location.street_name}} {{location.street_suffix}}'];
diff --git a/src/locales/lv/location/street_address.ts b/src/locales/lv/location/street_address.ts
new file mode 100644
index 00000000..437f20dd
--- /dev/null
+++ b/src/locales/lv/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.street}} {{location.buildingNumber}}',
+  full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/lv/address/street_name.ts b/src/locales/lv/location/street_name.ts
index 20a4307d..20a4307d 100644
--- a/src/locales/lv/address/street_name.ts
+++ b/src/locales/lv/location/street_name.ts
diff --git a/src/locales/lv/address/street_suffix.ts b/src/locales/lv/location/street_suffix.ts
index c1783b8d..c1783b8d 100644
--- a/src/locales/lv/address/street_suffix.ts
+++ b/src/locales/lv/location/street_suffix.ts
diff --git a/src/locales/mk/address/city.ts b/src/locales/mk/address/city.ts
deleted file mode 100644
index e3da346b..00000000
--- a/src/locales/mk/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_name}}'];
diff --git a/src/locales/mk/address/street.ts b/src/locales/mk/address/street.ts
deleted file mode 100644
index 30ba73fc..00000000
--- a/src/locales/mk/address/street.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.street_name}}'];
diff --git a/src/locales/mk/address/street_address.ts b/src/locales/mk/address/street_address.ts
deleted file mode 100644
index d1e8da38..00000000
--- a/src/locales/mk/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.street}} {{address.buildingNumber}}',
-  full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/mk/company/name_patterns.ts b/src/locales/mk/company/name_patterns.ts
index a214e6ae..edd34a66 100644
--- a/src/locales/mk/company/name_patterns.ts
+++ b/src/locales/mk/company/name_patterns.ts
@@ -1,5 +1,5 @@
 export default [
   '{{person.last_name}} {{company.suffix}}',
-  '{{address.city_name}} {{company.suffix}}',
+  '{{location.city_name}} {{company.suffix}}',
   '{{person.last_name}}, {{person.last_name}} и {{person.last_name}}',
 ];
diff --git a/src/locales/mk/index.ts b/src/locales/mk/index.ts
index 567c931b..6b1d245e 100644
--- a/src/locales/mk/index.ts
+++ b/src/locales/mk/index.ts
@@ -3,22 +3,22 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import cell_phone from './cell_phone';
 import company from './company';
 import date from './date';
 import internet from './internet';
+import location from './location';
 import person from './person';
 import phone_number from './phone_number';
 
 const mk: LocaleDefinition = {
   title: 'Macedonian',
   separator: ' и ',
-  address,
   cell_phone,
   company,
   date,
   internet,
+  location,
   person,
   phone_number,
 };
diff --git a/src/locales/mk/address/building_number.ts b/src/locales/mk/location/building_number.ts
index 4b74b7de..4b74b7de 100644
--- a/src/locales/mk/address/building_number.ts
+++ b/src/locales/mk/location/building_number.ts
diff --git a/src/locales/mk/location/city.ts b/src/locales/mk/location/city.ts
new file mode 100644
index 00000000..ad43b68f
--- /dev/null
+++ b/src/locales/mk/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_name}}'];
diff --git a/src/locales/mk/address/city_name.ts b/src/locales/mk/location/city_name.ts
index 4514d298..4514d298 100644
--- a/src/locales/mk/address/city_name.ts
+++ b/src/locales/mk/location/city_name.ts
diff --git a/src/locales/mk/address/country.ts b/src/locales/mk/location/country.ts
index 3d6a4c45..3d6a4c45 100644
--- a/src/locales/mk/address/country.ts
+++ b/src/locales/mk/location/country.ts
diff --git a/src/locales/mk/address/default_country.ts b/src/locales/mk/location/default_country.ts
index 5895c58b..5895c58b 100644
--- a/src/locales/mk/address/default_country.ts
+++ b/src/locales/mk/location/default_country.ts
diff --git a/src/locales/mk/address/index.ts b/src/locales/mk/location/index.ts
index d15f9ae6..7b286a9d 100644
--- a/src/locales/mk/address/index.ts
+++ b/src/locales/mk/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_name from './city_name';
@@ -14,7 +14,7 @@ import street from './street';
 import street_address from './street_address';
 import street_name from './street_name';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_name,
@@ -27,4 +27,4 @@ const address: AddressDefinitions = {
   street_name,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/mk/address/postcode.ts b/src/locales/mk/location/postcode.ts
index a8235678..a8235678 100644
--- a/src/locales/mk/address/postcode.ts
+++ b/src/locales/mk/location/postcode.ts
diff --git a/src/locales/mk/address/secondary_address.ts b/src/locales/mk/location/secondary_address.ts
index 6cbdd3de..6cbdd3de 100644
--- a/src/locales/mk/address/secondary_address.ts
+++ b/src/locales/mk/location/secondary_address.ts
diff --git a/src/locales/mk/location/street.ts b/src/locales/mk/location/street.ts
new file mode 100644
index 00000000..30a9a5dd
--- /dev/null
+++ b/src/locales/mk/location/street.ts
@@ -0,0 +1 @@
+export default ['{{location.street_name}}'];
diff --git a/src/locales/mk/location/street_address.ts b/src/locales/mk/location/street_address.ts
new file mode 100644
index 00000000..437f20dd
--- /dev/null
+++ b/src/locales/mk/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.street}} {{location.buildingNumber}}',
+  full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/mk/address/street_name.ts b/src/locales/mk/location/street_name.ts
index 4dcd7e6e..4dcd7e6e 100644
--- a/src/locales/mk/address/street_name.ts
+++ b/src/locales/mk/location/street_name.ts
diff --git a/src/locales/nb_NO/address/city.ts b/src/locales/nb_NO/address/city.ts
deleted file mode 100644
index 67bd1b88..00000000
--- a/src/locales/nb_NO/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_name}}{{address.city_suffix}}'];
diff --git a/src/locales/nb_NO/address/street.ts b/src/locales/nb_NO/address/street.ts
deleted file mode 100644
index 72310d5a..00000000
--- a/src/locales/nb_NO/address/street.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export default [
-  '{{address.street_name}}{{address.street_suffix}}',
-  '{{address.street_prefix}} {{address.street_name}}{{address.street_suffix}}',
-  '{{person.first_name}}{{address.common_street_suffix}}',
-  '{{person.last_name}}{{address.common_street_suffix}}',
-];
diff --git a/src/locales/nb_NO/address/street_address.ts b/src/locales/nb_NO/address/street_address.ts
deleted file mode 100644
index d1e8da38..00000000
--- a/src/locales/nb_NO/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.street}} {{address.buildingNumber}}',
-  full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/nb_NO/index.ts b/src/locales/nb_NO/index.ts
index 3eab6c88..f46b1760 100644
--- a/src/locales/nb_NO/index.ts
+++ b/src/locales/nb_NO/index.ts
@@ -3,11 +3,11 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import color from './color';
 import commerce from './commerce';
 import company from './company';
 import internet from './internet';
+import location from './location';
 import person from './person';
 import phone_number from './phone_number';
 import science from './science';
@@ -15,11 +15,11 @@ import word from './word';
 
 const nb_NO: LocaleDefinition = {
   title: 'Norwegian',
-  address,
   color,
   commerce,
   company,
   internet,
+  location,
   person,
   phone_number,
   science,
diff --git a/src/locales/nb_NO/address/building_number.ts b/src/locales/nb_NO/location/building_number.ts
index 1f07582e..1f07582e 100644
--- a/src/locales/nb_NO/address/building_number.ts
+++ b/src/locales/nb_NO/location/building_number.ts
diff --git a/src/locales/nb_NO/location/city.ts b/src/locales/nb_NO/location/city.ts
new file mode 100644
index 00000000..61f8d6f1
--- /dev/null
+++ b/src/locales/nb_NO/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_name}}{{location.city_suffix}}'];
diff --git a/src/locales/nb_NO/address/city_name.ts b/src/locales/nb_NO/location/city_name.ts
index 91763d2e..91763d2e 100644
--- a/src/locales/nb_NO/address/city_name.ts
+++ b/src/locales/nb_NO/location/city_name.ts
diff --git a/src/locales/nb_NO/address/city_suffix.ts b/src/locales/nb_NO/location/city_suffix.ts
index 442bd905..442bd905 100644
--- a/src/locales/nb_NO/address/city_suffix.ts
+++ b/src/locales/nb_NO/location/city_suffix.ts
diff --git a/src/locales/nb_NO/address/common_street_suffix.ts b/src/locales/nb_NO/location/common_street_suffix.ts
index 3fec4637..3fec4637 100644
--- a/src/locales/nb_NO/address/common_street_suffix.ts
+++ b/src/locales/nb_NO/location/common_street_suffix.ts
diff --git a/src/locales/nb_NO/address/default_country.ts b/src/locales/nb_NO/location/default_country.ts
index 8dcc45bd..8dcc45bd 100644
--- a/src/locales/nb_NO/address/default_country.ts
+++ b/src/locales/nb_NO/location/default_country.ts
diff --git a/src/locales/nb_NO/address/index.ts b/src/locales/nb_NO/location/index.ts
index 156adfea..c571f6bc 100644
--- a/src/locales/nb_NO/address/index.ts
+++ b/src/locales/nb_NO/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_name from './city_name';
@@ -18,7 +18,7 @@ import street_name from './street_name';
 import street_prefix from './street_prefix';
 import street_suffix from './street_suffix';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_name,
@@ -35,4 +35,4 @@ const address: AddressDefinitions = {
   street_suffix,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/nb_NO/address/postcode.ts b/src/locales/nb_NO/location/postcode.ts
index 90004f92..90004f92 100644
--- a/src/locales/nb_NO/address/postcode.ts
+++ b/src/locales/nb_NO/location/postcode.ts
diff --git a/src/locales/nb_NO/address/secondary_address.ts b/src/locales/nb_NO/location/secondary_address.ts
index 15962ab6..15962ab6 100644
--- a/src/locales/nb_NO/address/secondary_address.ts
+++ b/src/locales/nb_NO/location/secondary_address.ts
diff --git a/src/locales/nb_NO/address/state.ts b/src/locales/nb_NO/location/state.ts
index 1c4f017e..1c4f017e 100644
--- a/src/locales/nb_NO/address/state.ts
+++ b/src/locales/nb_NO/location/state.ts
diff --git a/src/locales/nb_NO/location/street.ts b/src/locales/nb_NO/location/street.ts
new file mode 100644
index 00000000..1e4fbfd7
--- /dev/null
+++ b/src/locales/nb_NO/location/street.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{location.street_name}}{{location.street_suffix}}',
+  '{{location.street_prefix}} {{location.street_name}}{{location.street_suffix}}',
+  '{{person.first_name}}{{location.common_street_suffix}}',
+  '{{person.last_name}}{{location.common_street_suffix}}',
+];
diff --git a/src/locales/nb_NO/location/street_address.ts b/src/locales/nb_NO/location/street_address.ts
new file mode 100644
index 00000000..437f20dd
--- /dev/null
+++ b/src/locales/nb_NO/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.street}} {{location.buildingNumber}}',
+  full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/nb_NO/address/street_name.ts b/src/locales/nb_NO/location/street_name.ts
index ee6380c0..ee6380c0 100644
--- a/src/locales/nb_NO/address/street_name.ts
+++ b/src/locales/nb_NO/location/street_name.ts
diff --git a/src/locales/nb_NO/address/street_prefix.ts b/src/locales/nb_NO/location/street_prefix.ts
index ac87e9c9..ac87e9c9 100644
--- a/src/locales/nb_NO/address/street_prefix.ts
+++ b/src/locales/nb_NO/location/street_prefix.ts
diff --git a/src/locales/nb_NO/address/street_suffix.ts b/src/locales/nb_NO/location/street_suffix.ts
index c2080611..c2080611 100644
--- a/src/locales/nb_NO/address/street_suffix.ts
+++ b/src/locales/nb_NO/location/street_suffix.ts
diff --git a/src/locales/ne/address/city.ts b/src/locales/ne/address/city.ts
deleted file mode 100644
index d77ac09a..00000000
--- a/src/locales/ne/address/city.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export default [
-  '{{address.city_prefix}} {{person.firstName}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{person.firstName}}',
-  '{{person.firstName}}{{address.city_suffix}}',
-  '{{person.lastName}}{{address.city_suffix}}',
-  '{{address.city_name}}',
-];
diff --git a/src/locales/ne/address/street.ts b/src/locales/ne/address/street.ts
deleted file mode 100644
index f7dd9d3b..00000000
--- a/src/locales/ne/address/street.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{person.firstName}} {{address.street_suffix}}',
-  '{{person.lastName}} {{address.street_suffix}}',
-];
diff --git a/src/locales/ne/index.ts b/src/locales/ne/index.ts
index 0c6dc8ee..0d35d85a 100644
--- a/src/locales/ne/index.ts
+++ b/src/locales/ne/index.ts
@@ -3,17 +3,17 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import company from './company';
 import internet from './internet';
+import location from './location';
 import person from './person';
 import phone_number from './phone_number';
 
 const ne: LocaleDefinition = {
   title: 'Nepalese',
-  address,
   company,
   internet,
+  location,
   person,
   phone_number,
 };
diff --git a/src/locales/ne/location/city.ts b/src/locales/ne/location/city.ts
new file mode 100644
index 00000000..0d422527
--- /dev/null
+++ b/src/locales/ne/location/city.ts
@@ -0,0 +1,7 @@
+export default [
+  '{{location.city_prefix}} {{person.firstName}}{{location.city_suffix}}',
+  '{{location.city_prefix}} {{person.firstName}}',
+  '{{person.firstName}}{{location.city_suffix}}',
+  '{{person.lastName}}{{location.city_suffix}}',
+  '{{location.city_name}}',
+];
diff --git a/src/locales/ne/address/city_name.ts b/src/locales/ne/location/city_name.ts
index 3aa3d059..3aa3d059 100644
--- a/src/locales/ne/address/city_name.ts
+++ b/src/locales/ne/location/city_name.ts
diff --git a/src/locales/ne/address/default_country.ts b/src/locales/ne/location/default_country.ts
index 74b36aaa..74b36aaa 100644
--- a/src/locales/ne/address/default_country.ts
+++ b/src/locales/ne/location/default_country.ts
diff --git a/src/locales/ne/address/index.ts b/src/locales/ne/location/index.ts
index 10df9e7b..7ca1578a 100644
--- a/src/locales/ne/address/index.ts
+++ b/src/locales/ne/location/index.ts
@@ -2,14 +2,14 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import city from './city';
 import city_name from './city_name';
 import default_country from './default_country';
 import state from './state';
 import street from './street';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   city,
   city_name,
   default_country,
@@ -17,4 +17,4 @@ const address: AddressDefinitions = {
   street,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/ne/address/state.ts b/src/locales/ne/location/state.ts
index 1b575d66..1b575d66 100644
--- a/src/locales/ne/address/state.ts
+++ b/src/locales/ne/location/state.ts
diff --git a/src/locales/ne/location/street.ts b/src/locales/ne/location/street.ts
new file mode 100644
index 00000000..af32d0c4
--- /dev/null
+++ b/src/locales/ne/location/street.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{person.firstName}} {{location.street_suffix}}',
+  '{{person.lastName}} {{location.street_suffix}}',
+];
diff --git a/src/locales/nl/address/city.ts b/src/locales/nl/address/city.ts
deleted file mode 100644
index 00365162..00000000
--- a/src/locales/nl/address/city.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{address.city_prefix}}{{address.city_suffix}}',
-  '{{address.city_prefix}}',
-];
diff --git a/src/locales/nl/address/street.ts b/src/locales/nl/address/street.ts
deleted file mode 100644
index a32c95d3..00000000
--- a/src/locales/nl/address/street.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{person.first_name}}{{address.street_suffix}}',
-  '{{person.last_name}}{{address.street_suffix}}',
-];
diff --git a/src/locales/nl/address/street_address.ts b/src/locales/nl/address/street_address.ts
deleted file mode 100644
index d1e8da38..00000000
--- a/src/locales/nl/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.street}} {{address.buildingNumber}}',
-  full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/nl/index.ts b/src/locales/nl/index.ts
index 92562824..ebb4b43a 100644
--- a/src/locales/nl/index.ts
+++ b/src/locales/nl/index.ts
@@ -3,26 +3,26 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import color from './color';
 import commerce from './commerce';
 import company from './company';
 import date from './date';
 import hacker from './hacker';
 import internet from './internet';
+import location from './location';
 import lorem from './lorem';
 import person from './person';
 import phone_number from './phone_number';
 
 const nl: LocaleDefinition = {
   title: 'Dutch',
-  address,
   color,
   commerce,
   company,
   date,
   hacker,
   internet,
+  location,
   lorem,
   person,
   phone_number,
diff --git a/src/locales/nl/address/building_number.ts b/src/locales/nl/location/building_number.ts
index 0b69bb19..0b69bb19 100644
--- a/src/locales/nl/address/building_number.ts
+++ b/src/locales/nl/location/building_number.ts
diff --git a/src/locales/nl/location/city.ts b/src/locales/nl/location/city.ts
new file mode 100644
index 00000000..daae91a8
--- /dev/null
+++ b/src/locales/nl/location/city.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{location.city_prefix}}{{location.city_suffix}}',
+  '{{location.city_prefix}}',
+];
diff --git a/src/locales/nl/address/city_prefix.ts b/src/locales/nl/location/city_prefix.ts
index 12029d63..12029d63 100644
--- a/src/locales/nl/address/city_prefix.ts
+++ b/src/locales/nl/location/city_prefix.ts
diff --git a/src/locales/nl/address/city_suffix.ts b/src/locales/nl/location/city_suffix.ts
index d8a1c1c4..d8a1c1c4 100644
--- a/src/locales/nl/address/city_suffix.ts
+++ b/src/locales/nl/location/city_suffix.ts
diff --git a/src/locales/nl/address/country.ts b/src/locales/nl/location/country.ts
index 9c901592..9c901592 100644
--- a/src/locales/nl/address/country.ts
+++ b/src/locales/nl/location/country.ts
diff --git a/src/locales/nl/address/default_country.ts b/src/locales/nl/location/default_country.ts
index ab089bd9..ab089bd9 100644
--- a/src/locales/nl/address/default_country.ts
+++ b/src/locales/nl/location/default_country.ts
diff --git a/src/locales/nl/address/index.ts b/src/locales/nl/location/index.ts
index e2327ce2..08afa155 100644
--- a/src/locales/nl/address/index.ts
+++ b/src/locales/nl/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_prefix from './city_prefix';
@@ -16,7 +16,7 @@ import street from './street';
 import street_address from './street_address';
 import street_suffix from './street_suffix';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_prefix,
@@ -31,4 +31,4 @@ const address: AddressDefinitions = {
   street_suffix,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/nl/address/postcode.ts b/src/locales/nl/location/postcode.ts
index f888da9f..f888da9f 100644
--- a/src/locales/nl/address/postcode.ts
+++ b/src/locales/nl/location/postcode.ts
diff --git a/src/locales/nl/address/secondary_address.ts b/src/locales/nl/location/secondary_address.ts
index 24f007c2..24f007c2 100644
--- a/src/locales/nl/address/secondary_address.ts
+++ b/src/locales/nl/location/secondary_address.ts
diff --git a/src/locales/nl/address/state.ts b/src/locales/nl/location/state.ts
index 6b1b2900..6b1b2900 100644
--- a/src/locales/nl/address/state.ts
+++ b/src/locales/nl/location/state.ts
diff --git a/src/locales/nl/location/street.ts b/src/locales/nl/location/street.ts
new file mode 100644
index 00000000..06ca3a5e
--- /dev/null
+++ b/src/locales/nl/location/street.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{person.first_name}}{{location.street_suffix}}',
+  '{{person.last_name}}{{location.street_suffix}}',
+];
diff --git a/src/locales/nl/location/street_address.ts b/src/locales/nl/location/street_address.ts
new file mode 100644
index 00000000..437f20dd
--- /dev/null
+++ b/src/locales/nl/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.street}} {{location.buildingNumber}}',
+  full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/nl/address/street_suffix.ts b/src/locales/nl/location/street_suffix.ts
index ac019f01..ac019f01 100644
--- a/src/locales/nl/address/street_suffix.ts
+++ b/src/locales/nl/location/street_suffix.ts
diff --git a/src/locales/nl_BE/address/city.ts b/src/locales/nl_BE/address/city.ts
deleted file mode 100644
index 5eaa0e41..00000000
--- a/src/locales/nl_BE/address/city.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{address.city_prefix}}',
-  '{{address.city_prefix}}{{address.city_suffix}}',
-];
diff --git a/src/locales/nl_BE/address/street.ts b/src/locales/nl_BE/address/street.ts
deleted file mode 100644
index a32c95d3..00000000
--- a/src/locales/nl_BE/address/street.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{person.first_name}}{{address.street_suffix}}',
-  '{{person.last_name}}{{address.street_suffix}}',
-];
diff --git a/src/locales/nl_BE/address/street_address.ts b/src/locales/nl_BE/address/street_address.ts
deleted file mode 100644
index d1e8da38..00000000
--- a/src/locales/nl_BE/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.street}} {{address.buildingNumber}}',
-  full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/nl_BE/index.ts b/src/locales/nl_BE/index.ts
index bf5060d3..0e583ddd 100644
--- a/src/locales/nl_BE/index.ts
+++ b/src/locales/nl_BE/index.ts
@@ -3,17 +3,17 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import company from './company';
 import internet from './internet';
+import location from './location';
 import person from './person';
 import phone_number from './phone_number';
 
 const nl_BE: LocaleDefinition = {
   title: 'Dutch (Belgium)',
-  address,
   company,
   internet,
+  location,
   person,
   phone_number,
 };
diff --git a/src/locales/nl_BE/address/building_number.ts b/src/locales/nl_BE/location/building_number.ts
index 14e42b59..14e42b59 100644
--- a/src/locales/nl_BE/address/building_number.ts
+++ b/src/locales/nl_BE/location/building_number.ts
diff --git a/src/locales/nl_BE/location/city.ts b/src/locales/nl_BE/location/city.ts
new file mode 100644
index 00000000..2bddf0f5
--- /dev/null
+++ b/src/locales/nl_BE/location/city.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{location.city_prefix}}',
+  '{{location.city_prefix}}{{location.city_suffix}}',
+];
diff --git a/src/locales/nl_BE/address/city_prefix.ts b/src/locales/nl_BE/location/city_prefix.ts
index 08394204..08394204 100644
--- a/src/locales/nl_BE/address/city_prefix.ts
+++ b/src/locales/nl_BE/location/city_prefix.ts
diff --git a/src/locales/nl_BE/address/city_suffix.ts b/src/locales/nl_BE/location/city_suffix.ts
index 1fd91475..1fd91475 100644
--- a/src/locales/nl_BE/address/city_suffix.ts
+++ b/src/locales/nl_BE/location/city_suffix.ts
diff --git a/src/locales/nl_BE/address/default_country.ts b/src/locales/nl_BE/location/default_country.ts
index 35a7abfd..35a7abfd 100644
--- a/src/locales/nl_BE/address/default_country.ts
+++ b/src/locales/nl_BE/location/default_country.ts
diff --git a/src/locales/nl_BE/address/index.ts b/src/locales/nl_BE/location/index.ts
index 6fa08a55..9b300647 100644
--- a/src/locales/nl_BE/address/index.ts
+++ b/src/locales/nl_BE/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_prefix from './city_prefix';
@@ -16,7 +16,7 @@ import street from './street';
 import street_address from './street_address';
 import street_suffix from './street_suffix';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_prefix,
@@ -31,4 +31,4 @@ const address: AddressDefinitions = {
   street_suffix,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/nl_BE/address/postcode.ts b/src/locales/nl_BE/location/postcode.ts
index a8235678..a8235678 100644
--- a/src/locales/nl_BE/address/postcode.ts
+++ b/src/locales/nl_BE/location/postcode.ts
diff --git a/src/locales/nl_BE/address/secondary_address.ts b/src/locales/nl_BE/location/secondary_address.ts
index 6bc87018..6bc87018 100644
--- a/src/locales/nl_BE/address/secondary_address.ts
+++ b/src/locales/nl_BE/location/secondary_address.ts
diff --git a/src/locales/nl_BE/address/state.ts b/src/locales/nl_BE/location/state.ts
index b174301e..b174301e 100644
--- a/src/locales/nl_BE/address/state.ts
+++ b/src/locales/nl_BE/location/state.ts
diff --git a/src/locales/nl_BE/address/state_abbr.ts b/src/locales/nl_BE/location/state_abbr.ts
index 27a06409..27a06409 100644
--- a/src/locales/nl_BE/address/state_abbr.ts
+++ b/src/locales/nl_BE/location/state_abbr.ts
diff --git a/src/locales/nl_BE/location/street.ts b/src/locales/nl_BE/location/street.ts
new file mode 100644
index 00000000..06ca3a5e
--- /dev/null
+++ b/src/locales/nl_BE/location/street.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{person.first_name}}{{location.street_suffix}}',
+  '{{person.last_name}}{{location.street_suffix}}',
+];
diff --git a/src/locales/nl_BE/location/street_address.ts b/src/locales/nl_BE/location/street_address.ts
new file mode 100644
index 00000000..437f20dd
--- /dev/null
+++ b/src/locales/nl_BE/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.street}} {{location.buildingNumber}}',
+  full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/nl_BE/address/street_suffix.ts b/src/locales/nl_BE/location/street_suffix.ts
index da0d962d..da0d962d 100644
--- a/src/locales/nl_BE/address/street_suffix.ts
+++ b/src/locales/nl_BE/location/street_suffix.ts
diff --git a/src/locales/pl/address/city.ts b/src/locales/pl/address/city.ts
deleted file mode 100644
index e3da346b..00000000
--- a/src/locales/pl/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_name}}'];
diff --git a/src/locales/pl/address/street.ts b/src/locales/pl/address/street.ts
deleted file mode 100644
index 9e114ccb..00000000
--- a/src/locales/pl/address/street.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.street_prefix}} {{person.last_name}}'];
diff --git a/src/locales/pl/address/street_address.ts b/src/locales/pl/address/street_address.ts
deleted file mode 100644
index d1e8da38..00000000
--- a/src/locales/pl/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.street}} {{address.buildingNumber}}',
-  full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/pl/index.ts b/src/locales/pl/index.ts
index 23a88b72..47ce1069 100644
--- a/src/locales/pl/index.ts
+++ b/src/locales/pl/index.ts
@@ -3,12 +3,12 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import animal from './animal';
 import cell_phone from './cell_phone';
 import color from './color';
 import company from './company';
 import internet from './internet';
+import location from './location';
 import lorem from './lorem';
 import music from './music';
 import person from './person';
@@ -18,12 +18,12 @@ import team from './team';
 
 const pl: LocaleDefinition = {
   title: 'Polish',
-  address,
   animal,
   cell_phone,
   color,
   company,
   internet,
+  location,
   lorem,
   music,
   person,
diff --git a/src/locales/pl/address/building_number.ts b/src/locales/pl/location/building_number.ts
index 801cb7df..801cb7df 100644
--- a/src/locales/pl/address/building_number.ts
+++ b/src/locales/pl/location/building_number.ts
diff --git a/src/locales/pl/location/city.ts b/src/locales/pl/location/city.ts
new file mode 100644
index 00000000..ad43b68f
--- /dev/null
+++ b/src/locales/pl/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_name}}'];
diff --git a/src/locales/pl/address/city_name.ts b/src/locales/pl/location/city_name.ts
index 9ecc9455..9ecc9455 100644
--- a/src/locales/pl/address/city_name.ts
+++ b/src/locales/pl/location/city_name.ts
diff --git a/src/locales/pl/address/country.ts b/src/locales/pl/location/country.ts
index dd0eddc0..dd0eddc0 100644
--- a/src/locales/pl/address/country.ts
+++ b/src/locales/pl/location/country.ts
diff --git a/src/locales/pl/address/default_country.ts b/src/locales/pl/location/default_country.ts
index cacb91a2..cacb91a2 100644
--- a/src/locales/pl/address/default_country.ts
+++ b/src/locales/pl/location/default_country.ts
diff --git a/src/locales/pl/address/direction.ts b/src/locales/pl/location/direction.ts
index 08a8dacd..08a8dacd 100644
--- a/src/locales/pl/address/direction.ts
+++ b/src/locales/pl/location/direction.ts
diff --git a/src/locales/pl/address/direction_abbr.ts b/src/locales/pl/location/direction_abbr.ts
index 84eb9c07..84eb9c07 100644
--- a/src/locales/pl/address/direction_abbr.ts
+++ b/src/locales/pl/location/direction_abbr.ts
diff --git a/src/locales/pl/address/index.ts b/src/locales/pl/location/index.ts
index 8ccf4197..1985d6e2 100644
--- a/src/locales/pl/address/index.ts
+++ b/src/locales/pl/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_name from './city_name';
@@ -18,7 +18,7 @@ import street from './street';
 import street_address from './street_address';
 import street_prefix from './street_prefix';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_name,
@@ -35,4 +35,4 @@ const address: AddressDefinitions = {
   street_prefix,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/pl/address/postcode.ts b/src/locales/pl/location/postcode.ts
index 31cf56d4..31cf56d4 100644
--- a/src/locales/pl/address/postcode.ts
+++ b/src/locales/pl/location/postcode.ts
diff --git a/src/locales/pl/address/secondary_address.ts b/src/locales/pl/location/secondary_address.ts
index 8adcf747..8adcf747 100644
--- a/src/locales/pl/address/secondary_address.ts
+++ b/src/locales/pl/location/secondary_address.ts
diff --git a/src/locales/pl/address/state.ts b/src/locales/pl/location/state.ts
index 0d7d3c6f..0d7d3c6f 100644
--- a/src/locales/pl/address/state.ts
+++ b/src/locales/pl/location/state.ts
diff --git a/src/locales/pl/address/state_abbr.ts b/src/locales/pl/location/state_abbr.ts
index 3e462050..3e462050 100644
--- a/src/locales/pl/address/state_abbr.ts
+++ b/src/locales/pl/location/state_abbr.ts
diff --git a/src/locales/pl/location/street.ts b/src/locales/pl/location/street.ts
new file mode 100644
index 00000000..7862632a
--- /dev/null
+++ b/src/locales/pl/location/street.ts
@@ -0,0 +1 @@
+export default ['{{location.street_prefix}} {{person.last_name}}'];
diff --git a/src/locales/pl/location/street_address.ts b/src/locales/pl/location/street_address.ts
new file mode 100644
index 00000000..437f20dd
--- /dev/null
+++ b/src/locales/pl/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.street}} {{location.buildingNumber}}',
+  full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/pl/address/street_prefix.ts b/src/locales/pl/location/street_prefix.ts
index 18790774..18790774 100644
--- a/src/locales/pl/address/street_prefix.ts
+++ b/src/locales/pl/location/street_prefix.ts
diff --git a/src/locales/pl/team/name.ts b/src/locales/pl/team/name.ts
index 3b22d3ab..62f24281 100644
--- a/src/locales/pl/team/name.ts
+++ b/src/locales/pl/team/name.ts
@@ -1 +1 @@
-export default ['{{team.prefix}} {{address.city}}'];
+export default ['{{team.prefix}} {{location.city}}'];
diff --git a/src/locales/pt_BR/address/city.ts b/src/locales/pt_BR/address/city.ts
deleted file mode 100644
index ea6ea950..00000000
--- a/src/locales/pt_BR/address/city.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export default [
-  '{{address.city_prefix}} {{person.firstName}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{person.firstName}}',
-  '{{person.firstName}}{{address.city_suffix}}',
-  '{{person.lastName}}{{address.city_suffix}}',
-];
diff --git a/src/locales/pt_BR/address/street.ts b/src/locales/pt_BR/address/street.ts
deleted file mode 100644
index f7dd9d3b..00000000
--- a/src/locales/pt_BR/address/street.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{person.firstName}} {{address.street_suffix}}',
-  '{{person.lastName}} {{address.street_suffix}}',
-];
diff --git a/src/locales/pt_BR/index.ts b/src/locales/pt_BR/index.ts
index 0f7aafa8..3e8a301a 100644
--- a/src/locales/pt_BR/index.ts
+++ b/src/locales/pt_BR/index.ts
@@ -3,24 +3,24 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import color from './color';
 import commerce from './commerce';
 import company from './company';
 import date from './date';
 import internet from './internet';
+import location from './location';
 import lorem from './lorem';
 import person from './person';
 import phone_number from './phone_number';
 
 const pt_BR: LocaleDefinition = {
   title: 'Portuguese (Brazil)',
-  address,
   color,
   commerce,
   company,
   date,
   internet,
+  location,
   lorem,
   person,
   phone_number,
diff --git a/src/locales/pt_BR/address/building_number.ts b/src/locales/pt_BR/location/building_number.ts
index 50c31ccb..50c31ccb 100644
--- a/src/locales/pt_BR/address/building_number.ts
+++ b/src/locales/pt_BR/location/building_number.ts
diff --git a/src/locales/pt_BR/location/city.ts b/src/locales/pt_BR/location/city.ts
new file mode 100644
index 00000000..7375aa83
--- /dev/null
+++ b/src/locales/pt_BR/location/city.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{location.city_prefix}} {{person.firstName}}{{location.city_suffix}}',
+  '{{location.city_prefix}} {{person.firstName}}',
+  '{{person.firstName}}{{location.city_suffix}}',
+  '{{person.lastName}}{{location.city_suffix}}',
+];
diff --git a/src/locales/pt_BR/address/city_prefix.ts b/src/locales/pt_BR/location/city_prefix.ts
index d6d1738d..d6d1738d 100644
--- a/src/locales/pt_BR/address/city_prefix.ts
+++ b/src/locales/pt_BR/location/city_prefix.ts
diff --git a/src/locales/pt_BR/address/city_suffix.ts b/src/locales/pt_BR/location/city_suffix.ts
index b267c38b..b267c38b 100644
--- a/src/locales/pt_BR/address/city_suffix.ts
+++ b/src/locales/pt_BR/location/city_suffix.ts
diff --git a/src/locales/pt_BR/address/country.ts b/src/locales/pt_BR/location/country.ts
index b1c15104..b1c15104 100644
--- a/src/locales/pt_BR/address/country.ts
+++ b/src/locales/pt_BR/location/country.ts
diff --git a/src/locales/pt_BR/address/default_country.ts b/src/locales/pt_BR/location/default_country.ts
index 82724f26..82724f26 100644
--- a/src/locales/pt_BR/address/default_country.ts
+++ b/src/locales/pt_BR/location/default_country.ts
diff --git a/src/locales/pt_BR/address/index.ts b/src/locales/pt_BR/location/index.ts
index 96786c71..b7bdee9b 100644
--- a/src/locales/pt_BR/address/index.ts
+++ b/src/locales/pt_BR/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_prefix from './city_prefix';
@@ -16,7 +16,7 @@ import state_abbr from './state_abbr';
 import street from './street';
 import street_suffix from './street_suffix';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_prefix,
@@ -31,4 +31,4 @@ const address: AddressDefinitions = {
   street_suffix,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/pt_BR/address/postcode.ts b/src/locales/pt_BR/location/postcode.ts
index 1f8b8fb4..1f8b8fb4 100644
--- a/src/locales/pt_BR/address/postcode.ts
+++ b/src/locales/pt_BR/location/postcode.ts
diff --git a/src/locales/pt_BR/address/secondary_address.ts b/src/locales/pt_BR/location/secondary_address.ts
index ebe87420..ebe87420 100644
--- a/src/locales/pt_BR/address/secondary_address.ts
+++ b/src/locales/pt_BR/location/secondary_address.ts
diff --git a/src/locales/pt_BR/address/state.ts b/src/locales/pt_BR/location/state.ts
index 445f03e1..445f03e1 100644
--- a/src/locales/pt_BR/address/state.ts
+++ b/src/locales/pt_BR/location/state.ts
diff --git a/src/locales/pt_BR/address/state_abbr.ts b/src/locales/pt_BR/location/state_abbr.ts
index e2137f97..e2137f97 100644
--- a/src/locales/pt_BR/address/state_abbr.ts
+++ b/src/locales/pt_BR/location/state_abbr.ts
diff --git a/src/locales/pt_BR/location/street.ts b/src/locales/pt_BR/location/street.ts
new file mode 100644
index 00000000..af32d0c4
--- /dev/null
+++ b/src/locales/pt_BR/location/street.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{person.firstName}} {{location.street_suffix}}',
+  '{{person.lastName}} {{location.street_suffix}}',
+];
diff --git a/src/locales/pt_BR/address/street_suffix.ts b/src/locales/pt_BR/location/street_suffix.ts
index 49ba524d..49ba524d 100644
--- a/src/locales/pt_BR/address/street_suffix.ts
+++ b/src/locales/pt_BR/location/street_suffix.ts
diff --git a/src/locales/pt_PT/address/city.ts b/src/locales/pt_PT/address/city.ts
deleted file mode 100644
index e3da346b..00000000
--- a/src/locales/pt_PT/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_name}}'];
diff --git a/src/locales/pt_PT/address/street.ts b/src/locales/pt_PT/address/street.ts
deleted file mode 100644
index 603c6461..00000000
--- a/src/locales/pt_PT/address/street.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export default [
-  '{{address.street_prefix}} {{person.first_name}} {{person.last_name}}',
-  'N#',
-  'N##',
-  'N###',
-  'N###-#',
-];
diff --git a/src/locales/pt_PT/address/street_address.ts b/src/locales/pt_PT/address/street_address.ts
deleted file mode 100644
index d1e8da38..00000000
--- a/src/locales/pt_PT/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.street}} {{address.buildingNumber}}',
-  full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/pt_PT/index.ts b/src/locales/pt_PT/index.ts
index 3c9fab57..cdb92a61 100644
--- a/src/locales/pt_PT/index.ts
+++ b/src/locales/pt_PT/index.ts
@@ -3,23 +3,23 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import cell_phone from './cell_phone';
 import color from './color';
 import commerce from './commerce';
 import date from './date';
 import internet from './internet';
+import location from './location';
 import person from './person';
 import phone_number from './phone_number';
 
 const pt_PT: LocaleDefinition = {
   title: 'Portuguese (Portugal)',
-  address,
   cell_phone,
   color,
   commerce,
   date,
   internet,
+  location,
   person,
   phone_number,
 };
diff --git a/src/locales/pt_PT/address/building_number.ts b/src/locales/pt_PT/location/building_number.ts
index b875f685..b875f685 100644
--- a/src/locales/pt_PT/address/building_number.ts
+++ b/src/locales/pt_PT/location/building_number.ts
diff --git a/src/locales/pt_PT/location/city.ts b/src/locales/pt_PT/location/city.ts
new file mode 100644
index 00000000..ad43b68f
--- /dev/null
+++ b/src/locales/pt_PT/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_name}}'];
diff --git a/src/locales/pt_PT/address/city_name.ts b/src/locales/pt_PT/location/city_name.ts
index 59a67e2e..59a67e2e 100644
--- a/src/locales/pt_PT/address/city_name.ts
+++ b/src/locales/pt_PT/location/city_name.ts
diff --git a/src/locales/pt_PT/address/city_prefix.ts b/src/locales/pt_PT/location/city_prefix.ts
index d6d1738d..d6d1738d 100644
--- a/src/locales/pt_PT/address/city_prefix.ts
+++ b/src/locales/pt_PT/location/city_prefix.ts
diff --git a/src/locales/pt_PT/address/city_suffix.ts b/src/locales/pt_PT/location/city_suffix.ts
index d6d1738d..d6d1738d 100644
--- a/src/locales/pt_PT/address/city_suffix.ts
+++ b/src/locales/pt_PT/location/city_suffix.ts
diff --git a/src/locales/pt_PT/address/country.ts b/src/locales/pt_PT/location/country.ts
index b9a3bb22..b9a3bb22 100644
--- a/src/locales/pt_PT/address/country.ts
+++ b/src/locales/pt_PT/location/country.ts
diff --git a/src/locales/pt_PT/address/default_country.ts b/src/locales/pt_PT/location/default_country.ts
index d5a257f1..d5a257f1 100644
--- a/src/locales/pt_PT/address/default_country.ts
+++ b/src/locales/pt_PT/location/default_country.ts
diff --git a/src/locales/pt_PT/address/direction.ts b/src/locales/pt_PT/location/direction.ts
index cb310480..cb310480 100644
--- a/src/locales/pt_PT/address/direction.ts
+++ b/src/locales/pt_PT/location/direction.ts
diff --git a/src/locales/pt_PT/address/index.ts b/src/locales/pt_PT/location/index.ts
index c15ccdb2..63674a1f 100644
--- a/src/locales/pt_PT/address/index.ts
+++ b/src/locales/pt_PT/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_name from './city_name';
@@ -16,7 +16,7 @@ import street from './street';
 import street_address from './street_address';
 import street_prefix from './street_prefix';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_name,
@@ -31,4 +31,4 @@ const address: AddressDefinitions = {
   street_prefix,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/pt_PT/address/postcode.ts b/src/locales/pt_PT/location/postcode.ts
index 7af79d49..7af79d49 100644
--- a/src/locales/pt_PT/address/postcode.ts
+++ b/src/locales/pt_PT/location/postcode.ts
diff --git a/src/locales/pt_PT/location/street.ts b/src/locales/pt_PT/location/street.ts
new file mode 100644
index 00000000..f579edee
--- /dev/null
+++ b/src/locales/pt_PT/location/street.ts
@@ -0,0 +1,7 @@
+export default [
+  '{{location.street_prefix}} {{person.first_name}} {{person.last_name}}',
+  'N#',
+  'N##',
+  'N###',
+  'N###-#',
+];
diff --git a/src/locales/pt_PT/location/street_address.ts b/src/locales/pt_PT/location/street_address.ts
new file mode 100644
index 00000000..437f20dd
--- /dev/null
+++ b/src/locales/pt_PT/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.street}} {{location.buildingNumber}}',
+  full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/pt_PT/address/street_prefix.ts b/src/locales/pt_PT/location/street_prefix.ts
index 3cd51db0..3cd51db0 100644
--- a/src/locales/pt_PT/address/street_prefix.ts
+++ b/src/locales/pt_PT/location/street_prefix.ts
diff --git a/src/locales/ro/address/city.ts b/src/locales/ro/address/city.ts
deleted file mode 100644
index d77ac09a..00000000
--- a/src/locales/ro/address/city.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export default [
-  '{{address.city_prefix}} {{person.firstName}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{person.firstName}}',
-  '{{person.firstName}}{{address.city_suffix}}',
-  '{{person.lastName}}{{address.city_suffix}}',
-  '{{address.city_name}}',
-];
diff --git a/src/locales/ro/address/street.ts b/src/locales/ro/address/street.ts
deleted file mode 100644
index b16d72dd..00000000
--- a/src/locales/ro/address/street.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.street_suffix}} {{address.street_name}}'];
diff --git a/src/locales/ro/address/street_address.ts b/src/locales/ro/address/street_address.ts
deleted file mode 100644
index 510bbab3..00000000
--- a/src/locales/ro/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.street}}, {{address.buildingNumber}}',
-  full: '{{address.street}}, {{address.buildingNumber}}, {{address.secondaryAddress}}',
-};
diff --git a/src/locales/ro/index.ts b/src/locales/ro/index.ts
index 5580d63d..b1e5bbed 100644
--- a/src/locales/ro/index.ts
+++ b/src/locales/ro/index.ts
@@ -3,19 +3,19 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import cell_phone from './cell_phone';
 import date from './date';
 import internet from './internet';
+import location from './location';
 import person from './person';
 import phone_number from './phone_number';
 
 const ro: LocaleDefinition = {
   title: 'Romanian',
-  address,
   cell_phone,
   date,
   internet,
+  location,
   person,
   phone_number,
 };
diff --git a/src/locales/ro/address/building_number.ts b/src/locales/ro/location/building_number.ts
index e96ef5c9..e96ef5c9 100644
--- a/src/locales/ro/address/building_number.ts
+++ b/src/locales/ro/location/building_number.ts
diff --git a/src/locales/ro/location/city.ts b/src/locales/ro/location/city.ts
new file mode 100644
index 00000000..0d422527
--- /dev/null
+++ b/src/locales/ro/location/city.ts
@@ -0,0 +1,7 @@
+export default [
+  '{{location.city_prefix}} {{person.firstName}}{{location.city_suffix}}',
+  '{{location.city_prefix}} {{person.firstName}}',
+  '{{person.firstName}}{{location.city_suffix}}',
+  '{{person.lastName}}{{location.city_suffix}}',
+  '{{location.city_name}}',
+];
diff --git a/src/locales/ro/address/city_name.ts b/src/locales/ro/location/city_name.ts
index a44711e4..a44711e4 100644
--- a/src/locales/ro/address/city_name.ts
+++ b/src/locales/ro/location/city_name.ts
diff --git a/src/locales/ro/address/county.ts b/src/locales/ro/location/county.ts
index 9c9ee7d9..9c9ee7d9 100644
--- a/src/locales/ro/address/county.ts
+++ b/src/locales/ro/location/county.ts
diff --git a/src/locales/ro/address/default_country.ts b/src/locales/ro/location/default_country.ts
index 923e2395..923e2395 100644
--- a/src/locales/ro/address/default_country.ts
+++ b/src/locales/ro/location/default_country.ts
diff --git a/src/locales/ro/address/index.ts b/src/locales/ro/location/index.ts
index 7a745711..bc610ff8 100644
--- a/src/locales/ro/address/index.ts
+++ b/src/locales/ro/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_name from './city_name';
@@ -17,7 +17,7 @@ import street_address from './street_address';
 import street_name from './street_name';
 import street_suffix from './street_suffix';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_name,
@@ -33,4 +33,4 @@ const address: AddressDefinitions = {
   street_suffix,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/ro/address/postcode.ts b/src/locales/ro/location/postcode.ts
index 519dcdec..519dcdec 100644
--- a/src/locales/ro/address/postcode.ts
+++ b/src/locales/ro/location/postcode.ts
diff --git a/src/locales/ro/address/secondary_address.ts b/src/locales/ro/location/secondary_address.ts
index 423f9111..423f9111 100644
--- a/src/locales/ro/address/secondary_address.ts
+++ b/src/locales/ro/location/secondary_address.ts
diff --git a/src/locales/ro/address/state.ts b/src/locales/ro/location/state.ts
index 9c9ee7d9..9c9ee7d9 100644
--- a/src/locales/ro/address/state.ts
+++ b/src/locales/ro/location/state.ts
diff --git a/src/locales/ro/address/state_abbr.ts b/src/locales/ro/location/state_abbr.ts
index 1801a0e0..1801a0e0 100644
--- a/src/locales/ro/address/state_abbr.ts
+++ b/src/locales/ro/location/state_abbr.ts
diff --git a/src/locales/ro/location/street.ts b/src/locales/ro/location/street.ts
new file mode 100644
index 00000000..e5bab9f7
--- /dev/null
+++ b/src/locales/ro/location/street.ts
@@ -0,0 +1 @@
+export default ['{{location.street_suffix}} {{location.street_name}}'];
diff --git a/src/locales/ro/location/street_address.ts b/src/locales/ro/location/street_address.ts
new file mode 100644
index 00000000..b1cf56fc
--- /dev/null
+++ b/src/locales/ro/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.street}}, {{location.buildingNumber}}',
+  full: '{{location.street}}, {{location.buildingNumber}}, {{location.secondaryAddress}}',
+};
diff --git a/src/locales/ro/address/street_name.ts b/src/locales/ro/location/street_name.ts
index 6fdd1fe3..6fdd1fe3 100644
--- a/src/locales/ro/address/street_name.ts
+++ b/src/locales/ro/location/street_name.ts
diff --git a/src/locales/ro/address/street_suffix.ts b/src/locales/ro/location/street_suffix.ts
index ce06bdf9..ce06bdf9 100644
--- a/src/locales/ro/address/street_suffix.ts
+++ b/src/locales/ro/location/street_suffix.ts
diff --git a/src/locales/ru/address/city.ts b/src/locales/ru/address/city.ts
deleted file mode 100644
index e3da346b..00000000
--- a/src/locales/ru/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_name}}'];
diff --git a/src/locales/ru/address/street.ts b/src/locales/ru/address/street.ts
deleted file mode 100644
index bddea6b0..00000000
--- a/src/locales/ru/address/street.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{address.street_suffix}} {{address.street_name}}',
-  '{{address.street_name}} {{address.street_suffix}}',
-];
diff --git a/src/locales/ru/address/street_address.ts b/src/locales/ru/address/street_address.ts
deleted file mode 100644
index 9a8e4da4..00000000
--- a/src/locales/ru/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.street}}, {{address.buildingNumber}}',
-  full: '{{address.street}}, {{address.buildingNumber}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/ru/company/name_patterns.ts b/src/locales/ru/company/name_patterns.ts
index 9db05dce..b9374d22 100644
--- a/src/locales/ru/company/name_patterns.ts
+++ b/src/locales/ru/company/name_patterns.ts
@@ -4,7 +4,7 @@ export default [
   '{{company.prefix}} {{person.male_last_name}}',
   '{{company.prefix}} {{company.suffix}}{{company.suffix}}',
   '{{company.prefix}} {{company.suffix}}{{company.suffix}}{{company.suffix}}',
-  '{{company.prefix}} {{address.city_name}}{{company.suffix}}',
-  '{{company.prefix}} {{address.city_name}}{{company.suffix}}{{company.suffix}}',
-  '{{company.prefix}} {{address.city_name}}{{company.suffix}}{{company.suffix}}{{company.suffix}}',
+  '{{company.prefix}} {{location.city_name}}{{company.suffix}}',
+  '{{company.prefix}} {{location.city_name}}{{company.suffix}}{{company.suffix}}',
+  '{{company.prefix}} {{location.city_name}}{{company.suffix}}{{company.suffix}}{{company.suffix}}',
 ];
diff --git a/src/locales/ru/index.ts b/src/locales/ru/index.ts
index 445fb973..966430db 100644
--- a/src/locales/ru/index.ts
+++ b/src/locales/ru/index.ts
@@ -3,13 +3,13 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import color from './color';
 import commerce from './commerce';
 import company from './company';
 import date from './date';
 import hacker from './hacker';
 import internet from './internet';
+import location from './location';
 import lorem from './lorem';
 import person from './person';
 import phone_number from './phone_number';
@@ -17,13 +17,13 @@ import phone_number from './phone_number';
 const ru: LocaleDefinition = {
   title: 'Russian',
   separator: ' и ',
-  address,
   color,
   commerce,
   company,
   date,
   hacker,
   internet,
+  location,
   lorem,
   person,
   phone_number,
diff --git a/src/locales/ru/address/building_number.ts b/src/locales/ru/location/building_number.ts
index fd93542d..fd93542d 100644
--- a/src/locales/ru/address/building_number.ts
+++ b/src/locales/ru/location/building_number.ts
diff --git a/src/locales/ru/location/city.ts b/src/locales/ru/location/city.ts
new file mode 100644
index 00000000..ad43b68f
--- /dev/null
+++ b/src/locales/ru/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_name}}'];
diff --git a/src/locales/ru/address/city_name.ts b/src/locales/ru/location/city_name.ts
index 96f58de8..96f58de8 100644
--- a/src/locales/ru/address/city_name.ts
+++ b/src/locales/ru/location/city_name.ts
diff --git a/src/locales/ru/address/country.ts b/src/locales/ru/location/country.ts
index fd824067..fd824067 100644
--- a/src/locales/ru/address/country.ts
+++ b/src/locales/ru/location/country.ts
diff --git a/src/locales/ru/address/default_country.ts b/src/locales/ru/location/default_country.ts
index b63e3ecb..b63e3ecb 100644
--- a/src/locales/ru/address/default_country.ts
+++ b/src/locales/ru/location/default_country.ts
diff --git a/src/locales/ru/address/index.ts b/src/locales/ru/location/index.ts
index 3c37ba5f..b28b0dfb 100644
--- a/src/locales/ru/address/index.ts
+++ b/src/locales/ru/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_name from './city_name';
@@ -16,7 +16,7 @@ import street_address from './street_address';
 import street_name from './street_name';
 import street_suffix from './street_suffix';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_name,
@@ -31,4 +31,4 @@ const address: AddressDefinitions = {
   street_suffix,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/ru/address/postcode.ts b/src/locales/ru/location/postcode.ts
index 519dcdec..519dcdec 100644
--- a/src/locales/ru/address/postcode.ts
+++ b/src/locales/ru/location/postcode.ts
diff --git a/src/locales/ru/address/secondary_address.ts b/src/locales/ru/location/secondary_address.ts
index 0493429a..0493429a 100644
--- a/src/locales/ru/address/secondary_address.ts
+++ b/src/locales/ru/location/secondary_address.ts
diff --git a/src/locales/ru/address/state.ts b/src/locales/ru/location/state.ts
index 8ff51b6a..8ff51b6a 100644
--- a/src/locales/ru/address/state.ts
+++ b/src/locales/ru/location/state.ts
diff --git a/src/locales/ru/location/street.ts b/src/locales/ru/location/street.ts
new file mode 100644
index 00000000..523f8165
--- /dev/null
+++ b/src/locales/ru/location/street.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{location.street_suffix}} {{location.street_name}}',
+  '{{location.street_name}} {{location.street_suffix}}',
+];
diff --git a/src/locales/ru/location/street_address.ts b/src/locales/ru/location/street_address.ts
new file mode 100644
index 00000000..3394fef6
--- /dev/null
+++ b/src/locales/ru/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.street}}, {{location.buildingNumber}}',
+  full: '{{location.street}}, {{location.buildingNumber}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/ru/address/street_name.ts b/src/locales/ru/location/street_name.ts
index ed971eac..ed971eac 100644
--- a/src/locales/ru/address/street_name.ts
+++ b/src/locales/ru/location/street_name.ts
diff --git a/src/locales/ru/address/street_suffix.ts b/src/locales/ru/location/street_suffix.ts
index 39f6228b..39f6228b 100644
--- a/src/locales/ru/address/street_suffix.ts
+++ b/src/locales/ru/location/street_suffix.ts
diff --git a/src/locales/sk/address/city.ts b/src/locales/sk/address/city.ts
deleted file mode 100644
index e3da346b..00000000
--- a/src/locales/sk/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_name}}'];
diff --git a/src/locales/sk/address/street.ts b/src/locales/sk/address/street.ts
deleted file mode 100644
index 30ba73fc..00000000
--- a/src/locales/sk/address/street.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.street_name}}'];
diff --git a/src/locales/sk/address/street_address.ts b/src/locales/sk/address/street_address.ts
deleted file mode 100644
index d1e8da38..00000000
--- a/src/locales/sk/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.street}} {{address.buildingNumber}}',
-  full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/sk/index.ts b/src/locales/sk/index.ts
index 0a034db0..a44966ac 100644
--- a/src/locales/sk/index.ts
+++ b/src/locales/sk/index.ts
@@ -3,18 +3,18 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import company from './company';
 import internet from './internet';
+import location from './location';
 import lorem from './lorem';
 import person from './person';
 import phone_number from './phone_number';
 
 const sk: LocaleDefinition = {
   title: 'Slovakian',
-  address,
   company,
   internet,
+  location,
   lorem,
   person,
   phone_number,
diff --git a/src/locales/sk/address/building_number.ts b/src/locales/sk/location/building_number.ts
index 4b74b7de..4b74b7de 100644
--- a/src/locales/sk/address/building_number.ts
+++ b/src/locales/sk/location/building_number.ts
diff --git a/src/locales/sk/location/city.ts b/src/locales/sk/location/city.ts
new file mode 100644
index 00000000..ad43b68f
--- /dev/null
+++ b/src/locales/sk/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_name}}'];
diff --git a/src/locales/sk/address/city_name.ts b/src/locales/sk/location/city_name.ts
index 316eb98f..316eb98f 100644
--- a/src/locales/sk/address/city_name.ts
+++ b/src/locales/sk/location/city_name.ts
diff --git a/src/locales/sk/address/city_prefix.ts b/src/locales/sk/location/city_prefix.ts
index 6a878062..6a878062 100644
--- a/src/locales/sk/address/city_prefix.ts
+++ b/src/locales/sk/location/city_prefix.ts
diff --git a/src/locales/sk/address/city_suffix.ts b/src/locales/sk/location/city_suffix.ts
index 97d1bc27..97d1bc27 100644
--- a/src/locales/sk/address/city_suffix.ts
+++ b/src/locales/sk/location/city_suffix.ts
diff --git a/src/locales/sk/address/country.ts b/src/locales/sk/location/country.ts
index 45506b6a..45506b6a 100644
--- a/src/locales/sk/address/country.ts
+++ b/src/locales/sk/location/country.ts
diff --git a/src/locales/sk/address/default_country.ts b/src/locales/sk/location/default_country.ts
index 7928217c..7928217c 100644
--- a/src/locales/sk/address/default_country.ts
+++ b/src/locales/sk/location/default_country.ts
diff --git a/src/locales/de/address/index.ts b/src/locales/sk/location/index.ts
index 2551894c..93f5515e 100644
--- a/src/locales/de/address/index.ts
+++ b/src/locales/sk/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_name from './city_name';
@@ -18,7 +18,7 @@ import street from './street';
 import street_address from './street_address';
 import street_name from './street_name';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_name,
@@ -35,4 +35,4 @@ const address: AddressDefinitions = {
   street_name,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/sk/address/postcode.ts b/src/locales/sk/location/postcode.ts
index 32bd4a79..32bd4a79 100644
--- a/src/locales/sk/address/postcode.ts
+++ b/src/locales/sk/location/postcode.ts
diff --git a/src/locales/sk/address/secondary_address.ts b/src/locales/sk/location/secondary_address.ts
index 6f2a5cc8..6f2a5cc8 100644
--- a/src/locales/sk/address/secondary_address.ts
+++ b/src/locales/sk/location/secondary_address.ts
diff --git a/src/locales/sk/address/state.ts b/src/locales/sk/location/state.ts
index d6d1738d..d6d1738d 100644
--- a/src/locales/sk/address/state.ts
+++ b/src/locales/sk/location/state.ts
diff --git a/src/locales/sk/address/state_abbr.ts b/src/locales/sk/location/state_abbr.ts
index d6d1738d..d6d1738d 100644
--- a/src/locales/sk/address/state_abbr.ts
+++ b/src/locales/sk/location/state_abbr.ts
diff --git a/src/locales/sk/location/street.ts b/src/locales/sk/location/street.ts
new file mode 100644
index 00000000..30a9a5dd
--- /dev/null
+++ b/src/locales/sk/location/street.ts
@@ -0,0 +1 @@
+export default ['{{location.street_name}}'];
diff --git a/src/locales/sk/location/street_address.ts b/src/locales/sk/location/street_address.ts
new file mode 100644
index 00000000..437f20dd
--- /dev/null
+++ b/src/locales/sk/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.street}} {{location.buildingNumber}}',
+  full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/sk/address/street_name.ts b/src/locales/sk/location/street_name.ts
index 0ca1d610..0ca1d610 100644
--- a/src/locales/sk/address/street_name.ts
+++ b/src/locales/sk/location/street_name.ts
diff --git a/src/locales/sv/address/city.ts b/src/locales/sv/address/city.ts
deleted file mode 100644
index b53f9163..00000000
--- a/src/locales/sv/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_prefix}}{{address.city_suffix}}'];
diff --git a/src/locales/sv/address/street.ts b/src/locales/sv/address/street.ts
deleted file mode 100644
index 72310d5a..00000000
--- a/src/locales/sv/address/street.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export default [
-  '{{address.street_name}}{{address.street_suffix}}',
-  '{{address.street_prefix}} {{address.street_name}}{{address.street_suffix}}',
-  '{{person.first_name}}{{address.common_street_suffix}}',
-  '{{person.last_name}}{{address.common_street_suffix}}',
-];
diff --git a/src/locales/sv/address/street_address.ts b/src/locales/sv/address/street_address.ts
deleted file mode 100644
index d1e8da38..00000000
--- a/src/locales/sv/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.street}} {{address.buildingNumber}}',
-  full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/sv/index.ts b/src/locales/sv/index.ts
index b9fb05b4..c017bd6a 100644
--- a/src/locales/sv/index.ts
+++ b/src/locales/sv/index.ts
@@ -3,26 +3,26 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import cell_phone from './cell_phone';
 import color from './color';
 import commerce from './commerce';
 import company from './company';
 import date from './date';
 import internet from './internet';
+import location from './location';
 import person from './person';
 import phone_number from './phone_number';
 import team from './team';
 
 const sv: LocaleDefinition = {
   title: 'Swedish',
-  address,
   cell_phone,
   color,
   commerce,
   company,
   date,
   internet,
+  location,
   person,
   phone_number,
   team,
diff --git a/src/locales/sv/address/building_number.ts b/src/locales/sv/location/building_number.ts
index 20cefab6..20cefab6 100644
--- a/src/locales/sv/address/building_number.ts
+++ b/src/locales/sv/location/building_number.ts
diff --git a/src/locales/sv/location/city.ts b/src/locales/sv/location/city.ts
new file mode 100644
index 00000000..aa67dfa8
--- /dev/null
+++ b/src/locales/sv/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_prefix}}{{location.city_suffix}}'];
diff --git a/src/locales/sv/address/city_prefix.ts b/src/locales/sv/location/city_prefix.ts
index 4301bd02..4301bd02 100644
--- a/src/locales/sv/address/city_prefix.ts
+++ b/src/locales/sv/location/city_prefix.ts
diff --git a/src/locales/sv/address/city_suffix.ts b/src/locales/sv/location/city_suffix.ts
index a6a94f1e..a6a94f1e 100644
--- a/src/locales/sv/address/city_suffix.ts
+++ b/src/locales/sv/location/city_suffix.ts
diff --git a/src/locales/sv/address/common_street_suffix.ts b/src/locales/sv/location/common_street_suffix.ts
index 25c908a2..25c908a2 100644
--- a/src/locales/sv/address/common_street_suffix.ts
+++ b/src/locales/sv/location/common_street_suffix.ts
diff --git a/src/locales/sv/address/country.ts b/src/locales/sv/location/country.ts
index 77308800..77308800 100644
--- a/src/locales/sv/address/country.ts
+++ b/src/locales/sv/location/country.ts
diff --git a/src/locales/sv/address/default_country.ts b/src/locales/sv/location/default_country.ts
index beaa835c..beaa835c 100644
--- a/src/locales/sv/address/default_country.ts
+++ b/src/locales/sv/location/default_country.ts
diff --git a/src/locales/sv/address/index.ts b/src/locales/sv/location/index.ts
index 7285f8b4..e243b6bd 100644
--- a/src/locales/sv/address/index.ts
+++ b/src/locales/sv/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_prefix from './city_prefix';
@@ -19,7 +19,7 @@ import street_name from './street_name';
 import street_prefix from './street_prefix';
 import street_suffix from './street_suffix';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_prefix,
@@ -37,4 +37,4 @@ const address: AddressDefinitions = {
   street_suffix,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/sv/address/postcode.ts b/src/locales/sv/location/postcode.ts
index db2bcfed..db2bcfed 100644
--- a/src/locales/sv/address/postcode.ts
+++ b/src/locales/sv/location/postcode.ts
diff --git a/src/locales/sv/address/secondary_address.ts b/src/locales/sv/location/secondary_address.ts
index f0a1e117..f0a1e117 100644
--- a/src/locales/sv/address/secondary_address.ts
+++ b/src/locales/sv/location/secondary_address.ts
diff --git a/src/locales/sv/address/state.ts b/src/locales/sv/location/state.ts
index b35a16b4..b35a16b4 100644
--- a/src/locales/sv/address/state.ts
+++ b/src/locales/sv/location/state.ts
diff --git a/src/locales/sv/location/street.ts b/src/locales/sv/location/street.ts
new file mode 100644
index 00000000..1e4fbfd7
--- /dev/null
+++ b/src/locales/sv/location/street.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{location.street_name}}{{location.street_suffix}}',
+  '{{location.street_prefix}} {{location.street_name}}{{location.street_suffix}}',
+  '{{person.first_name}}{{location.common_street_suffix}}',
+  '{{person.last_name}}{{location.common_street_suffix}}',
+];
diff --git a/src/locales/sv/location/street_address.ts b/src/locales/sv/location/street_address.ts
new file mode 100644
index 00000000..437f20dd
--- /dev/null
+++ b/src/locales/sv/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.street}} {{location.buildingNumber}}',
+  full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/sv/address/street_name.ts b/src/locales/sv/location/street_name.ts
index 015bd711..015bd711 100644
--- a/src/locales/sv/address/street_name.ts
+++ b/src/locales/sv/location/street_name.ts
diff --git a/src/locales/sv/address/street_prefix.ts b/src/locales/sv/location/street_prefix.ts
index 8448f168..8448f168 100644
--- a/src/locales/sv/address/street_prefix.ts
+++ b/src/locales/sv/location/street_prefix.ts
diff --git a/src/locales/sv/address/street_suffix.ts b/src/locales/sv/location/street_suffix.ts
index 54034ffe..54034ffe 100644
--- a/src/locales/sv/address/street_suffix.ts
+++ b/src/locales/sv/location/street_suffix.ts
diff --git a/src/locales/sv/team/name.ts b/src/locales/sv/team/name.ts
index 3a0c91ed..f8636c57 100644
--- a/src/locales/sv/team/name.ts
+++ b/src/locales/sv/team/name.ts
@@ -1 +1 @@
-export default ['{{address.city}} {{team.suffix}}'];
+export default ['{{location.city}} {{team.suffix}}'];
diff --git a/src/locales/tr/address/city.ts b/src/locales/tr/address/city.ts
deleted file mode 100644
index d77ac09a..00000000
--- a/src/locales/tr/address/city.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export default [
-  '{{address.city_prefix}} {{person.firstName}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{person.firstName}}',
-  '{{person.firstName}}{{address.city_suffix}}',
-  '{{person.lastName}}{{address.city_suffix}}',
-  '{{address.city_name}}',
-];
diff --git a/src/locales/tr/address/street.ts b/src/locales/tr/address/street.ts
deleted file mode 100644
index 30ba73fc..00000000
--- a/src/locales/tr/address/street.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.street_name}}'];
diff --git a/src/locales/tr/address/street_address.ts b/src/locales/tr/address/street_address.ts
deleted file mode 100644
index d1e8da38..00000000
--- a/src/locales/tr/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.street}} {{address.buildingNumber}}',
-  full: '{{address.street}} {{address.buildingNumber}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/tr/index.ts b/src/locales/tr/index.ts
index 9ed3b8e9..ae7a9a8d 100644
--- a/src/locales/tr/index.ts
+++ b/src/locales/tr/index.ts
@@ -3,22 +3,22 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import cell_phone from './cell_phone';
 import color from './color';
 import commerce from './commerce';
 import internet from './internet';
+import location from './location';
 import lorem from './lorem';
 import person from './person';
 import phone_number from './phone_number';
 
 const tr: LocaleDefinition = {
   title: 'Turkish',
-  address,
   cell_phone,
   color,
   commerce,
   internet,
+  location,
   lorem,
   person,
   phone_number,
diff --git a/src/locales/tr/address/building_number.ts b/src/locales/tr/location/building_number.ts
index 2fe49c1c..2fe49c1c 100644
--- a/src/locales/tr/address/building_number.ts
+++ b/src/locales/tr/location/building_number.ts
diff --git a/src/locales/tr/location/city.ts b/src/locales/tr/location/city.ts
new file mode 100644
index 00000000..0d422527
--- /dev/null
+++ b/src/locales/tr/location/city.ts
@@ -0,0 +1,7 @@
+export default [
+  '{{location.city_prefix}} {{person.firstName}}{{location.city_suffix}}',
+  '{{location.city_prefix}} {{person.firstName}}',
+  '{{person.firstName}}{{location.city_suffix}}',
+  '{{person.lastName}}{{location.city_suffix}}',
+  '{{location.city_name}}',
+];
diff --git a/src/locales/tr/address/city_name.ts b/src/locales/tr/location/city_name.ts
index 0e7f14c2..0e7f14c2 100644
--- a/src/locales/tr/address/city_name.ts
+++ b/src/locales/tr/location/city_name.ts
diff --git a/src/locales/tr/address/country.ts b/src/locales/tr/location/country.ts
index e657cc03..e657cc03 100644
--- a/src/locales/tr/address/country.ts
+++ b/src/locales/tr/location/country.ts
diff --git a/src/locales/tr/address/default_country.ts b/src/locales/tr/location/default_country.ts
index 8a3c8cf9..8a3c8cf9 100644
--- a/src/locales/tr/address/default_country.ts
+++ b/src/locales/tr/location/default_country.ts
diff --git a/src/locales/tr/address/index.ts b/src/locales/tr/location/index.ts
index f0885cf5..3554b1a9 100644
--- a/src/locales/tr/address/index.ts
+++ b/src/locales/tr/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_name from './city_name';
@@ -13,7 +13,7 @@ import street from './street';
 import street_address from './street_address';
 import street_name from './street_name';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_name,
@@ -25,4 +25,4 @@ const address: AddressDefinitions = {
   street_name,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/tr/address/postcode.ts b/src/locales/tr/location/postcode.ts
index db2bcfed..db2bcfed 100644
--- a/src/locales/tr/address/postcode.ts
+++ b/src/locales/tr/location/postcode.ts
diff --git a/src/locales/tr/location/street.ts b/src/locales/tr/location/street.ts
new file mode 100644
index 00000000..30a9a5dd
--- /dev/null
+++ b/src/locales/tr/location/street.ts
@@ -0,0 +1 @@
+export default ['{{location.street_name}}'];
diff --git a/src/locales/tr/location/street_address.ts b/src/locales/tr/location/street_address.ts
new file mode 100644
index 00000000..437f20dd
--- /dev/null
+++ b/src/locales/tr/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.street}} {{location.buildingNumber}}',
+  full: '{{location.street}} {{location.buildingNumber}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/tr/address/street_name.ts b/src/locales/tr/location/street_name.ts
index aa81cfb7..aa81cfb7 100644
--- a/src/locales/tr/address/street_name.ts
+++ b/src/locales/tr/location/street_name.ts
diff --git a/src/locales/uk/address/city.ts b/src/locales/uk/address/city.ts
deleted file mode 100644
index f99cfa33..00000000
--- a/src/locales/uk/address/city.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{address.city_name}}',
-  '{{address.city_prefix}} {{person.male_first_name}}',
-];
diff --git a/src/locales/uk/address/street.ts b/src/locales/uk/address/street.ts
deleted file mode 100644
index ce1d4f4d..00000000
--- a/src/locales/uk/address/street.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{address.street_prefix}} {{address.street_name}}',
-  '{{address.street_name}} {{address.street_suffix}}',
-];
diff --git a/src/locales/uk/address/street_address.ts b/src/locales/uk/address/street_address.ts
deleted file mode 100644
index 9a8e4da4..00000000
--- a/src/locales/uk/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.street}}, {{address.buildingNumber}}',
-  full: '{{address.street}}, {{address.buildingNumber}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/uk/company/name_patterns.ts b/src/locales/uk/company/name_patterns.ts
index 9db05dce..b9374d22 100644
--- a/src/locales/uk/company/name_patterns.ts
+++ b/src/locales/uk/company/name_patterns.ts
@@ -4,7 +4,7 @@ export default [
   '{{company.prefix}} {{person.male_last_name}}',
   '{{company.prefix}} {{company.suffix}}{{company.suffix}}',
   '{{company.prefix}} {{company.suffix}}{{company.suffix}}{{company.suffix}}',
-  '{{company.prefix}} {{address.city_name}}{{company.suffix}}',
-  '{{company.prefix}} {{address.city_name}}{{company.suffix}}{{company.suffix}}',
-  '{{company.prefix}} {{address.city_name}}{{company.suffix}}{{company.suffix}}{{company.suffix}}',
+  '{{company.prefix}} {{location.city_name}}{{company.suffix}}',
+  '{{company.prefix}} {{location.city_name}}{{company.suffix}}{{company.suffix}}',
+  '{{company.prefix}} {{location.city_name}}{{company.suffix}}{{company.suffix}}{{company.suffix}}',
 ];
diff --git a/src/locales/uk/index.ts b/src/locales/uk/index.ts
index bcdfda4e..5c450ec1 100644
--- a/src/locales/uk/index.ts
+++ b/src/locales/uk/index.ts
@@ -3,17 +3,17 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import company from './company';
 import internet from './internet';
+import location from './location';
 import person from './person';
 import phone_number from './phone_number';
 
 const uk: LocaleDefinition = {
   title: 'Ukrainian',
-  address,
   company,
   internet,
+  location,
   person,
   phone_number,
 };
diff --git a/src/locales/uk/address/building_number.ts b/src/locales/uk/location/building_number.ts
index 4b74b7de..4b74b7de 100644
--- a/src/locales/uk/address/building_number.ts
+++ b/src/locales/uk/location/building_number.ts
diff --git a/src/locales/uk/location/city.ts b/src/locales/uk/location/city.ts
new file mode 100644
index 00000000..da2f6aad
--- /dev/null
+++ b/src/locales/uk/location/city.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{location.city_name}}',
+  '{{location.city_prefix}} {{person.male_first_name}}',
+];
diff --git a/src/locales/uk/address/city_name.ts b/src/locales/uk/location/city_name.ts
index 24ae8c35..24ae8c35 100644
--- a/src/locales/uk/address/city_name.ts
+++ b/src/locales/uk/location/city_name.ts
diff --git a/src/locales/uk/address/city_prefix.ts b/src/locales/uk/location/city_prefix.ts
index af233d06..af233d06 100644
--- a/src/locales/uk/address/city_prefix.ts
+++ b/src/locales/uk/location/city_prefix.ts
diff --git a/src/locales/uk/address/city_suffix.ts b/src/locales/uk/location/city_suffix.ts
index 29c65f37..29c65f37 100644
--- a/src/locales/uk/address/city_suffix.ts
+++ b/src/locales/uk/location/city_suffix.ts
diff --git a/src/locales/uk/address/country.ts b/src/locales/uk/location/country.ts
index 9296c35a..9296c35a 100644
--- a/src/locales/uk/address/country.ts
+++ b/src/locales/uk/location/country.ts
diff --git a/src/locales/uk/address/default_country.ts b/src/locales/uk/location/default_country.ts
index 1d9098c3..1d9098c3 100644
--- a/src/locales/uk/address/default_country.ts
+++ b/src/locales/uk/location/default_country.ts
diff --git a/src/locales/uk/address/index.ts b/src/locales/uk/location/index.ts
index becc319b..17e4efa9 100644
--- a/src/locales/uk/address/index.ts
+++ b/src/locales/uk/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_name from './city_name';
@@ -19,7 +19,7 @@ import street_name from './street_name';
 import street_prefix from './street_prefix';
 import street_suffix from './street_suffix';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_name,
@@ -37,4 +37,4 @@ const address: AddressDefinitions = {
   street_suffix,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/uk/address/postcode.ts b/src/locales/uk/location/postcode.ts
index db2bcfed..db2bcfed 100644
--- a/src/locales/uk/address/postcode.ts
+++ b/src/locales/uk/location/postcode.ts
diff --git a/src/locales/uk/address/secondary_address.ts b/src/locales/uk/location/secondary_address.ts
index 0493429a..0493429a 100644
--- a/src/locales/uk/address/secondary_address.ts
+++ b/src/locales/uk/location/secondary_address.ts
diff --git a/src/locales/uk/address/state.ts b/src/locales/uk/location/state.ts
index 3ae7ecfd..3ae7ecfd 100644
--- a/src/locales/uk/address/state.ts
+++ b/src/locales/uk/location/state.ts
diff --git a/src/locales/uk/location/street.ts b/src/locales/uk/location/street.ts
new file mode 100644
index 00000000..2dc80f1c
--- /dev/null
+++ b/src/locales/uk/location/street.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{location.street_prefix}} {{location.street_name}}',
+  '{{location.street_name}} {{location.street_suffix}}',
+];
diff --git a/src/locales/uk/location/street_address.ts b/src/locales/uk/location/street_address.ts
new file mode 100644
index 00000000..3394fef6
--- /dev/null
+++ b/src/locales/uk/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.street}}, {{location.buildingNumber}}',
+  full: '{{location.street}}, {{location.buildingNumber}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/uk/address/street_name.ts b/src/locales/uk/location/street_name.ts
index 3bd25591..3bd25591 100644
--- a/src/locales/uk/address/street_name.ts
+++ b/src/locales/uk/location/street_name.ts
diff --git a/src/locales/uk/address/street_prefix.ts b/src/locales/uk/location/street_prefix.ts
index 4e52be55..4e52be55 100644
--- a/src/locales/uk/address/street_prefix.ts
+++ b/src/locales/uk/location/street_prefix.ts
diff --git a/src/locales/uk/address/street_suffix.ts b/src/locales/uk/location/street_suffix.ts
index d6ed83a4..d6ed83a4 100644
--- a/src/locales/uk/address/street_suffix.ts
+++ b/src/locales/uk/location/street_suffix.ts
diff --git a/src/locales/ur/address/city.ts b/src/locales/ur/address/city.ts
deleted file mode 100644
index 27a932f1..00000000
--- a/src/locales/ur/address/city.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export default [
-  '{{address.city_prefix}} {{person.first_name}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{person.first_name}}',
-  '{{person.first_name}}{{address.city_suffix}}',
-  '{{person.last_name}}{{address.city_suffix}}',
-];
diff --git a/src/locales/ur/address/street.ts b/src/locales/ur/address/street.ts
deleted file mode 100644
index 5e9ca117..00000000
--- a/src/locales/ur/address/street.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{person.first_name}} {{address.street_suffix}}',
-  '{{person.last_name}} {{address.street_suffix}}',
-];
diff --git a/src/locales/ur/address/street_address.ts b/src/locales/ur/address/street_address.ts
deleted file mode 100644
index 55bed362..00000000
--- a/src/locales/ur/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.buildingNumber}} {{address.street}}',
-  full: '{{address.buildingNumber}} {{address.street}} {{address.secondaryAddress}}',
-};
diff --git a/src/locales/ur/index.ts b/src/locales/ur/index.ts
index 903dfd63..6b4cd3a3 100644
--- a/src/locales/ur/index.ts
+++ b/src/locales/ur/index.ts
@@ -3,7 +3,6 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import animal from './animal';
 import app from './app';
 import business from './business';
@@ -12,6 +11,7 @@ import color from './color';
 import commerce from './commerce';
 import date from './date';
 import finance from './finance';
+import location from './location';
 import lorem from './lorem';
 import music from './music';
 import person from './person';
@@ -21,7 +21,6 @@ import vehicle from './vehicle';
 const ur: LocaleDefinition = {
   title: 'Urdu',
   separator: ' اور ',
-  address,
   animal,
   app,
   business,
@@ -30,6 +29,7 @@ const ur: LocaleDefinition = {
   commerce,
   date,
   finance,
+  location,
   lorem,
   music,
   person,
diff --git a/src/locales/ur/address/building_number.ts b/src/locales/ur/location/building_number.ts
index 50c31ccb..50c31ccb 100644
--- a/src/locales/ur/address/building_number.ts
+++ b/src/locales/ur/location/building_number.ts
diff --git a/src/locales/ur/location/city.ts b/src/locales/ur/location/city.ts
new file mode 100644
index 00000000..d744d882
--- /dev/null
+++ b/src/locales/ur/location/city.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{location.city_prefix}} {{person.first_name}}{{location.city_suffix}}',
+  '{{location.city_prefix}} {{person.first_name}}',
+  '{{person.first_name}}{{location.city_suffix}}',
+  '{{person.last_name}}{{location.city_suffix}}',
+];
diff --git a/src/locales/ur/address/city_name.ts b/src/locales/ur/location/city_name.ts
index 245d9816..245d9816 100644
--- a/src/locales/ur/address/city_name.ts
+++ b/src/locales/ur/location/city_name.ts
diff --git a/src/locales/ur/address/city_prefix.ts b/src/locales/ur/location/city_prefix.ts
index 93d39e55..93d39e55 100644
--- a/src/locales/ur/address/city_prefix.ts
+++ b/src/locales/ur/location/city_prefix.ts
diff --git a/src/locales/ur/address/city_suffix.ts b/src/locales/ur/location/city_suffix.ts
index 64603bb9..64603bb9 100644
--- a/src/locales/ur/address/city_suffix.ts
+++ b/src/locales/ur/location/city_suffix.ts
diff --git a/src/locales/ur/address/country.ts b/src/locales/ur/location/country.ts
index 22151eeb..22151eeb 100644
--- a/src/locales/ur/address/country.ts
+++ b/src/locales/ur/location/country.ts
diff --git a/src/locales/ur/address/default_country.ts b/src/locales/ur/location/default_country.ts
index c6de7531..c6de7531 100644
--- a/src/locales/ur/address/default_country.ts
+++ b/src/locales/ur/location/default_country.ts
diff --git a/src/locales/ur/address/direction.ts b/src/locales/ur/location/direction.ts
index 83df0c85..83df0c85 100644
--- a/src/locales/ur/address/direction.ts
+++ b/src/locales/ur/location/direction.ts
diff --git a/src/locales/ur/address/index.ts b/src/locales/ur/location/index.ts
index e234ccfe..73478f51 100644
--- a/src/locales/ur/address/index.ts
+++ b/src/locales/ur/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_name from './city_name';
@@ -19,7 +19,7 @@ import street from './street';
 import street_address from './street_address';
 import street_suffix from './street_suffix';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_name,
@@ -37,4 +37,4 @@ const address: AddressDefinitions = {
   street_suffix,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/ur/address/postcode.ts b/src/locales/ur/location/postcode.ts
index db2bcfed..db2bcfed 100644
--- a/src/locales/ur/address/postcode.ts
+++ b/src/locales/ur/location/postcode.ts
diff --git a/src/locales/ur/address/secondary_address.ts b/src/locales/ur/location/secondary_address.ts
index bd6348be..bd6348be 100644
--- a/src/locales/ur/address/secondary_address.ts
+++ b/src/locales/ur/location/secondary_address.ts
diff --git a/src/locales/ur/address/state.ts b/src/locales/ur/location/state.ts
index 6c9e1a0c..6c9e1a0c 100644
--- a/src/locales/ur/address/state.ts
+++ b/src/locales/ur/location/state.ts
diff --git a/src/locales/ur/address/state_abbr.ts b/src/locales/ur/location/state_abbr.ts
index 8823459c..8823459c 100644
--- a/src/locales/ur/address/state_abbr.ts
+++ b/src/locales/ur/location/state_abbr.ts
diff --git a/src/locales/ur/location/street.ts b/src/locales/ur/location/street.ts
new file mode 100644
index 00000000..b5fcd9fe
--- /dev/null
+++ b/src/locales/ur/location/street.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{person.first_name}} {{location.street_suffix}}',
+  '{{person.last_name}} {{location.street_suffix}}',
+];
diff --git a/src/locales/ur/location/street_address.ts b/src/locales/ur/location/street_address.ts
new file mode 100644
index 00000000..2e1a661d
--- /dev/null
+++ b/src/locales/ur/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.buildingNumber}} {{location.street}}',
+  full: '{{location.buildingNumber}} {{location.street}} {{location.secondaryAddress}}',
+};
diff --git a/src/locales/ur/address/street_suffix.ts b/src/locales/ur/location/street_suffix.ts
index e64e9334..e64e9334 100644
--- a/src/locales/ur/address/street_suffix.ts
+++ b/src/locales/ur/location/street_suffix.ts
diff --git a/src/locales/ur/team/name.ts b/src/locales/ur/team/name.ts
index ed2bdbb5..bdd4f123 100644
--- a/src/locales/ur/team/name.ts
+++ b/src/locales/ur/team/name.ts
@@ -1 +1 @@
-export default ['{{address.state}} {{team.creature}}'];
+export default ['{{location.state}} {{team.creature}}'];
diff --git a/src/locales/vi/address/city.ts b/src/locales/vi/address/city.ts
deleted file mode 100644
index e3da346b..00000000
--- a/src/locales/vi/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_name}}'];
diff --git a/src/locales/vi/address/street.ts b/src/locales/vi/address/street.ts
deleted file mode 100644
index f7dd9d3b..00000000
--- a/src/locales/vi/address/street.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{person.firstName}} {{address.street_suffix}}',
-  '{{person.lastName}} {{address.street_suffix}}',
-];
diff --git a/src/locales/vi/index.ts b/src/locales/vi/index.ts
index 0155b43d..f01dd348 100644
--- a/src/locales/vi/index.ts
+++ b/src/locales/vi/index.ts
@@ -3,22 +3,22 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import cell_phone from './cell_phone';
 import company from './company';
 import date from './date';
 import internet from './internet';
+import location from './location';
 import lorem from './lorem';
 import person from './person';
 import phone_number from './phone_number';
 
 const vi: LocaleDefinition = {
   title: 'Vietnamese',
-  address,
   cell_phone,
   company,
   date,
   internet,
+  location,
   lorem,
   person,
   phone_number,
diff --git a/src/locales/vi/location/city.ts b/src/locales/vi/location/city.ts
new file mode 100644
index 00000000..ad43b68f
--- /dev/null
+++ b/src/locales/vi/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_name}}'];
diff --git a/src/locales/vi/address/city_name.ts b/src/locales/vi/location/city_name.ts
index 46d1817d..46d1817d 100644
--- a/src/locales/vi/address/city_name.ts
+++ b/src/locales/vi/location/city_name.ts
diff --git a/src/locales/vi/address/country.ts b/src/locales/vi/location/country.ts
index 9c847fd2..9c847fd2 100644
--- a/src/locales/vi/address/country.ts
+++ b/src/locales/vi/location/country.ts
diff --git a/src/locales/vi/address/default_country.ts b/src/locales/vi/location/default_country.ts
index 4cc89afe..4cc89afe 100644
--- a/src/locales/vi/address/default_country.ts
+++ b/src/locales/vi/location/default_country.ts
diff --git a/src/locales/vi/address/index.ts b/src/locales/vi/location/index.ts
index 1122447c..37ed9c7d 100644
--- a/src/locales/vi/address/index.ts
+++ b/src/locales/vi/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import city from './city';
 import city_name from './city_name';
 import country from './country';
@@ -10,7 +10,7 @@ import default_country from './default_country';
 import postcode from './postcode';
 import street from './street';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   city,
   city_name,
   country,
@@ -19,4 +19,4 @@ const address: AddressDefinitions = {
   street,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/vi/address/postcode.ts b/src/locales/vi/location/postcode.ts
index db2bcfed..db2bcfed 100644
--- a/src/locales/vi/address/postcode.ts
+++ b/src/locales/vi/location/postcode.ts
diff --git a/src/locales/vi/location/street.ts b/src/locales/vi/location/street.ts
new file mode 100644
index 00000000..af32d0c4
--- /dev/null
+++ b/src/locales/vi/location/street.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{person.firstName}} {{location.street_suffix}}',
+  '{{person.lastName}} {{location.street_suffix}}',
+];
diff --git a/src/locales/zh_CN/address/city.ts b/src/locales/zh_CN/address/city.ts
deleted file mode 100644
index b53f9163..00000000
--- a/src/locales/zh_CN/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_prefix}}{{address.city_suffix}}'];
diff --git a/src/locales/zh_CN/address/street.ts b/src/locales/zh_CN/address/street.ts
deleted file mode 100644
index 6522d790..00000000
--- a/src/locales/zh_CN/address/street.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{person.last_name}}{{address.street_suffix}}'];
diff --git a/src/locales/zh_CN/address/street_address.ts b/src/locales/zh_CN/address/street_address.ts
deleted file mode 100644
index 6430ef1c..00000000
--- a/src/locales/zh_CN/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.street}}{{address.buildingNumber}}号',
-  full: '{{address.street}}{{address.buildingNumber}}号 {{address.secondaryAddress}}',
-};
diff --git a/src/locales/zh_CN/index.ts b/src/locales/zh_CN/index.ts
index 713218a3..eae7d1f6 100644
--- a/src/locales/zh_CN/index.ts
+++ b/src/locales/zh_CN/index.ts
@@ -3,13 +3,13 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
+import location from './location';
 import person from './person';
 import phone_number from './phone_number';
 
 const zh_CN: LocaleDefinition = {
   title: 'Chinese',
-  address,
+  location,
   person,
   phone_number,
 };
diff --git a/src/locales/zh_CN/address/building_number.ts b/src/locales/zh_CN/location/building_number.ts
index bca8d68b..bca8d68b 100644
--- a/src/locales/zh_CN/address/building_number.ts
+++ b/src/locales/zh_CN/location/building_number.ts
diff --git a/src/locales/zh_CN/location/city.ts b/src/locales/zh_CN/location/city.ts
new file mode 100644
index 00000000..aa67dfa8
--- /dev/null
+++ b/src/locales/zh_CN/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_prefix}}{{location.city_suffix}}'];
diff --git a/src/locales/zh_CN/address/city_prefix.ts b/src/locales/zh_CN/location/city_prefix.ts
index 5a4973c1..5a4973c1 100644
--- a/src/locales/zh_CN/address/city_prefix.ts
+++ b/src/locales/zh_CN/location/city_prefix.ts
diff --git a/src/locales/zh_CN/address/city_suffix.ts b/src/locales/zh_CN/location/city_suffix.ts
index 2ca80af6..2ca80af6 100644
--- a/src/locales/zh_CN/address/city_suffix.ts
+++ b/src/locales/zh_CN/location/city_suffix.ts
diff --git a/src/locales/zh_CN/address/default_country.ts b/src/locales/zh_CN/location/default_country.ts
index e8aecb25..e8aecb25 100644
--- a/src/locales/zh_CN/address/default_country.ts
+++ b/src/locales/zh_CN/location/default_country.ts
diff --git a/src/locales/zh_TW/address/index.ts b/src/locales/zh_CN/location/index.ts
index 41b62489..51788277 100644
--- a/src/locales/zh_TW/address/index.ts
+++ b/src/locales/zh_CN/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_prefix from './city_prefix';
@@ -15,7 +15,7 @@ import street from './street';
 import street_address from './street_address';
 import street_suffix from './street_suffix';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_prefix,
@@ -29,4 +29,4 @@ const address: AddressDefinitions = {
   street_suffix,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/zh_CN/address/postcode.ts b/src/locales/zh_CN/location/postcode.ts
index 519dcdec..519dcdec 100644
--- a/src/locales/zh_CN/address/postcode.ts
+++ b/src/locales/zh_CN/location/postcode.ts
diff --git a/src/locales/zh_CN/address/state.ts b/src/locales/zh_CN/location/state.ts
index ed157239..ed157239 100644
--- a/src/locales/zh_CN/address/state.ts
+++ b/src/locales/zh_CN/location/state.ts
diff --git a/src/locales/zh_CN/address/state_abbr.ts b/src/locales/zh_CN/location/state_abbr.ts
index a7eb2921..a7eb2921 100644
--- a/src/locales/zh_CN/address/state_abbr.ts
+++ b/src/locales/zh_CN/location/state_abbr.ts
diff --git a/src/locales/zh_CN/location/street.ts b/src/locales/zh_CN/location/street.ts
new file mode 100644
index 00000000..dfaaaa6e
--- /dev/null
+++ b/src/locales/zh_CN/location/street.ts
@@ -0,0 +1 @@
+export default ['{{person.last_name}}{{location.street_suffix}}'];
diff --git a/src/locales/zh_CN/location/street_address.ts b/src/locales/zh_CN/location/street_address.ts
new file mode 100644
index 00000000..28061915
--- /dev/null
+++ b/src/locales/zh_CN/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.street}}{{location.buildingNumber}}号',
+  full: '{{location.street}}{{location.buildingNumber}}号 {{location.secondaryAddress}}',
+};
diff --git a/src/locales/zh_CN/address/street_suffix.ts b/src/locales/zh_CN/location/street_suffix.ts
index 28980bcf..28980bcf 100644
--- a/src/locales/zh_CN/address/street_suffix.ts
+++ b/src/locales/zh_CN/location/street_suffix.ts
diff --git a/src/locales/zh_TW/address/city.ts b/src/locales/zh_TW/address/city.ts
deleted file mode 100644
index b53f9163..00000000
--- a/src/locales/zh_TW/address/city.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{address.city_prefix}}{{address.city_suffix}}'];
diff --git a/src/locales/zh_TW/address/street.ts b/src/locales/zh_TW/address/street.ts
deleted file mode 100644
index 6522d790..00000000
--- a/src/locales/zh_TW/address/street.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{person.last_name}}{{address.street_suffix}}'];
diff --git a/src/locales/zh_TW/address/street_address.ts b/src/locales/zh_TW/address/street_address.ts
deleted file mode 100644
index 665870ba..00000000
--- a/src/locales/zh_TW/address/street_address.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default {
-  normal: '{{address.street}}{{address.buildingNumber}}號',
-  full: '{{address.street}}{{address.buildingNumber}}號 {{address.secondaryAddress}}',
-};
diff --git a/src/locales/zh_TW/index.ts b/src/locales/zh_TW/index.ts
index 3904c3c0..ac385320 100644
--- a/src/locales/zh_TW/index.ts
+++ b/src/locales/zh_TW/index.ts
@@ -3,13 +3,13 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
+import location from './location';
 import person from './person';
 import phone_number from './phone_number';
 
 const zh_TW: LocaleDefinition = {
   title: 'Chinese (Taiwan)',
-  address,
+  location,
   person,
   phone_number,
 };
diff --git a/src/locales/zh_TW/address/building_number.ts b/src/locales/zh_TW/location/building_number.ts
index b875f685..b875f685 100644
--- a/src/locales/zh_TW/address/building_number.ts
+++ b/src/locales/zh_TW/location/building_number.ts
diff --git a/src/locales/zh_TW/location/city.ts b/src/locales/zh_TW/location/city.ts
new file mode 100644
index 00000000..aa67dfa8
--- /dev/null
+++ b/src/locales/zh_TW/location/city.ts
@@ -0,0 +1 @@
+export default ['{{location.city_prefix}}{{location.city_suffix}}'];
diff --git a/src/locales/zh_TW/address/city_prefix.ts b/src/locales/zh_TW/location/city_prefix.ts
index 17e882e8..17e882e8 100644
--- a/src/locales/zh_TW/address/city_prefix.ts
+++ b/src/locales/zh_TW/location/city_prefix.ts
diff --git a/src/locales/zh_TW/address/city_suffix.ts b/src/locales/zh_TW/location/city_suffix.ts
index f787653f..f787653f 100644
--- a/src/locales/zh_TW/address/city_suffix.ts
+++ b/src/locales/zh_TW/location/city_suffix.ts
diff --git a/src/locales/zh_TW/address/default_country.ts b/src/locales/zh_TW/location/default_country.ts
index f2d3c53d..f2d3c53d 100644
--- a/src/locales/zh_TW/address/default_country.ts
+++ b/src/locales/zh_TW/location/default_country.ts
diff --git a/src/locales/zh_CN/address/index.ts b/src/locales/zh_TW/location/index.ts
index 41b62489..51788277 100644
--- a/src/locales/zh_CN/address/index.ts
+++ b/src/locales/zh_TW/location/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import building_number from './building_number';
 import city from './city';
 import city_prefix from './city_prefix';
@@ -15,7 +15,7 @@ import street from './street';
 import street_address from './street_address';
 import street_suffix from './street_suffix';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   building_number,
   city,
   city_prefix,
@@ -29,4 +29,4 @@ const address: AddressDefinitions = {
   street_suffix,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/zh_TW/address/postcode.ts b/src/locales/zh_TW/location/postcode.ts
index 519dcdec..519dcdec 100644
--- a/src/locales/zh_TW/address/postcode.ts
+++ b/src/locales/zh_TW/location/postcode.ts
diff --git a/src/locales/zh_TW/address/state.ts b/src/locales/zh_TW/location/state.ts
index d2ad2038..d2ad2038 100644
--- a/src/locales/zh_TW/address/state.ts
+++ b/src/locales/zh_TW/location/state.ts
diff --git a/src/locales/zh_TW/address/state_abbr.ts b/src/locales/zh_TW/location/state_abbr.ts
index ce233112..ce233112 100644
--- a/src/locales/zh_TW/address/state_abbr.ts
+++ b/src/locales/zh_TW/location/state_abbr.ts
diff --git a/src/locales/zh_TW/location/street.ts b/src/locales/zh_TW/location/street.ts
new file mode 100644
index 00000000..dfaaaa6e
--- /dev/null
+++ b/src/locales/zh_TW/location/street.ts
@@ -0,0 +1 @@
+export default ['{{person.last_name}}{{location.street_suffix}}'];
diff --git a/src/locales/zh_TW/location/street_address.ts b/src/locales/zh_TW/location/street_address.ts
new file mode 100644
index 00000000..f808e3d9
--- /dev/null
+++ b/src/locales/zh_TW/location/street_address.ts
@@ -0,0 +1,4 @@
+export default {
+  normal: '{{location.street}}{{location.buildingNumber}}號',
+  full: '{{location.street}}{{location.buildingNumber}}號 {{location.secondaryAddress}}',
+};
diff --git a/src/locales/zh_TW/address/street_suffix.ts b/src/locales/zh_TW/location/street_suffix.ts
index f3213ebf..f3213ebf 100644
--- a/src/locales/zh_TW/address/street_suffix.ts
+++ b/src/locales/zh_TW/location/street_suffix.ts
diff --git a/src/locales/zu_ZA/address/city.ts b/src/locales/zu_ZA/address/city.ts
deleted file mode 100644
index ea6ea950..00000000
--- a/src/locales/zu_ZA/address/city.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export default [
-  '{{address.city_prefix}} {{person.firstName}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{person.firstName}}',
-  '{{person.firstName}}{{address.city_suffix}}',
-  '{{person.lastName}}{{address.city_suffix}}',
-];
diff --git a/src/locales/zu_ZA/address/street.ts b/src/locales/zu_ZA/address/street.ts
deleted file mode 100644
index f7dd9d3b..00000000
--- a/src/locales/zu_ZA/address/street.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{person.firstName}} {{address.street_suffix}}',
-  '{{person.lastName}} {{address.street_suffix}}',
-];
diff --git a/src/locales/zu_ZA/index.ts b/src/locales/zu_ZA/index.ts
index 6f5054f3..4712c79f 100644
--- a/src/locales/zu_ZA/index.ts
+++ b/src/locales/zu_ZA/index.ts
@@ -3,19 +3,19 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import address from './address';
 import cell_phone from './cell_phone';
 import company from './company';
 import internet from './internet';
+import location from './location';
 import person from './person';
 import phone_number from './phone_number';
 
 const zu_ZA: LocaleDefinition = {
   title: 'Zulu (South Africa)',
-  address,
   cell_phone,
   company,
   internet,
+  location,
   person,
   phone_number,
 };
diff --git a/src/locales/zu_ZA/location/city.ts b/src/locales/zu_ZA/location/city.ts
new file mode 100644
index 00000000..7375aa83
--- /dev/null
+++ b/src/locales/zu_ZA/location/city.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{location.city_prefix}} {{person.firstName}}{{location.city_suffix}}',
+  '{{location.city_prefix}} {{person.firstName}}',
+  '{{person.firstName}}{{location.city_suffix}}',
+  '{{person.lastName}}{{location.city_suffix}}',
+];
diff --git a/src/locales/zu_ZA/address/default_country.ts b/src/locales/zu_ZA/location/default_country.ts
index d74180a7..d74180a7 100644
--- a/src/locales/zu_ZA/address/default_country.ts
+++ b/src/locales/zu_ZA/location/default_country.ts
diff --git a/src/locales/af_ZA/address/index.ts b/src/locales/zu_ZA/location/index.ts
index c1739ea5..112133b4 100644
--- a/src/locales/af_ZA/address/index.ts
+++ b/src/locales/zu_ZA/location/index.ts
@@ -2,17 +2,17 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { AddressDefinitions } from '../../..';
+import type { LocationDefinitions } from '../../..';
 import city from './city';
 import default_country from './default_country';
 import postcode from './postcode';
 import street from './street';
 
-const address: AddressDefinitions = {
+const location: LocationDefinitions = {
   city,
   default_country,
   postcode,
   street,
 };
 
-export default address;
+export default location;
diff --git a/src/locales/zu_ZA/address/postcode.ts b/src/locales/zu_ZA/location/postcode.ts
index c97754f0..c97754f0 100644
--- a/src/locales/zu_ZA/address/postcode.ts
+++ b/src/locales/zu_ZA/location/postcode.ts
diff --git a/src/locales/zu_ZA/location/street.ts b/src/locales/zu_ZA/location/street.ts
new file mode 100644
index 00000000..af32d0c4
--- /dev/null
+++ b/src/locales/zu_ZA/location/street.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{person.firstName}} {{location.street_suffix}}',
+  '{{person.lastName}} {{location.street_suffix}}',
+];
diff --git a/src/modules/helpers/index.ts b/src/modules/helpers/index.ts
index bd765802..c473dfac 100644
--- a/src/modules/helpers/index.ts
+++ b/src/modules/helpers/index.ts
@@ -470,7 +470,7 @@ export class HelpersModule {
    *
    * Note: We recommend using string template literals instead of `fake()`,
    * which are faster and strongly typed (if you are using TypeScript),
-   * e.g. ``const address = `${faker.address.zipCode()} ${faker.address.city()}`;``
+   * e.g. ``const address = `${faker.location.zipCode()} ${faker.location.city()}`;``
    *
    * This method is useful if you have to build a random string from a static, non-executable source
    * (e.g. string coming from a user, stored in a database or a file).
diff --git a/src/modules/address/index.ts b/src/modules/location/index.ts
index 4d484651..36553572 100644
--- a/src/modules/address/index.ts
+++ b/src/modules/location/index.ts
@@ -3,10 +3,10 @@ import type { Faker } from '../..';
 /**
  * Module to generate addresses and locations.
  */
-export class AddressModule {
+export class LocationModule {
   constructor(private readonly faker: Faker) {
     // Bind `this` so namespaced is working correctly
-    for (const name of Object.getOwnPropertyNames(AddressModule.prototype)) {
+    for (const name of Object.getOwnPropertyNames(LocationModule.prototype)) {
       if (name === 'constructor' || typeof this[name] !== 'function') {
         continue;
       }
@@ -24,15 +24,15 @@ export class AddressModule {
    * @see faker.helpers.replaceSymbols()
    *
    * @example
-   * faker.address.zipCode() // '17839'
-   * faker.address.zipCode('####') // '6925'
+   * faker.location.zipCode() // '17839'
+   * faker.location.zipCode('####') // '6925'
    *
    * @since 2.0.1
    */
   zipCode(format?: string): string {
     // if zip format is not specified, use the zip format defined for the locale
     if (format == null) {
-      const localeFormat = this.faker.definitions.address.postcode;
+      const localeFormat = this.faker.definitions.location.postcode;
       if (typeof localeFormat === 'string') {
         format = localeFormat;
       } else {
@@ -52,13 +52,13 @@ export class AddressModule {
    * @param state The abbreviation of the state to generate the zip code for.
    *
    * @example
-   * fakerUS.address.zipCodeByState("AK") // '99595'
-   * fakerUS.address.zipCodeByState("??") // '47683-9880'
+   * fakerUS.location.zipCodeByState("AK") // '99595'
+   * fakerUS.location.zipCodeByState("??") // '47683-9880'
    *
    * @since 5.0.0
    */
   zipCodeByState(state: string): string {
-    const zipRange = this.faker.definitions.address.postcode_by_state?.[state];
+    const zipRange = this.faker.definitions.location.postcode_by_state?.[state];
     if (zipRange) {
       return String(this.faker.datatype.number(zipRange));
     }
@@ -69,13 +69,13 @@ export class AddressModule {
    * Generates a random localized city name.
    *
    * @example
-   * faker.address.city() // 'East Jarretmouth'
+   * faker.location.city() // 'East Jarretmouth'
    *
    * @since 2.0.1
    */
   city(): string {
     const pattern = this.faker.helpers.arrayElement(
-      this.faker.definitions.address.city
+      this.faker.definitions.location.city
     );
     return this.faker.helpers.fake(pattern);
   }
@@ -84,13 +84,13 @@ export class AddressModule {
    * Returns a random localized and existing city name.
    *
    * @example
-   * faker.address.cityName() // 'San Rafael'
+   * faker.location.cityName() // 'San Rafael'
    *
    * @since 5.5.0
    */
   cityName(): string {
     return this.faker.helpers.arrayElement(
-      this.faker.definitions.address.city_name
+      this.faker.definitions.location.city_name
     );
   }
 
@@ -98,13 +98,13 @@ export class AddressModule {
    * Generates a random building number.
    *
    * @example
-   * faker.address.buildingNumber() // '379'
+   * faker.location.buildingNumber() // '379'
    *
    * @since 6.2.0
    */
   buildingNumber(): string {
     const format = this.faker.helpers.arrayElement(
-      this.faker.definitions.address.building_number
+      this.faker.definitions.location.building_number
     );
 
     return this.faker.helpers.replaceSymbolWithNumber(format);
@@ -114,13 +114,13 @@ export class AddressModule {
    * Generates a random localized street name.
    *
    * @example
-   * faker.address.street() // 'Schroeder Isle'
+   * faker.location.street() // 'Schroeder Isle'
    *
    * @since 7.0.0
    */
   street(): string {
     const format = this.faker.helpers.arrayElement(
-      this.faker.definitions.address.street
+      this.faker.definitions.location.street
     );
     return this.faker.helpers.fake(format);
   }
@@ -129,13 +129,13 @@ export class AddressModule {
    * Returns a random localized street name.
    *
    * @example
-   * fakerDE.address.streetName() // 'Cavill Avenue'
+   * fakerDE.location.streetName() // 'Cavill Avenue'
    *
    * @since 2.0.1
    */
   streetName(): string {
     return this.faker.helpers.arrayElement(
-      this.faker.definitions.address.street_name
+      this.faker.definitions.location.street_name
     );
   }
 
@@ -146,14 +146,14 @@ export class AddressModule {
    * Otherwise it will just generate a street address.
    *
    * @example
-   * faker.address.streetAddress() // '0917 O'Conner Estates'
-   * faker.address.streetAddress(false) // '34830 Erdman Hollow'
-   * faker.address.streetAddress(true) // '3393 Ronny Way Apt. 742'
+   * faker.location.streetAddress() // '0917 O'Conner Estates'
+   * faker.location.streetAddress(false) // '34830 Erdman Hollow'
+   * faker.location.streetAddress(true) // '3393 Ronny Way Apt. 742'
    *
    * @since 2.0.1
    */
   streetAddress(useFullAddress: boolean = false): string {
-    const formats = this.faker.definitions.address.street_address;
+    const formats = this.faker.definitions.location.street_address;
     const format = formats[useFullAddress ? 'full' : 'normal'];
 
     return this.faker.helpers.fake(format);
@@ -164,14 +164,14 @@ export class AddressModule {
    * such as an apartment or room number.
    *
    * @example
-   * faker.address.secondaryAddress() // 'Apt. 861'
+   * faker.location.secondaryAddress() // 'Apt. 861'
    *
    * @since 2.0.1
    */
   secondaryAddress(): string {
     return this.faker.helpers.replaceSymbolWithNumber(
       this.faker.helpers.arrayElement(
-        this.faker.definitions.address.secondary_address
+        this.faker.definitions.location.secondary_address
       )
     );
   }
@@ -180,13 +180,13 @@ export class AddressModule {
    * Returns a random localized county.
    *
    * @example
-   * faker.address.county() // 'Cambridgeshire'
+   * faker.location.county() // 'Cambridgeshire'
    *
    * @since 2.0.1
    */
   county(): string {
     return this.faker.helpers.arrayElement(
-      this.faker.definitions.address.county
+      this.faker.definitions.location.county
     );
   }
 
@@ -194,13 +194,13 @@ export class AddressModule {
    * Returns a random country name.
    *
    * @example
-   * faker.address.country() // 'Greece'
+   * faker.location.country() // 'Greece'
    *
    * @since 2.0.1
    */
   country(): string {
     return this.faker.helpers.arrayElement(
-      this.faker.definitions.address.country
+      this.faker.definitions.location.country
     );
   }
 
@@ -211,9 +211,9 @@ export class AddressModule {
    * or `'alpha-3'` (three letter code). Defaults to `'alpha-2'`.
    *
    * @example
-   * faker.address.countryCode() // 'SJ'
-   * faker.address.countryCode('alpha-2') // 'GA'
-   * faker.address.countryCode('alpha-3') // 'TJK'
+   * faker.location.countryCode() // 'SJ'
+   * faker.location.countryCode('alpha-2') // 'GA'
+   * faker.location.countryCode('alpha-3') // 'TJK'
    *
    * @since 3.0.0
    */
@@ -221,20 +221,22 @@ export class AddressModule {
     const key =
       alphaCode === 'alpha-3' ? 'country_code_alpha_3' : 'country_code';
 
-    return this.faker.helpers.arrayElement(this.faker.definitions.address[key]);
+    return this.faker.helpers.arrayElement(
+      this.faker.definitions.location[key]
+    );
   }
 
   /**
    * Returns a random localized state from this country.
    *
    * @example
-   * faker.address.state() // 'Georgia'
+   * faker.location.state() // 'Georgia'
    *
    * @since 2.0.1
    */
   state(): string {
     return this.faker.helpers.arrayElement(
-      this.faker.definitions.address.state
+      this.faker.definitions.location.state
     );
   }
 
@@ -242,13 +244,13 @@ export class AddressModule {
    * Returns a random localized state's abbreviated name from this country.
    *
    * @example
-   * faker.address.stateAbbr() // 'ND'
+   * faker.location.stateAbbr() // 'ND'
    *
    * @since 2.0.1
    */
   stateAbbr(): string {
     return this.faker.helpers.arrayElement(
-      this.faker.definitions.address.state_abbr
+      this.faker.definitions.location.state_abbr
     );
   }
 
@@ -260,8 +262,8 @@ export class AddressModule {
    * @param precision The number of decimal points of precision for the latitude. Defaults to `4`.
    *
    * @example
-   * faker.address.latitude() // -30.9501
-   * faker.address.latitude(10, -10, 5) // 2.68452
+   * faker.location.latitude() // -30.9501
+   * faker.location.latitude(10, -10, 5) // 2.68452
    *
    * @since 2.0.1
    */
@@ -282,8 +284,8 @@ export class AddressModule {
    * @param precision The number of decimal points of precision for the longitude. Defaults to `4`.
    *
    * @example
-   * faker.address.longitude() // -154.0226
-   * faker.address.longitude(10, -10, 5) // -4.03620
+   * faker.location.longitude() // -154.0226
+   * faker.location.longitude(10, -10, 5) // -4.03620
    *
    * @since 2.0.1
    */
@@ -307,20 +309,20 @@ export class AddressModule {
    * Otherwise this will return the long name. Defaults to `false`.
    *
    * @example
-   * faker.address.direction() // 'Northeast'
-   * faker.address.direction(false) // 'South'
-   * faker.address.direction(true) // 'NE'
+   * faker.location.direction() // 'Northeast'
+   * faker.location.direction(false) // 'South'
+   * faker.location.direction(true) // 'NE'
    *
    * @since 5.0.0
    */
   direction(useAbbr: boolean = false): string {
     if (!useAbbr) {
       return this.faker.helpers.arrayElement(
-        this.faker.definitions.address.direction
+        this.faker.definitions.location.direction
       );
     }
     return this.faker.helpers.arrayElement(
-      this.faker.definitions.address.direction_abbr
+      this.faker.definitions.location.direction_abbr
     );
   }
 
@@ -331,20 +333,20 @@ export class AddressModule {
    * Otherwise this will return the long name. Defaults to `false`.
    *
    * @example
-   * faker.address.cardinalDirection() // 'North'
-   * faker.address.cardinalDirection(false) // 'South'
-   * faker.address.cardinalDirection(true) // 'N'
+   * faker.location.cardinalDirection() // 'North'
+   * faker.location.cardinalDirection(false) // 'South'
+   * faker.location.cardinalDirection(true) // 'N'
    *
    * @since 5.0.0
    */
   cardinalDirection(useAbbr: boolean = false): string {
     if (!useAbbr) {
       return this.faker.helpers.arrayElement(
-        this.faker.definitions.address.direction.slice(0, 4)
+        this.faker.definitions.location.direction.slice(0, 4)
       );
     }
     return this.faker.helpers.arrayElement(
-      this.faker.definitions.address.direction_abbr.slice(0, 4)
+      this.faker.definitions.location.direction_abbr.slice(0, 4)
     );
   }
 
@@ -355,20 +357,20 @@ export class AddressModule {
    * Otherwise this will return the long name. Defaults to `false`.
    *
    * @example
-   * faker.address.ordinalDirection() // 'Northeast'
-   * faker.address.ordinalDirection(false) // 'Northwest'
-   * faker.address.ordinalDirection(true) // 'NE'
+   * faker.location.ordinalDirection() // 'Northeast'
+   * faker.location.ordinalDirection(false) // 'Northwest'
+   * faker.location.ordinalDirection(true) // 'NE'
    *
    * @since 5.0.0
    */
   ordinalDirection(useAbbr: boolean = false): string {
     if (!useAbbr) {
       return this.faker.helpers.arrayElement(
-        this.faker.definitions.address.direction.slice(4, 8)
+        this.faker.definitions.location.direction.slice(4, 8)
       );
     }
     return this.faker.helpers.arrayElement(
-      this.faker.definitions.address.direction_abbr.slice(4, 8)
+      this.faker.definitions.location.direction_abbr.slice(4, 8)
     );
   }
 
@@ -381,9 +383,9 @@ export class AddressModule {
    * @param isMetric If `true` assume the radius to be in kilometers. If `false` for miles. Defaults to `false`.
    *
    * @example
-   * faker.address.nearbyGPSCoordinate() // [ 33.8475, -170.5953 ]
-   * faker.address.nearbyGPSCoordinate([33, -170]) // [ 33.0165, -170.0636 ]
-   * faker.address.nearbyGPSCoordinate([33, -170], 1000, true) // [ 37.9163, -179.2408 ]
+   * faker.location.nearbyGPSCoordinate() // [ 33.8475, -170.5953 ]
+   * faker.location.nearbyGPSCoordinate([33, -170]) // [ 33.0165, -170.0636 ]
+   * faker.location.nearbyGPSCoordinate([33, -170], 1000, true) // [ 37.9163, -179.2408 ]
    *
    * @since 5.0.0
    */
@@ -441,13 +443,13 @@ export class AddressModule {
    * Returns a random time zone.
    *
    * @example
-   * faker.address.timeZone() // 'Pacific/Guam'
+   * faker.location.timeZone() // 'Pacific/Guam'
    *
    * @since 5.1.0
    */
   timeZone(): string {
     return this.faker.helpers.arrayElement(
-      this.faker.definitions.address.time_zone
+      this.faker.definitions.location.time_zone
     );
   }
 }
diff --git a/src/modules/random/index.ts b/src/modules/random/index.ts
index 7f567edf..0505744d 100644
--- a/src/modules/random/index.ts
+++ b/src/modules/random/index.ts
@@ -32,14 +32,14 @@ export class RandomModule {
    */
   word(): string {
     const wordMethods = [
-      this.faker.address.cardinalDirection,
-      this.faker.address.cityName,
-      this.faker.address.country,
-      this.faker.address.county,
-      this.faker.address.direction,
-      this.faker.address.ordinalDirection,
-      this.faker.address.state,
-      this.faker.address.street,
+      this.faker.location.cardinalDirection,
+      this.faker.location.cityName,
+      this.faker.location.country,
+      this.faker.location.county,
+      this.faker.location.direction,
+      this.faker.location.ordinalDirection,
+      this.faker.location.state,
+      this.faker.location.street,
 
       this.faker.color.human,