refactor(person)!: rename name module (#1445)

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

573 files changed, 817 insertions, 817 deletions

diff --git a/src/locales/af_ZA/address/city.ts b/src/locales/af_ZA/address/city.ts
index 95588a58..ea6ea950 100644
--- a/src/locales/af_ZA/address/city.ts
+++ b/src/locales/af_ZA/address/city.ts
@@ -1,6 +1,6 @@
 export default [
-  '{{address.city_prefix}} {{name.firstName}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{name.firstName}}',
-  '{{name.firstName}}{{address.city_suffix}}',
-  '{{name.lastName}}{{address.city_suffix}}',
+  '{{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
index 1a1885b1..f7dd9d3b 100644
--- a/src/locales/af_ZA/address/street.ts
+++ b/src/locales/af_ZA/address/street.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{name.firstName}} {{address.street_suffix}}',
-  '{{name.lastName}} {{address.street_suffix}}',
+  '{{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 80a447d7..f0829959 100644
--- a/src/locales/af_ZA/index.ts
+++ b/src/locales/af_ZA/index.ts
@@ -7,7 +7,7 @@ import address from './address';
 import cell_phone from './cell_phone';
 import company from './company';
 import internet from './internet';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const af_ZA: LocaleDefinition = {
@@ -16,7 +16,7 @@ const af_ZA: LocaleDefinition = {
   cell_phone,
   company,
   internet,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/af_ZA/name/female_first_name.ts b/src/locales/af_ZA/person/female_first_name.ts
index 3190f818..3190f818 100644
--- a/src/locales/af_ZA/name/female_first_name.ts
+++ b/src/locales/af_ZA/person/female_first_name.ts
diff --git a/src/locales/af_ZA/name/first_name.ts b/src/locales/af_ZA/person/first_name.ts
index 23013e36..23013e36 100644
--- a/src/locales/af_ZA/name/first_name.ts
+++ b/src/locales/af_ZA/person/first_name.ts
diff --git a/src/locales/zu_ZA/name/index.ts b/src/locales/af_ZA/person/index.ts
index ea2e9181..b61cf108 100644
--- a/src/locales/zu_ZA/name/index.ts
+++ b/src/locales/af_ZA/person/index.ts
@@ -2,17 +2,17 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import first_name from './first_name';
 import last_name from './last_name';
 import male_first_name from './male_first_name';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   first_name,
   last_name,
   male_first_name,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/af_ZA/name/last_name.ts b/src/locales/af_ZA/person/last_name.ts
index bffe4385..bffe4385 100644
--- a/src/locales/af_ZA/name/last_name.ts
+++ b/src/locales/af_ZA/person/last_name.ts
diff --git a/src/locales/af_ZA/name/male_first_name.ts b/src/locales/af_ZA/person/male_first_name.ts
index 1571b1dc..1571b1dc 100644
--- a/src/locales/af_ZA/name/male_first_name.ts
+++ b/src/locales/af_ZA/person/male_first_name.ts
diff --git a/src/locales/ar/address/street.ts b/src/locales/ar/address/street.ts
index 0b48ceb8..5db4f5be 100644
--- a/src/locales/ar/address/street.ts
+++ b/src/locales/ar/address/street.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{address.street_prefix}} {{name.first_name}}',
-  '{{address.street_prefix}} {{name.last_name}}',
+  '{{address.street_prefix}} {{person.first_name}}',
+  '{{address.street_prefix}} {{person.last_name}}',
 ];
diff --git a/src/locales/ar/index.ts b/src/locales/ar/index.ts
index 643d2823..c052dc37 100644
--- a/src/locales/ar/index.ts
+++ b/src/locales/ar/index.ts
@@ -8,7 +8,7 @@ import cell_phone from './cell_phone';
 import color from './color';
 import commerce from './commerce';
 import date from './date';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 import team from './team';
 import vehicle from './vehicle';
@@ -21,7 +21,7 @@ const ar: LocaleDefinition = {
   color,
   commerce,
   date,
-  name: name_,
+  person,
   phone_number,
   team,
   vehicle,
diff --git a/src/locales/ar/name/name.ts b/src/locales/ar/name/name.ts
deleted file mode 100644
index 702d9581..00000000
--- a/src/locales/ar/name/name.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export default [
-  '{{name.prefix}} {{name.first_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.last_name}}',
-  '{{name.last_name}} {{name.first_name}}',
-];
diff --git a/src/locales/ar/name/female_first_name.ts b/src/locales/ar/person/female_first_name.ts
index 8f04be52..8f04be52 100644
--- a/src/locales/ar/name/female_first_name.ts
+++ b/src/locales/ar/person/female_first_name.ts
diff --git a/src/locales/ar/name/first_name.ts b/src/locales/ar/person/first_name.ts
index 20a5a1d0..20a5a1d0 100644
--- a/src/locales/ar/name/first_name.ts
+++ b/src/locales/ar/person/first_name.ts
diff --git a/src/locales/ar/name/index.ts b/src/locales/ar/person/index.ts
index 8018f95e..581c3d68 100644
--- a/src/locales/ar/name/index.ts
+++ b/src/locales/ar/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import first_name from './first_name';
 import last_name from './last_name';
@@ -12,7 +12,7 @@ import prefix from './prefix';
 import suffix from './suffix';
 import title from './title';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   first_name,
   last_name,
@@ -23,4 +23,4 @@ const name: NameDefinitions = {
   title,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/ar/name/last_name.ts b/src/locales/ar/person/last_name.ts
index e2cc7e5f..e2cc7e5f 100644
--- a/src/locales/ar/name/last_name.ts
+++ b/src/locales/ar/person/last_name.ts
diff --git a/src/locales/ar/name/male_first_name.ts b/src/locales/ar/person/male_first_name.ts
index e7c97091..e7c97091 100644
--- a/src/locales/ar/name/male_first_name.ts
+++ b/src/locales/ar/person/male_first_name.ts
diff --git a/src/locales/ar/person/name.ts b/src/locales/ar/person/name.ts
new file mode 100644
index 00000000..81f3b1e4
--- /dev/null
+++ b/src/locales/ar/person/name.ts
@@ -0,0 +1,5 @@
+export default [
+  '{{person.prefix}} {{person.first_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.last_name}}',
+  '{{person.last_name}} {{person.first_name}}',
+];
diff --git a/src/locales/ar/name/prefix.ts b/src/locales/ar/person/prefix.ts
index 6f6c38ef..6f6c38ef 100644
--- a/src/locales/ar/name/prefix.ts
+++ b/src/locales/ar/person/prefix.ts
diff --git a/src/locales/ar/name/suffix.ts b/src/locales/ar/person/suffix.ts
index eebfcb85..eebfcb85 100644
--- a/src/locales/ar/name/suffix.ts
+++ b/src/locales/ar/person/suffix.ts
diff --git a/src/locales/ar/name/title.ts b/src/locales/ar/person/title.ts
index 949390fe..949390fe 100644
--- a/src/locales/ar/name/title.ts
+++ b/src/locales/ar/person/title.ts
diff --git a/src/locales/az/company/name_patterns.ts b/src/locales/az/company/name_patterns.ts
index 358d8080..9db05dce 100644
--- a/src/locales/az/company/name_patterns.ts
+++ b/src/locales/az/company/name_patterns.ts
@@ -1,7 +1,7 @@
 export default [
-  '{{company.prefix}} {{name.female_first_name}}',
-  '{{company.prefix}} {{name.male_first_name}}',
-  '{{company.prefix}} {{name.male_last_name}}',
+  '{{company.prefix}} {{person.female_first_name}}',
+  '{{company.prefix}} {{person.male_first_name}}',
+  '{{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}}',
diff --git a/src/locales/az/index.ts b/src/locales/az/index.ts
index 55d7d807..b48e7235 100644
--- a/src/locales/az/index.ts
+++ b/src/locales/az/index.ts
@@ -9,7 +9,7 @@ import commerce from './commerce';
 import company from './company';
 import date from './date';
 import internet from './internet';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const az: LocaleDefinition = {
@@ -21,7 +21,7 @@ const az: LocaleDefinition = {
   company,
   date,
   internet,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/az/name/name.ts b/src/locales/az/name/name.ts
deleted file mode 100644
index da4da07a..00000000
--- a/src/locales/az/name/name.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export default [
-  '{{name.male_first_name}}',
-  '{{name.male_last_name}} {{name.male_first_name}}',
-  '{{name.male_first_name}} {{name.male_last_name}}',
-  '{{name.female_first_name}}',
-  '{{name.female_first_name}} {{name.female_last_name}}',
-  '{{name.female_last_name}} {{name.female_first_name}}',
-];
diff --git a/src/locales/az/name/female_first_name.ts b/src/locales/az/person/female_first_name.ts
index a0a5ade0..a0a5ade0 100644
--- a/src/locales/az/name/female_first_name.ts
+++ b/src/locales/az/person/female_first_name.ts
diff --git a/src/locales/az/name/female_last_name.ts b/src/locales/az/person/female_last_name.ts
index d6708e0d..d6708e0d 100644
--- a/src/locales/az/name/female_last_name.ts
+++ b/src/locales/az/person/female_last_name.ts
diff --git a/src/locales/az/name/index.ts b/src/locales/az/person/index.ts
index 740c83d0..2ebec1b1 100644
--- a/src/locales/az/name/index.ts
+++ b/src/locales/az/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import female_last_name from './female_last_name';
 import male_first_name from './male_first_name';
@@ -11,7 +11,7 @@ import name_ from './name';
 import prefix from './prefix';
 import suffix from './suffix';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   female_last_name,
   male_first_name,
@@ -21,4 +21,4 @@ const name: NameDefinitions = {
   suffix,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/az/name/male_first_name.ts b/src/locales/az/person/male_first_name.ts
index 6bcf477f..6bcf477f 100644
--- a/src/locales/az/name/male_first_name.ts
+++ b/src/locales/az/person/male_first_name.ts
diff --git a/src/locales/az/name/male_last_name.ts b/src/locales/az/person/male_last_name.ts
index e0e55528..e0e55528 100644
--- a/src/locales/az/name/male_last_name.ts
+++ b/src/locales/az/person/male_last_name.ts
diff --git a/src/locales/az/person/name.ts b/src/locales/az/person/name.ts
new file mode 100644
index 00000000..afecc403
--- /dev/null
+++ b/src/locales/az/person/name.ts
@@ -0,0 +1,8 @@
+export default [
+  '{{person.male_first_name}}',
+  '{{person.male_last_name}} {{person.male_first_name}}',
+  '{{person.male_first_name}} {{person.male_last_name}}',
+  '{{person.female_first_name}}',
+  '{{person.female_first_name}} {{person.female_last_name}}',
+  '{{person.female_last_name}} {{person.female_first_name}}',
+];
diff --git a/src/locales/az/name/prefix.ts b/src/locales/az/person/prefix.ts
index d6d1738d..d6d1738d 100644
--- a/src/locales/az/name/prefix.ts
+++ b/src/locales/az/person/prefix.ts
diff --git a/src/locales/az/name/suffix.ts b/src/locales/az/person/suffix.ts
index d6d1738d..d6d1738d 100644
--- a/src/locales/az/name/suffix.ts
+++ b/src/locales/az/person/suffix.ts
diff --git a/src/locales/cz/company/name_patterns.ts b/src/locales/cz/company/name_patterns.ts
index e3856948..d6eda221 100644
--- a/src/locales/cz/company/name_patterns.ts
+++ b/src/locales/cz/company/name_patterns.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{name.last_name}} {{company.suffix}}',
-  '{{name.male_last_name}} a {{name.male_last_name}} {{company.suffix}}',
+  '{{person.last_name}} {{company.suffix}}',
+  '{{person.male_last_name}} a {{person.male_last_name}} {{company.suffix}}',
 ];
diff --git a/src/locales/cz/index.ts b/src/locales/cz/index.ts
index c2a398a1..c9c7ab54 100644
--- a/src/locales/cz/index.ts
+++ b/src/locales/cz/index.ts
@@ -8,7 +8,7 @@ import company from './company';
 import date from './date';
 import internet from './internet';
 import lorem from './lorem';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const cz: LocaleDefinition = {
@@ -18,7 +18,7 @@ const cz: LocaleDefinition = {
   date,
   internet,
   lorem,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/cz/name/name.ts b/src/locales/cz/name/name.ts
deleted file mode 100644
index fc13ad95..00000000
--- a/src/locales/cz/name/name.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export default [
-  '{{name.prefix}} {{name.male_first_name}} {{name.male_last_name}}',
-  '{{name.prefix}} {{name.female_first_name}} {{name.female_last_name}}',
-  '{{name.male_first_name}} {{name.male_last_name}} {{name.suffix}}',
-  '{{name.female_first_name}} {{name.female_last_name}} {{name.suffix}}',
-  '{{name.male_first_name}} {{name.male_last_name}}',
-  '{{name.female_first_name}} {{name.female_last_name}}',
-];
diff --git a/src/locales/cz/name/female_first_name.ts b/src/locales/cz/person/female_first_name.ts
index 951b6a3a..951b6a3a 100644
--- a/src/locales/cz/name/female_first_name.ts
+++ b/src/locales/cz/person/female_first_name.ts
diff --git a/src/locales/cz/name/female_last_name.ts b/src/locales/cz/person/female_last_name.ts
index f8aae90a..f8aae90a 100644
--- a/src/locales/cz/name/female_last_name.ts
+++ b/src/locales/cz/person/female_last_name.ts
diff --git a/src/locales/cz/name/first_name.ts b/src/locales/cz/person/first_name.ts
index 6926a090..6926a090 100644
--- a/src/locales/cz/name/first_name.ts
+++ b/src/locales/cz/person/first_name.ts
diff --git a/src/locales/cz/name/index.ts b/src/locales/cz/person/index.ts
index 7c9ae183..22c88ff9 100644
--- a/src/locales/cz/name/index.ts
+++ b/src/locales/cz/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import female_last_name from './female_last_name';
 import first_name from './first_name';
@@ -14,7 +14,7 @@ import prefix from './prefix';
 import suffix from './suffix';
 import title from './title';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   female_last_name,
   first_name,
@@ -27,4 +27,4 @@ const name: NameDefinitions = {
   title,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/cz/name/last_name.ts b/src/locales/cz/person/last_name.ts
index 0ce6d456..0ce6d456 100644
--- a/src/locales/cz/name/last_name.ts
+++ b/src/locales/cz/person/last_name.ts
diff --git a/src/locales/cz/name/male_first_name.ts b/src/locales/cz/person/male_first_name.ts
index 5419e9ff..5419e9ff 100644
--- a/src/locales/cz/name/male_first_name.ts
+++ b/src/locales/cz/person/male_first_name.ts
diff --git a/src/locales/cz/name/male_last_name.ts b/src/locales/cz/person/male_last_name.ts
index 7fce5ae1..7fce5ae1 100644
--- a/src/locales/cz/name/male_last_name.ts
+++ b/src/locales/cz/person/male_last_name.ts
diff --git a/src/locales/cz/person/name.ts b/src/locales/cz/person/name.ts
new file mode 100644
index 00000000..e06caa3a
--- /dev/null
+++ b/src/locales/cz/person/name.ts
@@ -0,0 +1,8 @@
+export default [
+  '{{person.prefix}} {{person.male_first_name}} {{person.male_last_name}}',
+  '{{person.prefix}} {{person.female_first_name}} {{person.female_last_name}}',
+  '{{person.male_first_name}} {{person.male_last_name}} {{person.suffix}}',
+  '{{person.female_first_name}} {{person.female_last_name}} {{person.suffix}}',
+  '{{person.male_first_name}} {{person.male_last_name}}',
+  '{{person.female_first_name}} {{person.female_last_name}}',
+];
diff --git a/src/locales/cz/name/prefix.ts b/src/locales/cz/person/prefix.ts
index f499187e..f499187e 100644
--- a/src/locales/cz/name/prefix.ts
+++ b/src/locales/cz/person/prefix.ts
diff --git a/src/locales/cz/name/suffix.ts b/src/locales/cz/person/suffix.ts
index 20ab0b67..20ab0b67 100644
--- a/src/locales/cz/name/suffix.ts
+++ b/src/locales/cz/person/suffix.ts
diff --git a/src/locales/cz/name/title.ts b/src/locales/cz/person/title.ts
index 6372cc11..6372cc11 100644
--- a/src/locales/cz/name/title.ts
+++ b/src/locales/cz/person/title.ts
diff --git a/src/locales/de/address/city.ts b/src/locales/de/address/city.ts
index d518527b..27a932f1 100644
--- a/src/locales/de/address/city.ts
+++ b/src/locales/de/address/city.ts
@@ -1,6 +1,6 @@
 export default [
-  '{{address.city_prefix}} {{name.first_name}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{name.first_name}}',
-  '{{name.first_name}}{{address.city_suffix}}',
-  '{{name.last_name}}{{address.city_suffix}}',
+  '{{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/company/name_patterns.ts b/src/locales/de/company/name_patterns.ts
index d69a6508..4a77202d 100644
--- a/src/locales/de/company/name_patterns.ts
+++ b/src/locales/de/company/name_patterns.ts
@@ -1,5 +1,5 @@
 export default [
-  '{{name.last_name}} {{company.suffix}}',
-  '{{name.last_name}}-{{name.last_name}}',
-  '{{name.last_name}}, {{name.last_name}} und {{name.last_name}}',
+  '{{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}}-{{person.last_name}}',
+  '{{person.last_name}}, {{person.last_name}} und {{person.last_name}}',
 ];
diff --git a/src/locales/de/index.ts b/src/locales/de/index.ts
index 29b37620..49b98452 100644
--- a/src/locales/de/index.ts
+++ b/src/locales/de/index.ts
@@ -9,7 +9,7 @@ import company from './company';
 import date from './date';
 import internet from './internet';
 import lorem from './lorem';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 import word from './word';
 
@@ -21,7 +21,7 @@ const de: LocaleDefinition = {
   date,
   internet,
   lorem,
-  name: name_,
+  person,
   phone_number,
   word,
 };
diff --git a/src/locales/de/name/name.ts b/src/locales/de/name/name.ts
deleted file mode 100644
index ad8271a2..00000000
--- a/src/locales/de/name/name.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export default [
-  '{{name.prefix}} {{name.first_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.nobility_title_prefix}} {{name.last_name}}',
-  '{{name.first_name}} {{name.last_name}}',
-  '{{name.male_first_name}} {{name.last_name}}',
-  '{{name.female_first_name}} {{name.last_name}}',
-];
diff --git a/src/locales/de/name/female_first_name.ts b/src/locales/de/person/female_first_name.ts
index 8c9dc36a..8c9dc36a 100644
--- a/src/locales/de/name/female_first_name.ts
+++ b/src/locales/de/person/female_first_name.ts
diff --git a/src/locales/de/name/first_name.ts b/src/locales/de/person/first_name.ts
index 0fff5001..0fff5001 100644
--- a/src/locales/de/name/first_name.ts
+++ b/src/locales/de/person/first_name.ts
diff --git a/src/locales/de/name/index.ts b/src/locales/de/person/index.ts
index 0c5886c7..00cd7c19 100644
--- a/src/locales/de/name/index.ts
+++ b/src/locales/de/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import first_name from './first_name';
 import last_name from './last_name';
@@ -12,7 +12,7 @@ import nobility_title_prefix from './nobility_title_prefix';
 import prefix from './prefix';
 import sex from './sex';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   first_name,
   last_name,
@@ -23,4 +23,4 @@ const name: NameDefinitions = {
   sex,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/de/name/last_name.ts b/src/locales/de/person/last_name.ts
index 9569bc84..9569bc84 100644
--- a/src/locales/de/name/last_name.ts
+++ b/src/locales/de/person/last_name.ts
diff --git a/src/locales/de/name/male_first_name.ts b/src/locales/de/person/male_first_name.ts
index 3b151717..3b151717 100644
--- a/src/locales/de/name/male_first_name.ts
+++ b/src/locales/de/person/male_first_name.ts
diff --git a/src/locales/de/person/name.ts b/src/locales/de/person/name.ts
new file mode 100644
index 00000000..fd40e987
--- /dev/null
+++ b/src/locales/de/person/name.ts
@@ -0,0 +1,7 @@
+export default [
+  '{{person.prefix}} {{person.first_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.nobility_title_prefix}} {{person.last_name}}',
+  '{{person.first_name}} {{person.last_name}}',
+  '{{person.male_first_name}} {{person.last_name}}',
+  '{{person.female_first_name}} {{person.last_name}}',
+];
diff --git a/src/locales/de/name/nobility_title_prefix.ts b/src/locales/de/person/nobility_title_prefix.ts
index ba3a30d7..ba3a30d7 100644
--- a/src/locales/de/name/nobility_title_prefix.ts
+++ b/src/locales/de/person/nobility_title_prefix.ts
diff --git a/src/locales/de/name/prefix.ts b/src/locales/de/person/prefix.ts
index 44f0d037..44f0d037 100644
--- a/src/locales/de/name/prefix.ts
+++ b/src/locales/de/person/prefix.ts
diff --git a/src/locales/de/name/sex.ts b/src/locales/de/person/sex.ts
index c06d0d66..c06d0d66 100644
--- a/src/locales/de/name/sex.ts
+++ b/src/locales/de/person/sex.ts
diff --git a/src/locales/de_AT/company/name_patterns.ts b/src/locales/de_AT/company/name_patterns.ts
index d69a6508..4a77202d 100644
--- a/src/locales/de_AT/company/name_patterns.ts
+++ b/src/locales/de_AT/company/name_patterns.ts
@@ -1,5 +1,5 @@
 export default [
-  '{{name.last_name}} {{company.suffix}}',
-  '{{name.last_name}}-{{name.last_name}}',
-  '{{name.last_name}}, {{name.last_name}} und {{name.last_name}}',
+  '{{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}}-{{person.last_name}}',
+  '{{person.last_name}}, {{person.last_name}} und {{person.last_name}}',
 ];
diff --git a/src/locales/de_AT/index.ts b/src/locales/de_AT/index.ts
index 50974c77..3789ea88 100644
--- a/src/locales/de_AT/index.ts
+++ b/src/locales/de_AT/index.ts
@@ -7,7 +7,7 @@ import address from './address';
 import cell_phone from './cell_phone';
 import company from './company';
 import internet from './internet';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 import word from './word';
 
@@ -17,7 +17,7 @@ const de_AT: LocaleDefinition = {
   cell_phone,
   company,
   internet,
-  name: name_,
+  person,
   phone_number,
   word,
 };
diff --git a/src/locales/de_AT/name/name.ts b/src/locales/de_AT/name/name.ts
deleted file mode 100644
index 207dc76e..00000000
--- a/src/locales/de_AT/name/name.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export default [
-  '{{name.prefix}} {{name.first_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.nobility_title_prefix}} {{name.last_name}}',
-  '{{name.first_name}} {{name.last_name}}',
-];
diff --git a/src/locales/de_AT/name/first_name.ts b/src/locales/de_AT/person/first_name.ts
index 0fff5001..0fff5001 100644
--- a/src/locales/de_AT/name/first_name.ts
+++ b/src/locales/de_AT/person/first_name.ts
diff --git a/src/locales/de_AT/name/index.ts b/src/locales/de_AT/person/index.ts
index d7fee674..559f8e77 100644
--- a/src/locales/de_AT/name/index.ts
+++ b/src/locales/de_AT/person/index.ts
@@ -2,14 +2,14 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import first_name from './first_name';
 import last_name from './last_name';
 import name_ from './name';
 import nobility_title_prefix from './nobility_title_prefix';
 import prefix from './prefix';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   first_name,
   last_name,
   name: name_,
@@ -17,4 +17,4 @@ const name: NameDefinitions = {
   prefix,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/de_AT/name/last_name.ts b/src/locales/de_AT/person/last_name.ts
index 9569bc84..9569bc84 100644
--- a/src/locales/de_AT/name/last_name.ts
+++ b/src/locales/de_AT/person/last_name.ts
diff --git a/src/locales/de_AT/person/name.ts b/src/locales/de_AT/person/name.ts
new file mode 100644
index 00000000..011fae52
--- /dev/null
+++ b/src/locales/de_AT/person/name.ts
@@ -0,0 +1,5 @@
+export default [
+  '{{person.prefix}} {{person.first_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.nobility_title_prefix}} {{person.last_name}}',
+  '{{person.first_name}} {{person.last_name}}',
+];
diff --git a/src/locales/de_AT/name/nobility_title_prefix.ts b/src/locales/de_AT/person/nobility_title_prefix.ts
index ba3a30d7..ba3a30d7 100644
--- a/src/locales/de_AT/name/nobility_title_prefix.ts
+++ b/src/locales/de_AT/person/nobility_title_prefix.ts
diff --git a/src/locales/de_AT/name/prefix.ts b/src/locales/de_AT/person/prefix.ts
index 296dad7d..296dad7d 100644
--- a/src/locales/de_AT/name/prefix.ts
+++ b/src/locales/de_AT/person/prefix.ts
diff --git a/src/locales/de_CH/address/street.ts b/src/locales/de_CH/address/street.ts
index 1a1885b1..f7dd9d3b 100644
--- a/src/locales/de_CH/address/street.ts
+++ b/src/locales/de_CH/address/street.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{name.firstName}} {{address.street_suffix}}',
-  '{{name.lastName}} {{address.street_suffix}}',
+  '{{person.firstName}} {{address.street_suffix}}',
+  '{{person.lastName}} {{address.street_suffix}}',
 ];
diff --git a/src/locales/de_CH/company/name_patterns.ts b/src/locales/de_CH/company/name_patterns.ts
index d69a6508..4a77202d 100644
--- a/src/locales/de_CH/company/name_patterns.ts
+++ b/src/locales/de_CH/company/name_patterns.ts
@@ -1,5 +1,5 @@
 export default [
-  '{{name.last_name}} {{company.suffix}}',
-  '{{name.last_name}}-{{name.last_name}}',
-  '{{name.last_name}}, {{name.last_name}} und {{name.last_name}}',
+  '{{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}}-{{person.last_name}}',
+  '{{person.last_name}}, {{person.last_name}} und {{person.last_name}}',
 ];
diff --git a/src/locales/de_CH/index.ts b/src/locales/de_CH/index.ts
index 3a5d8fc4..4abc4e32 100644
--- a/src/locales/de_CH/index.ts
+++ b/src/locales/de_CH/index.ts
@@ -6,7 +6,7 @@ import type { LocaleDefinition } from '../..';
 import address from './address';
 import company from './company';
 import internet from './internet';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const de_CH: LocaleDefinition = {
@@ -14,7 +14,7 @@ const de_CH: LocaleDefinition = {
   address,
   company,
   internet,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/de_CH/name/name.ts b/src/locales/de_CH/name/name.ts
deleted file mode 100644
index 4640b571..00000000
--- a/src/locales/de_CH/name/name.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{name.first_name}} {{name.last_name}}'];
diff --git a/src/locales/de_CH/name/first_name.ts b/src/locales/de_CH/person/first_name.ts
index f704f6db..f704f6db 100644
--- a/src/locales/de_CH/name/first_name.ts
+++ b/src/locales/de_CH/person/first_name.ts
diff --git a/src/locales/de_CH/name/index.ts b/src/locales/de_CH/person/index.ts
index da97abbf..f66f9c6a 100644
--- a/src/locales/de_CH/name/index.ts
+++ b/src/locales/de_CH/person/index.ts
@@ -2,17 +2,17 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import first_name from './first_name';
 import last_name from './last_name';
 import name_ from './name';
 import prefix from './prefix';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   first_name,
   last_name,
   name: name_,
   prefix,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/de_CH/name/last_name.ts b/src/locales/de_CH/person/last_name.ts
index 580a75de..580a75de 100644
--- a/src/locales/de_CH/name/last_name.ts
+++ b/src/locales/de_CH/person/last_name.ts
diff --git a/src/locales/de_CH/person/name.ts b/src/locales/de_CH/person/name.ts
new file mode 100644
index 00000000..6d951dfc
--- /dev/null
+++ b/src/locales/de_CH/person/name.ts
@@ -0,0 +1 @@
+export default ['{{person.first_name}} {{person.last_name}}'];
diff --git a/src/locales/de_CH/name/prefix.ts b/src/locales/de_CH/person/prefix.ts
index 522edb84..522edb84 100644
--- a/src/locales/de_CH/name/prefix.ts
+++ b/src/locales/de_CH/person/prefix.ts
diff --git a/src/locales/el/address/city.ts b/src/locales/el/address/city.ts
index 95588a58..ea6ea950 100644
--- a/src/locales/el/address/city.ts
+++ b/src/locales/el/address/city.ts
@@ -1,6 +1,6 @@
 export default [
-  '{{address.city_prefix}} {{name.firstName}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{name.firstName}}',
-  '{{name.firstName}}{{address.city_suffix}}',
-  '{{name.lastName}}{{address.city_suffix}}',
+  '{{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
index 1a1885b1..f7dd9d3b 100644
--- a/src/locales/el/address/street.ts
+++ b/src/locales/el/address/street.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{name.firstName}} {{address.street_suffix}}',
-  '{{name.lastName}} {{address.street_suffix}}',
+  '{{person.firstName}} {{address.street_suffix}}',
+  '{{person.lastName}} {{address.street_suffix}}',
 ];
diff --git a/src/locales/el/app/author.ts b/src/locales/el/app/author.ts
index 20670ee1..507ad69d 100644
--- a/src/locales/el/app/author.ts
+++ b/src/locales/el/app/author.ts
@@ -1 +1 @@
-export default ['{{name.name}}', '{{company.name}}'];
+export default ['{{person.name}}', '{{company.name}}'];
diff --git a/src/locales/el/company/name_patterns.ts b/src/locales/el/company/name_patterns.ts
index cffd6e70..1108f6fc 100644
--- a/src/locales/el/company/name_patterns.ts
+++ b/src/locales/el/company/name_patterns.ts
@@ -1,5 +1,5 @@
 export default [
-  '{{name.last_name}} {{company.suffix}}',
-  '{{name.last_name}}-{{name.last_name}}',
-  '{{name.last_name}}, {{name.last_name}} and {{name.last_name}}',
+  '{{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}}-{{person.last_name}}',
+  '{{person.last_name}}, {{person.last_name}} and {{person.last_name}}',
 ];
diff --git a/src/locales/el/index.ts b/src/locales/el/index.ts
index 69b91f40..aea4beed 100644
--- a/src/locales/el/index.ts
+++ b/src/locales/el/index.ts
@@ -14,7 +14,7 @@ import finance from './finance';
 import hacker from './hacker';
 import internet from './internet';
 import lorem from './lorem';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 import team from './team';
 
@@ -32,7 +32,7 @@ const el: LocaleDefinition = {
   hacker,
   internet,
   lorem,
-  name: name_,
+  person,
   phone_number,
   team,
 };
diff --git a/src/locales/el/name/name.ts b/src/locales/el/name/name.ts
deleted file mode 100644
index 3d1d5755..00000000
--- a/src/locales/el/name/name.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export default [
-  '{{name.prefix}} {{name.first_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.last_name}} {{name.suffix}}',
-  '{{name.first_name}} {{name.last_name}}',
-];
diff --git a/src/locales/el/name/first_name.ts b/src/locales/el/person/first_name.ts
index 4d4ecbd9..4d4ecbd9 100644
--- a/src/locales/el/name/first_name.ts
+++ b/src/locales/el/person/first_name.ts
diff --git a/src/locales/ge/name/index.ts b/src/locales/el/person/index.ts
index e0c74acd..55a45eb2 100644
--- a/src/locales/ge/name/index.ts
+++ b/src/locales/el/person/index.ts
@@ -2,14 +2,14 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import first_name from './first_name';
 import last_name from './last_name';
 import name_ from './name';
 import prefix from './prefix';
 import title from './title';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   first_name,
   last_name,
   name: name_,
@@ -17,4 +17,4 @@ const name: NameDefinitions = {
   title,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/el/name/last_name.ts b/src/locales/el/person/last_name.ts
index 70634100..70634100 100644
--- a/src/locales/el/name/last_name.ts
+++ b/src/locales/el/person/last_name.ts
diff --git a/src/locales/el/person/name.ts b/src/locales/el/person/name.ts
new file mode 100644
index 00000000..8cee34fa
--- /dev/null
+++ b/src/locales/el/person/name.ts
@@ -0,0 +1,5 @@
+export default [
+  '{{person.prefix}} {{person.first_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.last_name}} {{person.suffix}}',
+  '{{person.first_name}} {{person.last_name}}',
+];
diff --git a/src/locales/el/name/prefix.ts b/src/locales/el/person/prefix.ts
index da5c4e3e..da5c4e3e 100644
--- a/src/locales/el/name/prefix.ts
+++ b/src/locales/el/person/prefix.ts
diff --git a/src/locales/el/name/title.ts b/src/locales/el/person/title.ts
index 9237d977..9237d977 100644
--- a/src/locales/el/name/title.ts
+++ b/src/locales/el/person/title.ts
diff --git a/src/locales/en/address/city.ts b/src/locales/en/address/city.ts
index 6032f4a7..9a277b6f 100644
--- a/src/locales/en/address/city.ts
+++ b/src/locales/en/address/city.ts
@@ -1,7 +1,7 @@
 export default [
-  '{{address.city_prefix}} {{name.first_name}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{name.first_name}}',
-  '{{name.first_name}}{{address.city_suffix}}',
-  '{{name.last_name}}{{address.city_suffix}}',
+  '{{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
index 6b2de465..5e9ca117 100644
--- a/src/locales/en/address/street.ts
+++ b/src/locales/en/address/street.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{name.first_name}} {{address.street_suffix}}',
-  '{{name.last_name}} {{address.street_suffix}}',
+  '{{person.first_name}} {{address.street_suffix}}',
+  '{{person.last_name}} {{address.street_suffix}}',
 ];
diff --git a/src/locales/en/app/author.ts b/src/locales/en/app/author.ts
index 20670ee1..507ad69d 100644
--- a/src/locales/en/app/author.ts
+++ b/src/locales/en/app/author.ts
@@ -1 +1 @@
-export default ['{{name.name}}', '{{company.name}}'];
+export default ['{{person.name}}', '{{company.name}}'];
diff --git a/src/locales/en/company/name_patterns.ts b/src/locales/en/company/name_patterns.ts
index 2acb30ea..d1ce0709 100644
--- a/src/locales/en/company/name_patterns.ts
+++ b/src/locales/en/company/name_patterns.ts
@@ -1,5 +1,5 @@
 export default [
-  '{{name.last_name}} {{company.suffix}}',
-  '{{name.last_name}} - {{name.last_name}}',
-  '{{name.last_name}}, {{name.last_name}} and {{name.last_name}}',
+  '{{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}} - {{person.last_name}}',
+  '{{person.last_name}}, {{person.last_name}} and {{person.last_name}}',
 ];
diff --git a/src/locales/en/index.ts b/src/locales/en/index.ts
index 0836cbab..242b4cd9 100644
--- a/src/locales/en/index.ts
+++ b/src/locales/en/index.ts
@@ -18,7 +18,7 @@ import hacker from './hacker';
 import internet from './internet';
 import lorem from './lorem';
 import music from './music';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 import science from './science';
 import system from './system';
@@ -44,7 +44,7 @@ const en: LocaleDefinition = {
   internet,
   lorem,
   music,
-  name: name_,
+  person,
   phone_number,
   science,
   system,
diff --git a/src/locales/en/name/name.ts b/src/locales/en/name/name.ts
deleted file mode 100644
index 05635661..00000000
--- a/src/locales/en/name/name.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export default [
-  '{{name.prefix}} {{name.first_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.last_name}} {{name.suffix}}',
-  '{{name.first_name}} {{name.last_name}}',
-  '{{name.male_first_name}} {{name.last_name}}',
-  '{{name.female_first_name}} {{name.last_name}}',
-];
diff --git a/src/locales/en/name/female_first_name.ts b/src/locales/en/person/female_first_name.ts
index ad13e7af..ad13e7af 100644
--- a/src/locales/en/name/female_first_name.ts
+++ b/src/locales/en/person/female_first_name.ts
diff --git a/src/locales/en/name/female_middle_name.ts b/src/locales/en/person/female_middle_name.ts
index 02a892fd..02a892fd 100644
--- a/src/locales/en/name/female_middle_name.ts
+++ b/src/locales/en/person/female_middle_name.ts
diff --git a/src/locales/en/name/first_name.ts b/src/locales/en/person/first_name.ts
index 51870fb4..51870fb4 100644
--- a/src/locales/en/name/first_name.ts
+++ b/src/locales/en/person/first_name.ts
diff --git a/src/locales/en/name/gender.ts b/src/locales/en/person/gender.ts
index 41516714..41516714 100644
--- a/src/locales/en/name/gender.ts
+++ b/src/locales/en/person/gender.ts
diff --git a/src/locales/en/name/index.ts b/src/locales/en/person/index.ts
index c1522a38..24dcdf76 100644
--- a/src/locales/en/name/index.ts
+++ b/src/locales/en/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import female_middle_name from './female_middle_name';
 import first_name from './first_name';
@@ -17,7 +17,7 @@ import sex from './sex';
 import suffix from './suffix';
 import title from './title';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   female_middle_name,
   first_name,
@@ -33,4 +33,4 @@ const name: NameDefinitions = {
   title,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/en/name/last_name.ts b/src/locales/en/person/last_name.ts
index b8b5692c..b8b5692c 100644
--- a/src/locales/en/name/last_name.ts
+++ b/src/locales/en/person/last_name.ts
diff --git a/src/locales/en/name/male_first_name.ts b/src/locales/en/person/male_first_name.ts
index 925aa19a..925aa19a 100644
--- a/src/locales/en/name/male_first_name.ts
+++ b/src/locales/en/person/male_first_name.ts
diff --git a/src/locales/en/name/male_middle_name.ts b/src/locales/en/person/male_middle_name.ts
index 6bd3ac84..6bd3ac84 100644
--- a/src/locales/en/name/male_middle_name.ts
+++ b/src/locales/en/person/male_middle_name.ts
diff --git a/src/locales/en/name/middle_name.ts b/src/locales/en/person/middle_name.ts
index 0f03c153..0f03c153 100644
--- a/src/locales/en/name/middle_name.ts
+++ b/src/locales/en/person/middle_name.ts
diff --git a/src/locales/en/person/name.ts b/src/locales/en/person/name.ts
new file mode 100644
index 00000000..28a268c4
--- /dev/null
+++ b/src/locales/en/person/name.ts
@@ -0,0 +1,7 @@
+export default [
+  '{{person.prefix}} {{person.first_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.last_name}} {{person.suffix}}',
+  '{{person.first_name}} {{person.last_name}}',
+  '{{person.male_first_name}} {{person.last_name}}',
+  '{{person.female_first_name}} {{person.last_name}}',
+];
diff --git a/src/locales/en/name/prefix.ts b/src/locales/en/person/prefix.ts
index 7dd8c5cb..7dd8c5cb 100644
--- a/src/locales/en/name/prefix.ts
+++ b/src/locales/en/person/prefix.ts
diff --git a/src/locales/en/name/sex.ts b/src/locales/en/person/sex.ts
index 66576370..66576370 100644
--- a/src/locales/en/name/sex.ts
+++ b/src/locales/en/person/sex.ts
diff --git a/src/locales/en/name/suffix.ts b/src/locales/en/person/suffix.ts
index f03e79a8..f03e79a8 100644
--- a/src/locales/en/name/suffix.ts
+++ b/src/locales/en/person/suffix.ts
diff --git a/src/locales/en/name/title.ts b/src/locales/en/person/title.ts
index 98af8927..98af8927 100644
--- a/src/locales/en/name/title.ts
+++ b/src/locales/en/person/title.ts
diff --git a/src/locales/en_AU/address/city.ts b/src/locales/en_AU/address/city.ts
index 95588a58..ea6ea950 100644
--- a/src/locales/en_AU/address/city.ts
+++ b/src/locales/en_AU/address/city.ts
@@ -1,6 +1,6 @@
 export default [
-  '{{address.city_prefix}} {{name.firstName}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{name.firstName}}',
-  '{{name.firstName}}{{address.city_suffix}}',
-  '{{name.lastName}}{{address.city_suffix}}',
+  '{{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
index 1a1885b1..f7dd9d3b 100644
--- a/src/locales/en_AU/address/street.ts
+++ b/src/locales/en_AU/address/street.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{name.firstName}} {{address.street_suffix}}',
-  '{{name.lastName}} {{address.street_suffix}}',
+  '{{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 d363bb3f..82f106d0 100644
--- a/src/locales/en_AU/index.ts
+++ b/src/locales/en_AU/index.ts
@@ -6,7 +6,7 @@ import type { LocaleDefinition } from '../..';
 import address from './address';
 import company from './company';
 import internet from './internet';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const en_AU: LocaleDefinition = {
@@ -14,7 +14,7 @@ const en_AU: LocaleDefinition = {
   address,
   company,
   internet,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/en_AU/name/first_name.ts b/src/locales/en_AU/person/first_name.ts
index 0fdc0c26..0fdc0c26 100644
--- a/src/locales/en_AU/name/first_name.ts
+++ b/src/locales/en_AU/person/first_name.ts
diff --git a/src/locales/en_IN/name/index.ts b/src/locales/en_AU/person/index.ts
index baa80784..bb956ea5 100644
--- a/src/locales/en_IN/name/index.ts
+++ b/src/locales/en_AU/person/index.ts
@@ -2,13 +2,13 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import first_name from './first_name';
 import last_name from './last_name';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   first_name,
   last_name,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/en_AU/name/last_name.ts b/src/locales/en_AU/person/last_name.ts
index 2288f061..2288f061 100644
--- a/src/locales/en_AU/name/last_name.ts
+++ b/src/locales/en_AU/person/last_name.ts
diff --git a/src/locales/en_AU_ocker/index.ts b/src/locales/en_AU_ocker/index.ts
index 409846f3..9dab70cb 100644
--- a/src/locales/en_AU_ocker/index.ts
+++ b/src/locales/en_AU_ocker/index.ts
@@ -6,7 +6,7 @@ import type { LocaleDefinition } from '../..';
 import address from './address';
 import company from './company';
 import internet from './internet';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const en_AU_ocker: LocaleDefinition = {
@@ -14,7 +14,7 @@ const en_AU_ocker: LocaleDefinition = {
   address,
   company,
   internet,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/en_AU_ocker/name/first_name.ts b/src/locales/en_AU_ocker/person/first_name.ts
index 434743d1..434743d1 100644
--- a/src/locales/en_AU_ocker/name/first_name.ts
+++ b/src/locales/en_AU_ocker/person/first_name.ts
diff --git a/src/locales/en_AU_ocker/name/index.ts b/src/locales/en_AU_ocker/person/index.ts
index 9320c171..894b55db 100644
--- a/src/locales/en_AU_ocker/name/index.ts
+++ b/src/locales/en_AU_ocker/person/index.ts
@@ -2,15 +2,15 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import first_name from './first_name';
 import last_name from './last_name';
 import ocker_first_name from './ocker_first_name';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   first_name,
   last_name,
   ocker_first_name,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/en_AU_ocker/name/last_name.ts b/src/locales/en_AU_ocker/person/last_name.ts
index 2a8e27fa..2a8e27fa 100644
--- a/src/locales/en_AU_ocker/name/last_name.ts
+++ b/src/locales/en_AU_ocker/person/last_name.ts
diff --git a/src/locales/en_AU_ocker/name/ocker_first_name.ts b/src/locales/en_AU_ocker/person/ocker_first_name.ts
index 18c59f2e..18c59f2e 100644
--- a/src/locales/en_AU_ocker/name/ocker_first_name.ts
+++ b/src/locales/en_AU_ocker/person/ocker_first_name.ts
diff --git a/src/locales/en_CA/address/city.ts b/src/locales/en_CA/address/city.ts
index 95588a58..ea6ea950 100644
--- a/src/locales/en_CA/address/city.ts
+++ b/src/locales/en_CA/address/city.ts
@@ -1,6 +1,6 @@
 export default [
-  '{{address.city_prefix}} {{name.firstName}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{name.firstName}}',
-  '{{name.firstName}}{{address.city_suffix}}',
-  '{{name.lastName}}{{address.city_suffix}}',
+  '{{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
index 1a1885b1..f7dd9d3b 100644
--- a/src/locales/en_CA/address/street.ts
+++ b/src/locales/en_CA/address/street.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{name.firstName}} {{address.street_suffix}}',
-  '{{name.lastName}} {{address.street_suffix}}',
+  '{{person.firstName}} {{address.street_suffix}}',
+  '{{person.lastName}} {{address.street_suffix}}',
 ];
diff --git a/src/locales/en_GB/address/city.ts b/src/locales/en_GB/address/city.ts
index 95588a58..ea6ea950 100644
--- a/src/locales/en_GB/address/city.ts
+++ b/src/locales/en_GB/address/city.ts
@@ -1,6 +1,6 @@
 export default [
-  '{{address.city_prefix}} {{name.firstName}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{name.firstName}}',
-  '{{name.firstName}}{{address.city_suffix}}',
-  '{{name.lastName}}{{address.city_suffix}}',
+  '{{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
index 1a1885b1..f7dd9d3b 100644
--- a/src/locales/en_GB/address/street.ts
+++ b/src/locales/en_GB/address/street.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{name.firstName}} {{address.street_suffix}}',
-  '{{name.lastName}} {{address.street_suffix}}',
+  '{{person.firstName}} {{address.street_suffix}}',
+  '{{person.lastName}} {{address.street_suffix}}',
 ];
diff --git a/src/locales/en_GH/address/street.ts b/src/locales/en_GH/address/street.ts
index 2450e110..0c511a22 100644
--- a/src/locales/en_GH/address/street.ts
+++ b/src/locales/en_GH/address/street.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{name.last_name}} {{address.street_suffix}}',
+  '{{person.last_name}} {{address.street_suffix}}',
   '{{address.street_prefix}} {{address.street_suffix}}',
 ];
diff --git a/src/locales/en_GH/company/name_patterns.ts b/src/locales/en_GH/company/name_patterns.ts
index 00dbe5eb..0d6bbac8 100644
--- a/src/locales/en_GH/company/name_patterns.ts
+++ b/src/locales/en_GH/company/name_patterns.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{name.last_name}} {{company.suffix}}',
-  '{{name.last_name}} and {{name.last_name}}',
+  '{{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}} and {{person.last_name}}',
 ];
diff --git a/src/locales/en_GH/index.ts b/src/locales/en_GH/index.ts
index ec202a83..0769e50a 100644
--- a/src/locales/en_GH/index.ts
+++ b/src/locales/en_GH/index.ts
@@ -6,7 +6,7 @@ import type { LocaleDefinition } from '../..';
 import address from './address';
 import company from './company';
 import internet from './internet';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const en_GH: LocaleDefinition = {
@@ -14,7 +14,7 @@ const en_GH: LocaleDefinition = {
   address,
   company,
   internet,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/en_GH/name/first_name.ts b/src/locales/en_GH/name/first_name.ts
deleted file mode 100644
index b20c511d..00000000
--- a/src/locales/en_GH/name/first_name.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{name.female_first_name}}', '{{name.male_first_name}}'];
diff --git a/src/locales/en_GH/name/name.ts b/src/locales/en_GH/name/name.ts
deleted file mode 100644
index a4eeb41d..00000000
--- a/src/locales/en_GH/name/name.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export default [
-  '{{name.female_first_name}} {{name.last_name}}',
-  '{{name.female_first_name}} {{name.last_name}}-{{name.last_name}}',
-  '{{name.male_first_name}} {{name.last_name}}',
-  '{{name.male_first_name}} {{name.last_name}}-{{name.last_name}}',
-];
diff --git a/src/locales/en_GH/name/female_first_name.ts b/src/locales/en_GH/person/female_first_name.ts
index 18df3725..18df3725 100644
--- a/src/locales/en_GH/name/female_first_name.ts
+++ b/src/locales/en_GH/person/female_first_name.ts
diff --git a/src/locales/en_GH/person/first_name.ts b/src/locales/en_GH/person/first_name.ts
new file mode 100644
index 00000000..8ce2b1ac
--- /dev/null
+++ b/src/locales/en_GH/person/first_name.ts
@@ -0,0 +1 @@
+export default ['{{person.female_first_name}}', '{{person.male_first_name}}'];
diff --git a/src/locales/en_ZA/name/index.ts b/src/locales/en_GH/person/index.ts
index 80631e1c..b0887ae5 100644
--- a/src/locales/en_ZA/name/index.ts
+++ b/src/locales/en_GH/person/index.ts
@@ -2,14 +2,14 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import first_name from './first_name';
 import last_name from './last_name';
 import male_first_name from './male_first_name';
 import name_ from './name';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   first_name,
   last_name,
@@ -17,4 +17,4 @@ const name: NameDefinitions = {
   name: name_,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/en_GH/name/last_name.ts b/src/locales/en_GH/person/last_name.ts
index 3fa4bbb1..3fa4bbb1 100644
--- a/src/locales/en_GH/name/last_name.ts
+++ b/src/locales/en_GH/person/last_name.ts
diff --git a/src/locales/en_GH/name/male_first_name.ts b/src/locales/en_GH/person/male_first_name.ts
index 20b2cf4d..20b2cf4d 100644
--- a/src/locales/en_GH/name/male_first_name.ts
+++ b/src/locales/en_GH/person/male_first_name.ts
diff --git a/src/locales/en_GH/person/name.ts b/src/locales/en_GH/person/name.ts
new file mode 100644
index 00000000..40cb9edc
--- /dev/null
+++ b/src/locales/en_GH/person/name.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{person.female_first_name}} {{person.last_name}}',
+  '{{person.female_first_name}} {{person.last_name}}-{{person.last_name}}',
+  '{{person.male_first_name}} {{person.last_name}}',
+  '{{person.male_first_name}} {{person.last_name}}-{{person.last_name}}',
+];
diff --git a/src/locales/en_IE/address/city.ts b/src/locales/en_IE/address/city.ts
index 95588a58..ea6ea950 100644
--- a/src/locales/en_IE/address/city.ts
+++ b/src/locales/en_IE/address/city.ts
@@ -1,6 +1,6 @@
 export default [
-  '{{address.city_prefix}} {{name.firstName}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{name.firstName}}',
-  '{{name.firstName}}{{address.city_suffix}}',
-  '{{name.lastName}}{{address.city_suffix}}',
+  '{{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
index 1a1885b1..f7dd9d3b 100644
--- a/src/locales/en_IE/address/street.ts
+++ b/src/locales/en_IE/address/street.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{name.firstName}} {{address.street_suffix}}',
-  '{{name.lastName}} {{address.street_suffix}}',
+  '{{person.firstName}} {{address.street_suffix}}',
+  '{{person.lastName}} {{address.street_suffix}}',
 ];
diff --git a/src/locales/en_IN/address/street.ts b/src/locales/en_IN/address/street.ts
index 1a1885b1..f7dd9d3b 100644
--- a/src/locales/en_IN/address/street.ts
+++ b/src/locales/en_IN/address/street.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{name.firstName}} {{address.street_suffix}}',
-  '{{name.lastName}} {{address.street_suffix}}',
+  '{{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 c0661492..8e92298c 100644
--- a/src/locales/en_IN/index.ts
+++ b/src/locales/en_IN/index.ts
@@ -6,7 +6,7 @@ import type { LocaleDefinition } from '../..';
 import address from './address';
 import company from './company';
 import internet from './internet';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const en_IN: LocaleDefinition = {
@@ -14,7 +14,7 @@ const en_IN: LocaleDefinition = {
   address,
   company,
   internet,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/en_IN/name/first_name.ts b/src/locales/en_IN/person/first_name.ts
index 2aae1669..2aae1669 100644
--- a/src/locales/en_IN/name/first_name.ts
+++ b/src/locales/en_IN/person/first_name.ts
diff --git a/src/locales/en_AU/name/index.ts b/src/locales/en_IN/person/index.ts
index baa80784..bb956ea5 100644
--- a/src/locales/en_AU/name/index.ts
+++ b/src/locales/en_IN/person/index.ts
@@ -2,13 +2,13 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import first_name from './first_name';
 import last_name from './last_name';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   first_name,
   last_name,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/en_IN/name/last_name.ts b/src/locales/en_IN/person/last_name.ts
index 01913363..01913363 100644
--- a/src/locales/en_IN/name/last_name.ts
+++ b/src/locales/en_IN/person/last_name.ts
diff --git a/src/locales/en_NG/address/street.ts b/src/locales/en_NG/address/street.ts
index 1a1885b1..f7dd9d3b 100644
--- a/src/locales/en_NG/address/street.ts
+++ b/src/locales/en_NG/address/street.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{name.firstName}} {{address.street_suffix}}',
-  '{{name.lastName}} {{address.street_suffix}}',
+  '{{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 b4273f6a..7ae85c95 100644
--- a/src/locales/en_NG/index.ts
+++ b/src/locales/en_NG/index.ts
@@ -6,7 +6,7 @@ import type { LocaleDefinition } from '../..';
 import address from './address';
 import company from './company';
 import internet from './internet';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const en_NG: LocaleDefinition = {
@@ -14,7 +14,7 @@ const en_NG: LocaleDefinition = {
   address,
   company,
   internet,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/en_NG/name/name.ts b/src/locales/en_NG/name/name.ts
deleted file mode 100644
index bfaf2fc6..00000000
--- a/src/locales/en_NG/name/name.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{name.first_name}} {{name.last_name}}',
-  '{{name.last_name}} {{name.first_name}}',
-];
diff --git a/src/locales/en_NG/name/female_first_name.ts b/src/locales/en_NG/person/female_first_name.ts
index f87370bb..f87370bb 100644
--- a/src/locales/en_NG/name/female_first_name.ts
+++ b/src/locales/en_NG/person/female_first_name.ts
diff --git a/src/locales/en_NG/name/first_name.ts b/src/locales/en_NG/person/first_name.ts
index 73c7f6be..73c7f6be 100644
--- a/src/locales/en_NG/name/first_name.ts
+++ b/src/locales/en_NG/person/first_name.ts
diff --git a/src/locales/en_GH/name/index.ts b/src/locales/en_NG/person/index.ts
index 80631e1c..b0887ae5 100644
--- a/src/locales/en_GH/name/index.ts
+++ b/src/locales/en_NG/person/index.ts
@@ -2,14 +2,14 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import first_name from './first_name';
 import last_name from './last_name';
 import male_first_name from './male_first_name';
 import name_ from './name';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   first_name,
   last_name,
@@ -17,4 +17,4 @@ const name: NameDefinitions = {
   name: name_,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/en_NG/name/last_name.ts b/src/locales/en_NG/person/last_name.ts
index bf66aa1e..bf66aa1e 100644
--- a/src/locales/en_NG/name/last_name.ts
+++ b/src/locales/en_NG/person/last_name.ts
diff --git a/src/locales/en_NG/name/male_first_name.ts b/src/locales/en_NG/person/male_first_name.ts
index 3241212e..3241212e 100644
--- a/src/locales/en_NG/name/male_first_name.ts
+++ b/src/locales/en_NG/person/male_first_name.ts
diff --git a/src/locales/en_NG/person/name.ts b/src/locales/en_NG/person/name.ts
new file mode 100644
index 00000000..ed508514
--- /dev/null
+++ b/src/locales/en_NG/person/name.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{person.first_name}} {{person.last_name}}',
+  '{{person.last_name}} {{person.first_name}}',
+];
diff --git a/src/locales/en_US/address/city.ts b/src/locales/en_US/address/city.ts
index 95588a58..ea6ea950 100644
--- a/src/locales/en_US/address/city.ts
+++ b/src/locales/en_US/address/city.ts
@@ -1,6 +1,6 @@
 export default [
-  '{{address.city_prefix}} {{name.firstName}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{name.firstName}}',
-  '{{name.firstName}}{{address.city_suffix}}',
-  '{{name.lastName}}{{address.city_suffix}}',
+  '{{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
index 1a1885b1..f7dd9d3b 100644
--- a/src/locales/en_US/address/street.ts
+++ b/src/locales/en_US/address/street.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{name.firstName}} {{address.street_suffix}}',
-  '{{name.lastName}} {{address.street_suffix}}',
+  '{{person.firstName}} {{address.street_suffix}}',
+  '{{person.lastName}} {{address.street_suffix}}',
 ];
diff --git a/src/locales/en_ZA/address/street.ts b/src/locales/en_ZA/address/street.ts
index 1a1885b1..f7dd9d3b 100644
--- a/src/locales/en_ZA/address/street.ts
+++ b/src/locales/en_ZA/address/street.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{name.firstName}} {{address.street_suffix}}',
-  '{{name.lastName}} {{address.street_suffix}}',
+  '{{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 d23b89d8..114c9c0c 100644
--- a/src/locales/en_ZA/index.ts
+++ b/src/locales/en_ZA/index.ts
@@ -7,7 +7,7 @@ import address from './address';
 import cell_phone from './cell_phone';
 import company from './company';
 import internet from './internet';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const en_ZA: LocaleDefinition = {
@@ -16,7 +16,7 @@ const en_ZA: LocaleDefinition = {
   cell_phone,
   company,
   internet,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/en_ZA/name/name.ts b/src/locales/en_ZA/name/name.ts
deleted file mode 100644
index bfaf2fc6..00000000
--- a/src/locales/en_ZA/name/name.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{name.first_name}} {{name.last_name}}',
-  '{{name.last_name}} {{name.first_name}}',
-];
diff --git a/src/locales/en_ZA/name/female_first_name.ts b/src/locales/en_ZA/person/female_first_name.ts
index 6825d9c0..6825d9c0 100644
--- a/src/locales/en_ZA/name/female_first_name.ts
+++ b/src/locales/en_ZA/person/female_first_name.ts
diff --git a/src/locales/en_ZA/name/first_name.ts b/src/locales/en_ZA/person/first_name.ts
index d11cb536..d11cb536 100644
--- a/src/locales/en_ZA/name/first_name.ts
+++ b/src/locales/en_ZA/person/first_name.ts
diff --git a/src/locales/fi/name/index.ts b/src/locales/en_ZA/person/index.ts
index 80631e1c..b0887ae5 100644
--- a/src/locales/fi/name/index.ts
+++ b/src/locales/en_ZA/person/index.ts
@@ -2,14 +2,14 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import first_name from './first_name';
 import last_name from './last_name';
 import male_first_name from './male_first_name';
 import name_ from './name';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   first_name,
   last_name,
@@ -17,4 +17,4 @@ const name: NameDefinitions = {
   name: name_,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/en_ZA/name/last_name.ts b/src/locales/en_ZA/person/last_name.ts
index be8aa3eb..be8aa3eb 100644
--- a/src/locales/en_ZA/name/last_name.ts
+++ b/src/locales/en_ZA/person/last_name.ts
diff --git a/src/locales/en_ZA/name/male_first_name.ts b/src/locales/en_ZA/person/male_first_name.ts
index 8a6439ff..8a6439ff 100644
--- a/src/locales/en_ZA/name/male_first_name.ts
+++ b/src/locales/en_ZA/person/male_first_name.ts
diff --git a/src/locales/en_ZA/person/name.ts b/src/locales/en_ZA/person/name.ts
new file mode 100644
index 00000000..ed508514
--- /dev/null
+++ b/src/locales/en_ZA/person/name.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{person.first_name}} {{person.last_name}}',
+  '{{person.last_name}} {{person.first_name}}',
+];
diff --git a/src/locales/es/address/street.ts b/src/locales/es/address/street.ts
index 89de841d..36db82de 100644
--- a/src/locales/es/address/street.ts
+++ b/src/locales/es/address/street.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{address.street_suffix}} {{name.first_name}}',
-  '{{address.street_suffix}} {{name.first_name}} {{name.last_name}}',
+  '{{address.street_suffix}} {{person.first_name}}',
+  '{{address.street_suffix}} {{person.first_name}} {{person.last_name}}',
 ];
diff --git a/src/locales/es/company/name_patterns.ts b/src/locales/es/company/name_patterns.ts
index a436ce84..9fd80f8a 100644
--- a/src/locales/es/company/name_patterns.ts
+++ b/src/locales/es/company/name_patterns.ts
@@ -1,6 +1,6 @@
 export default [
-  '{{name.last_name}} {{company.suffix}}',
-  '{{name.last_name}} y {{name.last_name}}',
-  '{{name.last_name}} {{name.last_name}} {{company.suffix}}',
-  '{{name.last_name}}, {{name.last_name}} y {{name.last_name}} Asociados',
+  '{{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}} y {{person.last_name}}',
+  '{{person.last_name}} {{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}}, {{person.last_name}} y {{person.last_name}} Asociados',
 ];
diff --git a/src/locales/es/index.ts b/src/locales/es/index.ts
index a4161d4e..04b72f8e 100644
--- a/src/locales/es/index.ts
+++ b/src/locales/es/index.ts
@@ -10,7 +10,7 @@ import commerce from './commerce';
 import company from './company';
 import date from './date';
 import internet from './internet';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const es: LocaleDefinition = {
@@ -22,7 +22,7 @@ const es: LocaleDefinition = {
   company,
   date,
   internet,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/es/name/name.ts b/src/locales/es/name/name.ts
deleted file mode 100644
index 69bd76db..00000000
--- a/src/locales/es/name/name.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{name.prefix}} {{name.first_name}} {{name.last_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.last_name}} {{name.last_name}}',
-];
diff --git a/src/locales/es/name/female_first_name.ts b/src/locales/es/person/female_first_name.ts
index 184f5038..184f5038 100644
--- a/src/locales/es/name/female_first_name.ts
+++ b/src/locales/es/person/female_first_name.ts
diff --git a/src/locales/es/name/first_name.ts b/src/locales/es/person/first_name.ts
index 4f1b8a00..4f1b8a00 100644
--- a/src/locales/es/name/first_name.ts
+++ b/src/locales/es/person/first_name.ts
diff --git a/src/locales/hr/name/index.ts b/src/locales/es/person/index.ts
index 8018f95e..581c3d68 100644
--- a/src/locales/hr/name/index.ts
+++ b/src/locales/es/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import first_name from './first_name';
 import last_name from './last_name';
@@ -12,7 +12,7 @@ import prefix from './prefix';
 import suffix from './suffix';
 import title from './title';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   first_name,
   last_name,
@@ -23,4 +23,4 @@ const name: NameDefinitions = {
   title,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/es/name/last_name.ts b/src/locales/es/person/last_name.ts
index 73ce6e05..73ce6e05 100644
--- a/src/locales/es/name/last_name.ts
+++ b/src/locales/es/person/last_name.ts
diff --git a/src/locales/es/name/male_first_name.ts b/src/locales/es/person/male_first_name.ts
index e1e8fe71..e1e8fe71 100644
--- a/src/locales/es/name/male_first_name.ts
+++ b/src/locales/es/person/male_first_name.ts
diff --git a/src/locales/es/person/name.ts b/src/locales/es/person/name.ts
new file mode 100644
index 00000000..45752dd6
--- /dev/null
+++ b/src/locales/es/person/name.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{person.prefix}} {{person.first_name}} {{person.last_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.last_name}} {{person.last_name}}',
+];
diff --git a/src/locales/es/name/prefix.ts b/src/locales/es/person/prefix.ts
index 0e7d848f..0e7d848f 100644
--- a/src/locales/es/name/prefix.ts
+++ b/src/locales/es/person/prefix.ts
diff --git a/src/locales/es/name/suffix.ts b/src/locales/es/person/suffix.ts
index f03e79a8..f03e79a8 100644
--- a/src/locales/es/name/suffix.ts
+++ b/src/locales/es/person/suffix.ts
diff --git a/src/locales/es/name/title.ts b/src/locales/es/person/title.ts
index e2c3d0e3..e2c3d0e3 100644
--- a/src/locales/es/name/title.ts
+++ b/src/locales/es/person/title.ts
diff --git a/src/locales/es_MX/address/street.ts b/src/locales/es_MX/address/street.ts
index 56c7de50..c831c985 100644
--- a/src/locales/es_MX/address/street.ts
+++ b/src/locales/es_MX/address/street.ts
@@ -1,5 +1,5 @@
 export default [
-  '{{address.street_suffix}} {{name.first_name}}',
-  '{{address.street_suffix}} {{name.first_name}} {{name.last_name}}',
+  '{{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/company/name_patterns.ts b/src/locales/es_MX/company/name_patterns.ts
index a436ce84..9fd80f8a 100644
--- a/src/locales/es_MX/company/name_patterns.ts
+++ b/src/locales/es_MX/company/name_patterns.ts
@@ -1,6 +1,6 @@
 export default [
-  '{{name.last_name}} {{company.suffix}}',
-  '{{name.last_name}} y {{name.last_name}}',
-  '{{name.last_name}} {{name.last_name}} {{company.suffix}}',
-  '{{name.last_name}}, {{name.last_name}} y {{name.last_name}} Asociados',
+  '{{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}} y {{person.last_name}}',
+  '{{person.last_name}} {{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}}, {{person.last_name}} y {{person.last_name}} Asociados',
 ];
diff --git a/src/locales/es_MX/index.ts b/src/locales/es_MX/index.ts
index c60536e9..27d43de0 100644
--- a/src/locales/es_MX/index.ts
+++ b/src/locales/es_MX/index.ts
@@ -10,7 +10,7 @@ import commerce from './commerce';
 import company from './company';
 import internet from './internet';
 import lorem from './lorem';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 import team from './team';
 
@@ -24,7 +24,7 @@ const es_MX: LocaleDefinition = {
   company,
   internet,
   lorem,
-  name: name_,
+  person,
   phone_number,
   team,
 };
diff --git a/src/locales/es_MX/name/name.ts b/src/locales/es_MX/name/name.ts
deleted file mode 100644
index ca24ae54..00000000
--- a/src/locales/es_MX/name/name.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export default [
-  '{{name.prefix}} {{name.first_name}} {{name.last_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.last_name}} de {{name.last_name}}',
-  '{{name.suffix}} {{name.first_name}} {{name.last_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.last_name}} {{name.last_name}}',
-];
diff --git a/src/locales/es_MX/name/first_name.ts b/src/locales/es_MX/person/first_name.ts
index 5186f14b..5186f14b 100644
--- a/src/locales/es_MX/name/first_name.ts
+++ b/src/locales/es_MX/person/first_name.ts
diff --git a/src/locales/es_MX/name/index.ts b/src/locales/es_MX/person/index.ts
index 8799810e..48c4cb2f 100644
--- a/src/locales/es_MX/name/index.ts
+++ b/src/locales/es_MX/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import first_name from './first_name';
 import last_name from './last_name';
 import name_ from './name';
@@ -10,7 +10,7 @@ import prefix from './prefix';
 import suffix from './suffix';
 import title from './title';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   first_name,
   last_name,
   name: name_,
@@ -19,4 +19,4 @@ const name: NameDefinitions = {
   title,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/es_MX/name/last_name.ts b/src/locales/es_MX/person/last_name.ts
index c517d7f0..c517d7f0 100644
--- a/src/locales/es_MX/name/last_name.ts
+++ b/src/locales/es_MX/person/last_name.ts
diff --git a/src/locales/es_MX/person/name.ts b/src/locales/es_MX/person/name.ts
new file mode 100644
index 00000000..e6032d2d
--- /dev/null
+++ b/src/locales/es_MX/person/name.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{person.prefix}} {{person.first_name}} {{person.last_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.last_name}} de {{person.last_name}}',
+  '{{person.suffix}} {{person.first_name}} {{person.last_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.last_name}} {{person.last_name}}',
+];
diff --git a/src/locales/es_MX/name/prefix.ts b/src/locales/es_MX/person/prefix.ts
index 0e7d848f..0e7d848f 100644
--- a/src/locales/es_MX/name/prefix.ts
+++ b/src/locales/es_MX/person/prefix.ts
diff --git a/src/locales/es_MX/name/suffix.ts b/src/locales/es_MX/person/suffix.ts
index 1fd63a43..1fd63a43 100644
--- a/src/locales/es_MX/name/suffix.ts
+++ b/src/locales/es_MX/person/suffix.ts
diff --git a/src/locales/es_MX/name/title.ts b/src/locales/es_MX/person/title.ts
index 2b1afedf..2b1afedf 100644
--- a/src/locales/es_MX/name/title.ts
+++ b/src/locales/es_MX/person/title.ts
diff --git a/src/locales/fa/company/name_patterns.ts b/src/locales/fa/company/name_patterns.ts
index 6b30fcd7..e6da7479 100644
--- a/src/locales/fa/company/name_patterns.ts
+++ b/src/locales/fa/company/name_patterns.ts
@@ -1,5 +1,5 @@
 export default [
-  '{{name.last_name}} {{company.suffix}}',
-  '{{name.last_name}}-{{name.last_name}}',
-  '{{name.last_name}}, {{name.last_name}} و {{name.last_name}}',
+  '{{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}}-{{person.last_name}}',
+  '{{person.last_name}}, {{person.last_name}} و {{person.last_name}}',
 ];
diff --git a/src/locales/fa/index.ts b/src/locales/fa/index.ts
index b554f801..27755669 100644
--- a/src/locales/fa/index.ts
+++ b/src/locales/fa/index.ts
@@ -12,7 +12,7 @@ import date from './date';
 import finance from './finance';
 import internet from './internet';
 import lorem from './lorem';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 import vehicle from './vehicle';
 
@@ -27,7 +27,7 @@ const fa: LocaleDefinition = {
   finance,
   internet,
   lorem,
-  name: name_,
+  person,
   phone_number,
   vehicle,
 };
diff --git a/src/locales/fa/name/name.ts b/src/locales/fa/name/name.ts
deleted file mode 100644
index d53b65f5..00000000
--- a/src/locales/fa/name/name.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export default [
-  '{{name.prefix}} {{name.first_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.last_name}}',
-  '{{name.male_first_name}} {{name.last_name}}',
-  '{{name.female_first_name}} {{name.last_name}}',
-];
diff --git a/src/locales/fa/name/female_first_name.ts b/src/locales/fa/person/female_first_name.ts
index a6605dd4..a6605dd4 100644
--- a/src/locales/fa/name/female_first_name.ts
+++ b/src/locales/fa/person/female_first_name.ts
diff --git a/src/locales/fa/name/first_name.ts b/src/locales/fa/person/first_name.ts
index ab010f3c..ab010f3c 100644
--- a/src/locales/fa/name/first_name.ts
+++ b/src/locales/fa/person/first_name.ts
diff --git a/src/locales/sv/name/index.ts b/src/locales/fa/person/index.ts
index 4d532475..7a045ad7 100644
--- a/src/locales/sv/name/index.ts
+++ b/src/locales/fa/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import first_name from './first_name';
 import last_name from './last_name';
@@ -11,7 +11,7 @@ import name_ from './name';
 import prefix from './prefix';
 import title from './title';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   first_name,
   last_name,
@@ -21,4 +21,4 @@ const name: NameDefinitions = {
   title,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/fa/name/last_name.ts b/src/locales/fa/person/last_name.ts
index c012140e..c012140e 100644
--- a/src/locales/fa/name/last_name.ts
+++ b/src/locales/fa/person/last_name.ts
diff --git a/src/locales/fa/name/male_first_name.ts b/src/locales/fa/person/male_first_name.ts
index 3c69594a..3c69594a 100644
--- a/src/locales/fa/name/male_first_name.ts
+++ b/src/locales/fa/person/male_first_name.ts
diff --git a/src/locales/fa/person/name.ts b/src/locales/fa/person/name.ts
new file mode 100644
index 00000000..482cbd41
--- /dev/null
+++ b/src/locales/fa/person/name.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{person.prefix}} {{person.first_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.last_name}}',
+  '{{person.male_first_name}} {{person.last_name}}',
+  '{{person.female_first_name}} {{person.last_name}}',
+];
diff --git a/src/locales/fa/name/prefix.ts b/src/locales/fa/person/prefix.ts
index 23481c79..23481c79 100644
--- a/src/locales/fa/name/prefix.ts
+++ b/src/locales/fa/person/prefix.ts
diff --git a/src/locales/fa/name/title.ts b/src/locales/fa/person/title.ts
index e7e0f52b..e7e0f52b 100644
--- a/src/locales/fa/name/title.ts
+++ b/src/locales/fa/person/title.ts
diff --git a/src/locales/fi/index.ts b/src/locales/fi/index.ts
index 2c511ec6..3aa71040 100644
--- a/src/locales/fi/index.ts
+++ b/src/locales/fi/index.ts
@@ -3,11 +3,11 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import name_ from './name';
+import person from './person';
 
 const fi: LocaleDefinition = {
   title: 'Finnish',
-  name: name_,
+  person,
 };
 
 export default fi;
