refactor(locale): rename company affix files (#2975)

115 files changed, 146 insertions, 170 deletions

diff --git a/src/locales/af_ZA/company/index.ts b/src/locales/af_ZA/company/index.ts
index cada7a57..b346e443 100644
--- a/src/locales/af_ZA/company/index.ts
+++ b/src/locales/af_ZA/company/index.ts
@@ -3,10 +3,10 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
-import suffix from './suffix';
+import legal_entity_type from './legal_entity_type';
 
 const company: CompanyDefinition = {
-  suffix,
+  legal_entity_type,
 };
 
 export default company;
diff --git a/src/locales/af_ZA/company/suffix.ts b/src/locales/af_ZA/company/legal_entity_type.ts
index 872faf24..872faf24 100644
--- a/src/locales/af_ZA/company/suffix.ts
+++ b/src/locales/af_ZA/company/legal_entity_type.ts
diff --git a/src/locales/az/company/index.ts b/src/locales/az/company/index.ts
index 27f89a04..86925375 100644
--- a/src/locales/az/company/index.ts
+++ b/src/locales/az/company/index.ts
@@ -3,14 +3,12 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
+import legal_entity_type from './legal_entity_type';
 import name_pattern from './name_pattern';
-import prefix from './prefix';
-import suffix from './suffix';
 
 const company: CompanyDefinition = {
+  legal_entity_type,
   name_pattern,
-  prefix,
-  suffix,
 };
 
 export default company;
diff --git a/src/locales/az/company/prefix.ts b/src/locales/az/company/legal_entity_type.ts
index 82e88e50..82e88e50 100644
--- a/src/locales/az/company/prefix.ts
+++ b/src/locales/az/company/legal_entity_type.ts
diff --git a/src/locales/az/company/name_pattern.ts b/src/locales/az/company/name_pattern.ts
index 2f9fdc29..28496ee0 100644
--- a/src/locales/az/company/name_pattern.ts
+++ b/src/locales/az/company/name_pattern.ts
@@ -1,5 +1,5 @@
 export default [
-  '{{company.prefix}} {{person.female_first_name}}',
-  '{{company.prefix}} {{person.male_first_name}}',
-  '{{company.prefix}} {{person.male_last_name}}',
+  '{{company.legal_entity_type}} {{person.female_first_name}}',
+  '{{company.legal_entity_type}} {{person.male_first_name}}',
+  '{{company.legal_entity_type}} {{person.male_last_name}}',
 ];
diff --git a/src/locales/az/company/suffix.ts b/src/locales/az/company/suffix.ts
deleted file mode 100644
index 7646bbd1..00000000
--- a/src/locales/az/company/suffix.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default null;
diff --git a/src/locales/cs_CZ/company/index.ts b/src/locales/cs_CZ/company/index.ts
index c3d0395a..86925375 100644
--- a/src/locales/cs_CZ/company/index.ts
+++ b/src/locales/cs_CZ/company/index.ts
@@ -3,12 +3,12 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
+import legal_entity_type from './legal_entity_type';
 import name_pattern from './name_pattern';
-import suffix from './suffix';
 
 const company: CompanyDefinition = {
+  legal_entity_type,
   name_pattern,
-  suffix,
 };
 
 export default company;
diff --git a/src/locales/cs_CZ/company/suffix.ts b/src/locales/cs_CZ/company/legal_entity_type.ts
index 5c554052..5c554052 100644
--- a/src/locales/cs_CZ/company/suffix.ts
+++ b/src/locales/cs_CZ/company/legal_entity_type.ts
diff --git a/src/locales/cs_CZ/company/name_pattern.ts b/src/locales/cs_CZ/company/name_pattern.ts
index d6eda221..2cfbd4cc 100644
--- a/src/locales/cs_CZ/company/name_pattern.ts
+++ b/src/locales/cs_CZ/company/name_pattern.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{person.last_name}} {{company.suffix}}',
-  '{{person.male_last_name}} a {{person.male_last_name}} {{company.suffix}}',
+  '{{person.last_name}} {{company.legal_entity_type}}',
+  '{{person.male_last_name}} a {{person.male_last_name}} {{company.legal_entity_type}}',
 ];
diff --git a/src/locales/da/company/index.ts b/src/locales/da/company/index.ts
index 5143349e..d7d2110b 100644
--- a/src/locales/da/company/index.ts
+++ b/src/locales/da/company/index.ts
@@ -9,9 +9,9 @@ import buzz_noun from './buzz_noun';
 import buzz_verb from './buzz_verb';
 import company_name from './company_name';
 import descriptor from './descriptor';
+import legal_entity_type from './legal_entity_type';
 import name_pattern from './name_pattern';
 import noun from './noun';