diff --git a/src/locales/fi/name/name.ts b/src/locales/fi/name/name.ts
deleted file mode 100644
index aaabd8d5..00000000
--- a/src/locales/fi/name/name.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export default [
-  '{{name.first_name}} {{name.last_name}}',
-  '{{name.male_first_name}} {{name.last_name}}',
-  '{{name.female_first_name}} {{name.last_name}}',
-];
diff --git a/src/locales/fi/name/female_first_name.ts b/src/locales/fi/person/female_first_name.ts
index 3989d6ff..3989d6ff 100644
--- a/src/locales/fi/name/female_first_name.ts
+++ b/src/locales/fi/person/female_first_name.ts
diff --git a/src/locales/fi/name/first_name.ts b/src/locales/fi/person/first_name.ts
index 8c61dc5b..8c61dc5b 100644
--- a/src/locales/fi/name/first_name.ts
+++ b/src/locales/fi/person/first_name.ts
diff --git a/src/locales/en_NG/name/index.ts b/src/locales/fi/person/index.ts
index 80631e1c..b0887ae5 100644
--- a/src/locales/en_NG/name/index.ts
+++ b/src/locales/fi/person/index.ts
@@ -2,14 +2,14 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import first_name from './first_name';
 import last_name from './last_name';
 import male_first_name from './male_first_name';
 import name_ from './name';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   first_name,
   last_name,