-import suffix from './suffix';
 
 const company: CompanyDefinition = {
   adjective,
@@ -20,9 +20,9 @@ const company: CompanyDefinition = {
   buzz_verb,
   company_name,
   descriptor,
+  legal_entity_type,
   name_pattern,
   noun,
-  suffix,
 };
 
 export default company;
diff --git a/src/locales/da/company/suffix.ts b/src/locales/da/company/legal_entity_type.ts
index 63233353..63233353 100644
--- a/src/locales/da/company/suffix.ts
+++ b/src/locales/da/company/legal_entity_type.ts
diff --git a/src/locales/da/company/name_pattern.ts b/src/locales/da/company/name_pattern.ts
index 0abeedf2..12b033e9 100644
--- a/src/locales/da/company/name_pattern.ts
+++ b/src/locales/da/company/name_pattern.ts
@@ -1,4 +1,4 @@
 export default [
   '{{company.company_name}}',
-  '{{person.last_name}} {{commerce.department}} {{company.suffix}}',
+  '{{person.last_name}} {{commerce.department}} {{company.legal_entity_type}}',
 ];
diff --git a/src/locales/de/company/index.ts b/src/locales/de/company/index.ts
index 88b26b8d..86925375 100644
--- a/src/locales/de/company/index.ts
+++ b/src/locales/de/company/index.ts
@@ -3,14 +3,12 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
-import legal_form from './legal_form';
+import legal_entity_type from './legal_entity_type';
 import name_pattern from './name_pattern';
-import suffix from './suffix';
 
 const company: CompanyDefinition = {
-  legal_form,
+  legal_entity_type,
   name_pattern,
-  suffix,
 };
 
 export default company;
diff --git a/src/locales/de/company/legal_form.ts b/src/locales/de/company/legal_entity_type.ts
index f4818190..f4818190 100644
--- a/src/locales/de/company/legal_form.ts
+++ b/src/locales/de/company/legal_entity_type.ts
diff --git a/src/locales/de/company/name_pattern.ts b/src/locales/de/company/name_pattern.ts
index 354ef879..bceb640c 100644
--- a/src/locales/de/company/name_pattern.ts
+++ b/src/locales/de/company/name_pattern.ts
@@ -1,5 +1,5 @@
 export default [
-  '{{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}} {{company.legal_entity_type}}',
   '{{person.last_name}}, {{person.last_name}} und {{person.last_name}}',
   '{{person.last_name}}-{{person.last_name}}',
 ];
diff --git a/src/locales/de_AT/company/index.ts b/src/locales/de_AT/company/index.ts
index 88b26b8d..86925375 100644
--- a/src/locales/de_AT/company/index.ts
+++ b/src/locales/de_AT/company/index.ts
@@ -3,14 +3,12 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
-import legal_form from './legal_form';
+import legal_entity_type from './legal_entity_type';
 import name_pattern from './name_pattern';
-import suffix from './suffix';
 
 const company: CompanyDefinition = {
-  legal_form,
+  legal_entity_type,
   name_pattern,
-  suffix,
 };
 
 export default company;
diff --git a/src/locales/de/company/suffix.ts b/src/locales/de_AT/company/legal_entity_type.ts
index f4818190..f4818190 100644
--- a/src/locales/de/company/suffix.ts
+++ b/src/locales/de_AT/company/legal_entity_type.ts
diff --git a/src/locales/de_AT/company/legal_form.ts b/src/locales/de_AT/company/legal_form.ts
deleted file mode 100644
index f4818190..00000000
--- a/src/locales/de_AT/company/legal_form.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['AG', 'GmbH', 'GmbH & Co. KG', 'Gruppe', 'KG', 'OHG', 'UG'];
diff --git a/src/locales/de_AT/company/name_pattern.ts b/src/locales/de_AT/company/name_pattern.ts
index 354ef879..bceb640c 100644
--- a/src/locales/de_AT/company/name_pattern.ts
+++ b/src/locales/de_AT/company/name_pattern.ts
@@ -1,5 +1,5 @@
 export default [
-  '{{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}} {{company.legal_entity_type}}',
   '{{person.last_name}}, {{person.last_name}} und {{person.last_name}}',
   '{{person.last_name}}-{{person.last_name}}',
 ];
diff --git a/src/locales/de_AT/company/suffix.ts b/src/locales/de_AT/company/suffix.ts
deleted file mode 100644
index f4818190..00000000
--- a/src/locales/de_AT/company/suffix.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['AG', 'GmbH', 'GmbH & Co. KG', 'Gruppe', 'KG', 'OHG', 'UG'];
diff --git a/src/locales/de_CH/company/index.ts b/src/locales/de_CH/company/index.ts
index c3d0395a..86925375 100644
--- a/src/locales/de_CH/company/index.ts
+++ b/src/locales/de_CH/company/index.ts
@@ -3,12 +3,12 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
+import legal_entity_type from './legal_entity_type';
 import name_pattern from './name_pattern';
-import suffix from './suffix';
 
 const company: CompanyDefinition = {
+  legal_entity_type,
   name_pattern,
-  suffix,
 };
 
 export default company;
diff --git a/src/locales/de_CH/company/suffix.ts b/src/locales/de_CH/company/legal_entity_type.ts
index 7c082a17..7c082a17 100644
--- a/src/locales/de_CH/company/suffix.ts
+++ b/src/locales/de_CH/company/legal_entity_type.ts
diff --git a/src/locales/de_CH/company/name_pattern.ts b/src/locales/de_CH/company/name_pattern.ts
index 354ef879..bceb640c 100644
--- a/src/locales/de_CH/company/name_pattern.ts
+++ b/src/locales/de_CH/company/name_pattern.ts
@@ -1,5 +1,5 @@
 export default [
-  '{{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}} {{company.legal_entity_type}}',
   '{{person.last_name}}, {{person.last_name}} und {{person.last_name}}',
   '{{person.last_name}}-{{person.last_name}}',
 ];
diff --git a/src/locales/dv/company/index.ts b/src/locales/dv/company/index.ts
index 8b0a4174..c3cf74d5 100644
--- a/src/locales/dv/company/index.ts
+++ b/src/locales/dv/company/index.ts
@@ -4,15 +4,15 @@
  */
 import type { CompanyDefinition } from '../../..';
 import adjective from './adjective';
+import legal_entity_type from './legal_entity_type';
 import name_pattern from './name_pattern';
 import noun from './noun';
-import suffix from './suffix';
 
 const company: CompanyDefinition = {
   adjective,
+  legal_entity_type,
   name_pattern,
   noun,
-  suffix,
 };
 
 export default company;
diff --git a/src/locales/dv/company/suffix.ts b/src/locales/dv/company/legal_entity_type.ts
index f34c7eb0..f34c7eb0 100644
--- a/src/locales/dv/company/suffix.ts
+++ b/src/locales/dv/company/legal_entity_type.ts
diff --git a/src/locales/dv/company/name_pattern.ts b/src/locales/dv/company/name_pattern.ts
index 89c99b4b..e0a065a1 100644
--- a/src/locales/dv/company/name_pattern.ts
+++ b/src/locales/dv/company/name_pattern.ts
@@ -1,7 +1,7 @@
 export default [
-  '{{company.adjective}} {{company.noun}} {{company.suffix}}',
-  '{{company.adjective}} {{person.last_name}} {{person.last_name}} {{company.suffix}}',
-  '{{person.first_name}} {{company.suffix}}',
-  '{{person.last_name}} & {{person.last_name}} {{company.noun}} {{company.suffix}}',
-  '{{person.last_name}} {{company.suffix}}',
+  '{{company.adjective}} {{company.noun}} {{company.legal_entity_type}}',
+  '{{company.adjective}} {{person.last_name}} {{person.last_name}} {{company.legal_entity_type}}',
+  '{{person.first_name}} {{company.legal_entity_type}}',
+  '{{person.last_name}} & {{person.last_name}} {{company.noun}} {{company.legal_entity_type}}',
+  '{{person.last_name}} {{company.legal_entity_type}}',
 ];
diff --git a/src/locales/el/company/index.ts b/src/locales/el/company/index.ts
index a5bba951..91c5f26f 100644
--- a/src/locales/el/company/index.ts
+++ b/src/locales/el/company/index.ts
@@ -8,9 +8,9 @@ import buzz_adjective from './buzz_adjective';
 import buzz_noun from './buzz_noun';
 import buzz_verb from './buzz_verb';
 import descriptor from './descriptor';
+import legal_entity_type from './legal_entity_type';
 import name_pattern from './name_pattern';
 import noun from './noun';
-import suffix from './suffix';
 
 const company: CompanyDefinition = {
   adjective,
@@ -18,9 +18,9 @@ const company: CompanyDefinition = {
   buzz_noun,
   buzz_verb,
   descriptor,
+  legal_entity_type,
   name_pattern,
   noun,
-  suffix,
 };
 
 export default company;
diff --git a/src/locales/el/company/suffix.ts b/src/locales/el/company/legal_entity_type.ts
index f1b2eb6b..f1b2eb6b 100644
--- a/src/locales/el/company/suffix.ts
+++ b/src/locales/el/company/legal_entity_type.ts
diff --git a/src/locales/el/company/name_pattern.ts b/src/locales/el/company/name_pattern.ts
index 30a7946b..a4789952 100644
--- a/src/locales/el/company/name_pattern.ts
+++ b/src/locales/el/company/name_pattern.ts
@@ -1,5 +1,5 @@
 export default [
-  '{{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}} {{company.legal_entity_type}}',
   '{{person.last_name}}, {{person.last_name}} and {{person.last_name}}',
   '{{person.last_name}}-{{person.last_name}}',
 ];
diff --git a/src/locales/en/company/index.ts b/src/locales/en/company/index.ts
index a5bba951..91c5f26f 100644
--- a/src/locales/en/company/index.ts
+++ b/src/locales/en/company/index.ts
@@ -8,9 +8,9 @@ import buzz_adjective from './buzz_adjective';
 import buzz_noun from './buzz_noun';
 import buzz_verb from './buzz_verb';
 import descriptor from './descriptor';
+import legal_entity_type from './legal_entity_type';
 import name_pattern from './name_pattern';
 import noun from './noun';
-import suffix from './suffix';
 
 const company: CompanyDefinition = {
   adjective,
@@ -18,9 +18,9 @@ const company: CompanyDefinition = {
   buzz_noun,
   buzz_verb,
   descriptor,
+  legal_entity_type,
   name_pattern,
   noun,
-  suffix,
 };
 
 export default company;
diff --git a/src/locales/en/company/suffix.ts b/src/locales/en/company/legal_entity_type.ts
index 4b2c8454..4b2c8454 100644
--- a/src/locales/en/company/suffix.ts
+++ b/src/locales/en/company/legal_entity_type.ts
diff --git a/src/locales/en/company/name_pattern.ts b/src/locales/en/company/name_pattern.ts
index 92c1503b..7b728df2 100644
--- a/src/locales/en/company/name_pattern.ts
+++ b/src/locales/en/company/name_pattern.ts
@@ -1,5 +1,5 @@
 export default [
   '{{person.last_name}} - {{person.last_name}}',
-  '{{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}} {{company.legal_entity_type}}',
   '{{person.last_name}}, {{person.last_name}} and {{person.last_name}}',
 ];
diff --git a/src/locales/en_AU/company/index.ts b/src/locales/en_AU/company/index.ts
index cada7a57..b346e443 100644
--- a/src/locales/en_AU/company/index.ts
+++ b/src/locales/en_AU/company/index.ts
@@ -3,10 +3,10 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
-import suffix from './suffix';
+import legal_entity_type from './legal_entity_type';
 
 const company: CompanyDefinition = {
-  suffix,
+  legal_entity_type,
 };
 
 export default company;
diff --git a/src/locales/en_AU/company/suffix.ts b/src/locales/en_AU/company/legal_entity_type.ts
index dd13c3c5..dd13c3c5 100644
--- a/src/locales/en_AU/company/suffix.ts
+++ b/src/locales/en_AU/company/legal_entity_type.ts
diff --git a/src/locales/en_AU_ocker/company/index.ts b/src/locales/en_AU_ocker/company/index.ts
deleted file mode 100644
index cada7a57..00000000
--- a/src/locales/en_AU_ocker/company/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * This file is automatically generated.
- * Run 'pnpm run generate:locales' to update.
- */
-import type { CompanyDefinition } from '../../..';
-import suffix from './suffix';
-
-const company: CompanyDefinition = {
-  suffix,
-};
-
-export default company;
diff --git a/src/locales/en_AU_ocker/company/suffix.ts b/src/locales/en_AU_ocker/company/suffix.ts
deleted file mode 100644
index dd13c3c5..00000000
--- a/src/locales/en_AU_ocker/company/suffix.ts
+++ /dev/null
@@ -1 +0,0 @@
-export default ['Brothers', 'Corp', 'Group', 'Partners', 'Pty Ltd', 'and Sons'];
diff --git a/src/locales/en_AU_ocker/index.ts b/src/locales/en_AU_ocker/index.ts
index 6c406c50..0a15fa0d 100644
--- a/src/locales/en_AU_ocker/index.ts
+++ b/src/locales/en_AU_ocker/index.ts
@@ -3,7 +3,6 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { LocaleDefinition } from '../..';
-import company from './company';
 import internet from './internet';
 import location from './location';
 import metadata from './metadata';
@@ -11,7 +10,6 @@ import person from './person';
 import phone_number from './phone_number';
 
 const en_AU_ocker: LocaleDefinition = {
-  company,
   internet,
   location,
   metadata,
diff --git a/src/locales/en_GH/company/index.ts b/src/locales/en_GH/company/index.ts
index c3d0395a..86925375 100644
--- a/src/locales/en_GH/company/index.ts
+++ b/src/locales/en_GH/company/index.ts
@@ -3,12 +3,12 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
+import legal_entity_type from './legal_entity_type';
 import name_pattern from './name_pattern';
-import suffix from './suffix';
 
 const company: CompanyDefinition = {
+  legal_entity_type,
   name_pattern,
-  suffix,
 };
 
 export default company;
diff --git a/src/locales/en_GH/company/suffix.ts b/src/locales/en_GH/company/legal_entity_type.ts
index 84921056..84921056 100644
--- a/src/locales/en_GH/company/suffix.ts
+++ b/src/locales/en_GH/company/legal_entity_type.ts
diff --git a/src/locales/en_GH/company/name_pattern.ts b/src/locales/en_GH/company/name_pattern.ts
index a14fdda5..83a220df 100644
--- a/src/locales/en_GH/company/name_pattern.ts
+++ b/src/locales/en_GH/company/name_pattern.ts
@@ -1,4 +1,4 @@
 export default [
   '{{person.last_name}} and {{person.last_name}}',
-  '{{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}} {{company.legal_entity_type}}',
 ];
diff --git a/src/locales/en_HK/company/index.ts b/src/locales/en_HK/company/index.ts
index cada7a57..b346e443 100644
--- a/src/locales/en_HK/company/index.ts
+++ b/src/locales/en_HK/company/index.ts
@@ -3,10 +3,10 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
-import suffix from './suffix';
+import legal_entity_type from './legal_entity_type';
 
 const company: CompanyDefinition = {
-  suffix,
+  legal_entity_type,
 };
 
 export default company;
diff --git a/src/locales/en_HK/company/suffix.ts b/src/locales/en_HK/company/legal_entity_type.ts
index eb5764ba..eb5764ba 100644
--- a/src/locales/en_HK/company/suffix.ts
+++ b/src/locales/en_HK/company/legal_entity_type.ts
diff --git a/src/locales/en_IN/company/index.ts b/src/locales/en_IN/company/index.ts
index cada7a57..b346e443 100644
--- a/src/locales/en_IN/company/index.ts
+++ b/src/locales/en_IN/company/index.ts
@@ -3,10 +3,10 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
-import suffix from './suffix';
+import legal_entity_type from './legal_entity_type';
 
 const company: CompanyDefinition = {
-  suffix,
+  legal_entity_type,
 };
 
 export default company;
diff --git a/src/locales/en_IN/company/suffix.ts b/src/locales/en_IN/company/legal_entity_type.ts
index b029129d..b029129d 100644
--- a/src/locales/en_IN/company/suffix.ts
+++ b/src/locales/en_IN/company/legal_entity_type.ts
diff --git a/src/locales/en_NG/company/index.ts b/src/locales/en_NG/company/index.ts
index cada7a57..b346e443 100644
--- a/src/locales/en_NG/company/index.ts
+++ b/src/locales/en_NG/company/index.ts
@@ -3,10 +3,10 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
-import suffix from './suffix';
+import legal_entity_type from './legal_entity_type';
 
 const company: CompanyDefinition = {
-  suffix,
+  legal_entity_type,
 };
 
 export default company;
diff --git a/src/locales/en_NG/company/suffix.ts b/src/locales/en_NG/company/legal_entity_type.ts
index 20a1dc72..20a1dc72 100644
--- a/src/locales/en_NG/company/suffix.ts
+++ b/src/locales/en_NG/company/legal_entity_type.ts
diff --git a/src/locales/en_ZA/company/index.ts b/src/locales/en_ZA/company/index.ts
index cada7a57..b346e443 100644
--- a/src/locales/en_ZA/company/index.ts
+++ b/src/locales/en_ZA/company/index.ts
@@ -3,10 +3,10 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
-import suffix from './suffix';
+import legal_entity_type from './legal_entity_type';
 
 const company: CompanyDefinition = {
-  suffix,
+  legal_entity_type,
 };
 
 export default company;
diff --git a/src/locales/en_ZA/company/suffix.ts b/src/locales/en_ZA/company/legal_entity_type.ts
index 872faf24..872faf24 100644
--- a/src/locales/en_ZA/company/suffix.ts
+++ b/src/locales/en_ZA/company/legal_entity_type.ts
diff --git a/src/locales/es/company/index.ts b/src/locales/es/company/index.ts
index b44b47b2..01134971 100644
--- a/src/locales/es/company/index.ts
+++ b/src/locales/es/company/index.ts
@@ -5,16 +5,16 @@
 import type { CompanyDefinition } from '../../..';
 import adjective from './adjective';
 import descriptor from './descriptor';
+import legal_entity_type from './legal_entity_type';
 import name_pattern from './name_pattern';
 import noun from './noun';
-import suffix from './suffix';
 
 const company: CompanyDefinition = {
   adjective,
   descriptor,
+  legal_entity_type,
   name_pattern,
   noun,
-  suffix,
 };
 
 export default company;
diff --git a/src/locales/es/company/suffix.ts b/src/locales/es/company/legal_entity_type.ts
index db2b33c3..db2b33c3 100644
--- a/src/locales/es/company/suffix.ts
+++ b/src/locales/es/company/legal_entity_type.ts
diff --git a/src/locales/es/company/name_pattern.ts b/src/locales/es/company/name_pattern.ts
index 5abf8cba..c12ba3fa 100644
--- a/src/locales/es/company/name_pattern.ts
+++ b/src/locales/es/company/name_pattern.ts
@@ -1,6 +1,6 @@
 export default [
   '{{person.last_name}} y {{person.last_name}}',
-  '{{person.last_name}} {{company.suffix}}',
-  '{{person.last_name}} {{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}} {{company.legal_entity_type}}',
+  '{{person.last_name}} {{person.last_name}} {{company.legal_entity_type}}',
   '{{person.last_name}}, {{person.last_name}} y {{person.last_name}} Asociados',
 ];
diff --git a/src/locales/es_MX/company/index.ts b/src/locales/es_MX/company/index.ts
index a5bba951..91c5f26f 100644
--- a/src/locales/es_MX/company/index.ts
+++ b/src/locales/es_MX/company/index.ts
@@ -8,9 +8,9 @@ import buzz_adjective from './buzz_adjective';
 import buzz_noun from './buzz_noun';
 import buzz_verb from './buzz_verb';
 import descriptor from './descriptor';
+import legal_entity_type from './legal_entity_type';
 import name_pattern from './name_pattern';
 import noun from './noun';
-import suffix from './suffix';
 
 const company: CompanyDefinition = {
   adjective,
@@ -18,9 +18,9 @@ const company: CompanyDefinition = {
   buzz_noun,
   buzz_verb,
   descriptor,
+  legal_entity_type,
   name_pattern,
   noun,
-  suffix,
 };
 
 export default company;
diff --git a/src/locales/es_MX/company/suffix.ts b/src/locales/es_MX/company/legal_entity_type.ts
index db2b33c3..db2b33c3 100644
--- a/src/locales/es_MX/company/suffix.ts
+++ b/src/locales/es_MX/company/legal_entity_type.ts
diff --git a/src/locales/es_MX/company/name_pattern.ts b/src/locales/es_MX/company/name_pattern.ts
index 5abf8cba..c12ba3fa 100644
--- a/src/locales/es_MX/company/name_pattern.ts
+++ b/src/locales/es_MX/company/name_pattern.ts
@@ -1,6 +1,6 @@
 export default [
   '{{person.last_name}} y {{person.last_name}}',
-  '{{person.last_name}} {{company.suffix}}',
-  '{{person.last_name}} {{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}} {{company.legal_entity_type}}',
+  '{{person.last_name}} {{person.last_name}} {{company.legal_entity_type}}',
   '{{person.last_name}}, {{person.last_name}} y {{person.last_name}} Asociados',
 ];
diff --git a/src/locales/fa/company/index.ts b/src/locales/fa/company/index.ts
index a5bba951..91c5f26f 100644
--- a/src/locales/fa/company/index.ts
+++ b/src/locales/fa/company/index.ts
@@ -8,9 +8,9 @@ import buzz_adjective from './buzz_adjective';
 import buzz_noun from './buzz_noun';
 import buzz_verb from './buzz_verb';
 import descriptor from './descriptor';
+import legal_entity_type from './legal_entity_type';
 import name_pattern from './name_pattern';
 import noun from './noun';
-import suffix from './suffix';
 
 const company: CompanyDefinition = {
   adjective,
@@ -18,9 +18,9 @@ const company: CompanyDefinition = {
   buzz_noun,
   buzz_verb,
   descriptor,
+  legal_entity_type,
   name_pattern,
   noun,
-  suffix,
 };
 
 export default company;
diff --git a/src/locales/fa/company/suffix.ts b/src/locales/fa/company/legal_entity_type.ts
index 487bf0c7..487bf0c7 100644
--- a/src/locales/fa/company/suffix.ts
+++ b/src/locales/fa/company/legal_entity_type.ts
diff --git a/src/locales/fa/company/name_pattern.ts b/src/locales/fa/company/name_pattern.ts
index 5e53b5bd..22d7bb75 100644
--- a/src/locales/fa/company/name_pattern.ts
+++ b/src/locales/fa/company/name_pattern.ts
@@ -1,5 +1,5 @@
 export default [
-  '{{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}} {{company.legal_entity_type}}',
   '{{person.last_name}}, {{person.last_name}} و {{person.last_name}}',
   '{{person.last_name}}-{{person.last_name}}',
 ];
diff --git a/src/locales/fr/company/index.ts b/src/locales/fr/company/index.ts
index c3d0395a..86925375 100644
--- a/src/locales/fr/company/index.ts
+++ b/src/locales/fr/company/index.ts
@@ -3,12 +3,12 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
+import legal_entity_type from './legal_entity_type';
 import name_pattern from './name_pattern';
-import suffix from './suffix';
 
 const company: CompanyDefinition = {
+  legal_entity_type,
   name_pattern,
-  suffix,
 };
 
 export default company;
diff --git a/src/locales/fr/company/suffix.ts b/src/locales/fr/company/legal_entity_type.ts
index 924f8fa7..924f8fa7 100644
--- a/src/locales/fr/company/suffix.ts
+++ b/src/locales/fr/company/legal_entity_type.ts
diff --git a/src/locales/fr/company/name_pattern.ts b/src/locales/fr/company/name_pattern.ts
index 75ae6b7d..493d2417 100644
--- a/src/locales/fr/company/name_pattern.ts
+++ b/src/locales/fr/company/name_pattern.ts
@@ -1,4 +1,4 @@
 export default [
   '{{person.last_name}} et {{person.last_name}}',
-  '{{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}} {{company.legal_entity_type}}',
 ];
diff --git a/src/locales/he/company/index.ts b/src/locales/he/company/index.ts
index a5bba951..91c5f26f 100644
--- a/src/locales/he/company/index.ts
+++ b/src/locales/he/company/index.ts
@@ -8,9 +8,9 @@ import buzz_adjective from './buzz_adjective';
 import buzz_noun from './buzz_noun';
 import buzz_verb from './buzz_verb';
 import descriptor from './descriptor';
+import legal_entity_type from './legal_entity_type';
 import name_pattern from './name_pattern';
 import noun from './noun';
-import suffix from './suffix';
 
 const company: CompanyDefinition = {
   adjective,
@@ -18,9 +18,9 @@ const company: CompanyDefinition = {
   buzz_noun,
   buzz_verb,
   descriptor,
+  legal_entity_type,
   name_pattern,
   noun,
-  suffix,
 };
 
 export default company;
diff --git a/src/locales/he/company/suffix.ts b/src/locales/he/company/legal_entity_type.ts
index b3140319..b3140319 100644
--- a/src/locales/he/company/suffix.ts
+++ b/src/locales/he/company/legal_entity_type.ts
diff --git a/src/locales/he/company/name_pattern.ts b/src/locales/he/company/name_pattern.ts
index 14db6fdf..6bf1e03e 100644
--- a/src/locales/he/company/name_pattern.ts
+++ b/src/locales/he/company/name_pattern.ts
@@ -1,5 +1,5 @@
 export default [
   '{{person.last_name}} - {{person.last_name}}',
-  '{{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}} {{company.legal_entity_type}}',
   '{{person.last_name}}, {{person.last_name}} ו{{person.last_name}}',
 ];
diff --git a/src/locales/hu/company/index.ts b/src/locales/hu/company/index.ts
index c3d0395a..86925375 100644
--- a/src/locales/hu/company/index.ts
+++ b/src/locales/hu/company/index.ts
@@ -3,12 +3,12 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
+import legal_entity_type from './legal_entity_type';
 import name_pattern from './name_pattern';
-import suffix from './suffix';
 
 const company: CompanyDefinition = {
+  legal_entity_type,
   name_pattern,
-  suffix,
 };
 
 export default company;
diff --git a/src/locales/hu/company/suffix.ts b/src/locales/hu/company/legal_entity_type.ts
index a6a07131..a6a07131 100644
--- a/src/locales/hu/company/suffix.ts
+++ b/src/locales/hu/company/legal_entity_type.ts
diff --git a/src/locales/hu/company/name_pattern.ts b/src/locales/hu/company/name_pattern.ts
index 20a485a8..bb407c55 100644
--- a/src/locales/hu/company/name_pattern.ts
+++ b/src/locales/hu/company/name_pattern.ts
@@ -1,6 +1,6 @@
 export default [
-  '{{person.last_name}} 2000 {{company.suffix}}',
-  '{{person.last_name}} {{company.suffix}}',
-  '{{person.last_name}} és Tsa. {{company.suffix}}',
-  '{{person.last_name}} és {{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}} 2000 {{company.legal_entity_type}}',
+  '{{person.last_name}} {{company.legal_entity_type}}',
+  '{{person.last_name}} és Tsa. {{company.legal_entity_type}}',
+  '{{person.last_name}} és {{person.last_name}} {{company.legal_entity_type}}',
 ];
diff --git a/src/locales/id_ID/company/index.ts b/src/locales/id_ID/company/index.ts
index 27f89a04..b27e5782 100644
--- a/src/locales/id_ID/company/index.ts
+++ b/src/locales/id_ID/company/index.ts
@@ -3,14 +3,14 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
+import legal_entity_type from './legal_entity_type';
 import name_pattern from './name_pattern';
 import prefix from './prefix';
-import suffix from './suffix';
 
 const company: CompanyDefinition = {
+  legal_entity_type,
   name_pattern,
   prefix,
-  suffix,
 };
 
 export default company;
diff --git a/src/locales/id_ID/company/suffix.ts b/src/locales/id_ID/company/legal_entity_type.ts
index eb53c863..eb53c863 100644
--- a/src/locales/id_ID/company/suffix.ts
+++ b/src/locales/id_ID/company/legal_entity_type.ts
diff --git a/src/locales/id_ID/company/name_pattern.ts b/src/locales/id_ID/company/name_pattern.ts
index 369545b9..59ee6144 100644
--- a/src/locales/id_ID/company/name_pattern.ts
+++ b/src/locales/id_ID/company/name_pattern.ts
@@ -1,5 +1,5 @@
 export default [
   '{{company.prefix}} {{person.last_name}}',
-  '{{company.prefix}} {{person.last_name}} {{company.suffix}}',
-  '{{person.last_name}} {{company.suffix}}',
+  '{{company.prefix}} {{person.last_name}} {{company.legal_entity_type}}',
+  '{{person.last_name}} {{company.legal_entity_type}}',
 ];
diff --git a/src/locales/it/company/index.ts b/src/locales/it/company/index.ts
index a5bba951..91c5f26f 100644
--- a/src/locales/it/company/index.ts
+++ b/src/locales/it/company/index.ts
@@ -8,9 +8,9 @@ import buzz_adjective from './buzz_adjective';
 import buzz_noun from './buzz_noun';
 import buzz_verb from './buzz_verb';
 import descriptor from './descriptor';
+import legal_entity_type from './legal_entity_type';
 import name_pattern from './name_pattern';
 import noun from './noun';
-import suffix from './suffix';
 
 const company: CompanyDefinition = {
   adjective,
@@ -18,9 +18,9 @@ const company: CompanyDefinition = {
   buzz_noun,
   buzz_verb,
   descriptor,
+  legal_entity_type,
   name_pattern,
   noun,
-  suffix,
 };
 
 export default company;
diff --git a/src/locales/it/company/suffix.ts b/src/locales/it/company/legal_entity_type.ts
index 94ec942e..94ec942e 100644
--- a/src/locales/it/company/suffix.ts
+++ b/src/locales/it/company/legal_entity_type.ts
diff --git a/src/locales/it/company/name_pattern.ts b/src/locales/it/company/name_pattern.ts
index 091a6ebe..d1d4a6bf 100644
--- a/src/locales/it/company/name_pattern.ts
+++ b/src/locales/it/company/name_pattern.ts
@@ -1,5 +1,5 @@
 export default [
-  '{{person.last_name}} {{company.suffix}}',
-  '{{person.last_name}}, {{person.last_name}} e {{person.last_name}} {{company.suffix}}',
-  '{{person.last_name}}-{{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}} {{company.legal_entity_type}}',
+  '{{person.last_name}}, {{person.last_name}} e {{person.last_name}} {{company.legal_entity_type}}',
+  '{{person.last_name}}-{{person.last_name}} {{company.legal_entity_type}}',
 ];
diff --git a/src/locales/ka_GE/company/index.ts b/src/locales/ka_GE/company/index.ts
index 27f89a04..b27e5782 100644
--- a/src/locales/ka_GE/company/index.ts
+++ b/src/locales/ka_GE/company/index.ts
@@ -3,14 +3,14 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
+import legal_entity_type from './legal_entity_type';
 import name_pattern from './name_pattern';
 import prefix from './prefix';
-import suffix from './suffix';
 
 const company: CompanyDefinition = {
+  legal_entity_type,
   name_pattern,
   prefix,
-  suffix,
 };
 
 export default company;
diff --git a/src/locales/ka_GE/company/suffix.ts b/src/locales/ka_GE/company/legal_entity_type.ts
index b917f22d..b917f22d 100644
--- a/src/locales/ka_GE/company/suffix.ts
+++ b/src/locales/ka_GE/company/legal_entity_type.ts
diff --git a/src/locales/ka_GE/company/name_pattern.ts b/src/locales/ka_GE/company/name_pattern.ts
index bfbf1f1f..229cbbdd 100644
--- a/src/locales/ka_GE/company/name_pattern.ts
+++ b/src/locales/ka_GE/company/name_pattern.ts
@@ -1,7 +1,7 @@
 export default [
   '{{company.prefix}} {{person.first_name}}',
-  '{{company.prefix}} {{person.first_name}} {{company.suffix}}',
+  '{{company.prefix}} {{person.first_name}} {{company.legal_entity_type}}',
   '{{company.prefix}} {{person.last_name}}',
-  '{{company.prefix}} {{person.last_name}} {{company.suffix}}',
+  '{{company.prefix}} {{person.last_name}} {{company.legal_entity_type}}',
   '{{company.prefix}} {{person.last_name}}-{{person.last_name}}',
 ];
diff --git a/src/locales/ko/company/suffix.ts b/src/locales/ko/company/category.ts
index 6c1ad012..6c1ad012 100644
--- a/src/locales/ko/company/suffix.ts
+++ b/src/locales/ko/company/category.ts
diff --git a/src/locales/ko/company/index.ts b/src/locales/ko/company/index.ts
index 27f89a04..000b59c3 100644
--- a/src/locales/ko/company/index.ts
+++ b/src/locales/ko/company/index.ts
@@ -3,14 +3,14 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
+import category from './category';
+import legal_entity_type from './legal_entity_type';
 import name_pattern from './name_pattern';
-import prefix from './prefix';
-import suffix from './suffix';
 
 const company: CompanyDefinition = {
+  category,
+  legal_entity_type,
   name_pattern,
-  prefix,
-  suffix,
 };
 
 export default company;
diff --git a/src/locales/ko/company/prefix.ts b/src/locales/ko/company/legal_entity_type.ts
index 52c76171..52c76171 100644
--- a/src/locales/ko/company/prefix.ts
+++ b/src/locales/ko/company/legal_entity_type.ts
diff --git a/src/locales/ko/company/name_pattern.ts b/src/locales/ko/company/name_pattern.ts
index bfbe6d87..96e186a4 100644
--- a/src/locales/ko/company/name_pattern.ts
+++ b/src/locales/ko/company/name_pattern.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{company.prefix}} {{person.first_name}}',
-  '{{person.first_name}} {{company.suffix}}',
+  '{{company.legal_entity_type}} {{person.first_name}}',
+  '{{person.first_name}} {{company.category}}',
 ];
diff --git a/src/locales/lv/company/index.ts b/src/locales/lv/company/index.ts
index 27f89a04..b27e5782 100644
--- a/src/locales/lv/company/index.ts
+++ b/src/locales/lv/company/index.ts
@@ -3,14 +3,14 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
+import legal_entity_type from './legal_entity_type';
 import name_pattern from './name_pattern';
 import prefix from './prefix';
-import suffix from './suffix';
 
 const company: CompanyDefinition = {
+  legal_entity_type,
   name_pattern,
   prefix,
-  suffix,
 };
 
 export default company;
diff --git a/src/locales/lv/company/suffix.ts b/src/locales/lv/company/legal_entity_type.ts
index 6b2e35fe..6b2e35fe 100644
--- a/src/locales/lv/company/suffix.ts
+++ b/src/locales/lv/company/legal_entity_type.ts
diff --git a/src/locales/lv/company/name_pattern.ts b/src/locales/lv/company/name_pattern.ts
index b705e782..8f8253d1 100644
--- a/src/locales/lv/company/name_pattern.ts
+++ b/src/locales/lv/company/name_pattern.ts
@@ -1,7 +1,7 @@
 export default [
-  '{{company.prefix}} {{person.female_last_name}} {{company.suffix}}',
+  '{{company.prefix}} {{person.female_last_name}} {{company.legal_entity_type}}',
   '{{company.prefix}} {{person.male_last_name}}',
-  '{{company.prefix}} {{person.male_last_name}} {{company.suffix}}',
+  '{{company.prefix}} {{person.male_last_name}} {{company.legal_entity_type}}',
   '{{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/mk/company/index.ts b/src/locales/mk/company/index.ts
index c3d0395a..86925375 100644
--- a/src/locales/mk/company/index.ts
+++ b/src/locales/mk/company/index.ts
@@ -3,12 +3,12 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
+import legal_entity_type from './legal_entity_type';
 import name_pattern from './name_pattern';
-import suffix from './suffix';
 
 const company: CompanyDefinition = {
+  legal_entity_type,
   name_pattern,
-  suffix,
 };
 
 export default company;
diff --git a/src/locales/mk/company/suffix.ts b/src/locales/mk/company/legal_entity_type.ts
index 73cfb294..73cfb294 100644
--- a/src/locales/mk/company/suffix.ts
+++ b/src/locales/mk/company/legal_entity_type.ts
diff --git a/src/locales/mk/company/name_pattern.ts b/src/locales/mk/company/name_pattern.ts
index 077b00ba..79928e35 100644
--- a/src/locales/mk/company/name_pattern.ts
+++ b/src/locales/mk/company/name_pattern.ts
@@ -1,5 +1,5 @@
 export default [
-  '{{location.city_name}} {{company.suffix}}',
-  '{{person.last_name}} {{company.suffix}}',
+  '{{location.city_name}} {{company.legal_entity_type}}',
+  '{{person.last_name}} {{company.legal_entity_type}}',
   '{{person.last_name}}, {{person.last_name}} и {{person.last_name}}',
 ];
diff --git a/src/locales/nb_NO/company/index.ts b/src/locales/nb_NO/company/index.ts
index c3d0395a..86925375 100644
--- a/src/locales/nb_NO/company/index.ts
+++ b/src/locales/nb_NO/company/index.ts
@@ -3,12 +3,12 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
+import legal_entity_type from './legal_entity_type';
 import name_pattern from './name_pattern';
-import suffix from './suffix';
 
 const company: CompanyDefinition = {
+  legal_entity_type,
   name_pattern,
-  suffix,
 };
 
 export default company;
diff --git a/src/locales/nb_NO/company/suffix.ts b/src/locales/nb_NO/company/legal_entity_type.ts
index b49c76ae..b49c76ae 100644
--- a/src/locales/nb_NO/company/suffix.ts
+++ b/src/locales/nb_NO/company/legal_entity_type.ts
diff --git a/src/locales/nb_NO/company/name_pattern.ts b/src/locales/nb_NO/company/name_pattern.ts
index 6c636899..faf0cf9f 100644
--- a/src/locales/nb_NO/company/name_pattern.ts
+++ b/src/locales/nb_NO/company/name_pattern.ts
@@ -1,5 +1,5 @@
 export default [
-  '{{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}} {{company.legal_entity_type}}',
   '{{person.last_name}}, {{person.last_name}} og {{person.last_name}}',
   '{{person.last_name}}-{{person.last_name}}',
 ];
diff --git a/src/locales/ne/company/index.ts b/src/locales/ne/company/index.ts
index cada7a57..b346e443 100644
--- a/src/locales/ne/company/index.ts
+++ b/src/locales/ne/company/index.ts
@@ -3,10 +3,10 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
-import suffix from './suffix';
+import legal_entity_type from './legal_entity_type';
 
 const company: CompanyDefinition = {
-  suffix,
+  legal_entity_type,
 };
 
 export default company;
diff --git a/src/locales/ne/company/suffix.ts b/src/locales/ne/company/legal_entity_type.ts
index 3c326565..3c326565 100644
--- a/src/locales/ne/company/suffix.ts
+++ b/src/locales/ne/company/legal_entity_type.ts
diff --git a/src/locales/nl/company/index.ts b/src/locales/nl/company/index.ts
index cada7a57..b346e443 100644
--- a/src/locales/nl/company/index.ts
+++ b/src/locales/nl/company/index.ts
@@ -3,10 +3,10 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
-import suffix from './suffix';
+import legal_entity_type from './legal_entity_type';
 
 const company: CompanyDefinition = {
-  suffix,
+  legal_entity_type,
 };
 
 export default company;
diff --git a/src/locales/nl/company/suffix.ts b/src/locales/nl/company/legal_entity_type.ts
index 3d997f30..3d997f30 100644
--- a/src/locales/nl/company/suffix.ts
+++ b/src/locales/nl/company/legal_entity_type.ts
diff --git a/src/locales/nl_BE/company/index.ts b/src/locales/nl_BE/company/index.ts
index cada7a57..b346e443 100644
--- a/src/locales/nl_BE/company/index.ts
+++ b/src/locales/nl_BE/company/index.ts
@@ -3,10 +3,10 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
-import suffix from './suffix';
+import legal_entity_type from './legal_entity_type';
 
 const company: CompanyDefinition = {
-  suffix,
+  legal_entity_type,
 };
 
 export default company;
diff --git a/src/locales/nl_BE/company/suffix.ts b/src/locales/nl_BE/company/legal_entity_type.ts
index ceead4ec..ceead4ec 100644
--- a/src/locales/nl_BE/company/suffix.ts
+++ b/src/locales/nl_BE/company/legal_entity_type.ts
diff --git a/src/locales/pl/company/index.ts b/src/locales/pl/company/index.ts
index c3d0395a..86925375 100644
--- a/src/locales/pl/company/index.ts
+++ b/src/locales/pl/company/index.ts
@@ -3,12 +3,12 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
+import legal_entity_type from './legal_entity_type';
 import name_pattern from './name_pattern';
-import suffix from './suffix';
 
 const company: CompanyDefinition = {
+  legal_entity_type,
   name_pattern,
-  suffix,
 };
 
 export default company;
diff --git a/src/locales/pl/company/suffix.ts b/src/locales/pl/company/legal_entity_type.ts
index 50c39953..50c39953 100644
--- a/src/locales/pl/company/suffix.ts
+++ b/src/locales/pl/company/legal_entity_type.ts
diff --git a/src/locales/pl/company/name_pattern.ts b/src/locales/pl/company/name_pattern.ts
index 30a7946b..a4789952 100644
--- a/src/locales/pl/company/name_pattern.ts
+++ b/src/locales/pl/company/name_pattern.ts
@@ -1,5 +1,5 @@
 export default [
-  '{{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}} {{company.legal_entity_type}}',
   '{{person.last_name}}, {{person.last_name}} and {{person.last_name}}',
   '{{person.last_name}}-{{person.last_name}}',
 ];
diff --git a/src/locales/pt_BR/company/index.ts b/src/locales/pt_BR/company/index.ts
index c3d0395a..86925375 100644
--- a/src/locales/pt_BR/company/index.ts
+++ b/src/locales/pt_BR/company/index.ts
@@ -3,12 +3,12 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
+import legal_entity_type from './legal_entity_type';
 import name_pattern from './name_pattern';
-import suffix from './suffix';
 
 const company: CompanyDefinition = {
+  legal_entity_type,
   name_pattern,
-  suffix,
 };
 
 export default company;
diff --git a/src/locales/pt_BR/company/suffix.ts b/src/locales/pt_BR/company/legal_entity_type.ts
index ada8b9fb..ada8b9fb 100644
--- a/src/locales/pt_BR/company/suffix.ts
+++ b/src/locales/pt_BR/company/legal_entity_type.ts
diff --git a/src/locales/pt_BR/company/name_pattern.ts b/src/locales/pt_BR/company/name_pattern.ts
index 6599004e..2f895627 100644
--- a/src/locales/pt_BR/company/name_pattern.ts
+++ b/src/locales/pt_BR/company/name_pattern.ts
@@ -1,5 +1,5 @@
 export default [
-  '{{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}} {{company.legal_entity_type}}',
   '{{person.last_name}}, {{person.last_name}} e {{person.last_name}}',
   '{{person.last_name}}-{{person.last_name}}',
 ];
diff --git a/src/locales/ru/company/index.ts b/src/locales/ru/company/index.ts
index 27f89a04..aeb192e8 100644
--- a/src/locales/ru/company/index.ts
+++ b/src/locales/ru/company/index.ts
@@ -3,13 +3,13 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
+import legal_entity_type from './legal_entity_type';
 import name_pattern from './name_pattern';
-import prefix from './prefix';
 import suffix from './suffix';
 
 const company: CompanyDefinition = {
+  legal_entity_type,
   name_pattern,
-  prefix,
   suffix,
 };
 
diff --git a/src/locales/ru/company/prefix.ts b/src/locales/ru/company/legal_entity_type.ts
index 90b703be..90b703be 100644
--- a/src/locales/ru/company/prefix.ts
+++ b/src/locales/ru/company/legal_entity_type.ts
diff --git a/src/locales/ru/company/name_pattern.ts b/src/locales/ru/company/name_pattern.ts
index 39403380..0fdbdbb7 100644
--- a/src/locales/ru/company/name_pattern.ts
+++ b/src/locales/ru/company/name_pattern.ts
@@ -1,10 +1,10 @@
 export default [
-  '{{company.prefix}} {{company.suffix}}{{company.suffix}}',
-  '{{company.prefix}} {{company.suffix}}{{company.suffix}}{{company.suffix}}',
-  '{{company.prefix}} {{location.city_name}}{{company.suffix}}',
-  '{{company.prefix}} {{location.city_name}}{{company.suffix}}{{company.suffix}}',
-  '{{company.prefix}} {{location.city_name}}{{company.suffix}}{{company.suffix}}{{company.suffix}}',
-  '{{company.prefix}} {{person.female_first_name}}',
-  '{{company.prefix}} {{person.male_first_name}}',
-  '{{company.prefix}} {{person.male_last_name}}',
+  '{{company.legal_entity_type}} {{company.suffix}}{{company.suffix}}',
+  '{{company.legal_entity_type}} {{company.suffix}}{{company.suffix}}{{company.suffix}}',
+  '{{company.legal_entity_type}} {{location.city_name}}{{company.suffix}}',
+  '{{company.legal_entity_type}} {{location.city_name}}{{company.suffix}}{{company.suffix}}',
+  '{{company.legal_entity_type}} {{location.city_name}}{{company.suffix}}{{company.suffix}}{{company.suffix}}',
+  '{{company.legal_entity_type}} {{person.female_first_name}}',
+  '{{company.legal_entity_type}} {{person.male_first_name}}',
+  '{{company.legal_entity_type}} {{person.male_last_name}}',
 ];
diff --git a/src/locales/sk/company/index.ts b/src/locales/sk/company/index.ts
index c3d0395a..86925375 100644
--- a/src/locales/sk/company/index.ts
+++ b/src/locales/sk/company/index.ts
@@ -3,12 +3,12 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
+import legal_entity_type from './legal_entity_type';
 import name_pattern from './name_pattern';
-import suffix from './suffix';
 
 const company: CompanyDefinition = {
+  legal_entity_type,
   name_pattern,
-  suffix,
 };
 
 export default company;
diff --git a/src/locales/sk/company/suffix.ts b/src/locales/sk/company/legal_entity_type.ts
index 5c554052..5c554052 100644
--- a/src/locales/sk/company/suffix.ts
+++ b/src/locales/sk/company/legal_entity_type.ts
diff --git a/src/locales/sk/company/name_pattern.ts b/src/locales/sk/company/name_pattern.ts
index d6eda221..2cfbd4cc 100644
--- a/src/locales/sk/company/name_pattern.ts
+++ b/src/locales/sk/company/name_pattern.ts
@@ -1,4 +1,4 @@
 export default [
-  '{{person.last_name}} {{company.suffix}}',
-  '{{person.male_last_name}} a {{person.male_last_name}} {{company.suffix}}',
+  '{{person.last_name}} {{company.legal_entity_type}}',
+  '{{person.male_last_name}} a {{person.male_last_name}} {{company.legal_entity_type}}',
 ];
diff --git a/src/locales/sv/company/index.ts b/src/locales/sv/company/index.ts
index c3d0395a..86925375 100644
--- a/src/locales/sv/company/index.ts
+++ b/src/locales/sv/company/index.ts
@@ -3,12 +3,12 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
+import legal_entity_type from './legal_entity_type';
 import name_pattern from './name_pattern';
-import suffix from './suffix';
 
 const company: CompanyDefinition = {
+  legal_entity_type,
   name_pattern,
-  suffix,
 };
 
 export default company;
diff --git a/src/locales/sv/company/suffix.ts b/src/locales/sv/company/legal_entity_type.ts
index 6cf91270..6cf91270 100644
--- a/src/locales/sv/company/suffix.ts
+++ b/src/locales/sv/company/legal_entity_type.ts
diff --git a/src/locales/sv/company/name_pattern.ts b/src/locales/sv/company/name_pattern.ts
index debdd4c5..7bf06daf 100644
--- a/src/locales/sv/company/name_pattern.ts
+++ b/src/locales/sv/company/name_pattern.ts
@@ -1,5 +1,5 @@
 export default [
-  '{{person.last_name}} {{company.suffix}}',
-  '{{person.last_name}}, {{person.last_name}} {{company.suffix}}',
+  '{{person.last_name}} {{company.legal_entity_type}}',
+  '{{person.last_name}}, {{person.last_name}} {{company.legal_entity_type}}',
   '{{person.last_name}}-{{person.last_name}}',
 ];
diff --git a/src/locales/uk/company/suffix.ts b/src/locales/uk/company/category.ts
index a1da3fff..a1da3fff 100644
--- a/src/locales/uk/company/suffix.ts
+++ b/src/locales/uk/company/category.ts
diff --git a/src/locales/uk/company/index.ts b/src/locales/uk/company/index.ts
index 27f89a04..000b59c3 100644
--- a/src/locales/uk/company/index.ts
+++ b/src/locales/uk/company/index.ts
@@ -3,14 +3,14 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
+import category from './category';
+import legal_entity_type from './legal_entity_type';
 import name_pattern from './name_pattern';
-import prefix from './prefix';
-import suffix from './suffix';
 
 const company: CompanyDefinition = {
+  category,
+  legal_entity_type,
   name_pattern,
-  prefix,
-  suffix,
 };
 
 export default company;
diff --git a/src/locales/uk/company/prefix.ts b/src/locales/uk/company/legal_entity_type.ts
index c828f2c0..c828f2c0 100644
--- a/src/locales/uk/company/prefix.ts
+++ b/src/locales/uk/company/legal_entity_type.ts
diff --git a/src/locales/uk/company/name_pattern.ts b/src/locales/uk/company/name_pattern.ts
index 39403380..6452a80a 100644
--- a/src/locales/uk/company/name_pattern.ts
+++ b/src/locales/uk/company/name_pattern.ts
@@ -1,10 +1,10 @@
 export default [
-  '{{company.prefix}} {{company.suffix}}{{company.suffix}}',
-  '{{company.prefix}} {{company.suffix}}{{company.suffix}}{{company.suffix}}',
-  '{{company.prefix}} {{location.city_name}}{{company.suffix}}',
-  '{{company.prefix}} {{location.city_name}}{{company.suffix}}{{company.suffix}}',
-  '{{company.prefix}} {{location.city_name}}{{company.suffix}}{{company.suffix}}{{company.suffix}}',
-  '{{company.prefix}} {{person.female_first_name}}',
-  '{{company.prefix}} {{person.male_first_name}}',
-  '{{company.prefix}} {{person.male_last_name}}',
+  '{{company.legal_entity_type}} {{company.category}}{{company.category}}',
+  '{{company.legal_entity_type}} {{company.category}}{{company.category}}{{company.category}}',
+  '{{company.legal_entity_type}} {{location.city_name}}{{company.category}}',
+  '{{company.legal_entity_type}} {{location.city_name}}{{company.category}}{{company.category}}',
+  '{{company.legal_entity_type}} {{location.city_name}}{{company.category}}{{company.category}}{{company.category}}',
+  '{{company.legal_entity_type}} {{person.female_first_name}}',
+  '{{company.legal_entity_type}} {{person.male_first_name}}',
+  '{{company.legal_entity_type}} {{person.male_last_name}}',
 ];
diff --git a/src/locales/zu_ZA/company/index.ts b/src/locales/zu_ZA/company/index.ts
index cada7a57..b346e443 100644
--- a/src/locales/zu_ZA/company/index.ts
+++ b/src/locales/zu_ZA/company/index.ts
@@ -3,10 +3,10 @@
  * Run 'pnpm run generate:locales' to update.
  */
 import type { CompanyDefinition } from '../../..';
-import suffix from './suffix';
+import legal_entity_type from './legal_entity_type';
 
 const company: CompanyDefinition = {
-  suffix,
+  legal_entity_type,
 };
 
 export default company;
diff --git a/src/locales/zu_ZA/company/suffix.ts b/src/locales/zu_ZA/company/legal_entity_type.ts
index 872faf24..872faf24 100644
--- a/src/locales/zu_ZA/company/suffix.ts
+++ b/src/locales/zu_ZA/company/legal_entity_type.ts