@@ -17,4 +17,4 @@ const name: NameDefinitions = {
   name: name_,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/fi/name/last_name.ts b/src/locales/fi/person/last_name.ts
index 94a97cc6..94a97cc6 100644
--- a/src/locales/fi/name/last_name.ts
+++ b/src/locales/fi/person/last_name.ts
diff --git a/src/locales/fi/name/male_first_name.ts b/src/locales/fi/person/male_first_name.ts
index 5f2128f8..5f2128f8 100644
--- a/src/locales/fi/name/male_first_name.ts
+++ b/src/locales/fi/person/male_first_name.ts
diff --git a/src/locales/fi/person/name.ts b/src/locales/fi/person/name.ts
new file mode 100644
index 00000000..34f0370d
--- /dev/null
+++ b/src/locales/fi/person/name.ts
@@ -0,0 +1,5 @@
+export default [
+  '{{person.first_name}} {{person.last_name}}',
+  '{{person.male_first_name}} {{person.last_name}}',
+  '{{person.female_first_name}} {{person.last_name}}',
+];
diff --git a/src/locales/fr/company/name_patterns.ts b/src/locales/fr/company/name_patterns.ts
index b56c8812..f5505525 100644
--- a/src/locales/fr/company/name_patterns.ts
+++ b/src/locales/fr/company/name_patterns.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{name.last_name}} {{company.suffix}}',
-  '{{name.last_name}} et {{name.last_name}}',
+  '{{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}} et {{person.last_name}}',
 ];
diff --git a/src/locales/fr/index.ts b/src/locales/fr/index.ts
index e880a475..9beebf7f 100644
--- a/src/locales/fr/index.ts
+++ b/src/locales/fr/index.ts
@@ -13,7 +13,7 @@ import finance from './finance';
 import internet from './internet';
 import lorem from './lorem';
 import music from './music';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 import vehicle from './vehicle';
 import word from './word';
@@ -30,7 +30,7 @@ const fr: LocaleDefinition = {
   internet,
   lorem,
   music,
-  name: name_,
+  person,
   phone_number,
   vehicle,
   word,
diff --git a/src/locales/fr/name/name.ts b/src/locales/fr/name/name.ts
deleted file mode 100644
index 702d9581..00000000
--- a/src/locales/fr/name/name.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export default [
-  '{{name.prefix}} {{name.first_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.last_name}}',
-  '{{name.last_name}} {{name.first_name}}',
-];
diff --git a/src/locales/fr/name/female_first_name.ts b/src/locales/fr/person/female_first_name.ts
index d9fbda26..d9fbda26 100644
--- a/src/locales/fr/name/female_first_name.ts
+++ b/src/locales/fr/person/female_first_name.ts
diff --git a/src/locales/fr/name/first_name.ts b/src/locales/fr/person/first_name.ts
index 6926a090..6926a090 100644
--- a/src/locales/fr/name/first_name.ts
+++ b/src/locales/fr/person/first_name.ts
diff --git a/src/locales/fr_CH/name/index.ts b/src/locales/fr/person/index.ts
index fb0bbc37..507240d7 100644
--- a/src/locales/fr_CH/name/index.ts
+++ b/src/locales/fr/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import first_name from './first_name';
 import last_name from './last_name';
@@ -12,7 +12,7 @@ import prefix from './prefix';
 import sex from './sex';
 import title from './title';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   first_name,
   last_name,
@@ -23,4 +23,4 @@ const name: NameDefinitions = {
   title,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/fr/name/last_name.ts b/src/locales/fr/person/last_name.ts
index 4cd3bac7..4cd3bac7 100644
--- a/src/locales/fr/name/last_name.ts
+++ b/src/locales/fr/person/last_name.ts
diff --git a/src/locales/fr/name/male_first_name.ts b/src/locales/fr/person/male_first_name.ts
index def7ad7c..def7ad7c 100644
--- a/src/locales/fr/name/male_first_name.ts
+++ b/src/locales/fr/person/male_first_name.ts
diff --git a/src/locales/fr/person/name.ts b/src/locales/fr/person/name.ts
new file mode 100644
index 00000000..81f3b1e4
--- /dev/null
+++ b/src/locales/fr/person/name.ts
@@ -0,0 +1,5 @@
+export default [
+  '{{person.prefix}} {{person.first_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.last_name}}',
+  '{{person.last_name}} {{person.first_name}}',
+];
diff --git a/src/locales/fr/name/prefix.ts b/src/locales/fr/person/prefix.ts
index 9418fa41..9418fa41 100644
--- a/src/locales/fr/name/prefix.ts
+++ b/src/locales/fr/person/prefix.ts
diff --git a/src/locales/fr/name/sex.ts b/src/locales/fr/person/sex.ts
index 3f337c9b..3f337c9b 100644
--- a/src/locales/fr/name/sex.ts
+++ b/src/locales/fr/person/sex.ts
diff --git a/src/locales/fr/name/title.ts b/src/locales/fr/person/title.ts
index 85f235ff..85f235ff 100644
--- a/src/locales/fr/name/title.ts
+++ b/src/locales/fr/person/title.ts
diff --git a/src/locales/fr_BE/address/street.ts b/src/locales/fr_BE/address/street.ts
index 24b53ad2..00c17d59 100644
--- a/src/locales/fr_BE/address/street.ts
+++ b/src/locales/fr_BE/address/street.ts
@@ -1,5 +1,5 @@
 export default [
-  '{{address.street_prefix}} {{name.first_name}}',
-  '{{address.street_prefix}} {{name.last_name}}',
+  '{{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/index.ts b/src/locales/fr_BE/index.ts
index addacf79..ed7167df 100644
--- a/src/locales/fr_BE/index.ts
+++ b/src/locales/fr_BE/index.ts
@@ -6,7 +6,7 @@ import type { LocaleDefinition } from '../..';
 import address from './address';
 import cell_phone from './cell_phone';
 import internet from './internet';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const fr_BE: LocaleDefinition = {
@@ -14,7 +14,7 @@ const fr_BE: LocaleDefinition = {
   address,
   cell_phone,
   internet,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/fr_BE/name/name.ts b/src/locales/fr_BE/name/name.ts
deleted file mode 100644
index 05635661..00000000
--- a/src/locales/fr_BE/name/name.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export default [
-  '{{name.prefix}} {{name.first_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.last_name}} {{name.suffix}}',
-  '{{name.first_name}} {{name.last_name}}',
-  '{{name.male_first_name}} {{name.last_name}}',
-  '{{name.female_first_name}} {{name.last_name}}',
-];
diff --git a/src/locales/fr_BE/name/female_first_name.ts b/src/locales/fr_BE/person/female_first_name.ts
index f99c459d..f99c459d 100644
--- a/src/locales/fr_BE/name/female_first_name.ts
+++ b/src/locales/fr_BE/person/female_first_name.ts
diff --git a/src/locales/fr_BE/name/first_name.ts b/src/locales/fr_BE/person/first_name.ts
index 3764777b..3764777b 100644
--- a/src/locales/fr_BE/name/first_name.ts
+++ b/src/locales/fr_BE/person/first_name.ts
diff --git a/src/locales/fr_BE/name/gender.ts b/src/locales/fr_BE/person/gender.ts
index b1cfddaf..b1cfddaf 100644
--- a/src/locales/fr_BE/name/gender.ts
+++ b/src/locales/fr_BE/person/gender.ts
diff --git a/src/locales/fr_BE/name/index.ts b/src/locales/fr_BE/person/index.ts
index c2a67693..1bfa6faa 100644
--- a/src/locales/fr_BE/name/index.ts
+++ b/src/locales/fr_BE/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import first_name from './first_name';
 import gender from './gender';
@@ -13,7 +13,7 @@ import prefix from './prefix';
 import suffix from './suffix';
 import title from './title';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   first_name,
   gender,
@@ -25,4 +25,4 @@ const name: NameDefinitions = {
   title,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/fr_BE/name/last_name.ts b/src/locales/fr_BE/person/last_name.ts
index 66ec1397..66ec1397 100644
--- a/src/locales/fr_BE/name/last_name.ts
+++ b/src/locales/fr_BE/person/last_name.ts
diff --git a/src/locales/fr_BE/name/male_first_name.ts b/src/locales/fr_BE/person/male_first_name.ts
index 14cf81f9..14cf81f9 100644
--- a/src/locales/fr_BE/name/male_first_name.ts
+++ b/src/locales/fr_BE/person/male_first_name.ts
diff --git a/src/locales/fr_BE/person/name.ts b/src/locales/fr_BE/person/name.ts
new file mode 100644
index 00000000..28a268c4
--- /dev/null
+++ b/src/locales/fr_BE/person/name.ts
@@ -0,0 +1,7 @@
+export default [
+  '{{person.prefix}} {{person.first_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.last_name}} {{person.suffix}}',
+  '{{person.first_name}} {{person.last_name}}',
+  '{{person.male_first_name}} {{person.last_name}}',
+  '{{person.female_first_name}} {{person.last_name}}',
+];
diff --git a/src/locales/fr_BE/name/prefix.ts b/src/locales/fr_BE/person/prefix.ts
index 87573ab9..87573ab9 100644
--- a/src/locales/fr_BE/name/prefix.ts
+++ b/src/locales/fr_BE/person/prefix.ts
diff --git a/src/locales/fr_BE/name/suffix.ts b/src/locales/fr_BE/person/suffix.ts
index 97261e04..97261e04 100644
--- a/src/locales/fr_BE/name/suffix.ts
+++ b/src/locales/fr_BE/person/suffix.ts
diff --git a/src/locales/fr_BE/name/title.ts b/src/locales/fr_BE/person/title.ts
index 85f235ff..85f235ff 100644
--- a/src/locales/fr_BE/name/title.ts
+++ b/src/locales/fr_BE/person/title.ts
diff --git a/src/locales/fr_CA/address/city.ts b/src/locales/fr_CA/address/city.ts
index 95588a58..ea6ea950 100644
--- a/src/locales/fr_CA/address/city.ts
+++ b/src/locales/fr_CA/address/city.ts
@@ -1,6 +1,6 @@
 export default [
-  '{{address.city_prefix}} {{name.firstName}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{name.firstName}}',
-  '{{name.firstName}}{{address.city_suffix}}',
-  '{{name.lastName}}{{address.city_suffix}}',
+  '{{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
index 1a1885b1..f7dd9d3b 100644
--- a/src/locales/fr_CA/address/street.ts
+++ b/src/locales/fr_CA/address/street.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{name.firstName}} {{address.street_suffix}}',
-  '{{name.lastName}} {{address.street_suffix}}',
+  '{{person.firstName}} {{address.street_suffix}}',
+  '{{person.lastName}} {{address.street_suffix}}',
 ];
diff --git a/src/locales/fr_CH/index.ts b/src/locales/fr_CH/index.ts
index e46336bb..39f607f6 100644
--- a/src/locales/fr_CH/index.ts
+++ b/src/locales/fr_CH/index.ts
@@ -13,7 +13,7 @@ import finance from './finance';
 import internet from './internet';
 import lorem from './lorem';
 import music from './music';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 import vehicle from './vehicle';
 import word from './word';
@@ -30,7 +30,7 @@ const fr_CH: LocaleDefinition = {
   internet,
   lorem,
   music,
-  name: name_,
+  person,
   phone_number,
   vehicle,
   word,
diff --git a/src/locales/fr_CH/name/name.ts b/src/locales/fr_CH/name/name.ts
deleted file mode 100644
index 702d9581..00000000
--- a/src/locales/fr_CH/name/name.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export default [
-  '{{name.prefix}} {{name.first_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.last_name}}',
-  '{{name.last_name}} {{name.first_name}}',
-];
diff --git a/src/locales/fr_CH/name/female_first_name.ts b/src/locales/fr_CH/person/female_first_name.ts
index eb8733e5..eb8733e5 100644
--- a/src/locales/fr_CH/name/female_first_name.ts
+++ b/src/locales/fr_CH/person/female_first_name.ts
diff --git a/src/locales/fr_CH/name/first_name.ts b/src/locales/fr_CH/person/first_name.ts
index 6926a090..6926a090 100644
--- a/src/locales/fr_CH/name/first_name.ts
+++ b/src/locales/fr_CH/person/first_name.ts
diff --git a/src/locales/fr/name/index.ts b/src/locales/fr_CH/person/index.ts
index fb0bbc37..507240d7 100644
--- a/src/locales/fr/name/index.ts
+++ b/src/locales/fr_CH/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import first_name from './first_name';
 import last_name from './last_name';
@@ -12,7 +12,7 @@ import prefix from './prefix';
 import sex from './sex';
 import title from './title';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   first_name,
   last_name,
@@ -23,4 +23,4 @@ const name: NameDefinitions = {
   title,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/fr_CH/name/last_name.ts b/src/locales/fr_CH/person/last_name.ts
index 9ddbcaa2..9ddbcaa2 100644
--- a/src/locales/fr_CH/name/last_name.ts
+++ b/src/locales/fr_CH/person/last_name.ts
diff --git a/src/locales/fr_CH/name/male_first_name.ts b/src/locales/fr_CH/person/male_first_name.ts
index 284928e4..284928e4 100644
--- a/src/locales/fr_CH/name/male_first_name.ts
+++ b/src/locales/fr_CH/person/male_first_name.ts
diff --git a/src/locales/fr_CH/person/name.ts b/src/locales/fr_CH/person/name.ts
new file mode 100644
index 00000000..81f3b1e4
--- /dev/null
+++ b/src/locales/fr_CH/person/name.ts
@@ -0,0 +1,5 @@
+export default [
+  '{{person.prefix}} {{person.first_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.last_name}}',
+  '{{person.last_name}} {{person.first_name}}',
+];
diff --git a/src/locales/fr_CH/name/prefix.ts b/src/locales/fr_CH/person/prefix.ts
index 9418fa41..9418fa41 100644
--- a/src/locales/fr_CH/name/prefix.ts
+++ b/src/locales/fr_CH/person/prefix.ts
diff --git a/src/locales/fr_CH/name/sex.ts b/src/locales/fr_CH/person/sex.ts
index 3f337c9b..3f337c9b 100644
--- a/src/locales/fr_CH/name/sex.ts
+++ b/src/locales/fr_CH/person/sex.ts
diff --git a/src/locales/fr_CH/name/title.ts b/src/locales/fr_CH/person/title.ts
index 85f235ff..85f235ff 100644
--- a/src/locales/fr_CH/name/title.ts
+++ b/src/locales/fr_CH/person/title.ts
diff --git a/src/locales/ge/address/city.ts b/src/locales/ge/address/city.ts
index d518527b..27a932f1 100644
--- a/src/locales/ge/address/city.ts
+++ b/src/locales/ge/address/city.ts
@@ -1,6 +1,6 @@
 export default [
-  '{{address.city_prefix}} {{name.first_name}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{name.first_name}}',
-  '{{name.first_name}}{{address.city_suffix}}',
-  '{{name.last_name}}{{address.city_suffix}}',
+  '{{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/company/name_patterns.ts b/src/locales/ge/company/name_patterns.ts
index 0bf9d304..51e9f464 100644
--- a/src/locales/ge/company/name_patterns.ts
+++ b/src/locales/ge/company/name_patterns.ts
@@ -1,7 +1,7 @@
 export default [
-  '{{company.prefix}} {{name.first_name}}',
-  '{{company.prefix}} {{name.last_name}}',
-  '{{company.prefix}} {{name.last_name}} {{company.suffix}}',
-  '{{company.prefix}} {{name.first_name}} {{company.suffix}}',
-  '{{company.prefix}} {{name.last_name}}-{{name.last_name}}',
+  '{{company.prefix}} {{person.first_name}}',
+  '{{company.prefix}} {{person.last_name}}',
+  '{{company.prefix}} {{person.last_name}} {{company.suffix}}',
+  '{{company.prefix}} {{person.first_name}} {{company.suffix}}',
+  '{{company.prefix}} {{person.last_name}}-{{person.last_name}}',
 ];
diff --git a/src/locales/ge/index.ts b/src/locales/ge/index.ts
index 73d93f8e..4b98ece6 100644
--- a/src/locales/ge/index.ts
+++ b/src/locales/ge/index.ts
@@ -7,7 +7,7 @@ import address from './address';
 import cell_phone from './cell_phone';
 import company from './company';
 import internet from './internet';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const ge: LocaleDefinition = {
@@ -17,7 +17,7 @@ const ge: LocaleDefinition = {
   cell_phone,
   company,
   internet,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/ge/name/name.ts b/src/locales/ge/name/name.ts
deleted file mode 100644
index 877a3756..00000000
--- a/src/locales/ge/name/name.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{name.prefix}} {{name.first_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.last_name}}',
-];
diff --git a/src/locales/ge/name/first_name.ts b/src/locales/ge/person/first_name.ts
index c60d60df..c60d60df 100644
--- a/src/locales/ge/name/first_name.ts
+++ b/src/locales/ge/person/first_name.ts
diff --git a/src/locales/el/name/index.ts b/src/locales/ge/person/index.ts
index e0c74acd..55a45eb2 100644
--- a/src/locales/el/name/index.ts
+++ b/src/locales/ge/person/index.ts
@@ -2,14 +2,14 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import first_name from './first_name';
 import last_name from './last_name';
 import name_ from './name';
 import prefix from './prefix';
 import title from './title';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   first_name,
   last_name,
   name: name_,
@@ -17,4 +17,4 @@ const name: NameDefinitions = {
   title,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/ge/name/last_name.ts b/src/locales/ge/person/last_name.ts
index f6a9eeaa..f6a9eeaa 100644
--- a/src/locales/ge/name/last_name.ts
+++ b/src/locales/ge/person/last_name.ts
diff --git a/src/locales/ge/person/name.ts b/src/locales/ge/person/name.ts
new file mode 100644
index 00000000..2e536501
--- /dev/null
+++ b/src/locales/ge/person/name.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{person.prefix}} {{person.first_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.last_name}}',
+];
diff --git a/src/locales/ge/name/prefix.ts b/src/locales/ge/person/prefix.ts
index d180b6b7..d180b6b7 100644
--- a/src/locales/ge/name/prefix.ts
+++ b/src/locales/ge/person/prefix.ts
diff --git a/src/locales/ge/name/title.ts b/src/locales/ge/person/title.ts
index f6721ed6..f6721ed6 100644
--- a/src/locales/ge/name/title.ts
+++ b/src/locales/ge/person/title.ts
diff --git a/src/locales/he/index.ts b/src/locales/he/index.ts
index 38a26a29..e17ddc73 100644
--- a/src/locales/he/index.ts
+++ b/src/locales/he/index.ts
@@ -10,7 +10,7 @@ import commerce from './commerce';
 import date from './date';
 import lorem from './lorem';
 import music from './music';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const he: LocaleDefinition = {
@@ -23,7 +23,7 @@ const he: LocaleDefinition = {
   date,
   lorem,
   music,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/he/name/name.ts b/src/locales/he/name/name.ts
deleted file mode 100644
index d53b65f5..00000000
--- a/src/locales/he/name/name.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export default [
-  '{{name.prefix}} {{name.first_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.last_name}}',
-  '{{name.male_first_name}} {{name.last_name}}',
-  '{{name.female_first_name}} {{name.last_name}}',
-];
diff --git a/src/locales/he/name/female_first_name.ts b/src/locales/he/person/female_first_name.ts
index 0329b54f..0329b54f 100644
--- a/src/locales/he/name/female_first_name.ts
+++ b/src/locales/he/person/female_first_name.ts
diff --git a/src/locales/he/name/first_name.ts b/src/locales/he/person/first_name.ts
index 6926a090..6926a090 100644
--- a/src/locales/he/name/first_name.ts
+++ b/src/locales/he/person/first_name.ts
diff --git a/src/locales/he/name/index.ts b/src/locales/he/person/index.ts
index 4d532475..7a045ad7 100644
--- a/src/locales/he/name/index.ts
+++ b/src/locales/he/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import first_name from './first_name';
 import last_name from './last_name';
@@ -11,7 +11,7 @@ import name_ from './name';
 import prefix from './prefix';
 import title from './title';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   first_name,
   last_name,
@@ -21,4 +21,4 @@ const name: NameDefinitions = {
   title,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/he/name/last_name.ts b/src/locales/he/person/last_name.ts
index 2f6a63ec..2f6a63ec 100644
--- a/src/locales/he/name/last_name.ts
+++ b/src/locales/he/person/last_name.ts
diff --git a/src/locales/he/name/male_first_name.ts b/src/locales/he/person/male_first_name.ts
index 83035de0..83035de0 100644
--- a/src/locales/he/name/male_first_name.ts
+++ b/src/locales/he/person/male_first_name.ts
diff --git a/src/locales/he/person/name.ts b/src/locales/he/person/name.ts
new file mode 100644
index 00000000..482cbd41
--- /dev/null
+++ b/src/locales/he/person/name.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{person.prefix}} {{person.first_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.last_name}}',
+  '{{person.male_first_name}} {{person.last_name}}',
+  '{{person.female_first_name}} {{person.last_name}}',
+];
diff --git a/src/locales/he/name/prefix.ts b/src/locales/he/person/prefix.ts
index 9be0e750..9be0e750 100644
--- a/src/locales/he/name/prefix.ts
+++ b/src/locales/he/person/prefix.ts
diff --git a/src/locales/he/name/title.ts b/src/locales/he/person/title.ts
index 98af8927..98af8927 100644
--- a/src/locales/he/name/title.ts
+++ b/src/locales/he/person/title.ts
diff --git a/src/locales/hr/index.ts b/src/locales/hr/index.ts
index 1a018d9f..619d3f3e 100644
--- a/src/locales/hr/index.ts
+++ b/src/locales/hr/index.ts
@@ -7,7 +7,7 @@ import address from './address';
 import cell_phone from './cell_phone';
 import date from './date';
 import internet from './internet';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const hr: LocaleDefinition = {
@@ -16,7 +16,7 @@ const hr: LocaleDefinition = {
   cell_phone,
   date,
   internet,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/hr/name/name.ts b/src/locales/hr/name/name.ts
deleted file mode 100644
index 9ae3a4fa..00000000
--- a/src/locales/hr/name/name.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export default [
-  '{{name.prefix}} {{name.first_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.last_name}}, {{name.suffix}}',
-  '{{name.first_name}} {{name.last_name}}',
-  '{{name.male_first_name}} {{name.last_name}}',
-  '{{name.female_first_name}} {{name.last_name}}',
-];
diff --git a/src/locales/hr/name/female_first_name.ts b/src/locales/hr/person/female_first_name.ts
index 780a427a..780a427a 100644
--- a/src/locales/hr/name/female_first_name.ts
+++ b/src/locales/hr/person/female_first_name.ts
diff --git a/src/locales/hr/name/first_name.ts b/src/locales/hr/person/first_name.ts
index 78f9c831..78f9c831 100644
--- a/src/locales/hr/name/first_name.ts
+++ b/src/locales/hr/person/first_name.ts
diff --git a/src/locales/es/name/index.ts b/src/locales/hr/person/index.ts
index 8018f95e..581c3d68 100644
--- a/src/locales/es/name/index.ts
+++ b/src/locales/hr/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import first_name from './first_name';
 import last_name from './last_name';
@@ -12,7 +12,7 @@ import prefix from './prefix';
 import suffix from './suffix';
 import title from './title';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   first_name,
   last_name,
@@ -23,4 +23,4 @@ const name: NameDefinitions = {
   title,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/hr/name/last_name.ts b/src/locales/hr/person/last_name.ts
index a25aa2ba..a25aa2ba 100644
--- a/src/locales/hr/name/last_name.ts
+++ b/src/locales/hr/person/last_name.ts
diff --git a/src/locales/hr/name/male_first_name.ts b/src/locales/hr/person/male_first_name.ts
index 2c2efb38..2c2efb38 100644
--- a/src/locales/hr/name/male_first_name.ts
+++ b/src/locales/hr/person/male_first_name.ts
diff --git a/src/locales/hr/person/name.ts b/src/locales/hr/person/name.ts
new file mode 100644
index 00000000..740b0642
--- /dev/null
+++ b/src/locales/hr/person/name.ts
@@ -0,0 +1,7 @@
+export default [
+  '{{person.prefix}} {{person.first_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.last_name}}, {{person.suffix}}',
+  '{{person.first_name}} {{person.last_name}}',
+  '{{person.male_first_name}} {{person.last_name}}',
+  '{{person.female_first_name}} {{person.last_name}}',
+];
diff --git a/src/locales/hr/name/prefix.ts b/src/locales/hr/person/prefix.ts
index ce182e8b..ce182e8b 100644
--- a/src/locales/hr/name/prefix.ts
+++ b/src/locales/hr/person/prefix.ts
diff --git a/src/locales/hr/name/suffix.ts b/src/locales/hr/person/suffix.ts
index c3bd5945..c3bd5945 100644
--- a/src/locales/hr/name/suffix.ts
+++ b/src/locales/hr/person/suffix.ts
diff --git a/src/locales/hr/name/title.ts b/src/locales/hr/person/title.ts
index 50cdf3f9..50cdf3f9 100644
--- a/src/locales/hr/name/title.ts
+++ b/src/locales/hr/person/title.ts
diff --git a/src/locales/hu/index.ts b/src/locales/hu/index.ts
index 65629325..f093b93b 100644
--- a/src/locales/hu/index.ts
+++ b/src/locales/hu/index.ts
@@ -8,7 +8,7 @@ import commerce from './commerce';
 import date from './date';
 import finance from './finance';
 import internet from './internet';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 import word from './word';
 
@@ -19,7 +19,7 @@ const hu: LocaleDefinition = {
   date,
   finance,
   internet,
-  name: name_,
+  person,
   phone_number,
   word,
 };
diff --git a/src/locales/hu/name/name.ts b/src/locales/hu/name/name.ts
deleted file mode 100644
index be3286d4..00000000
--- a/src/locales/hu/name/name.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{name.prefix}} {{name.last_name}} {{name.first_name}}',
-  '{{name.last_name}} {{name.first_name}}',
-];
diff --git a/src/locales/hu/name/female_first_name.ts b/src/locales/hu/person/female_first_name.ts
index 2cecf791..2cecf791 100644
--- a/src/locales/hu/name/female_first_name.ts
+++ b/src/locales/hu/person/female_first_name.ts
diff --git a/src/locales/hu/name/first_name.ts b/src/locales/hu/person/first_name.ts
index 6926a090..6926a090 100644
--- a/src/locales/hu/name/first_name.ts
+++ b/src/locales/hu/person/first_name.ts
diff --git a/src/locales/tr/name/index.ts b/src/locales/hu/person/index.ts
index fbc16c3d..2ba33f8c 100644
--- a/src/locales/tr/name/index.ts
+++ b/src/locales/hu/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import first_name from './first_name';
 import last_name from './last_name';
@@ -10,7 +10,7 @@ import male_first_name from './male_first_name';
 import name_ from './name';
 import prefix from './prefix';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   first_name,
   last_name,
@@ -19,4 +19,4 @@ const name: NameDefinitions = {
   prefix,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/hu/name/last_name.ts b/src/locales/hu/person/last_name.ts
index 0792f35f..0792f35f 100644
--- a/src/locales/hu/name/last_name.ts
+++ b/src/locales/hu/person/last_name.ts
diff --git a/src/locales/hu/name/male_first_name.ts b/src/locales/hu/person/male_first_name.ts
index 2f0e0ac8..2f0e0ac8 100644
--- a/src/locales/hu/name/male_first_name.ts
+++ b/src/locales/hu/person/male_first_name.ts
diff --git a/src/locales/hu/person/name.ts b/src/locales/hu/person/name.ts
new file mode 100644
index 00000000..0a6c8d52
--- /dev/null
+++ b/src/locales/hu/person/name.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{person.prefix}} {{person.last_name}} {{person.first_name}}',
+  '{{person.last_name}} {{person.first_name}}',
+];
diff --git a/src/locales/hu/name/prefix.ts b/src/locales/hu/person/prefix.ts
index f6b457bf..f6b457bf 100644
--- a/src/locales/hu/name/prefix.ts
+++ b/src/locales/hu/person/prefix.ts
diff --git a/src/locales/hy/address/city.ts b/src/locales/hy/address/city.ts
index 70c65be9..a441b2f7 100644
--- a/src/locales/hy/address/city.ts
+++ b/src/locales/hy/address/city.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{address.city_prefix}} {{name.last_name}}',
-  '{{name.last_name}}{{address.city_suffix}}',
+  '{{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
index cd90bc60..4b6c9f6f 100644
--- a/src/locales/hy/address/street.ts
+++ b/src/locales/hy/address/street.ts
@@ -1 +1 @@
-export default ['{{name.last_name}} {{address.street_suffix}}'];
+export default ['{{person.last_name}} {{address.street_suffix}}'];
diff --git a/src/locales/hy/index.ts b/src/locales/hy/index.ts
index 1a1fb639..8ee5b063 100644
--- a/src/locales/hy/index.ts
+++ b/src/locales/hy/index.ts
@@ -8,7 +8,7 @@ import color from './color';
 import date from './date';
 import internet from './internet';
 import lorem from './lorem';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const hy: LocaleDefinition = {
@@ -19,7 +19,7 @@ const hy: LocaleDefinition = {
   date,
   internet,
   lorem,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/hy/name/index.ts b/src/locales/hy/name/index.ts
deleted file mode 100644
index 80631e1c..00000000
--- a/src/locales/hy/name/index.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * This file is automatically generated.
- * Run 'pnpm run generate:locales' to update.
- */
-import type { NameDefinitions } from '../../..';
-import female_first_name from './female_first_name';
-import first_name from './first_name';
-import last_name from './last_name';
-import male_first_name from './male_first_name';
-import name_ from './name';
-
-const name: NameDefinitions = {
-  female_first_name,
-  first_name,
-  last_name,
-  male_first_name,
-  name: name_,
-};
-
-export default name;
diff --git a/src/locales/hy/name/name.ts b/src/locales/hy/name/name.ts
deleted file mode 100644
index 05635661..00000000
--- a/src/locales/hy/name/name.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export default [
-  '{{name.prefix}} {{name.first_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.last_name}} {{name.suffix}}',
-  '{{name.first_name}} {{name.last_name}}',
-  '{{name.male_first_name}} {{name.last_name}}',
-  '{{name.female_first_name}} {{name.last_name}}',
-];
diff --git a/src/locales/hy/name/female_first_name.ts b/src/locales/hy/person/female_first_name.ts
index 085dc022..085dc022 100644
--- a/src/locales/hy/name/female_first_name.ts
+++ b/src/locales/hy/person/female_first_name.ts
diff --git a/src/locales/hy/name/first_name.ts b/src/locales/hy/person/first_name.ts
index 6aa9c011..6aa9c011 100644
--- a/src/locales/hy/name/first_name.ts
+++ b/src/locales/hy/person/first_name.ts
diff --git a/src/locales/hy/person/index.ts b/src/locales/hy/person/index.ts
new file mode 100644
index 00000000..b0887ae5
--- /dev/null
+++ b/src/locales/hy/person/index.ts
@@ -0,0 +1,20 @@
+/*
+ * This file is automatically generated.
+ * Run 'pnpm run generate:locales' to update.
+ */
+import type { PersonDefinitions } from '../../..';
+import female_first_name from './female_first_name';
+import first_name from './first_name';
+import last_name from './last_name';
+import male_first_name from './male_first_name';
+import name_ from './name';
+
+const person: PersonDefinitions = {
+  female_first_name,
+  first_name,
+  last_name,
+  male_first_name,
+  name: name_,
+};
+
+export default person;
diff --git a/src/locales/hy/name/last_name.ts b/src/locales/hy/person/last_name.ts
index a40923ed..a40923ed 100644
--- a/src/locales/hy/name/last_name.ts
+++ b/src/locales/hy/person/last_name.ts
diff --git a/src/locales/hy/name/male_first_name.ts b/src/locales/hy/person/male_first_name.ts
index 312a7864..312a7864 100644
--- a/src/locales/hy/name/male_first_name.ts
+++ b/src/locales/hy/person/male_first_name.ts
diff --git a/src/locales/hy/person/name.ts b/src/locales/hy/person/name.ts
new file mode 100644
index 00000000..28a268c4
--- /dev/null
+++ b/src/locales/hy/person/name.ts
@@ -0,0 +1,7 @@
+export default [
+  '{{person.prefix}} {{person.first_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.last_name}} {{person.suffix}}',
+  '{{person.first_name}} {{person.last_name}}',
+  '{{person.male_first_name}} {{person.last_name}}',
+  '{{person.female_first_name}} {{person.last_name}}',
+];
diff --git a/src/locales/id_ID/address/street.ts b/src/locales/id_ID/address/street.ts
index 0b48ceb8..5db4f5be 100644
--- a/src/locales/id_ID/address/street.ts
+++ b/src/locales/id_ID/address/street.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{address.street_prefix}} {{name.first_name}}',
-  '{{address.street_prefix}} {{name.last_name}}',
+  '{{address.street_prefix}} {{person.first_name}}',
+  '{{address.street_prefix}} {{person.last_name}}',
 ];
diff --git a/src/locales/id_ID/company/name_patterns.ts b/src/locales/id_ID/company/name_patterns.ts
index ad727b37..ac47d182 100644
--- a/src/locales/id_ID/company/name_patterns.ts
+++ b/src/locales/id_ID/company/name_patterns.ts
@@ -1,5 +1,5 @@
 export default [
-  '{{company.prefix}} {{name.last_name}}',
-  '{{name.last_name}} {{company.suffix}}',
-  '{{company.prefix}} {{name.last_name}} {{company.suffix}}',
+  '{{company.prefix}} {{person.last_name}}',
+  '{{person.last_name}} {{company.suffix}}',
+  '{{company.prefix}} {{person.last_name}} {{company.suffix}}',
 ];
diff --git a/src/locales/id_ID/index.ts b/src/locales/id_ID/index.ts
index 18ae34d0..71ffec29 100644
--- a/src/locales/id_ID/index.ts
+++ b/src/locales/id_ID/index.ts
@@ -7,7 +7,7 @@ import address from './address';
 import company from './company';
 import date from './date';
 import internet from './internet';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const id_ID: LocaleDefinition = {
@@ -16,7 +16,7 @@ const id_ID: LocaleDefinition = {
   company,
   date,
   internet,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/id_ID/name/name.ts b/src/locales/id_ID/name/name.ts
deleted file mode 100644
index ed95e27e..00000000
--- a/src/locales/id_ID/name/name.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export default [
-  '{{name.male_first_name}} {{name.male_last_name}}',
-  '{{name.male_last_name}} {{name.male_first_name}}',
-  '{{name.male_first_name}} {{name.male_first_name}} {{name.male_last_name}}',
-  '{{name.female_first_name}} {{name.female_last_name}}',
-  '{{name.female_first_name}} {{name.male_last_name}}',
-  '{{name.female_last_name}} {{name.female_first_name}}',
-  '{{name.female_first_name}} {{name.female_first_name}} {{name.female_last_name}}',
-];
diff --git a/src/locales/id_ID/name/female_first_name.ts b/src/locales/id_ID/person/female_first_name.ts
index 3e4650c7..3e4650c7 100644
--- a/src/locales/id_ID/name/female_first_name.ts
+++ b/src/locales/id_ID/person/female_first_name.ts
diff --git a/src/locales/id_ID/name/female_last_name.ts b/src/locales/id_ID/person/female_last_name.ts
index ce83a7d0..ce83a7d0 100644
--- a/src/locales/id_ID/name/female_last_name.ts
+++ b/src/locales/id_ID/person/female_last_name.ts
diff --git a/src/locales/id_ID/name/female_title.ts b/src/locales/id_ID/person/female_title.ts
index ebef5417..ebef5417 100644
--- a/src/locales/id_ID/name/female_title.ts
+++ b/src/locales/id_ID/person/female_title.ts
diff --git a/src/locales/id_ID/name/index.ts b/src/locales/id_ID/person/index.ts
index 9fd0141a..38afd8b4 100644
--- a/src/locales/id_ID/name/index.ts
+++ b/src/locales/id_ID/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import female_last_name from './female_last_name';
 import female_title from './female_title';
@@ -13,7 +13,7 @@ import name_ from './name';
 import prefix from './prefix';
 import suffix from './suffix';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   female_last_name,
   female_title,
@@ -25,4 +25,4 @@ const name: NameDefinitions = {
   suffix,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/id_ID/name/male_first_name.ts b/src/locales/id_ID/person/male_first_name.ts
index eaf88972..eaf88972 100644
--- a/src/locales/id_ID/name/male_first_name.ts
+++ b/src/locales/id_ID/person/male_first_name.ts
diff --git a/src/locales/id_ID/name/male_last_name.ts b/src/locales/id_ID/person/male_last_name.ts
index af3d1493..af3d1493 100644
--- a/src/locales/id_ID/name/male_last_name.ts
+++ b/src/locales/id_ID/person/male_last_name.ts
diff --git a/src/locales/id_ID/name/male_title.ts b/src/locales/id_ID/person/male_title.ts
index b51302fc..b51302fc 100644
--- a/src/locales/id_ID/name/male_title.ts
+++ b/src/locales/id_ID/person/male_title.ts
diff --git a/src/locales/id_ID/person/name.ts b/src/locales/id_ID/person/name.ts
new file mode 100644
index 00000000..fefc263e
--- /dev/null
+++ b/src/locales/id_ID/person/name.ts
@@ -0,0 +1,9 @@
+export default [
+  '{{person.male_first_name}} {{person.male_last_name}}',
+  '{{person.male_last_name}} {{person.male_first_name}}',
+  '{{person.male_first_name}} {{person.male_first_name}} {{person.male_last_name}}',
+  '{{person.female_first_name}} {{person.female_last_name}}',
+  '{{person.female_first_name}} {{person.male_last_name}}',
+  '{{person.female_last_name}} {{person.female_first_name}}',
+  '{{person.female_first_name}} {{person.female_first_name}} {{person.female_last_name}}',
+];
diff --git a/src/locales/id_ID/name/prefix.ts b/src/locales/id_ID/person/prefix.ts
index d6d1738d..d6d1738d 100644
--- a/src/locales/id_ID/name/prefix.ts
+++ b/src/locales/id_ID/person/prefix.ts
diff --git a/src/locales/id_ID/name/suffix.ts b/src/locales/id_ID/person/suffix.ts
index 5f4267e9..5f4267e9 100644
--- a/src/locales/id_ID/name/suffix.ts
+++ b/src/locales/id_ID/person/suffix.ts
diff --git a/src/locales/it/address/city.ts b/src/locales/it/address/city.ts
index a58b8181..f1c33d47 100644
--- a/src/locales/it/address/city.ts
+++ b/src/locales/it/address/city.ts
@@ -1,6 +1,6 @@
 export default [
-  '{{address.city_prefix}} {{name.first_name}} {{address.city_suffix}}',
-  '{{address.city_prefix}} {{name.first_name}}',
-  '{{name.first_name}} {{address.city_suffix}}',
-  '{{name.last_name}} {{address.city_suffix}}',
+  '{{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
index 831de801..5d4a0900 100644
--- a/src/locales/it/address/street.ts
+++ b/src/locales/it/address/street.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{address.street_suffix}} {{name.first_name}}',
-  '{{address.street_suffix}} {{name.last_name}}',
+  '{{address.street_suffix}} {{person.first_name}}',
+  '{{address.street_suffix}} {{person.last_name}}',
 ];
diff --git a/src/locales/it/company/name_patterns.ts b/src/locales/it/company/name_patterns.ts
index f9d0e1e7..a413c532 100644
--- a/src/locales/it/company/name_patterns.ts
+++ b/src/locales/it/company/name_patterns.ts
@@ -1,5 +1,5 @@
 export default [
-  '{{name.last_name}} {{company.suffix}}',
-  '{{name.last_name}}-{{name.last_name}} {{company.suffix}}',
-  '{{name.last_name}}, {{name.last_name}} e {{name.last_name}} {{company.suffix}}',
+  '{{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}}-{{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}}, {{person.last_name}} e {{person.last_name}} {{company.suffix}}',
 ];
diff --git a/src/locales/it/index.ts b/src/locales/it/index.ts
index 0156f5c4..09ce560d 100644
--- a/src/locales/it/index.ts
+++ b/src/locales/it/index.ts
@@ -6,7 +6,7 @@ import type { LocaleDefinition } from '../..';
 import address from './address';
 import company from './company';
 import internet from './internet';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const it: LocaleDefinition = {
@@ -14,7 +14,7 @@ const it: LocaleDefinition = {
   address,
   company,
   internet,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/it/name/name.ts b/src/locales/it/name/name.ts
deleted file mode 100644
index d53b65f5..00000000
--- a/src/locales/it/name/name.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export default [
-  '{{name.prefix}} {{name.first_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.last_name}}',
-  '{{name.male_first_name}} {{name.last_name}}',
-  '{{name.female_first_name}} {{name.last_name}}',
-];
diff --git a/src/locales/it/name/female_first_name.ts b/src/locales/it/person/female_first_name.ts
index 4a408524..4a408524 100644
--- a/src/locales/it/name/female_first_name.ts
+++ b/src/locales/it/person/female_first_name.ts
diff --git a/src/locales/it/name/first_name.ts b/src/locales/it/person/first_name.ts
index c4baa334..c4baa334 100644
--- a/src/locales/it/name/first_name.ts
+++ b/src/locales/it/person/first_name.ts
diff --git a/src/locales/nb_NO/name/index.ts b/src/locales/it/person/index.ts
index 4393e0e7..55193f15 100644
--- a/src/locales/nb_NO/name/index.ts
+++ b/src/locales/it/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import first_name from './first_name';
 import last_name from './last_name';
@@ -11,7 +11,7 @@ import name_ from './name';
 import prefix from './prefix';
 import suffix from './suffix';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   first_name,
   last_name,
@@ -21,4 +21,4 @@ const name: NameDefinitions = {
   suffix,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/it/name/last_name.ts b/src/locales/it/person/last_name.ts
index e9c4ad58..e9c4ad58 100644
--- a/src/locales/it/name/last_name.ts
+++ b/src/locales/it/person/last_name.ts
diff --git a/src/locales/it/name/male_first_name.ts b/src/locales/it/person/male_first_name.ts
index b53826fd..b53826fd 100644
--- a/src/locales/it/name/male_first_name.ts
+++ b/src/locales/it/person/male_first_name.ts
diff --git a/src/locales/it/person/name.ts b/src/locales/it/person/name.ts
new file mode 100644
index 00000000..482cbd41
--- /dev/null
+++ b/src/locales/it/person/name.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{person.prefix}} {{person.first_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.last_name}}',
+  '{{person.male_first_name}} {{person.last_name}}',
+  '{{person.female_first_name}} {{person.last_name}}',
+];
diff --git a/src/locales/it/name/prefix.ts b/src/locales/it/person/prefix.ts
index dd49461b..dd49461b 100644
--- a/src/locales/it/name/prefix.ts
+++ b/src/locales/it/person/prefix.ts
diff --git a/src/locales/it/name/suffix.ts b/src/locales/it/person/suffix.ts
index d6d1738d..d6d1738d 100644
--- a/src/locales/it/name/suffix.ts
+++ b/src/locales/it/person/suffix.ts
diff --git a/src/locales/ja/address/city.ts b/src/locales/ja/address/city.ts
index a0aee22a..2cb639cd 100644
--- a/src/locales/ja/address/city.ts
+++ b/src/locales/ja/address/city.ts
@@ -1,6 +1,6 @@
 export default [
-  '{{address.city_prefix}}{{name.first_name}}{{address.city_suffix}}',
-  '{{name.first_name}}{{address.city_suffix}}',
-  '{{address.city_prefix}}{{name.last_name}}{{address.city_suffix}}',
-  '{{name.last_name}}{{address.city_suffix}}',
+  '{{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
index 15595bf9..a32c95d3 100644
--- a/src/locales/ja/address/street.ts
+++ b/src/locales/ja/address/street.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{name.first_name}}{{address.street_suffix}}',
-  '{{name.last_name}}{{address.street_suffix}}',
+  '{{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 151c8bdb..c5c06758 100644
--- a/src/locales/ja/index.ts
+++ b/src/locales/ja/index.ts
@@ -6,7 +6,7 @@ import type { LocaleDefinition } from '../..';
 import address from './address';
 import cell_phone from './cell_phone';
 import lorem from './lorem';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const ja: LocaleDefinition = {
@@ -14,7 +14,7 @@ const ja: LocaleDefinition = {
   address,
   cell_phone,
   lorem,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/ja/name/index.ts b/src/locales/ja/name/index.ts
deleted file mode 100644
index 80631e1c..00000000
--- a/src/locales/ja/name/index.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * This file is automatically generated.
- * Run 'pnpm run generate:locales' to update.
- */
-import type { NameDefinitions } from '../../..';
-import female_first_name from './female_first_name';
-import first_name from './first_name';
-import last_name from './last_name';
-import male_first_name from './male_first_name';
-import name_ from './name';
-
-const name: NameDefinitions = {
-  female_first_name,
-  first_name,
-  last_name,
-  male_first_name,
-  name: name_,
-};
-
-export default name;
diff --git a/src/locales/ja/name/name.ts b/src/locales/ja/name/name.ts
deleted file mode 100644
index d58f90c6..00000000
--- a/src/locales/ja/name/name.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{name.last_name}} {{name.first_name}}'];
diff --git a/src/locales/ja/name/female_first_name.ts b/src/locales/ja/person/female_first_name.ts
index ea0a7a3c..ea0a7a3c 100644
--- a/src/locales/ja/name/female_first_name.ts
+++ b/src/locales/ja/person/female_first_name.ts
diff --git a/src/locales/ja/name/first_name.ts b/src/locales/ja/person/first_name.ts
index 1f99283d..1f99283d 100644
--- a/src/locales/ja/name/first_name.ts
+++ b/src/locales/ja/person/first_name.ts
diff --git a/src/locales/ja/person/index.ts b/src/locales/ja/person/index.ts
new file mode 100644
index 00000000..b0887ae5
--- /dev/null
+++ b/src/locales/ja/person/index.ts
@@ -0,0 +1,20 @@
+/*
+ * This file is automatically generated.
+ * Run 'pnpm run generate:locales' to update.
+ */
+import type { PersonDefinitions } from '../../..';
+import female_first_name from './female_first_name';
+import first_name from './first_name';
+import last_name from './last_name';
+import male_first_name from './male_first_name';
+import name_ from './name';
+
+const person: PersonDefinitions = {
+  female_first_name,
+  first_name,
+  last_name,
+  male_first_name,
+  name: name_,
+};
+
+export default person;
diff --git a/src/locales/ja/name/last_name.ts b/src/locales/ja/person/last_name.ts
index 99f27c8a..99f27c8a 100644
--- a/src/locales/ja/name/last_name.ts
+++ b/src/locales/ja/person/last_name.ts
diff --git a/src/locales/ja/name/male_first_name.ts b/src/locales/ja/person/male_first_name.ts
index fda7e1b9..fda7e1b9 100644
--- a/src/locales/ja/name/male_first_name.ts
+++ b/src/locales/ja/person/male_first_name.ts
diff --git a/src/locales/ja/person/name.ts b/src/locales/ja/person/name.ts
new file mode 100644
index 00000000..3558edaf
--- /dev/null
+++ b/src/locales/ja/person/name.ts
@@ -0,0 +1 @@
+export default ['{{person.last_name}} {{person.first_name}}'];
diff --git a/src/locales/ko/company/name_patterns.ts b/src/locales/ko/company/name_patterns.ts
index f3285bc9..bfbe6d87 100644
--- a/src/locales/ko/company/name_patterns.ts
+++ b/src/locales/ko/company/name_patterns.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{company.prefix}} {{name.first_name}}',
-  '{{name.first_name}} {{company.suffix}}',
+  '{{company.prefix}} {{person.first_name}}',
+  '{{person.first_name}} {{company.suffix}}',
 ];
diff --git a/src/locales/ko/index.ts b/src/locales/ko/index.ts
index 0538044f..e3d69654 100644
--- a/src/locales/ko/index.ts
+++ b/src/locales/ko/index.ts
@@ -7,7 +7,7 @@ import address from './address';
 import company from './company';
 import internet from './internet';
 import lorem from './lorem';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const ko: LocaleDefinition = {
@@ -16,7 +16,7 @@ const ko: LocaleDefinition = {
   company,
   internet,
   lorem,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/ko/name/name.ts b/src/locales/ko/name/name.ts
deleted file mode 100644
index d58f90c6..00000000
--- a/src/locales/ko/name/name.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{name.last_name}} {{name.first_name}}'];
diff --git a/src/locales/ko/name/first_name.ts b/src/locales/ko/person/first_name.ts
index cfb2fe11..cfb2fe11 100644
--- a/src/locales/ko/name/first_name.ts
+++ b/src/locales/ko/person/first_name.ts
diff --git a/src/locales/zh_TW/name/index.ts b/src/locales/ko/person/index.ts
index e5ceaf3c..aa1a4857 100644
--- a/src/locales/zh_TW/name/index.ts
+++ b/src/locales/ko/person/index.ts
@@ -2,15 +2,15 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import first_name from './first_name';
 import last_name from './last_name';
 import name_ from './name';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   first_name,
   last_name,
   name: name_,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/ko/name/last_name.ts b/src/locales/ko/person/last_name.ts
index 025f9a5d..025f9a5d 100644
--- a/src/locales/ko/name/last_name.ts
+++ b/src/locales/ko/person/last_name.ts
diff --git a/src/locales/ko/person/name.ts b/src/locales/ko/person/name.ts
new file mode 100644
index 00000000..3558edaf
--- /dev/null
+++ b/src/locales/ko/person/name.ts
@@ -0,0 +1 @@
+export default ['{{person.last_name}} {{person.first_name}}'];
diff --git a/src/locales/lv/company/name_patterns.ts b/src/locales/lv/company/name_patterns.ts
index c327baf1..d963ca20 100644
--- a/src/locales/lv/company/name_patterns.ts
+++ b/src/locales/lv/company/name_patterns.ts
@@ -1,7 +1,7 @@
 export default [
-  '{{company.prefix}} {{name.male_last_name}}',
-  '{{company.prefix}} {{name.male_last_name}} {{company.suffix}}',
-  '{{company.prefix}} {{name.female_last_name}} {{company.suffix}}',
-  '{{name.male_last_name}} un {{name.male_last_name}}',
-  '{{name.male_last_name}}, {{name.male_last_name}} un {{name.male_last_name}}',
+  '{{company.prefix}} {{person.male_last_name}}',
+  '{{company.prefix}} {{person.male_last_name}} {{company.suffix}}',
+  '{{company.prefix}} {{person.female_last_name}} {{company.suffix}}',
+  '{{person.male_last_name}} un {{person.male_last_name}}',
+  '{{person.male_last_name}}, {{person.male_last_name}} un {{person.male_last_name}}',
 ];
diff --git a/src/locales/lv/index.ts b/src/locales/lv/index.ts
index 527d7c3f..5ffc21f9 100644
--- a/src/locales/lv/index.ts
+++ b/src/locales/lv/index.ts
@@ -11,7 +11,7 @@ import company from './company';
 import date from './date';
 import internet from './internet';
 import lorem from './lorem';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const lv: LocaleDefinition = {
@@ -25,7 +25,7 @@ const lv: LocaleDefinition = {
   date,
   internet,
   lorem,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/lv/name/name.ts b/src/locales/lv/name/name.ts
deleted file mode 100644
index 2e9c5e4b..00000000
--- a/src/locales/lv/name/name.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export default [
-  '{{name.prefix}} {{name.male_first_name}} {{name.male_last_name}}',
-  '{{name.male_first_name}} {{name.male_last_name}}',
-  '{{name.male_last_name}} {{name.male_first_name}}',
-  '{{name.male_first_name}} {{name.male_first_name}} {{name.male_last_name}}',
-  '{{name.male_first_name}} {{name.male_last_name}}-{{name.male_last_name}}',
-  '{{name.prefix}} {{name.female_first_name}} {{name.female_last_name}}',
-  '{{name.female_first_name}} {{name.female_last_name}} {{name.suffix}}',
-  '{{name.female_first_name}} {{name.female_last_name}}',
-  '{{name.female_last_name}} {{name.female_first_name}}',
-  '{{name.female_first_name}} {{name.female_first_name}} {{name.female_last_name}}',
-  '{{name.female_first_name}} {{name.female_last_name}}-{{name.female_last_name}}',
-];
diff --git a/src/locales/lv/name/female_first_name.ts b/src/locales/lv/person/female_first_name.ts
index b1b2d486..b1b2d486 100644
--- a/src/locales/lv/name/female_first_name.ts
+++ b/src/locales/lv/person/female_first_name.ts
diff --git a/src/locales/lv/name/female_last_name.ts b/src/locales/lv/person/female_last_name.ts
index f89cc262..f89cc262 100644
--- a/src/locales/lv/name/female_last_name.ts
+++ b/src/locales/lv/person/female_last_name.ts
diff --git a/src/locales/sk/name/index.ts b/src/locales/lv/person/index.ts
index 3f757e95..7eef036c 100644
--- a/src/locales/sk/name/index.ts
+++ b/src/locales/lv/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import female_last_name from './female_last_name';
 import male_first_name from './male_first_name';
@@ -12,7 +12,7 @@ import prefix from './prefix';
 import suffix from './suffix';
 import title from './title';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   female_last_name,
   male_first_name,
@@ -23,4 +23,4 @@ const name: NameDefinitions = {
   title,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/lv/name/male_first_name.ts b/src/locales/lv/person/male_first_name.ts
index afec1cf2..afec1cf2 100644
--- a/src/locales/lv/name/male_first_name.ts
+++ b/src/locales/lv/person/male_first_name.ts
diff --git a/src/locales/lv/name/male_last_name.ts b/src/locales/lv/person/male_last_name.ts
index 9422bd8d..9422bd8d 100644
--- a/src/locales/lv/name/male_last_name.ts
+++ b/src/locales/lv/person/male_last_name.ts
diff --git a/src/locales/lv/person/name.ts b/src/locales/lv/person/name.ts
new file mode 100644
index 00000000..55bf8bff
--- /dev/null
+++ b/src/locales/lv/person/name.ts
@@ -0,0 +1,13 @@
+export default [
+  '{{person.prefix}} {{person.male_first_name}} {{person.male_last_name}}',
+  '{{person.male_first_name}} {{person.male_last_name}}',
+  '{{person.male_last_name}} {{person.male_first_name}}',
+  '{{person.male_first_name}} {{person.male_first_name}} {{person.male_last_name}}',
+  '{{person.male_first_name}} {{person.male_last_name}}-{{person.male_last_name}}',
+  '{{person.prefix}} {{person.female_first_name}} {{person.female_last_name}}',
+  '{{person.female_first_name}} {{person.female_last_name}} {{person.suffix}}',
+  '{{person.female_first_name}} {{person.female_last_name}}',
+  '{{person.female_last_name}} {{person.female_first_name}}',
+  '{{person.female_first_name}} {{person.female_first_name}} {{person.female_last_name}}',
+  '{{person.female_first_name}} {{person.female_last_name}}-{{person.female_last_name}}',
+];
diff --git a/src/locales/lv/name/prefix.ts b/src/locales/lv/person/prefix.ts
index 9f8feac5..9f8feac5 100644
--- a/src/locales/lv/name/prefix.ts
+++ b/src/locales/lv/person/prefix.ts
diff --git a/src/locales/lv/name/suffix.ts b/src/locales/lv/person/suffix.ts
index 4c8035b0..4c8035b0 100644
--- a/src/locales/lv/name/suffix.ts
+++ b/src/locales/lv/person/suffix.ts
diff --git a/src/locales/lv/name/title.ts b/src/locales/lv/person/title.ts
index a136b681..a136b681 100644
--- a/src/locales/lv/name/title.ts
+++ b/src/locales/lv/person/title.ts
diff --git a/src/locales/mk/company/name_patterns.ts b/src/locales/mk/company/name_patterns.ts
index ee8262bd..a214e6ae 100644
--- a/src/locales/mk/company/name_patterns.ts
+++ b/src/locales/mk/company/name_patterns.ts
@@ -1,5 +1,5 @@
 export default [
-  '{{name.last_name}} {{company.suffix}}',
+  '{{person.last_name}} {{company.suffix}}',
   '{{address.city_name}} {{company.suffix}}',
-  '{{name.last_name}}, {{name.last_name}} и {{name.last_name}}',
+  '{{person.last_name}}, {{person.last_name}} и {{person.last_name}}',
 ];
diff --git a/src/locales/mk/index.ts b/src/locales/mk/index.ts
index d481184b..567c931b 100644
--- a/src/locales/mk/index.ts
+++ b/src/locales/mk/index.ts
@@ -8,7 +8,7 @@ import cell_phone from './cell_phone';
 import company from './company';
 import date from './date';
 import internet from './internet';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const mk: LocaleDefinition = {
@@ -19,7 +19,7 @@ const mk: LocaleDefinition = {
   company,
   date,
   internet,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/mk/name/name.ts b/src/locales/mk/name/name.ts
deleted file mode 100644
index b92a5ccc..00000000
--- a/src/locales/mk/name/name.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export default [
-  '{{name.female_prefix}} {{name.female_first_name}} {{name.female_last_name}}',
-  '{{name.male_prefix}} {{name.male_first_name}} {{name.male_last_name}}',
-  '{{name.female_first_name}} {{name.female_last_name}}',
-  '{{name.male_first_name}} {{name.male_last_name}}',
-];
diff --git a/src/locales/mk/name/prefix.ts b/src/locales/mk/name/prefix.ts
deleted file mode 100644
index a12fcf63..00000000
--- a/src/locales/mk/name/prefix.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{name.female_prefix}}', '{{name.male_prefix}}'];
diff --git a/src/locales/mk/name/female_first_name.ts b/src/locales/mk/person/female_first_name.ts
index b23b078d..b23b078d 100644
--- a/src/locales/mk/name/female_first_name.ts
+++ b/src/locales/mk/person/female_first_name.ts
diff --git a/src/locales/mk/name/female_last_name.ts b/src/locales/mk/person/female_last_name.ts
index c84fe390..c84fe390 100644
--- a/src/locales/mk/name/female_last_name.ts
+++ b/src/locales/mk/person/female_last_name.ts
diff --git a/src/locales/mk/name/female_prefix.ts b/src/locales/mk/person/female_prefix.ts
index 90d50450..90d50450 100644
--- a/src/locales/mk/name/female_prefix.ts
+++ b/src/locales/mk/person/female_prefix.ts
diff --git a/src/locales/mk/name/first_name.ts b/src/locales/mk/person/first_name.ts
index 6926a090..6926a090 100644
--- a/src/locales/mk/name/first_name.ts
+++ b/src/locales/mk/person/first_name.ts
diff --git a/src/locales/mk/name/index.ts b/src/locales/mk/person/index.ts
index 8c6e627e..7161bc3a 100644
--- a/src/locales/mk/name/index.ts
+++ b/src/locales/mk/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import female_last_name from './female_last_name';
 import female_prefix from './female_prefix';
@@ -16,7 +16,7 @@ import prefix from './prefix';
 import suffix from './suffix';
 import title from './title';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   female_last_name,
   female_prefix,
@@ -31,4 +31,4 @@ const name: NameDefinitions = {
   title,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/mk/name/last_name.ts b/src/locales/mk/person/last_name.ts
index 0ce6d456..0ce6d456 100644
--- a/src/locales/mk/name/last_name.ts
+++ b/src/locales/mk/person/last_name.ts
diff --git a/src/locales/mk/name/male_first_name.ts b/src/locales/mk/person/male_first_name.ts
index fb3170a0..fb3170a0 100644
--- a/src/locales/mk/name/male_first_name.ts
+++ b/src/locales/mk/person/male_first_name.ts
diff --git a/src/locales/mk/name/male_last_name.ts b/src/locales/mk/person/male_last_name.ts
index 0f24f736..0f24f736 100644
--- a/src/locales/mk/name/male_last_name.ts
+++ b/src/locales/mk/person/male_last_name.ts
diff --git a/src/locales/mk/name/male_prefix.ts b/src/locales/mk/person/male_prefix.ts
index 8b46b56d..8b46b56d 100644
--- a/src/locales/mk/name/male_prefix.ts
+++ b/src/locales/mk/person/male_prefix.ts
diff --git a/src/locales/mk/person/name.ts b/src/locales/mk/person/name.ts
new file mode 100644
index 00000000..9a2cbe85
--- /dev/null
+++ b/src/locales/mk/person/name.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{person.female_prefix}} {{person.female_first_name}} {{person.female_last_name}}',
+  '{{person.male_prefix}} {{person.male_first_name}} {{person.male_last_name}}',
+  '{{person.female_first_name}} {{person.female_last_name}}',
+  '{{person.male_first_name}} {{person.male_last_name}}',
+];
diff --git a/src/locales/mk/person/prefix.ts b/src/locales/mk/person/prefix.ts
new file mode 100644
index 00000000..7f2454a6
--- /dev/null
+++ b/src/locales/mk/person/prefix.ts
@@ -0,0 +1 @@
+export default ['{{person.female_prefix}}', '{{person.male_prefix}}'];
diff --git a/src/locales/mk/name/suffix.ts b/src/locales/mk/person/suffix.ts
index d6d1738d..d6d1738d 100644
--- a/src/locales/mk/name/suffix.ts
+++ b/src/locales/mk/person/suffix.ts
diff --git a/src/locales/mk/name/title.ts b/src/locales/mk/person/title.ts
index 127d7a9b..127d7a9b 100644
--- a/src/locales/mk/name/title.ts
+++ b/src/locales/mk/person/title.ts
diff --git a/src/locales/nb_NO/address/street.ts b/src/locales/nb_NO/address/street.ts
index 4c9604f6..72310d5a 100644
--- a/src/locales/nb_NO/address/street.ts
+++ b/src/locales/nb_NO/address/street.ts
@@ -1,6 +1,6 @@
 export default [
   '{{address.street_name}}{{address.street_suffix}}',
   '{{address.street_prefix}} {{address.street_name}}{{address.street_suffix}}',
-  '{{name.first_name}}{{address.common_street_suffix}}',
-  '{{name.last_name}}{{address.common_street_suffix}}',
+  '{{person.first_name}}{{address.common_street_suffix}}',
+  '{{person.last_name}}{{address.common_street_suffix}}',
 ];
diff --git a/src/locales/nb_NO/company/name_patterns.ts b/src/locales/nb_NO/company/name_patterns.ts
index 1bdb5e8f..0e33c6fe 100644
--- a/src/locales/nb_NO/company/name_patterns.ts
+++ b/src/locales/nb_NO/company/name_patterns.ts
@@ -1,5 +1,5 @@
 export default [
-  '{{name.last_name}} {{company.suffix}}',
-  '{{name.last_name}}-{{name.last_name}}',
-  '{{name.last_name}}, {{name.last_name}} og {{name.last_name}}',
+  '{{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}}-{{person.last_name}}',
+  '{{person.last_name}}, {{person.last_name}} og {{person.last_name}}',
 ];
diff --git a/src/locales/nb_NO/index.ts b/src/locales/nb_NO/index.ts
index 98c5ea1b..3eab6c88 100644
--- a/src/locales/nb_NO/index.ts
+++ b/src/locales/nb_NO/index.ts
@@ -8,7 +8,7 @@ import color from './color';
 import commerce from './commerce';
 import company from './company';
 import internet from './internet';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 import science from './science';
 import word from './word';
@@ -20,7 +20,7 @@ const nb_NO: LocaleDefinition = {
   commerce,
   company,
   internet,
-  name: name_,
+  person,
   phone_number,
   science,
   word,
diff --git a/src/locales/nb_NO/name/name.ts b/src/locales/nb_NO/name/name.ts
deleted file mode 100644
index a7ddf681..00000000
--- a/src/locales/nb_NO/name/name.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export default [
-  '{{name.prefix}} {{name.first_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.last_name}} {{name.suffix}}',
-  '{{name.female_first_name}} {{name.female_first_name}} {{name.last_name}}',
-  '{{name.male_first_name}} {{name.male_first_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.last_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.last_name}}',
-];
diff --git a/src/locales/nb_NO/name/female_first_name.ts b/src/locales/nb_NO/person/female_first_name.ts
index e970a9dc..e970a9dc 100644
--- a/src/locales/nb_NO/name/female_first_name.ts
+++ b/src/locales/nb_NO/person/female_first_name.ts
diff --git a/src/locales/nb_NO/name/first_name.ts b/src/locales/nb_NO/person/first_name.ts
index 754de84a..754de84a 100644
--- a/src/locales/nb_NO/name/first_name.ts
+++ b/src/locales/nb_NO/person/first_name.ts
diff --git a/src/locales/it/name/index.ts b/src/locales/nb_NO/person/index.ts
index 4393e0e7..55193f15 100644
--- a/src/locales/it/name/index.ts
+++ b/src/locales/nb_NO/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import first_name from './first_name';
 import last_name from './last_name';
@@ -11,7 +11,7 @@ import name_ from './name';
 import prefix from './prefix';
 import suffix from './suffix';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   first_name,
   last_name,
@@ -21,4 +21,4 @@ const name: NameDefinitions = {
   suffix,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/nb_NO/name/last_name.ts b/src/locales/nb_NO/person/last_name.ts
index 42ad634e..42ad634e 100644
--- a/src/locales/nb_NO/name/last_name.ts
+++ b/src/locales/nb_NO/person/last_name.ts
diff --git a/src/locales/nb_NO/name/male_first_name.ts b/src/locales/nb_NO/person/male_first_name.ts
index 2b11d54c..2b11d54c 100644
--- a/src/locales/nb_NO/name/male_first_name.ts
+++ b/src/locales/nb_NO/person/male_first_name.ts
diff --git a/src/locales/nb_NO/person/name.ts b/src/locales/nb_NO/person/name.ts
new file mode 100644
index 00000000..a0c4cc5e
--- /dev/null
+++ b/src/locales/nb_NO/person/name.ts
@@ -0,0 +1,8 @@
+export default [
+  '{{person.prefix}} {{person.first_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.last_name}} {{person.suffix}}',
+  '{{person.female_first_name}} {{person.female_first_name}} {{person.last_name}}',
+  '{{person.male_first_name}} {{person.male_first_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.last_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.last_name}}',
+];
diff --git a/src/locales/nb_NO/name/prefix.ts b/src/locales/nb_NO/person/prefix.ts
index f6b457bf..f6b457bf 100644
--- a/src/locales/nb_NO/name/prefix.ts
+++ b/src/locales/nb_NO/person/prefix.ts
diff --git a/src/locales/nb_NO/name/suffix.ts b/src/locales/nb_NO/person/suffix.ts
index d3295c36..d3295c36 100644
--- a/src/locales/nb_NO/name/suffix.ts
+++ b/src/locales/nb_NO/person/suffix.ts
diff --git a/src/locales/ne/address/city.ts b/src/locales/ne/address/city.ts
index 86ea14b2..d77ac09a 100644
--- a/src/locales/ne/address/city.ts
+++ b/src/locales/ne/address/city.ts
@@ -1,7 +1,7 @@
 export default [
-  '{{address.city_prefix}} {{name.firstName}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{name.firstName}}',
-  '{{name.firstName}}{{address.city_suffix}}',
-  '{{name.lastName}}{{address.city_suffix}}',
+  '{{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
index 1a1885b1..f7dd9d3b 100644
--- a/src/locales/ne/address/street.ts
+++ b/src/locales/ne/address/street.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{name.firstName}} {{address.street_suffix}}',
-  '{{name.lastName}} {{address.street_suffix}}',
+  '{{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 3a0a79d1..0c6dc8ee 100644
--- a/src/locales/ne/index.ts
+++ b/src/locales/ne/index.ts
@@ -6,7 +6,7 @@ import type { LocaleDefinition } from '../..';
 import address from './address';
 import company from './company';
 import internet from './internet';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const ne: LocaleDefinition = {
@@ -14,7 +14,7 @@ const ne: LocaleDefinition = {
   address,
   company,
   internet,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/ne/name/first_name.ts b/src/locales/ne/person/first_name.ts
index 997cf459..997cf459 100644
--- a/src/locales/ne/name/first_name.ts
+++ b/src/locales/ne/person/first_name.ts
diff --git a/src/locales/ne/name/index.ts b/src/locales/ne/person/index.ts
index baa80784..bb956ea5 100644
--- a/src/locales/ne/name/index.ts
+++ b/src/locales/ne/person/index.ts
@@ -2,13 +2,13 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import first_name from './first_name';
 import last_name from './last_name';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   first_name,
   last_name,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/ne/name/last_name.ts b/src/locales/ne/person/last_name.ts
index a1b8818d..a1b8818d 100644
--- a/src/locales/ne/name/last_name.ts
+++ b/src/locales/ne/person/last_name.ts
diff --git a/src/locales/nl/address/street.ts b/src/locales/nl/address/street.ts
index 15595bf9..a32c95d3 100644
--- a/src/locales/nl/address/street.ts
+++ b/src/locales/nl/address/street.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{name.first_name}}{{address.street_suffix}}',
-  '{{name.last_name}}{{address.street_suffix}}',
+  '{{person.first_name}}{{address.street_suffix}}',
+  '{{person.last_name}}{{address.street_suffix}}',
 ];
diff --git a/src/locales/nl/index.ts b/src/locales/nl/index.ts
index 6e6fb8a5..92562824 100644
--- a/src/locales/nl/index.ts
+++ b/src/locales/nl/index.ts
@@ -11,7 +11,7 @@ import date from './date';
 import hacker from './hacker';
 import internet from './internet';
 import lorem from './lorem';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const nl: LocaleDefinition = {
@@ -24,7 +24,7 @@ const nl: LocaleDefinition = {
   hacker,
   internet,
   lorem,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/nl/name/name.ts b/src/locales/nl/name/name.ts
deleted file mode 100644
index 4aba1829..00000000
--- a/src/locales/nl/name/name.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export default [
-  '{{name.prefix}} {{name.first_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.last_name}} {{name.suffix}}',
-  '{{name.first_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.tussenvoegsel}} {{name.last_name}}',
-];
diff --git a/src/locales/nl/name/female_first_name.ts b/src/locales/nl/person/female_first_name.ts
index 74900d6d..74900d6d 100644
--- a/src/locales/nl/name/female_first_name.ts
+++ b/src/locales/nl/person/female_first_name.ts
diff --git a/src/locales/nl/name/first_name.ts b/src/locales/nl/person/first_name.ts
index 0829cbfe..0829cbfe 100644
--- a/src/locales/nl/name/first_name.ts
+++ b/src/locales/nl/person/first_name.ts
diff --git a/src/locales/nl/name/index.ts b/src/locales/nl/person/index.ts
index 6df85f13..562b58c9 100644
--- a/src/locales/nl/name/index.ts
+++ b/src/locales/nl/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import first_name from './first_name';
 import last_name from './last_name';
@@ -12,7 +12,7 @@ import prefix from './prefix';
 import suffix from './suffix';
 import tussenvoegsel from './tussenvoegsel';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   first_name,
   last_name,
@@ -23,4 +23,4 @@ const name: NameDefinitions = {
   tussenvoegsel,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/nl/name/last_name.ts b/src/locales/nl/person/last_name.ts
index ea160c3e..ea160c3e 100644
--- a/src/locales/nl/name/last_name.ts
+++ b/src/locales/nl/person/last_name.ts
diff --git a/src/locales/nl/name/male_first_name.ts b/src/locales/nl/person/male_first_name.ts
index cf6b91f3..cf6b91f3 100644
--- a/src/locales/nl/name/male_first_name.ts
+++ b/src/locales/nl/person/male_first_name.ts
diff --git a/src/locales/nl/person/name.ts b/src/locales/nl/person/name.ts
new file mode 100644
index 00000000..ab5165b6
--- /dev/null
+++ b/src/locales/nl/person/name.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{person.prefix}} {{person.first_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.last_name}} {{person.suffix}}',
+  '{{person.first_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.tussenvoegsel}} {{person.last_name}}',
+];
diff --git a/src/locales/nl/name/prefix.ts b/src/locales/nl/person/prefix.ts
index f2a34781..f2a34781 100644
--- a/src/locales/nl/name/prefix.ts
+++ b/src/locales/nl/person/prefix.ts
diff --git a/src/locales/nl/name/suffix.ts b/src/locales/nl/person/suffix.ts
index d3295c36..d3295c36 100644
--- a/src/locales/nl/name/suffix.ts
+++ b/src/locales/nl/person/suffix.ts
diff --git a/src/locales/nl/name/tussenvoegsel.ts b/src/locales/nl/person/tussenvoegsel.ts
index cd7f275b..cd7f275b 100644
--- a/src/locales/nl/name/tussenvoegsel.ts
+++ b/src/locales/nl/person/tussenvoegsel.ts
diff --git a/src/locales/nl_BE/address/street.ts b/src/locales/nl_BE/address/street.ts
index 15595bf9..a32c95d3 100644
--- a/src/locales/nl_BE/address/street.ts
+++ b/src/locales/nl_BE/address/street.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{name.first_name}}{{address.street_suffix}}',
-  '{{name.last_name}}{{address.street_suffix}}',
+  '{{person.first_name}}{{address.street_suffix}}',
+  '{{person.last_name}}{{address.street_suffix}}',
 ];
diff --git a/src/locales/nl_BE/index.ts b/src/locales/nl_BE/index.ts
index e7079699..bf5060d3 100644
--- a/src/locales/nl_BE/index.ts
+++ b/src/locales/nl_BE/index.ts
@@ -6,7 +6,7 @@ import type { LocaleDefinition } from '../..';
 import address from './address';
 import company from './company';
 import internet from './internet';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const nl_BE: LocaleDefinition = {
@@ -14,7 +14,7 @@ const nl_BE: LocaleDefinition = {
   address,
   company,
   internet,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/nl_BE/name/name.ts b/src/locales/nl_BE/name/name.ts
deleted file mode 100644
index 3d1d5755..00000000
--- a/src/locales/nl_BE/name/name.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export default [
-  '{{name.prefix}} {{name.first_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.last_name}} {{name.suffix}}',
-  '{{name.first_name}} {{name.last_name}}',
-];
diff --git a/src/locales/nl_BE/name/first_name.ts b/src/locales/nl_BE/person/first_name.ts
index aec8110c..aec8110c 100644
--- a/src/locales/nl_BE/name/first_name.ts
+++ b/src/locales/nl_BE/person/first_name.ts
diff --git a/src/locales/nl_BE/name/index.ts b/src/locales/nl_BE/person/index.ts
index 9c4bab79..1019bd29 100644
--- a/src/locales/nl_BE/name/index.ts
+++ b/src/locales/nl_BE/person/index.ts
@@ -2,14 +2,14 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import first_name from './first_name';
 import last_name from './last_name';
 import name_ from './name';
 import prefix from './prefix';
 import suffix from './suffix';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   first_name,
   last_name,
   name: name_,
@@ -17,4 +17,4 @@ const name: NameDefinitions = {
   suffix,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/nl_BE/name/last_name.ts b/src/locales/nl_BE/person/last_name.ts
index 591fc17a..591fc17a 100644
--- a/src/locales/nl_BE/name/last_name.ts
+++ b/src/locales/nl_BE/person/last_name.ts
diff --git a/src/locales/nl_BE/person/name.ts b/src/locales/nl_BE/person/name.ts
new file mode 100644
index 00000000..8cee34fa
--- /dev/null
+++ b/src/locales/nl_BE/person/name.ts
@@ -0,0 +1,5 @@
+export default [
+  '{{person.prefix}} {{person.first_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.last_name}} {{person.suffix}}',
+  '{{person.first_name}} {{person.last_name}}',
+];
diff --git a/src/locales/nl_BE/name/prefix.ts b/src/locales/nl_BE/person/prefix.ts
index f421877a..f421877a 100644
--- a/src/locales/nl_BE/name/prefix.ts
+++ b/src/locales/nl_BE/person/prefix.ts
diff --git a/src/locales/nl_BE/name/suffix.ts b/src/locales/nl_BE/person/suffix.ts
index 6fc8322b..6fc8322b 100644
--- a/src/locales/nl_BE/name/suffix.ts
+++ b/src/locales/nl_BE/person/suffix.ts
diff --git a/src/locales/pl/address/street.ts b/src/locales/pl/address/street.ts
index 279efea8..9e114ccb 100644
--- a/src/locales/pl/address/street.ts
+++ b/src/locales/pl/address/street.ts
@@ -1 +1 @@
-export default ['{{address.street_prefix}} {{name.last_name}}'];
+export default ['{{address.street_prefix}} {{person.last_name}}'];
diff --git a/src/locales/pl/company/name_patterns.ts b/src/locales/pl/company/name_patterns.ts
index cffd6e70..1108f6fc 100644
--- a/src/locales/pl/company/name_patterns.ts
+++ b/src/locales/pl/company/name_patterns.ts
@@ -1,5 +1,5 @@
 export default [
-  '{{name.last_name}} {{company.suffix}}',
-  '{{name.last_name}}-{{name.last_name}}',
-  '{{name.last_name}}, {{name.last_name}} and {{name.last_name}}',
+  '{{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}}-{{person.last_name}}',
+  '{{person.last_name}}, {{person.last_name}} and {{person.last_name}}',
 ];
diff --git a/src/locales/pl/index.ts b/src/locales/pl/index.ts
index bc7df1eb..23a88b72 100644
--- a/src/locales/pl/index.ts
+++ b/src/locales/pl/index.ts
@@ -11,7 +11,7 @@ import company from './company';
 import internet from './internet';
 import lorem from './lorem';
 import music from './music';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 import science from './science';
 import team from './team';
@@ -26,7 +26,7 @@ const pl: LocaleDefinition = {
   internet,
   lorem,
   music,
-  name: name_,
+  person,
   phone_number,
   science,
   team,
diff --git a/src/locales/pl/name/name.ts b/src/locales/pl/name/name.ts
deleted file mode 100644
index 877a3756..00000000
--- a/src/locales/pl/name/name.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export default [
-  '{{name.prefix}} {{name.first_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.last_name}}',
-];
diff --git a/src/locales/pl/name/female_first_name.ts b/src/locales/pl/person/female_first_name.ts
index 19387302..19387302 100644
--- a/src/locales/pl/name/female_first_name.ts
+++ b/src/locales/pl/person/female_first_name.ts
diff --git a/src/locales/pl/name/first_name.ts b/src/locales/pl/person/first_name.ts
index 6926a090..6926a090 100644
--- a/src/locales/pl/name/first_name.ts
+++ b/src/locales/pl/person/first_name.ts
diff --git a/src/locales/pl/name/gender.ts b/src/locales/pl/person/gender.ts
index 6e8f8224..6e8f8224 100644
--- a/src/locales/pl/name/gender.ts
+++ b/src/locales/pl/person/gender.ts
diff --git a/src/locales/pl/name/index.ts b/src/locales/pl/person/index.ts
index 0d874207..c8aa156b 100644
--- a/src/locales/pl/name/index.ts
+++ b/src/locales/pl/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import first_name from './first_name';
 import gender from './gender';
@@ -13,7 +13,7 @@ import prefix from './prefix';
 import sex from './sex';
 import title from './title';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   first_name,
   gender,
@@ -25,4 +25,4 @@ const name: NameDefinitions = {
   title,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/pl/name/last_name.ts b/src/locales/pl/person/last_name.ts
index f7a360ea..f7a360ea 100644
--- a/src/locales/pl/name/last_name.ts
+++ b/src/locales/pl/person/last_name.ts
diff --git a/src/locales/pl/name/male_first_name.ts b/src/locales/pl/person/male_first_name.ts
index ad3df475..ad3df475 100644
--- a/src/locales/pl/name/male_first_name.ts
+++ b/src/locales/pl/person/male_first_name.ts
diff --git a/src/locales/pl/person/name.ts b/src/locales/pl/person/name.ts
new file mode 100644
index 00000000..2e536501
--- /dev/null
+++ b/src/locales/pl/person/name.ts
@@ -0,0 +1,4 @@
+export default [
+  '{{person.prefix}} {{person.first_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.last_name}}',
+];
diff --git a/src/locales/pl/name/prefix.ts b/src/locales/pl/person/prefix.ts
index e4a8be4a..e4a8be4a 100644
--- a/src/locales/pl/name/prefix.ts
+++ b/src/locales/pl/person/prefix.ts
diff --git a/src/locales/pl/name/sex.ts b/src/locales/pl/person/sex.ts
index 913a0aa8..913a0aa8 100644
--- a/src/locales/pl/name/sex.ts
+++ b/src/locales/pl/person/sex.ts
diff --git a/src/locales/pl/name/title.ts b/src/locales/pl/person/title.ts
index 98af8927..98af8927 100644
--- a/src/locales/pl/name/title.ts
+++ b/src/locales/pl/person/title.ts
diff --git a/src/locales/pt_BR/address/city.ts b/src/locales/pt_BR/address/city.ts
index 95588a58..ea6ea950 100644
--- a/src/locales/pt_BR/address/city.ts
+++ b/src/locales/pt_BR/address/city.ts
@@ -1,6 +1,6 @@
 export default [
-  '{{address.city_prefix}} {{name.firstName}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{name.firstName}}',
-  '{{name.firstName}}{{address.city_suffix}}',
-  '{{name.lastName}}{{address.city_suffix}}',
+  '{{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
index 1a1885b1..f7dd9d3b 100644
--- a/src/locales/pt_BR/address/street.ts
+++ b/src/locales/pt_BR/address/street.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{name.firstName}} {{address.street_suffix}}',
-  '{{name.lastName}} {{address.street_suffix}}',
+  '{{person.firstName}} {{address.street_suffix}}',
+  '{{person.lastName}} {{address.street_suffix}}',
 ];
diff --git a/src/locales/pt_BR/company/name_patterns.ts b/src/locales/pt_BR/company/name_patterns.ts
index d4730827..66184e18 100644
--- a/src/locales/pt_BR/company/name_patterns.ts
+++ b/src/locales/pt_BR/company/name_patterns.ts
@@ -1,5 +1,5 @@
 export default [
-  '{{name.last_name}} {{company.suffix}}',
-  '{{name.last_name}}-{{name.last_name}}',
-  '{{name.last_name}}, {{name.last_name}} e {{name.last_name}}',
+  '{{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}}-{{person.last_name}}',
+  '{{person.last_name}}, {{person.last_name}} e {{person.last_name}}',
 ];
diff --git a/src/locales/pt_BR/index.ts b/src/locales/pt_BR/index.ts
index de563dcd..0f7aafa8 100644
--- a/src/locales/pt_BR/index.ts
+++ b/src/locales/pt_BR/index.ts
@@ -10,7 +10,7 @@ import company from './company';
 import date from './date';
 import internet from './internet';
 import lorem from './lorem';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const pt_BR: LocaleDefinition = {
@@ -22,7 +22,7 @@ const pt_BR: LocaleDefinition = {
   date,
   internet,
   lorem,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/pt_BR/name/name.ts b/src/locales/pt_BR/name/name.ts
deleted file mode 100644
index 05635661..00000000
--- a/src/locales/pt_BR/name/name.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export default [
-  '{{name.prefix}} {{name.first_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.last_name}} {{name.suffix}}',
-  '{{name.first_name}} {{name.last_name}}',
-  '{{name.male_first_name}} {{name.last_name}}',
-  '{{name.female_first_name}} {{name.last_name}}',
-];
diff --git a/src/locales/pt_BR/name/female_first_name.ts b/src/locales/pt_BR/person/female_first_name.ts
index b9e60646..b9e60646 100644
--- a/src/locales/pt_BR/name/female_first_name.ts
+++ b/src/locales/pt_BR/person/female_first_name.ts
diff --git a/src/locales/pt_BR/name/first_name.ts b/src/locales/pt_BR/person/first_name.ts
index 146a5b72..146a5b72 100644
--- a/src/locales/pt_BR/name/first_name.ts
+++ b/src/locales/pt_BR/person/first_name.ts
diff --git a/src/locales/ur/name/index.ts b/src/locales/pt_BR/person/index.ts
index 2565f4d5..a68dd267 100644
--- a/src/locales/ur/name/index.ts
+++ b/src/locales/pt_BR/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import first_name from './first_name';
 import last_name from './last_name';
@@ -13,7 +13,7 @@ import sex from './sex';
 import suffix from './suffix';
 import title from './title';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   first_name,
   last_name,
@@ -25,4 +25,4 @@ const name: NameDefinitions = {
   title,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/pt_BR/name/last_name.ts b/src/locales/pt_BR/person/last_name.ts
index 6c1da005..6c1da005 100644
--- a/src/locales/pt_BR/name/last_name.ts
+++ b/src/locales/pt_BR/person/last_name.ts
diff --git a/src/locales/pt_BR/name/male_first_name.ts b/src/locales/pt_BR/person/male_first_name.ts
index d31aff14..d31aff14 100644
--- a/src/locales/pt_BR/name/male_first_name.ts
+++ b/src/locales/pt_BR/person/male_first_name.ts
diff --git a/src/locales/pt_BR/person/name.ts b/src/locales/pt_BR/person/name.ts
new file mode 100644
index 00000000..28a268c4
--- /dev/null
+++ b/src/locales/pt_BR/person/name.ts
@@ -0,0 +1,7 @@
+export default [
+  '{{person.prefix}} {{person.first_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.last_name}} {{person.suffix}}',
+  '{{person.first_name}} {{person.last_name}}',
+  '{{person.male_first_name}} {{person.last_name}}',
+  '{{person.female_first_name}} {{person.last_name}}',
+];
diff --git a/src/locales/pt_BR/name/prefix.ts b/src/locales/pt_BR/person/prefix.ts
index a24ade48..a24ade48 100644
--- a/src/locales/pt_BR/name/prefix.ts
+++ b/src/locales/pt_BR/person/prefix.ts
diff --git a/src/locales/pt_BR/name/sex.ts b/src/locales/pt_BR/person/sex.ts
index 9c8e5a7f..9c8e5a7f 100644
--- a/src/locales/pt_BR/name/sex.ts
+++ b/src/locales/pt_BR/person/sex.ts
diff --git a/src/locales/pt_BR/name/suffix.ts b/src/locales/pt_BR/person/suffix.ts
index 42f21133..42f21133 100644
--- a/src/locales/pt_BR/name/suffix.ts
+++ b/src/locales/pt_BR/person/suffix.ts
diff --git a/src/locales/pt_BR/name/title.ts b/src/locales/pt_BR/person/title.ts
index 4762de0b..4762de0b 100644
--- a/src/locales/pt_BR/name/title.ts
+++ b/src/locales/pt_BR/person/title.ts
diff --git a/src/locales/pt_PT/address/street.ts b/src/locales/pt_PT/address/street.ts
index da37a3be..603c6461 100644
--- a/src/locales/pt_PT/address/street.ts
+++ b/src/locales/pt_PT/address/street.ts
@@ -1,5 +1,5 @@
 export default [
-  '{{address.street_prefix}} {{name.first_name}} {{name.last_name}}',
+  '{{address.street_prefix}} {{person.first_name}} {{person.last_name}}',
   'N#',
   'N##',
   'N###',
diff --git a/src/locales/pt_PT/index.ts b/src/locales/pt_PT/index.ts
index ca3a9f30..3c9fab57 100644
--- a/src/locales/pt_PT/index.ts
+++ b/src/locales/pt_PT/index.ts
@@ -9,7 +9,7 @@ import color from './color';
 import commerce from './commerce';
 import date from './date';
 import internet from './internet';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const pt_PT: LocaleDefinition = {
@@ -20,7 +20,7 @@ const pt_PT: LocaleDefinition = {
   commerce,
   date,
   internet,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/pt_PT/name/name.ts b/src/locales/pt_PT/name/name.ts
deleted file mode 100644
index 9ec34f99..00000000
--- a/src/locales/pt_PT/name/name.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export default [
-  '{{name.first_name}} {{name.last_name}}',
-  '{{name.male_first_name}} {{name.last_name}}',
-  '{{name.female_first_name}} {{name.last_name}}',
-  '{{name.male_prefix}} {{name.male_first_name}} {{name.last_name}}',
-  '{{name.female_prefix}} {{name.female_first_name}} {{name.last_name}}',
-];
diff --git a/src/locales/pt_PT/name/prefix.ts b/src/locales/pt_PT/name/prefix.ts
deleted file mode 100644
index a12fcf63..00000000
--- a/src/locales/pt_PT/name/prefix.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{name.female_prefix}}', '{{name.male_prefix}}'];
diff --git a/src/locales/pt_PT/name/female_first_name.ts b/src/locales/pt_PT/person/female_first_name.ts
index 8bc2c41c..8bc2c41c 100644
--- a/src/locales/pt_PT/name/female_first_name.ts
+++ b/src/locales/pt_PT/person/female_first_name.ts
diff --git a/src/locales/pt_PT/name/female_prefix.ts b/src/locales/pt_PT/person/female_prefix.ts
index 60c49a3f..60c49a3f 100644
--- a/src/locales/pt_PT/name/female_prefix.ts
+++ b/src/locales/pt_PT/person/female_prefix.ts
diff --git a/src/locales/pt_PT/name/first_name.ts b/src/locales/pt_PT/person/first_name.ts
index 67fb069d..67fb069d 100644
--- a/src/locales/pt_PT/name/first_name.ts
+++ b/src/locales/pt_PT/person/first_name.ts
diff --git a/src/locales/pt_PT/name/index.ts b/src/locales/pt_PT/person/index.ts
index 6fbdcb53..eb000343 100644
--- a/src/locales/pt_PT/name/index.ts
+++ b/src/locales/pt_PT/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import female_prefix from './female_prefix';
 import first_name from './first_name';
@@ -13,7 +13,7 @@ import name_ from './name';
 import prefix from './prefix';
 import suffix from './suffix';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   female_prefix,
   first_name,
@@ -25,4 +25,4 @@ const name: NameDefinitions = {
   suffix,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/pt_PT/name/last_name.ts b/src/locales/pt_PT/person/last_name.ts
index 5116e965..5116e965 100644
--- a/src/locales/pt_PT/name/last_name.ts
+++ b/src/locales/pt_PT/person/last_name.ts
diff --git a/src/locales/pt_PT/name/male_first_name.ts b/src/locales/pt_PT/person/male_first_name.ts
index 29604556..29604556 100644
--- a/src/locales/pt_PT/name/male_first_name.ts
+++ b/src/locales/pt_PT/person/male_first_name.ts
diff --git a/src/locales/pt_PT/name/male_prefix.ts b/src/locales/pt_PT/person/male_prefix.ts
index 755ad6c1..755ad6c1 100644
--- a/src/locales/pt_PT/name/male_prefix.ts
+++ b/src/locales/pt_PT/person/male_prefix.ts
diff --git a/src/locales/pt_PT/person/name.ts b/src/locales/pt_PT/person/name.ts
new file mode 100644
index 00000000..98c6b8db
--- /dev/null
+++ b/src/locales/pt_PT/person/name.ts
@@ -0,0 +1,7 @@
+export default [
+  '{{person.first_name}} {{person.last_name}}',
+  '{{person.male_first_name}} {{person.last_name}}',
+  '{{person.female_first_name}} {{person.last_name}}',
+  '{{person.male_prefix}} {{person.male_first_name}} {{person.last_name}}',
+  '{{person.female_prefix}} {{person.female_first_name}} {{person.last_name}}',
+];
diff --git a/src/locales/pt_PT/person/prefix.ts b/src/locales/pt_PT/person/prefix.ts
new file mode 100644
index 00000000..7f2454a6
--- /dev/null
+++ b/src/locales/pt_PT/person/prefix.ts
@@ -0,0 +1 @@
+export default ['{{person.female_prefix}}', '{{person.male_prefix}}'];
diff --git a/src/locales/pt_PT/name/suffix.ts b/src/locales/pt_PT/person/suffix.ts
index d6d1738d..d6d1738d 100644
--- a/src/locales/pt_PT/name/suffix.ts
+++ b/src/locales/pt_PT/person/suffix.ts
diff --git a/src/locales/ro/address/city.ts b/src/locales/ro/address/city.ts
index 86ea14b2..d77ac09a 100644
--- a/src/locales/ro/address/city.ts
+++ b/src/locales/ro/address/city.ts
@@ -1,7 +1,7 @@
 export default [
-  '{{address.city_prefix}} {{name.firstName}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{name.firstName}}',
-  '{{name.firstName}}{{address.city_suffix}}',
-  '{{name.lastName}}{{address.city_suffix}}',
+  '{{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/index.ts b/src/locales/ro/index.ts
index 22f0d5c9..5580d63d 100644
--- a/src/locales/ro/index.ts
+++ b/src/locales/ro/index.ts
@@ -7,7 +7,7 @@ import address from './address';
 import cell_phone from './cell_phone';
 import date from './date';
 import internet from './internet';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const ro: LocaleDefinition = {
@@ -16,7 +16,7 @@ const ro: LocaleDefinition = {
   cell_phone,
   date,
   internet,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/ro/name/name.ts b/src/locales/ro/name/name.ts
deleted file mode 100644
index 6943d454..00000000
--- a/src/locales/ro/name/name.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export default [
-  '{{name.male_first_name}} {{name.last_name}}',
-  '{{name.last_name}} {{name.male_first_name}}',
-  '{{name.prefix}} {{name.male_first_name}} {{name.last_name}}',
-  '{{name.male_first_name}} {{name.last_name}}, {{name.suffix}}',
-  '{{name.prefix}} {{name.male_first_name}} {{name.last_name}}, {{name.suffix}}',
-  '{{name.female_first_name}} {{name.last_name}}',
-  '{{name.last_name}} {{name.female_first_name}}',
-  '{{name.prefix}} {{name.female_first_name}} {{name.last_name}}',
-];
diff --git a/src/locales/ro/name/female_first_name.ts b/src/locales/ro/person/female_first_name.ts
index ab63addd..ab63addd 100644
--- a/src/locales/ro/name/female_first_name.ts
+++ b/src/locales/ro/person/female_first_name.ts
diff --git a/src/locales/ro/name/index.ts b/src/locales/ro/person/index.ts
index b142fe88..f1a7a7c8 100644
--- a/src/locales/ro/name/index.ts
+++ b/src/locales/ro/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import last_name from './last_name';
 import male_first_name from './male_first_name';
@@ -10,7 +10,7 @@ import name_ from './name';
 import prefix from './prefix';
 import suffix from './suffix';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   last_name,
   male_first_name,
@@ -19,4 +19,4 @@ const name: NameDefinitions = {
   suffix,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/ro/name/last_name.ts b/src/locales/ro/person/last_name.ts
index 6380a67a..6380a67a 100644
--- a/src/locales/ro/name/last_name.ts
+++ b/src/locales/ro/person/last_name.ts
diff --git a/src/locales/ro/name/male_first_name.ts b/src/locales/ro/person/male_first_name.ts
index ec5c2476..ec5c2476 100644
--- a/src/locales/ro/name/male_first_name.ts
+++ b/src/locales/ro/person/male_first_name.ts
diff --git a/src/locales/ro/person/name.ts b/src/locales/ro/person/name.ts
new file mode 100644
index 00000000..761a6ec6
--- /dev/null
+++ b/src/locales/ro/person/name.ts
@@ -0,0 +1,10 @@
+export default [
+  '{{person.male_first_name}} {{person.last_name}}',
+  '{{person.last_name}} {{person.male_first_name}}',
+  '{{person.prefix}} {{person.male_first_name}} {{person.last_name}}',
+  '{{person.male_first_name}} {{person.last_name}}, {{person.suffix}}',
+  '{{person.prefix}} {{person.male_first_name}} {{person.last_name}}, {{person.suffix}}',
+  '{{person.female_first_name}} {{person.last_name}}',
+  '{{person.last_name}} {{person.female_first_name}}',
+  '{{person.prefix}} {{person.female_first_name}} {{person.last_name}}',
+];
diff --git a/src/locales/ro/name/prefix.ts b/src/locales/ro/person/prefix.ts
index 821d18fd..821d18fd 100644
--- a/src/locales/ro/name/prefix.ts
+++ b/src/locales/ro/person/prefix.ts
diff --git a/src/locales/ro/name/suffix.ts b/src/locales/ro/person/suffix.ts
index 21306793..21306793 100644
--- a/src/locales/ro/name/suffix.ts
+++ b/src/locales/ro/person/suffix.ts
diff --git a/src/locales/ru/company/name_patterns.ts b/src/locales/ru/company/name_patterns.ts
index 358d8080..9db05dce 100644
--- a/src/locales/ru/company/name_patterns.ts
+++ b/src/locales/ru/company/name_patterns.ts
@@ -1,7 +1,7 @@
 export default [
-  '{{company.prefix}} {{name.female_first_name}}',
-  '{{company.prefix}} {{name.male_first_name}}',
-  '{{company.prefix}} {{name.male_last_name}}',
+  '{{company.prefix}} {{person.female_first_name}}',
+  '{{company.prefix}} {{person.male_first_name}}',
+  '{{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}}',
diff --git a/src/locales/ru/index.ts b/src/locales/ru/index.ts
index d8e94dee..445fb973 100644
--- a/src/locales/ru/index.ts
+++ b/src/locales/ru/index.ts
@@ -11,7 +11,7 @@ import date from './date';
 import hacker from './hacker';
 import internet from './internet';
 import lorem from './lorem';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const ru: LocaleDefinition = {
@@ -25,7 +25,7 @@ const ru: LocaleDefinition = {
   hacker,
   internet,
   lorem,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/ru/name/name.ts b/src/locales/ru/name/name.ts
deleted file mode 100644
index 87c014db..00000000
--- a/src/locales/ru/name/name.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export default [
-  '{{name.male_first_name}} {{name.male_last_name}}',
-  '{{name.male_last_name}} {{name.male_first_name}}',
-  '{{name.male_first_name}} {{name.male_middle_name}} {{name.male_last_name}}',
-  '{{name.male_last_name}} {{name.male_first_name}} {{name.male_middle_name}}',
-  '{{name.female_first_name}} {{name.female_last_name}}',
-  '{{name.female_last_name}} {{name.female_first_name}}',
-  '{{name.female_first_name}} {{name.female_middle_name}} {{name.female_last_name}}',
-  '{{name.female_last_name}} {{name.female_first_name}} {{name.female_middle_name}}',
-];
diff --git a/src/locales/ru/name/female_first_name.ts b/src/locales/ru/person/female_first_name.ts
index 59c7b6e4..59c7b6e4 100644
--- a/src/locales/ru/name/female_first_name.ts
+++ b/src/locales/ru/person/female_first_name.ts
diff --git a/src/locales/ru/name/female_last_name.ts b/src/locales/ru/person/female_last_name.ts
index eb2199d3..eb2199d3 100644
--- a/src/locales/ru/name/female_last_name.ts
+++ b/src/locales/ru/person/female_last_name.ts
diff --git a/src/locales/ru/name/female_middle_name.ts b/src/locales/ru/person/female_middle_name.ts
index 8ce3c6ee..8ce3c6ee 100644
--- a/src/locales/ru/name/female_middle_name.ts
+++ b/src/locales/ru/person/female_middle_name.ts
diff --git a/src/locales/ru/name/index.ts b/src/locales/ru/person/index.ts
index 6a0b4f3f..7413a152 100644
--- a/src/locales/ru/name/index.ts
+++ b/src/locales/ru/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import female_last_name from './female_last_name';
 import female_middle_name from './female_middle_name';
@@ -14,7 +14,7 @@ import prefix from './prefix';
 import suffix from './suffix';
 import title from './title';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   female_last_name,
   female_middle_name,
@@ -27,4 +27,4 @@ const name: NameDefinitions = {
   title,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/ru/name/male_first_name.ts b/src/locales/ru/person/male_first_name.ts
index 6ddd65f5..6ddd65f5 100644
--- a/src/locales/ru/name/male_first_name.ts
+++ b/src/locales/ru/person/male_first_name.ts
diff --git a/src/locales/ru/name/male_last_name.ts b/src/locales/ru/person/male_last_name.ts
index 2e55f3d5..2e55f3d5 100644
--- a/src/locales/ru/name/male_last_name.ts
+++ b/src/locales/ru/person/male_last_name.ts
diff --git a/src/locales/ru/name/male_middle_name.ts b/src/locales/ru/person/male_middle_name.ts
index 6696ca9d..6696ca9d 100644
--- a/src/locales/ru/name/male_middle_name.ts
+++ b/src/locales/ru/person/male_middle_name.ts
diff --git a/src/locales/ru/person/name.ts b/src/locales/ru/person/name.ts
new file mode 100644
index 00000000..c5189e48
--- /dev/null
+++ b/src/locales/ru/person/name.ts
@@ -0,0 +1,10 @@
+export default [
+  '{{person.male_first_name}} {{person.male_last_name}}',
+  '{{person.male_last_name}} {{person.male_first_name}}',
+  '{{person.male_first_name}} {{person.male_middle_name}} {{person.male_last_name}}',
+  '{{person.male_last_name}} {{person.male_first_name}} {{person.male_middle_name}}',
+  '{{person.female_first_name}} {{person.female_last_name}}',
+  '{{person.female_last_name}} {{person.female_first_name}}',
+  '{{person.female_first_name}} {{person.female_middle_name}} {{person.female_last_name}}',
+  '{{person.female_last_name}} {{person.female_first_name}} {{person.female_middle_name}}',
+];
diff --git a/src/locales/ru/name/prefix.ts b/src/locales/ru/person/prefix.ts
index d6d1738d..d6d1738d 100644
--- a/src/locales/ru/name/prefix.ts
+++ b/src/locales/ru/person/prefix.ts
diff --git a/src/locales/ru/name/suffix.ts b/src/locales/ru/person/suffix.ts
index d6d1738d..d6d1738d 100644
--- a/src/locales/ru/name/suffix.ts
+++ b/src/locales/ru/person/suffix.ts
diff --git a/src/locales/ru/name/title.ts b/src/locales/ru/person/title.ts
index dd3d5905..dd3d5905 100644
--- a/src/locales/ru/name/title.ts
+++ b/src/locales/ru/person/title.ts
diff --git a/src/locales/sk/company/name_patterns.ts b/src/locales/sk/company/name_patterns.ts
index e3856948..d6eda221 100644
--- a/src/locales/sk/company/name_patterns.ts
+++ b/src/locales/sk/company/name_patterns.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{name.last_name}} {{company.suffix}}',
-  '{{name.male_last_name}} a {{name.male_last_name}} {{company.suffix}}',
+  '{{person.last_name}} {{company.suffix}}',
+  '{{person.male_last_name}} a {{person.male_last_name}} {{company.suffix}}',
 ];
diff --git a/src/locales/sk/index.ts b/src/locales/sk/index.ts
index cbdffc68..0a034db0 100644
--- a/src/locales/sk/index.ts
+++ b/src/locales/sk/index.ts
@@ -7,7 +7,7 @@ import address from './address';
 import company from './company';
 import internet from './internet';
 import lorem from './lorem';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const sk: LocaleDefinition = {
@@ -16,7 +16,7 @@ const sk: LocaleDefinition = {
   company,
   internet,
   lorem,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/sk/name/name.ts b/src/locales/sk/name/name.ts
deleted file mode 100644
index fc13ad95..00000000
--- a/src/locales/sk/name/name.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export default [
-  '{{name.prefix}} {{name.male_first_name}} {{name.male_last_name}}',
-  '{{name.prefix}} {{name.female_first_name}} {{name.female_last_name}}',
-  '{{name.male_first_name}} {{name.male_last_name}} {{name.suffix}}',
-  '{{name.female_first_name}} {{name.female_last_name}} {{name.suffix}}',
-  '{{name.male_first_name}} {{name.male_last_name}}',
-  '{{name.female_first_name}} {{name.female_last_name}}',
-];
diff --git a/src/locales/sk/name/female_first_name.ts b/src/locales/sk/person/female_first_name.ts
index 6ca071a2..6ca071a2 100644
--- a/src/locales/sk/name/female_first_name.ts
+++ b/src/locales/sk/person/female_first_name.ts
diff --git a/src/locales/sk/name/female_last_name.ts b/src/locales/sk/person/female_last_name.ts
index 056aba1b..056aba1b 100644
--- a/src/locales/sk/name/female_last_name.ts
+++ b/src/locales/sk/person/female_last_name.ts
diff --git a/src/locales/lv/name/index.ts b/src/locales/sk/person/index.ts
index 3f757e95..7eef036c 100644
--- a/src/locales/lv/name/index.ts
+++ b/src/locales/sk/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import female_last_name from './female_last_name';
 import male_first_name from './male_first_name';
@@ -12,7 +12,7 @@ import prefix from './prefix';
 import suffix from './suffix';
 import title from './title';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   female_last_name,
   male_first_name,
@@ -23,4 +23,4 @@ const name: NameDefinitions = {
   title,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/sk/name/male_first_name.ts b/src/locales/sk/person/male_first_name.ts
index c8d7711e..c8d7711e 100644
--- a/src/locales/sk/name/male_first_name.ts
+++ b/src/locales/sk/person/male_first_name.ts
diff --git a/src/locales/sk/name/male_last_name.ts b/src/locales/sk/person/male_last_name.ts
index 11a43dd3..11a43dd3 100644
--- a/src/locales/sk/name/male_last_name.ts
+++ b/src/locales/sk/person/male_last_name.ts
diff --git a/src/locales/sk/person/name.ts b/src/locales/sk/person/name.ts
new file mode 100644
index 00000000..e06caa3a
--- /dev/null
+++ b/src/locales/sk/person/name.ts
@@ -0,0 +1,8 @@
+export default [
+  '{{person.prefix}} {{person.male_first_name}} {{person.male_last_name}}',
+  '{{person.prefix}} {{person.female_first_name}} {{person.female_last_name}}',
+  '{{person.male_first_name}} {{person.male_last_name}} {{person.suffix}}',
+  '{{person.female_first_name}} {{person.female_last_name}} {{person.suffix}}',
+  '{{person.male_first_name}} {{person.male_last_name}}',
+  '{{person.female_first_name}} {{person.female_last_name}}',
+];
diff --git a/src/locales/sk/name/prefix.ts b/src/locales/sk/person/prefix.ts
index f499187e..f499187e 100644
--- a/src/locales/sk/name/prefix.ts
+++ b/src/locales/sk/person/prefix.ts
diff --git a/src/locales/sk/name/suffix.ts b/src/locales/sk/person/suffix.ts
index 20ab0b67..20ab0b67 100644
--- a/src/locales/sk/name/suffix.ts
+++ b/src/locales/sk/person/suffix.ts
diff --git a/src/locales/sk/name/title.ts b/src/locales/sk/person/title.ts
index 98af8927..98af8927 100644
--- a/src/locales/sk/name/title.ts
+++ b/src/locales/sk/person/title.ts
diff --git a/src/locales/sv/address/street.ts b/src/locales/sv/address/street.ts
index 4c9604f6..72310d5a 100644
--- a/src/locales/sv/address/street.ts
+++ b/src/locales/sv/address/street.ts
@@ -1,6 +1,6 @@
 export default [
   '{{address.street_name}}{{address.street_suffix}}',
   '{{address.street_prefix}} {{address.street_name}}{{address.street_suffix}}',
-  '{{name.first_name}}{{address.common_street_suffix}}',
-  '{{name.last_name}}{{address.common_street_suffix}}',
+  '{{person.first_name}}{{address.common_street_suffix}}',
+  '{{person.last_name}}{{address.common_street_suffix}}',
 ];
diff --git a/src/locales/sv/company/name_patterns.ts b/src/locales/sv/company/name_patterns.ts
index 5202f2fd..3d0aee24 100644
--- a/src/locales/sv/company/name_patterns.ts
+++ b/src/locales/sv/company/name_patterns.ts
@@ -1,5 +1,5 @@
 export default [
-  '{{name.last_name}} {{company.suffix}}',
-  '{{name.last_name}}-{{name.last_name}}',
-  '{{name.last_name}}, {{name.last_name}} {{company.suffix}}',
+  '{{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}}-{{person.last_name}}',
+  '{{person.last_name}}, {{person.last_name}} {{company.suffix}}',
 ];
diff --git a/src/locales/sv/index.ts b/src/locales/sv/index.ts
index 6c5ffe69..b9fb05b4 100644
--- a/src/locales/sv/index.ts
+++ b/src/locales/sv/index.ts
@@ -10,7 +10,7 @@ import commerce from './commerce';
 import company from './company';
 import date from './date';
 import internet from './internet';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 import team from './team';
 
@@ -23,7 +23,7 @@ const sv: LocaleDefinition = {
   company,
   date,
   internet,
-  name: name_,
+  person,
   phone_number,
   team,
 };
diff --git a/src/locales/sv/name/name.ts b/src/locales/sv/name/name.ts
deleted file mode 100644
index f670be76..00000000
--- a/src/locales/sv/name/name.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export default [
-  '{{name.prefix}} {{name.first_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.last_name}} {{name.suffix}}',
-  '{{name.first_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.last_name}} {{name.last_name}}',
-  '{{name.male_first_name}} {{name.last_name}}',
-  '{{name.female_first_name}} {{name.last_name}}',
-];
diff --git a/src/locales/sv/name/female_first_name.ts b/src/locales/sv/person/female_first_name.ts
index b9d4f6ed..b9d4f6ed 100644
--- a/src/locales/sv/name/female_first_name.ts
+++ b/src/locales/sv/person/female_first_name.ts
diff --git a/src/locales/sv/name/first_name.ts b/src/locales/sv/person/first_name.ts
index 1c9d18a9..1c9d18a9 100644
--- a/src/locales/sv/name/first_name.ts
+++ b/src/locales/sv/person/first_name.ts
diff --git a/src/locales/fa/name/index.ts b/src/locales/sv/person/index.ts
index 4d532475..7a045ad7 100644
--- a/src/locales/fa/name/index.ts
+++ b/src/locales/sv/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import first_name from './first_name';
 import last_name from './last_name';
@@ -11,7 +11,7 @@ import name_ from './name';
 import prefix from './prefix';
 import title from './title';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   first_name,
   last_name,
@@ -21,4 +21,4 @@ const name: NameDefinitions = {
   title,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/sv/name/last_name.ts b/src/locales/sv/person/last_name.ts
index aea2b0eb..aea2b0eb 100644
--- a/src/locales/sv/name/last_name.ts
+++ b/src/locales/sv/person/last_name.ts
diff --git a/src/locales/sv/name/male_first_name.ts b/src/locales/sv/person/male_first_name.ts
index 63b71cb7..63b71cb7 100644
--- a/src/locales/sv/name/male_first_name.ts
+++ b/src/locales/sv/person/male_first_name.ts
diff --git a/src/locales/sv/person/name.ts b/src/locales/sv/person/name.ts
new file mode 100644
index 00000000..b8314da3
--- /dev/null
+++ b/src/locales/sv/person/name.ts
@@ -0,0 +1,8 @@
+export default [
+  '{{person.prefix}} {{person.first_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.last_name}} {{person.suffix}}',
+  '{{person.first_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.last_name}} {{person.last_name}}',
+  '{{person.male_first_name}} {{person.last_name}}',
+  '{{person.female_first_name}} {{person.last_name}}',
+];
diff --git a/src/locales/sv/name/prefix.ts b/src/locales/sv/person/prefix.ts
index d18bd457..d18bd457 100644
--- a/src/locales/sv/name/prefix.ts
+++ b/src/locales/sv/person/prefix.ts
diff --git a/src/locales/sv/name/title.ts b/src/locales/sv/person/title.ts
index 4684566c..4684566c 100644
--- a/src/locales/sv/name/title.ts
+++ b/src/locales/sv/person/title.ts
diff --git a/src/locales/tr/address/city.ts b/src/locales/tr/address/city.ts
index 86ea14b2..d77ac09a 100644
--- a/src/locales/tr/address/city.ts
+++ b/src/locales/tr/address/city.ts
@@ -1,7 +1,7 @@
 export default [
-  '{{address.city_prefix}} {{name.firstName}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{name.firstName}}',
-  '{{name.firstName}}{{address.city_suffix}}',
-  '{{name.lastName}}{{address.city_suffix}}',
+  '{{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/index.ts b/src/locales/tr/index.ts
index 70a988b6..9ed3b8e9 100644
--- a/src/locales/tr/index.ts
+++ b/src/locales/tr/index.ts
@@ -9,7 +9,7 @@ import color from './color';
 import commerce from './commerce';
 import internet from './internet';
 import lorem from './lorem';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const tr: LocaleDefinition = {
@@ -20,7 +20,7 @@ const tr: LocaleDefinition = {
   commerce,
   internet,
   lorem,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/tr/name/name.ts b/src/locales/tr/name/name.ts
deleted file mode 100644
index d53b65f5..00000000
--- a/src/locales/tr/name/name.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export default [
-  '{{name.prefix}} {{name.first_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.last_name}}',
-  '{{name.male_first_name}} {{name.last_name}}',
-  '{{name.female_first_name}} {{name.last_name}}',
-];
diff --git a/src/locales/tr/name/female_first_name.ts b/src/locales/tr/person/female_first_name.ts
index de7e4895..de7e4895 100644
--- a/src/locales/tr/name/female_first_name.ts
+++ b/src/locales/tr/person/female_first_name.ts
diff --git a/src/locales/tr/name/first_name.ts b/src/locales/tr/person/first_name.ts
index 65f38a82..65f38a82 100644
--- a/src/locales/tr/name/first_name.ts
+++ b/src/locales/tr/person/first_name.ts
diff --git a/src/locales/hu/name/index.ts b/src/locales/tr/person/index.ts
index fbc16c3d..2ba33f8c 100644
--- a/src/locales/hu/name/index.ts
+++ b/src/locales/tr/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import first_name from './first_name';
 import last_name from './last_name';
@@ -10,7 +10,7 @@ import male_first_name from './male_first_name';
 import name_ from './name';
 import prefix from './prefix';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   first_name,
   last_name,
@@ -19,4 +19,4 @@ const name: NameDefinitions = {
   prefix,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/tr/name/last_name.ts b/src/locales/tr/person/last_name.ts
index f883b353..f883b353 100644
--- a/src/locales/tr/name/last_name.ts
+++ b/src/locales/tr/person/last_name.ts
diff --git a/src/locales/tr/name/male_first_name.ts b/src/locales/tr/person/male_first_name.ts
index 25ea6cee..25ea6cee 100644
--- a/src/locales/tr/name/male_first_name.ts
+++ b/src/locales/tr/person/male_first_name.ts
diff --git a/src/locales/tr/person/name.ts b/src/locales/tr/person/name.ts
new file mode 100644
index 00000000..482cbd41
--- /dev/null
+++ b/src/locales/tr/person/name.ts
@@ -0,0 +1,6 @@
+export default [
+  '{{person.prefix}} {{person.first_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.last_name}}',
+  '{{person.male_first_name}} {{person.last_name}}',
+  '{{person.female_first_name}} {{person.last_name}}',
+];
diff --git a/src/locales/tr/name/prefix.ts b/src/locales/tr/person/prefix.ts
index 46792996..46792996 100644
--- a/src/locales/tr/name/prefix.ts
+++ b/src/locales/tr/person/prefix.ts
diff --git a/src/locales/uk/address/city.ts b/src/locales/uk/address/city.ts
index f526335a..f99cfa33 100644
--- a/src/locales/uk/address/city.ts
+++ b/src/locales/uk/address/city.ts
@@ -1,4 +1,4 @@
 export default [
   '{{address.city_name}}',
-  '{{address.city_prefix}} {{name.male_first_name}}',
+  '{{address.city_prefix}} {{person.male_first_name}}',
 ];
diff --git a/src/locales/uk/company/name_patterns.ts b/src/locales/uk/company/name_patterns.ts
index 358d8080..9db05dce 100644
--- a/src/locales/uk/company/name_patterns.ts
+++ b/src/locales/uk/company/name_patterns.ts
@@ -1,7 +1,7 @@
 export default [
-  '{{company.prefix}} {{name.female_first_name}}',
-  '{{company.prefix}} {{name.male_first_name}}',
-  '{{company.prefix}} {{name.male_last_name}}',
+  '{{company.prefix}} {{person.female_first_name}}',
+  '{{company.prefix}} {{person.male_first_name}}',
+  '{{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}}',
diff --git a/src/locales/uk/index.ts b/src/locales/uk/index.ts
index f09ceaa0..bcdfda4e 100644
--- a/src/locales/uk/index.ts
+++ b/src/locales/uk/index.ts
@@ -6,7 +6,7 @@ import type { LocaleDefinition } from '../..';
 import address from './address';
 import company from './company';
 import internet from './internet';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const uk: LocaleDefinition = {
@@ -14,7 +14,7 @@ const uk: LocaleDefinition = {
   address,
   company,
   internet,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/uk/name/name.ts b/src/locales/uk/name/name.ts
deleted file mode 100644
index 87c014db..00000000
--- a/src/locales/uk/name/name.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export default [
-  '{{name.male_first_name}} {{name.male_last_name}}',
-  '{{name.male_last_name}} {{name.male_first_name}}',
-  '{{name.male_first_name}} {{name.male_middle_name}} {{name.male_last_name}}',
-  '{{name.male_last_name}} {{name.male_first_name}} {{name.male_middle_name}}',
-  '{{name.female_first_name}} {{name.female_last_name}}',
-  '{{name.female_last_name}} {{name.female_first_name}}',
-  '{{name.female_first_name}} {{name.female_middle_name}} {{name.female_last_name}}',
-  '{{name.female_last_name}} {{name.female_first_name}} {{name.female_middle_name}}',
-];
diff --git a/src/locales/uk/name/female_first_name.ts b/src/locales/uk/person/female_first_name.ts
index 93cd3092..93cd3092 100644
--- a/src/locales/uk/name/female_first_name.ts
+++ b/src/locales/uk/person/female_first_name.ts
diff --git a/src/locales/uk/name/female_last_name.ts b/src/locales/uk/person/female_last_name.ts
index 004db0d9..004db0d9 100644
--- a/src/locales/uk/name/female_last_name.ts
+++ b/src/locales/uk/person/female_last_name.ts
diff --git a/src/locales/uk/name/female_middle_name.ts b/src/locales/uk/person/female_middle_name.ts
index 74862ed1..74862ed1 100644
--- a/src/locales/uk/name/female_middle_name.ts
+++ b/src/locales/uk/person/female_middle_name.ts
diff --git a/src/locales/uk/name/index.ts b/src/locales/uk/person/index.ts
index 6a0b4f3f..7413a152 100644
--- a/src/locales/uk/name/index.ts
+++ b/src/locales/uk/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import female_last_name from './female_last_name';
 import female_middle_name from './female_middle_name';
@@ -14,7 +14,7 @@ import prefix from './prefix';
 import suffix from './suffix';
 import title from './title';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   female_last_name,
   female_middle_name,
@@ -27,4 +27,4 @@ const name: NameDefinitions = {
   title,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/uk/name/male_first_name.ts b/src/locales/uk/person/male_first_name.ts
index 86821d89..86821d89 100644
--- a/src/locales/uk/name/male_first_name.ts
+++ b/src/locales/uk/person/male_first_name.ts
diff --git a/src/locales/uk/name/male_last_name.ts b/src/locales/uk/person/male_last_name.ts
index dca77381..dca77381 100644
--- a/src/locales/uk/name/male_last_name.ts
+++ b/src/locales/uk/person/male_last_name.ts
diff --git a/src/locales/uk/name/male_middle_name.ts b/src/locales/uk/person/male_middle_name.ts
index 240d687d..240d687d 100644
--- a/src/locales/uk/name/male_middle_name.ts
+++ b/src/locales/uk/person/male_middle_name.ts
diff --git a/src/locales/uk/person/name.ts b/src/locales/uk/person/name.ts
new file mode 100644
index 00000000..c5189e48
--- /dev/null
+++ b/src/locales/uk/person/name.ts
@@ -0,0 +1,10 @@
+export default [
+  '{{person.male_first_name}} {{person.male_last_name}}',
+  '{{person.male_last_name}} {{person.male_first_name}}',
+  '{{person.male_first_name}} {{person.male_middle_name}} {{person.male_last_name}}',
+  '{{person.male_last_name}} {{person.male_first_name}} {{person.male_middle_name}}',
+  '{{person.female_first_name}} {{person.female_last_name}}',
+  '{{person.female_last_name}} {{person.female_first_name}}',
+  '{{person.female_first_name}} {{person.female_middle_name}} {{person.female_last_name}}',
+  '{{person.female_last_name}} {{person.female_first_name}} {{person.female_middle_name}}',
+];
diff --git a/src/locales/uk/name/prefix.ts b/src/locales/uk/person/prefix.ts
index 22dcdb8c..22dcdb8c 100644
--- a/src/locales/uk/name/prefix.ts
+++ b/src/locales/uk/person/prefix.ts
diff --git a/src/locales/uk/name/suffix.ts b/src/locales/uk/person/suffix.ts
index 6c7e11bf..6c7e11bf 100644
--- a/src/locales/uk/name/suffix.ts
+++ b/src/locales/uk/person/suffix.ts
diff --git a/src/locales/uk/name/title.ts b/src/locales/uk/person/title.ts
index ad85a00f..ad85a00f 100644
--- a/src/locales/uk/name/title.ts
+++ b/src/locales/uk/person/title.ts
diff --git a/src/locales/ur/address/city.ts b/src/locales/ur/address/city.ts
index d518527b..27a932f1 100644
--- a/src/locales/ur/address/city.ts
+++ b/src/locales/ur/address/city.ts
@@ -1,6 +1,6 @@
 export default [
-  '{{address.city_prefix}} {{name.first_name}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{name.first_name}}',
-  '{{name.first_name}}{{address.city_suffix}}',
-  '{{name.last_name}}{{address.city_suffix}}',
+  '{{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
index 6b2de465..5e9ca117 100644
--- a/src/locales/ur/address/street.ts
+++ b/src/locales/ur/address/street.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{name.first_name}} {{address.street_suffix}}',
-  '{{name.last_name}} {{address.street_suffix}}',
+  '{{person.first_name}} {{address.street_suffix}}',
+  '{{person.last_name}} {{address.street_suffix}}',
 ];
diff --git a/src/locales/ur/app/author.ts b/src/locales/ur/app/author.ts
index 20670ee1..507ad69d 100644
--- a/src/locales/ur/app/author.ts
+++ b/src/locales/ur/app/author.ts
@@ -1 +1 @@
-export default ['{{name.name}}', '{{company.name}}'];
+export default ['{{person.name}}', '{{company.name}}'];
diff --git a/src/locales/ur/index.ts b/src/locales/ur/index.ts
index 5794e793..903dfd63 100644
--- a/src/locales/ur/index.ts
+++ b/src/locales/ur/index.ts
@@ -14,7 +14,7 @@ import date from './date';
 import finance from './finance';
 import lorem from './lorem';
 import music from './music';
-import name_ from './name';
+import person from './person';
 import team from './team';
 import vehicle from './vehicle';
 
@@ -32,7 +32,7 @@ const ur: LocaleDefinition = {
   finance,
   lorem,
   music,
-  name: name_,
+  person,
   team,
   vehicle,
 };
diff --git a/src/locales/ur/name/name.ts b/src/locales/ur/name/name.ts
deleted file mode 100644
index 1cee9130..00000000
--- a/src/locales/ur/name/name.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-export default [
-  '{{name.prefix}} {{name.first_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.last_name}} {{name.suffix}}',
-  '{{name.first_name}} {{name.last_name}}',
-  '{{name.male_first_name}} {{name.last_name}}',
-  '{{name.female_first_name}} {{name.last_name}}',
-  '{{name.male_first_name}} بن {{name.male_first_name}}',
-  '{{name.female_first_name}} بنت {{name.male_first_name}}',
-];
diff --git a/src/locales/ur/name/female_first_name.ts b/src/locales/ur/person/female_first_name.ts
index 726b106e..726b106e 100644
--- a/src/locales/ur/name/female_first_name.ts
+++ b/src/locales/ur/person/female_first_name.ts
diff --git a/src/locales/ur/name/first_name.ts b/src/locales/ur/person/first_name.ts
index 6d8d44ed..6d8d44ed 100644
--- a/src/locales/ur/name/first_name.ts
+++ b/src/locales/ur/person/first_name.ts
diff --git a/src/locales/pt_BR/name/index.ts b/src/locales/ur/person/index.ts
index 2565f4d5..a68dd267 100644
--- a/src/locales/pt_BR/name/index.ts
+++ b/src/locales/ur/person/index.ts
@@ -2,7 +2,7 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import first_name from './first_name';
 import last_name from './last_name';
@@ -13,7 +13,7 @@ import sex from './sex';
 import suffix from './suffix';
 import title from './title';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   first_name,
   last_name,
@@ -25,4 +25,4 @@ const name: NameDefinitions = {
   title,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/ur/name/last_name.ts b/src/locales/ur/person/last_name.ts
index 176bd64e..176bd64e 100644
--- a/src/locales/ur/name/last_name.ts
+++ b/src/locales/ur/person/last_name.ts
diff --git a/src/locales/ur/name/male_first_name.ts b/src/locales/ur/person/male_first_name.ts
index c4d2bc3e..c4d2bc3e 100644
--- a/src/locales/ur/name/male_first_name.ts
+++ b/src/locales/ur/person/male_first_name.ts
diff --git a/src/locales/ur/person/name.ts b/src/locales/ur/person/name.ts
new file mode 100644
index 00000000..a946985a
--- /dev/null
+++ b/src/locales/ur/person/name.ts
@@ -0,0 +1,9 @@
+export default [
+  '{{person.prefix}} {{person.first_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.last_name}} {{person.suffix}}',
+  '{{person.first_name}} {{person.last_name}}',
+  '{{person.male_first_name}} {{person.last_name}}',
+  '{{person.female_first_name}} {{person.last_name}}',
+  '{{person.male_first_name}} بن {{person.male_first_name}}',
+  '{{person.female_first_name}} بنت {{person.male_first_name}}',
+];
diff --git a/src/locales/ur/name/prefix.ts b/src/locales/ur/person/prefix.ts
index 87a129c2..87a129c2 100644
--- a/src/locales/ur/name/prefix.ts
+++ b/src/locales/ur/person/prefix.ts
diff --git a/src/locales/ur/name/sex.ts b/src/locales/ur/person/sex.ts
index fcd9a817..fcd9a817 100644
--- a/src/locales/ur/name/sex.ts
+++ b/src/locales/ur/person/sex.ts
diff --git a/src/locales/ur/name/suffix.ts b/src/locales/ur/person/suffix.ts
index 16f224e2..16f224e2 100644
--- a/src/locales/ur/name/suffix.ts
+++ b/src/locales/ur/person/suffix.ts
diff --git a/src/locales/ur/name/title.ts b/src/locales/ur/person/title.ts
index 76461074..504e78f1 100644
--- a/src/locales/ur/name/title.ts
+++ b/src/locales/ur/person/title.ts
@@ -1,4 +1,4 @@
-import type { NameTitleDefinitions } from '../../../definitions';
+import type { PersonTitleDefinitions } from '../../../definitions';
 
 export default {
   descriptor: [
@@ -33,4 +33,4 @@ export default {
     'بات چیت',
     'جال',
   ],
-} as NameTitleDefinitions;
+} as PersonTitleDefinitions;
diff --git a/src/locales/vi/address/street.ts b/src/locales/vi/address/street.ts
index 1a1885b1..f7dd9d3b 100644
--- a/src/locales/vi/address/street.ts
+++ b/src/locales/vi/address/street.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{name.firstName}} {{address.street_suffix}}',
-  '{{name.lastName}} {{address.street_suffix}}',
+  '{{person.firstName}} {{address.street_suffix}}',
+  '{{person.lastName}} {{address.street_suffix}}',
 ];
diff --git a/src/locales/vi/company/name_patterns.ts b/src/locales/vi/company/name_patterns.ts
index ceed90c9..60e4d003 100644
--- a/src/locales/vi/company/name_patterns.ts
+++ b/src/locales/vi/company/name_patterns.ts
@@ -1 +1 @@
-export default ['{{company.prefix}} {{name.last_name}}'];
+export default ['{{company.prefix}} {{person.last_name}}'];
diff --git a/src/locales/vi/index.ts b/src/locales/vi/index.ts
index 98b1a70e..0155b43d 100644
--- a/src/locales/vi/index.ts
+++ b/src/locales/vi/index.ts
@@ -9,7 +9,7 @@ import company from './company';
 import date from './date';
 import internet from './internet';
 import lorem from './lorem';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const vi: LocaleDefinition = {
@@ -20,7 +20,7 @@ const vi: LocaleDefinition = {
   date,
   internet,
   lorem,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/vi/name/index.ts b/src/locales/vi/name/index.ts
deleted file mode 100644
index 80631e1c..00000000
--- a/src/locales/vi/name/index.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * This file is automatically generated.
- * Run 'pnpm run generate:locales' to update.
- */
-import type { NameDefinitions } from '../../..';
-import female_first_name from './female_first_name';
-import first_name from './first_name';
-import last_name from './last_name';
-import male_first_name from './male_first_name';
-import name_ from './name';
-
-const name: NameDefinitions = {
-  female_first_name,
-  first_name,
-  last_name,
-  male_first_name,
-  name: name_,
-};
-
-export default name;
diff --git a/src/locales/vi/name/name.ts b/src/locales/vi/name/name.ts
deleted file mode 100644
index 14933b6a..00000000
--- a/src/locales/vi/name/name.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export default [
-  '{{name.male_first_name}} {{name.last_name}}',
-  '{{name.female_first_name}} {{name.last_name}}',
-  '{{name.first_name}} {{name.last_name}}',
-];
diff --git a/src/locales/vi/name/female_first_name.ts b/src/locales/vi/person/female_first_name.ts
index 141f380d..141f380d 100644
--- a/src/locales/vi/name/female_first_name.ts
+++ b/src/locales/vi/person/female_first_name.ts
diff --git a/src/locales/vi/name/first_name.ts b/src/locales/vi/person/first_name.ts
index 6926a090..6926a090 100644
--- a/src/locales/vi/name/first_name.ts
+++ b/src/locales/vi/person/first_name.ts
diff --git a/src/locales/vi/person/index.ts b/src/locales/vi/person/index.ts
new file mode 100644
index 00000000..b0887ae5
--- /dev/null
+++ b/src/locales/vi/person/index.ts
@@ -0,0 +1,20 @@
+/*
+ * This file is automatically generated.
+ * Run 'pnpm run generate:locales' to update.
+ */
+import type { PersonDefinitions } from '../../..';
+import female_first_name from './female_first_name';
+import first_name from './first_name';
+import last_name from './last_name';
+import male_first_name from './male_first_name';
+import name_ from './name';
+
+const person: PersonDefinitions = {
+  female_first_name,
+  first_name,
+  last_name,
+  male_first_name,
+  name: name_,
+};
+
+export default person;
diff --git a/src/locales/vi/name/last_name.ts b/src/locales/vi/person/last_name.ts
index 373b4587..373b4587 100644
--- a/src/locales/vi/name/last_name.ts
+++ b/src/locales/vi/person/last_name.ts
diff --git a/src/locales/vi/name/male_first_name.ts b/src/locales/vi/person/male_first_name.ts
index 3168cbb3..3168cbb3 100644
--- a/src/locales/vi/name/male_first_name.ts
+++ b/src/locales/vi/person/male_first_name.ts
diff --git a/src/locales/vi/person/name.ts b/src/locales/vi/person/name.ts
new file mode 100644
index 00000000..ac2a668e
--- /dev/null
+++ b/src/locales/vi/person/name.ts
@@ -0,0 +1,5 @@
+export default [
+  '{{person.male_first_name}} {{person.last_name}}',
+  '{{person.female_first_name}} {{person.last_name}}',
+  '{{person.first_name}} {{person.last_name}}',
+];
diff --git a/src/locales/zh_CN/address/street.ts b/src/locales/zh_CN/address/street.ts
index e046e3a7..6522d790 100644
--- a/src/locales/zh_CN/address/street.ts
+++ b/src/locales/zh_CN/address/street.ts
@@ -1 +1 @@
-export default ['{{name.last_name}}{{address.street_suffix}}'];
+export default ['{{person.last_name}}{{address.street_suffix}}'];
diff --git a/src/locales/zh_CN/index.ts b/src/locales/zh_CN/index.ts
index 3720db67..713218a3 100644
--- a/src/locales/zh_CN/index.ts
+++ b/src/locales/zh_CN/index.ts
@@ -4,13 +4,13 @@
  */
 import type { LocaleDefinition } from '../..';
 import address from './address';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const zh_CN: LocaleDefinition = {
   title: 'Chinese',
   address,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/zh_CN/name/index.ts b/src/locales/zh_CN/name/index.ts
deleted file mode 100644
index 80631e1c..00000000
--- a/src/locales/zh_CN/name/index.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * This file is automatically generated.
- * Run 'pnpm run generate:locales' to update.
- */
-import type { NameDefinitions } from '../../..';
-import female_first_name from './female_first_name';
-import first_name from './first_name';
-import last_name from './last_name';
-import male_first_name from './male_first_name';
-import name_ from './name';
-
-const name: NameDefinitions = {
-  female_first_name,
-  first_name,
-  last_name,
-  male_first_name,
-  name: name_,
-};
-
-export default name;
diff --git a/src/locales/zh_CN/name/name.ts b/src/locales/zh_CN/name/name.ts
deleted file mode 100644
index f4f67e1a..00000000
--- a/src/locales/zh_CN/name/name.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{name.first_name}}{{name.last_name}}'];
diff --git a/src/locales/zh_CN/name/female_first_name.ts b/src/locales/zh_CN/person/female_first_name.ts
index 71993df5..71993df5 100644
--- a/src/locales/zh_CN/name/female_first_name.ts
+++ b/src/locales/zh_CN/person/female_first_name.ts
diff --git a/src/locales/zh_CN/name/first_name.ts b/src/locales/zh_CN/person/first_name.ts
index 64076783..64076783 100644
--- a/src/locales/zh_CN/name/first_name.ts
+++ b/src/locales/zh_CN/person/first_name.ts
diff --git a/src/locales/zh_CN/person/index.ts b/src/locales/zh_CN/person/index.ts
new file mode 100644
index 00000000..b0887ae5
--- /dev/null
+++ b/src/locales/zh_CN/person/index.ts
@@ -0,0 +1,20 @@
+/*
+ * This file is automatically generated.
+ * Run 'pnpm run generate:locales' to update.
+ */
+import type { PersonDefinitions } from '../../..';
+import female_first_name from './female_first_name';
+import first_name from './first_name';
+import last_name from './last_name';
+import male_first_name from './male_first_name';
+import name_ from './name';
+
+const person: PersonDefinitions = {
+  female_first_name,
+  first_name,
+  last_name,
+  male_first_name,
+  name: name_,
+};
+
+export default person;
diff --git a/src/locales/zh_CN/name/last_name.ts b/src/locales/zh_CN/person/last_name.ts
index 6addc935..6addc935 100644
--- a/src/locales/zh_CN/name/last_name.ts
+++ b/src/locales/zh_CN/person/last_name.ts
diff --git a/src/locales/zh_CN/name/male_first_name.ts b/src/locales/zh_CN/person/male_first_name.ts
index 509ac38a..509ac38a 100644
--- a/src/locales/zh_CN/name/male_first_name.ts
+++ b/src/locales/zh_CN/person/male_first_name.ts
diff --git a/src/locales/zh_CN/person/name.ts b/src/locales/zh_CN/person/name.ts
new file mode 100644
index 00000000..4052e58f
--- /dev/null
+++ b/src/locales/zh_CN/person/name.ts
@@ -0,0 +1 @@
+export default ['{{person.first_name}}{{person.last_name}}'];
diff --git a/src/locales/zh_TW/address/street.ts b/src/locales/zh_TW/address/street.ts
index e046e3a7..6522d790 100644
--- a/src/locales/zh_TW/address/street.ts
+++ b/src/locales/zh_TW/address/street.ts
@@ -1 +1 @@
-export default ['{{name.last_name}}{{address.street_suffix}}'];
+export default ['{{person.last_name}}{{address.street_suffix}}'];
diff --git a/src/locales/zh_TW/index.ts b/src/locales/zh_TW/index.ts
index a89b53c3..3904c3c0 100644
--- a/src/locales/zh_TW/index.ts
+++ b/src/locales/zh_TW/index.ts
@@ -4,13 +4,13 @@
  */
 import type { LocaleDefinition } from '../..';
 import address from './address';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const zh_TW: LocaleDefinition = {
   title: 'Chinese (Taiwan)',
   address,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/zh_TW/name/name.ts b/src/locales/zh_TW/name/name.ts
deleted file mode 100644
index f4f67e1a..00000000
--- a/src/locales/zh_TW/name/name.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['{{name.first_name}}{{name.last_name}}'];
diff --git a/src/locales/zh_TW/name/first_name.ts b/src/locales/zh_TW/person/first_name.ts
index 5bd1e4c9..5bd1e4c9 100644
--- a/src/locales/zh_TW/name/first_name.ts
+++ b/src/locales/zh_TW/person/first_name.ts
diff --git a/src/locales/ko/name/index.ts b/src/locales/zh_TW/person/index.ts
index e5ceaf3c..aa1a4857 100644
--- a/src/locales/ko/name/index.ts
+++ b/src/locales/zh_TW/person/index.ts
@@ -2,15 +2,15 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import first_name from './first_name';
 import last_name from './last_name';
 import name_ from './name';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   first_name,
   last_name,
   name: name_,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/zh_TW/name/last_name.ts b/src/locales/zh_TW/person/last_name.ts
index 88ee8e93..88ee8e93 100644
--- a/src/locales/zh_TW/name/last_name.ts
+++ b/src/locales/zh_TW/person/last_name.ts
diff --git a/src/locales/zh_TW/person/name.ts b/src/locales/zh_TW/person/name.ts
new file mode 100644
index 00000000..4052e58f
--- /dev/null
+++ b/src/locales/zh_TW/person/name.ts
@@ -0,0 +1 @@
+export default ['{{person.first_name}}{{person.last_name}}'];
diff --git a/src/locales/zu_ZA/address/city.ts b/src/locales/zu_ZA/address/city.ts
index 95588a58..ea6ea950 100644
--- a/src/locales/zu_ZA/address/city.ts
+++ b/src/locales/zu_ZA/address/city.ts
@@ -1,6 +1,6 @@
 export default [
-  '{{address.city_prefix}} {{name.firstName}}{{address.city_suffix}}',
-  '{{address.city_prefix}} {{name.firstName}}',
-  '{{name.firstName}}{{address.city_suffix}}',
-  '{{name.lastName}}{{address.city_suffix}}',
+  '{{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
index 1a1885b1..f7dd9d3b 100644
--- a/src/locales/zu_ZA/address/street.ts
+++ b/src/locales/zu_ZA/address/street.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{name.firstName}} {{address.street_suffix}}',
-  '{{name.lastName}} {{address.street_suffix}}',
+  '{{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 83ed698f..6f5054f3 100644
--- a/src/locales/zu_ZA/index.ts
+++ b/src/locales/zu_ZA/index.ts
@@ -7,7 +7,7 @@ import address from './address';
 import cell_phone from './cell_phone';
 import company from './company';
 import internet from './internet';
-import name_ from './name';
+import person from './person';
 import phone_number from './phone_number';
 
 const zu_ZA: LocaleDefinition = {
@@ -16,7 +16,7 @@ const zu_ZA: LocaleDefinition = {
   cell_phone,
   company,
   internet,
-  name: name_,
+  person,
   phone_number,
 };
 
diff --git a/src/locales/zu_ZA/name/female_first_name.ts b/src/locales/zu_ZA/person/female_first_name.ts
index 59bf69c3..59bf69c3 100644
--- a/src/locales/zu_ZA/name/female_first_name.ts
+++ b/src/locales/zu_ZA/person/female_first_name.ts
diff --git a/src/locales/zu_ZA/name/first_name.ts b/src/locales/zu_ZA/person/first_name.ts
index 43562be9..43562be9 100644
--- a/src/locales/zu_ZA/name/first_name.ts
+++ b/src/locales/zu_ZA/person/first_name.ts
diff --git a/src/locales/af_ZA/name/index.ts b/src/locales/zu_ZA/person/index.ts
index ea2e9181..b61cf108 100644
--- a/src/locales/af_ZA/name/index.ts
+++ b/src/locales/zu_ZA/person/index.ts
@@ -2,17 +2,17 @@
  * This file is automatically generated.
  * Run 'pnpm run generate:locales' to update.
  */
-import type { NameDefinitions } from '../../..';
+import type { PersonDefinitions } from '../../..';
 import female_first_name from './female_first_name';
 import first_name from './first_name';
 import last_name from './last_name';
 import male_first_name from './male_first_name';
 
-const name: NameDefinitions = {
+const person: PersonDefinitions = {
   female_first_name,
   first_name,
   last_name,
   male_first_name,
 };
 
-export default name;
+export default person;
diff --git a/src/locales/zu_ZA/name/last_name.ts b/src/locales/zu_ZA/person/last_name.ts
index e626302a..e626302a 100644
--- a/src/locales/zu_ZA/name/last_name.ts
+++ b/src/locales/zu_ZA/person/last_name.ts
diff --git a/src/locales/zu_ZA/name/male_first_name.ts b/src/locales/zu_ZA/person/male_first_name.ts
index bc0fb449..bc0fb449 100644
--- a/src/locales/zu_ZA/name/male_first_name.ts
+++ b/src/locales/zu_ZA/person/male_first_name.ts