From 9bd73b41184d63035299ee73536572b1ba9b9da0 Mon Sep 17 00:00:00 2001
From: ST-DDT <ST-DDT@gmx.de>
Date: Thu, 28 Apr 2022 14:17:49 +0200
Subject: [PATCH 1/3] feat: support locale definitions directly from faker.fake

---
 src/modules/fake/index.ts | 23 ++++++++++++++++++-----
 test/fake.spec.ts         | 36 ++++++++++++++++++++++++++++++++++--
 2 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/src/modules/fake/index.ts b/src/modules/fake/index.ts
index a9f2a22a173..a94d8845279 100644
--- a/src/modules/fake/index.ts
+++ b/src/modules/fake/index.ts
@@ -88,16 +88,29 @@ export class Fake {
     // split the method into module and function
     const parts = method.split('.');
 
-    if (this.faker[parts[0]] == null) {
-      throw new FakerError(`Invalid module: ${parts[0]}`);
+    let currentModuleOrMethod: unknown = this.faker;
+    let currentDefinitions: unknown = this.faker.definitions;
+
+    // Search for the requested method or definition
+    for (const part of parts) {
+      currentModuleOrMethod = currentModuleOrMethod?.[part];
+      currentDefinitions = currentDefinitions?.[part];
     }
 
-    if (this.faker[parts[0]][parts[1]] == null) {
-      throw new FakerError(`Invalid method: ${parts[0]}.${parts[1]}`);
+    // Make method executable
+    let fn: (args?: unknown) => unknown;
+    if (typeof currentModuleOrMethod === 'function') {
+      fn = currentModuleOrMethod as (args?: unknown) => unknown;
+    } else if (Array.isArray(currentDefinitions)) {
+      fn = () =>
+        this.faker.helpers.arrayElement(currentDefinitions as unknown[]);
+    } else {
+      throw new FakerError(`Invalid module method or definition: ${method}
+- faker.${method} is not a function
+- faker.definitions.${method} is not an array`);
     }
 
     // assign the function from the module.function namespace
-    let fn: (args?: unknown) => string = this.faker[parts[0]][parts[1]];
     fn = fn.bind(this);
 
     // If parameters are populated here, they are always going to be of string type
diff --git a/test/fake.spec.ts b/test/fake.spec.ts
index 2846b9ee9c0..c9ce3b31790 100644
--- a/test/fake.spec.ts
+++ b/test/fake.spec.ts
@@ -38,13 +38,33 @@ describe('fake', () => {
 
     it('does not allow invalid module name', () => {
       expect(() => faker.fake('{{foo.bar}}')).toThrowError(
-        new FakerError('Invalid module: foo')
+        new FakerError(`Invalid module method or definition: foo.bar
+- faker.foo.bar is not a function
+- faker.definitions.foo.bar is not an array`)
+      );
+    });
+
+    it('does not allow missing method name', () => {
+      expect(() => faker.fake('{{address}}')).toThrowError(
+        new FakerError(`Invalid module method or definition: address
+- faker.address is not a function
+- faker.definitions.address is not an array`)
       );
     });
 
     it('does not allow invalid method name', () => {
       expect(() => faker.fake('{{address.foo}}')).toThrowError(
-        new FakerError('Invalid method: address.foo')
+        new FakerError(`Invalid module method or definition: address.foo
+- faker.address.foo is not a function
+- faker.definitions.address.foo is not an array`)
+      );
+    });
+
+    it('does not allow invalid definitions data', () => {
+      expect(() => faker.fake('{{finance.credit_card}}')).toThrowError(
+        new FakerError(`Invalid module method or definition: finance.credit_card
+- faker.finance.credit_card is not a function
+- faker.definitions.finance.credit_card is not an array`)
       );
     });
 
@@ -52,6 +72,18 @@ describe('fake', () => {
       expect(faker.fake('{{helpers.repeatString}}')).toBe('');
     });
 
+    it('should be able to return locale definition strings', () => {
+      expect(faker.definitions.cell_phone.formats).toContain(
+        faker.fake('{{cell_phone.formats}}')
+      );
+    });
+
+    it('should be able to return locale definition strings that starts with the name of an existing module', () => {
+      expect(faker.definitions.address.city_name).toContain(
+        faker.fake('{{address.city_name}}')
+      );
+    });
+
     it('should be able to handle only {{ brackets', () => {
       expect(faker.fake('{{hello')).toBe('{{hello');
       expect(faker.fake('hello{{')).toBe('hello{{');

From 3c25e5f81bba9f8200df7583ca436a307cb921c9 Mon Sep 17 00:00:00 2001
From: ST-DDT <ST-DDT@gmx.de>
Date: Thu, 5 May 2022 13:38:20 +0200
Subject: [PATCH 2/3] chore(locales): convert locales data to faker.fake format

---
 src/locales/ar/address/city.ts                |  2 +-
 src/locales/ar/address/street_name.ts         |  4 +-
 src/locales/ar/name/name.ts                   |  6 +-
 src/locales/ar/team/name.ts                   |  2 +-
 src/locales/az/address/city.ts                |  2 +-
 src/locales/az/address/street_name.ts         |  4 +-
 src/locales/az/company/name.ts                | 16 ++---
 src/locales/az/name/name.ts                   | 12 ++--
 src/locales/cz/address/city.ts                |  2 +-
 src/locales/cz/address/street_name.ts         |  2 +-
 src/locales/cz/company/name.ts                |  6 +-
 src/locales/cz/name/name.ts                   | 20 +++---
 src/locales/de/address/city.ts                |  8 +--
 src/locales/de/address/street_name.ts         |  2 +-
 src/locales/de/company/name.ts                |  6 +-
 src/locales/de/name/name.ts                   | 12 ++--
 src/locales/de_AT/address/city.ts             |  2 +-
 src/locales/de_AT/address/street_name.ts      |  2 +-
 src/locales/de_AT/company/name.ts             |  6 +-
 src/locales/de_AT/name/name.ts                | 12 ++--
 src/locales/de_CH/address/city.ts             |  2 +-
 src/locales/de_CH/company/name.ts             |  6 +-
 src/locales/de_CH/name/name.ts                | 12 ++--
 src/locales/el/app/author.ts                  |  2 +-
 src/locales/el/company/name.ts                |  6 +-
 src/locales/el/name/name.ts                   | 12 ++--
 src/locales/el/team/name.ts                   |  2 +-
 src/locales/en/address/city.ts                |  8 +--
 src/locales/en/address/street_name.ts         |  4 +-
 src/locales/en/app/author.ts                  |  2 +-
 src/locales/en/company/name.ts                |  6 +-
 src/locales/en/name/name.ts                   | 12 ++--
 src/locales/en/team/name.ts                   |  2 +-
 src/locales/en_AU_ocker/address/city.ts       |  2 +-
 .../en_AU_ocker/address/street_name.ts        |  2 +-
 src/locales/en_GH/address/city.ts             |  2 +-
 src/locales/en_GH/address/street_name.ts      |  4 +-
 src/locales/en_GH/company/name.ts             |  4 +-
 src/locales/en_GH/name/first_name.ts          |  2 +-
 src/locales/en_GH/name/name.ts                |  8 +--
 src/locales/en_IND/address/city.ts            |  2 +-
 src/locales/en_NG/address/city.ts             |  2 +-
 src/locales/en_NG/name/name.ts                |  5 +-
 src/locales/en_ZA/address/city.ts             |  2 +-
 src/locales/en_ZA/name/name.ts                |  5 +-
 src/locales/es/address/city.ts                |  2 +-
 src/locales/es/address/street_name.ts         |  4 +-
 src/locales/es/company/name.ts                |  8 +--
 src/locales/es/name/name.ts                   | 10 +--
 src/locales/es_MX/address/city.ts             |  2 +-
 src/locales/es_MX/address/street_name.ts      | 12 ++--
 src/locales/es_MX/company/name.ts             |  8 +--
 src/locales/es_MX/name/name.ts                | 10 +--
 src/locales/es_MX/team/name.ts                |  2 +-
 src/locales/fa/address/city.ts                |  2 +-
 src/locales/fa/address/street_name.ts         |  2 +-
 src/locales/fa/company/name.ts                |  6 +-
 src/locales/fa/name/name.ts                   | 10 +--
 src/locales/fi/name/name.ts                   |  8 +--
 src/locales/fr/address/city.ts                |  2 +-
 src/locales/fr/address/street_name.ts         |  2 +-
 src/locales/fr/company/name.ts                |  4 +-
 src/locales/fr/name/name.ts                   |  6 +-
 src/locales/fr_BE/address/city.ts             |  5 +-
 src/locales/fr_BE/address/street_name.ts      |  6 +-
 src/locales/fr_BE/name/name.ts                | 12 ++--
 src/locales/fr_CH/address/city.ts             |  2 +-
 src/locales/ge/address/city.ts                | 12 ++--
 src/locales/ge/address/street_name.ts         |  2 +-
 src/locales/ge/company/name.ts                | 10 +--
 src/locales/ge/name/name.ts                   | 12 ++--
 src/locales/he/address/city.ts                |  8 +--
 src/locales/he/address/street_name.ts         |  4 +-
 src/locales/he/name/name.ts                   | 12 ++--
 src/locales/hr/address/city.ts                |  2 +-
 src/locales/hr/address/street_name.ts         |  2 +-
 src/locales/hr/name/name.ts                   | 12 ++--
 src/locales/hu/name/name.ts                   |  4 +-
 src/locales/hy/address/city.ts                |  4 +-
 src/locales/hy/address/street_name.ts         |  2 +-
 src/locales/hy/name/name.ts                   | 12 ++--
 src/locales/id_ID/address/city.ts             |  2 +-
 src/locales/id_ID/address/street_name.ts      |  4 +-
 src/locales/id_ID/company/name.ts             |  6 +-
 src/locales/id_ID/name/name.ts                | 14 ++--
 src/locales/it/address/city.ts                |  8 +--
 src/locales/it/address/street_name.ts         |  4 +-
 src/locales/it/company/name.ts                |  6 +-
 src/locales/it/name/name.ts                   | 12 ++--
 src/locales/ja/address/city.ts                |  8 +--
 src/locales/ja/address/street_name.ts         |  4 +-
 src/locales/ja/name/name.ts                   |  2 +-
 src/locales/ko/address/city.ts                |  2 +-
 src/locales/ko/address/street_name.ts         |  2 +-
 src/locales/ko/company/name.ts                |  5 +-
 src/locales/ko/name/name.ts                   |  2 +-
 src/locales/lv/address/city.ts                |  2 +-
 src/locales/lv/address/street_name.ts         |  2 +-
 src/locales/lv/company/name.ts                | 10 +--
 src/locales/lv/name/name.ts                   | 22 +++----
 src/locales/mk/address/city.ts                |  2 +-
 src/locales/mk/address/street_name.ts         |  2 +-
 src/locales/mk/company/name.ts                |  6 +-
 src/locales/mk/name/name.ts                   | 16 ++---
 src/locales/mk/name/prefix.ts                 |  2 +-
 src/locales/nb_NO/address/city.ts             |  2 +-
 src/locales/nb_NO/address/street_name.ts      |  8 +--
 src/locales/nb_NO/company/name.ts             |  6 +-
 src/locales/nb_NO/name/name.ts                | 12 ++--
 src/locales/nl/address/city.ts                |  5 +-
 src/locales/nl/address/street_name.ts         |  4 +-
 src/locales/nl/name/name.ts                   | 12 ++--
 src/locales/nl_BE/address/city.ts             |  5 +-
 src/locales/nl_BE/address/street_name.ts      |  4 +-
 src/locales/nl_BE/name/name.ts                |  8 +--
 src/locales/pl/address/city.ts                |  2 +-
 src/locales/pl/address/street_name.ts         |  2 +-
 src/locales/pl/company/name.ts                |  6 +-
 src/locales/pl/name/name.ts                   | 12 ++--
 src/locales/pt_BR/company/name.ts             |  6 +-
 src/locales/pt_BR/name/name.ts                | 12 ++--
 src/locales/pt_PT/address/city.ts             |  2 +-
 src/locales/pt_PT/address/street_name.ts      |  2 +-
 src/locales/pt_PT/name/name.ts                | 10 +--
 src/locales/pt_PT/name/prefix.ts              |  2 +-
 src/locales/ro/address/street_name.ts         |  2 +-
 src/locales/ro/name/name.ts                   | 64 +++++++++----------
 src/locales/ru/address/city.ts                |  2 +-
 src/locales/ru/address/street_name.ts         |  4 +-
 src/locales/ru/company/name.ts                | 16 ++---
 src/locales/ru/name/name.ts                   | 16 ++---
 src/locales/sk/address/city.ts                |  2 +-
 src/locales/sk/address/street_name.ts         |  2 +-
 src/locales/sk/company/name.ts                |  6 +-
 src/locales/sk/name/name.ts                   | 20 +++---
 src/locales/sv/address/city.ts                |  2 +-
 src/locales/sv/address/street_name.ts         |  8 +--
 src/locales/sv/cell_phone/formats.ts          |  2 +-
 src/locales/sv/company/name.ts                |  6 +-
 src/locales/sv/name/name.ts                   | 14 ++--
 src/locales/sv/team/name.ts                   |  2 +-
 src/locales/tr/address/street_name.ts         |  2 +-
 src/locales/tr/name/name.ts                   | 12 ++--
 src/locales/uk/address/city.ts                |  5 +-
 src/locales/uk/address/street_name.ts         |  4 +-
 src/locales/uk/company/name.ts                | 16 ++---
 src/locales/uk/name/name.ts                   | 16 ++---
 src/locales/ur/address/city.ts                |  8 +--
 src/locales/ur/address/street_name.ts         |  4 +-
 src/locales/ur/app/author.ts                  |  2 +-
 src/locales/ur/name/name.ts                   | 16 ++---
 src/locales/ur/team/name.ts                   |  2 +-
 src/locales/vi/address/city.ts                |  2 +-
 src/locales/vi/company/name.ts                |  2 +-
 src/locales/vi/name/name.ts                   |  6 +-
 src/locales/zh_CN/address/city.ts             |  2 +-
 src/locales/zh_CN/address/street_name.ts      |  2 +-
 src/locales/zh_CN/name/name.ts                |  2 +-
 src/locales/zh_TW/address/city.ts             |  2 +-
 src/locales/zh_TW/address/street_name.ts      |  2 +-
 src/locales/zh_TW/name/name.ts                |  2 +-
 161 files changed, 516 insertions(+), 495 deletions(-)

diff --git a/src/locales/ar/address/city.ts b/src/locales/ar/address/city.ts
index 1af570d730b..e3da346bd1e 100644
--- a/src/locales/ar/address/city.ts
+++ b/src/locales/ar/address/city.ts
@@ -1 +1 @@
-export default ['#{city_name}'];
+export default ['{{address.city_name}}'];
diff --git a/src/locales/ar/address/street_name.ts b/src/locales/ar/address/street_name.ts
index cb709b68de5..0b48ceb89d2 100644
--- a/src/locales/ar/address/street_name.ts
+++ b/src/locales/ar/address/street_name.ts
@@ -1,4 +1,4 @@
 export default [
-  '#{street_prefix} #{Name.first_name}',
-  '#{street_prefix} #{Name.last_name}',
+  '{{address.street_prefix}} {{name.first_name}}',
+  '{{address.street_prefix}} {{name.last_name}}',
 ];
diff --git a/src/locales/ar/name/name.ts b/src/locales/ar/name/name.ts
index ca2412c289e..702d95810ca 100644
--- a/src/locales/ar/name/name.ts
+++ b/src/locales/ar/name/name.ts
@@ -1,5 +1,5 @@
 export default [
-  '#{prefix} #{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{last_name} #{first_name}',
+  '{{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/team/name.ts b/src/locales/ar/team/name.ts
index 000c58ec0e1..ed2bdbb53fa 100644
--- a/src/locales/ar/team/name.ts
+++ b/src/locales/ar/team/name.ts
@@ -1 +1 @@
-export default ['#{Address.state} #{creature}'];
+export default ['{{address.state}} {{team.creature}}'];
diff --git a/src/locales/az/address/city.ts b/src/locales/az/address/city.ts
index 532d780fb90..e3da346bd1e 100644
--- a/src/locales/az/address/city.ts
+++ b/src/locales/az/address/city.ts
@@ -1 +1 @@
-export default ['#{Address.city_name}'];
+export default ['{{address.city_name}}'];
diff --git a/src/locales/az/address/street_name.ts b/src/locales/az/address/street_name.ts
index 9ed5d0f4921..2c86913d02e 100644
--- a/src/locales/az/address/street_name.ts
+++ b/src/locales/az/address/street_name.ts
@@ -1,4 +1,4 @@
 export default [
-  '#{street_suffix} #{Address.street_title}',
-  '#{Address.street_title} #{street_suffix}',
+  '{{address.street_suffix}} {{address.street_title}}',
+  '{{address.street_title}} {{address.street_suffix}}',
 ];
diff --git a/src/locales/az/company/name.ts b/src/locales/az/company/name.ts
index 10d825eb45f..358d8080bfb 100644
--- a/src/locales/az/company/name.ts
+++ b/src/locales/az/company/name.ts
@@ -1,10 +1,10 @@
 export default [
-  '#{prefix} #{Name.female_first_name}',
-  '#{prefix} #{Name.male_first_name}',
-  '#{prefix} #{Name.male_last_name}',
-  '#{prefix} #{suffix}#{suffix}',
-  '#{prefix} #{suffix}#{suffix}#{suffix}',
-  '#{prefix} #{Address.city_name}#{suffix}',
-  '#{prefix} #{Address.city_name}#{suffix}#{suffix}',
-  '#{prefix} #{Address.city_name}#{suffix}#{suffix}#{suffix}',
+  '{{company.prefix}} {{name.female_first_name}}',
+  '{{company.prefix}} {{name.male_first_name}}',
+  '{{company.prefix}} {{name.male_last_name}}',
+  '{{company.prefix}} {{company.suffix}}{{company.suffix}}',
+  '{{company.prefix}} {{company.suffix}}{{company.suffix}}{{company.suffix}}',
+  '{{company.prefix}} {{address.city_name}}{{company.suffix}}',
+  '{{company.prefix}} {{address.city_name}}{{company.suffix}}{{company.suffix}}',
+  '{{company.prefix}} {{address.city_name}}{{company.suffix}}{{company.suffix}}{{company.suffix}}',
 ];
diff --git a/src/locales/az/name/name.ts b/src/locales/az/name/name.ts
index 7994e6d9988..da4da07ace7 100644
--- a/src/locales/az/name/name.ts
+++ b/src/locales/az/name/name.ts
@@ -1,8 +1,8 @@
 export default [
-  '#{male_first_name}',
-  '#{male_last_name} #{male_first_name}',
-  '#{male_first_name} #{male_last_name}',
-  '#{female_first_name}',
-  '#{female_first_name} #{female_last_name}',
-  '#{female_last_name} #{female_first_name}',
+  '{{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/cz/address/city.ts b/src/locales/cz/address/city.ts
index 1af570d730b..e3da346bd1e 100644
--- a/src/locales/cz/address/city.ts
+++ b/src/locales/cz/address/city.ts
@@ -1 +1 @@
-export default ['#{city_name}'];
+export default ['{{address.city_name}}'];
diff --git a/src/locales/cz/address/street_name.ts b/src/locales/cz/address/street_name.ts
index a178c9ba951..3667961ce48 100644
--- a/src/locales/cz/address/street_name.ts
+++ b/src/locales/cz/address/street_name.ts
@@ -1 +1 @@
-export default ['#{street}'];
+export default ['{{address.street}}'];
diff --git a/src/locales/cz/company/name.ts b/src/locales/cz/company/name.ts
index 3ee3142f0c7..19edcc2ee05 100644
--- a/src/locales/cz/company/name.ts
+++ b/src/locales/cz/company/name.ts
@@ -1,5 +1,5 @@
 export default [
-  '#{Name.last_name} #{suffix}',
-  '#{Name.last_name} #{suffix}',
-  '#{Name.man_last_name} a #{Name.man_last_name} #{suffix}',
+  '{{name.last_name}} {{company.suffix}}',
+  '{{name.last_name}} {{company.suffix}}',
+  '{{name.male_last_name}} a {{name.male_last_name}} {{company.suffix}}',
 ];
diff --git a/src/locales/cz/name/name.ts b/src/locales/cz/name/name.ts
index cee01499484..cb42d811c2e 100644
--- a/src/locales/cz/name/name.ts
+++ b/src/locales/cz/name/name.ts
@@ -1,12 +1,12 @@
 export default [
-  '#{prefix} #{male_first_name} #{male_last_name}',
-  '#{prefix} #{female_first_name} #{female_last_name}',
-  '#{male_first_name} #{male_last_name} #{suffix}',
-  '#{female_first_name} #{female_last_name} #{suffix}',
-  '#{male_first_name} #{male_last_name}',
-  '#{male_first_name} #{male_last_name}',
-  '#{male_first_name} #{male_last_name}',
-  '#{female_first_name} #{female_last_name}',
-  '#{female_first_name} #{female_last_name}',
-  '#{female_first_name} #{female_last_name}',
+  '{{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.male_first_name}} {{name.male_last_name}}',
+  '{{name.male_first_name}} {{name.male_last_name}}',
+  '{{name.female_first_name}} {{name.female_last_name}}',
+  '{{name.female_first_name}} {{name.female_last_name}}',
+  '{{name.female_first_name}} {{name.female_last_name}}',
 ];
diff --git a/src/locales/de/address/city.ts b/src/locales/de/address/city.ts
index a1cd1dc1eb7..d518527b6d1 100644
--- a/src/locales/de/address/city.ts
+++ b/src/locales/de/address/city.ts
@@ -1,6 +1,6 @@
 export default [
-  '#{city_prefix} #{Name.first_name}#{city_suffix}',
-  '#{city_prefix} #{Name.first_name}',
-  '#{Name.first_name}#{city_suffix}',
-  '#{Name.last_name}#{city_suffix}',
+  '{{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}}',
 ];
diff --git a/src/locales/de/address/street_name.ts b/src/locales/de/address/street_name.ts
index 515178fa3f4..ffe0771bd4a 100644
--- a/src/locales/de/address/street_name.ts
+++ b/src/locales/de/address/street_name.ts
@@ -1 +1 @@
-export default ['#{street_root}'];
+export default ['{{address.street_root}}'];
diff --git a/src/locales/de/company/name.ts b/src/locales/de/company/name.ts
index 3349005e2ff..d69a650853c 100644
--- a/src/locales/de/company/name.ts
+++ b/src/locales/de/company/name.ts
@@ -1,5 +1,5 @@
 export default [
-  '#{Name.last_name} #{suffix}',
-  '#{Name.last_name}-#{Name.last_name}',
-  '#{Name.last_name}, #{Name.last_name} und #{Name.last_name}',
+  '{{name.last_name}} {{company.suffix}}',
+  '{{name.last_name}}-{{name.last_name}}',
+  '{{name.last_name}}, {{name.last_name}} und {{name.last_name}}',
 ];
diff --git a/src/locales/de/name/name.ts b/src/locales/de/name/name.ts
index 072c7954d55..69197fbf669 100644
--- a/src/locales/de/name/name.ts
+++ b/src/locales/de/name/name.ts
@@ -1,8 +1,8 @@
 export default [
-  '#{prefix} #{first_name} #{last_name}',
-  '#{first_name} #{nobility_title_prefix} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{male_first_name} #{last_name}',
-  '#{female_first_name} #{last_name}',
+  '{{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.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_AT/address/city.ts b/src/locales/de_AT/address/city.ts
index 1af570d730b..e3da346bd1e 100644
--- a/src/locales/de_AT/address/city.ts
+++ b/src/locales/de_AT/address/city.ts
@@ -1 +1 @@
-export default ['#{city_name}'];
+export default ['{{address.city_name}}'];
diff --git a/src/locales/de_AT/address/street_name.ts b/src/locales/de_AT/address/street_name.ts
index 515178fa3f4..ffe0771bd4a 100644
--- a/src/locales/de_AT/address/street_name.ts
+++ b/src/locales/de_AT/address/street_name.ts
@@ -1 +1 @@
-export default ['#{street_root}'];
+export default ['{{address.street_root}}'];
diff --git a/src/locales/de_AT/company/name.ts b/src/locales/de_AT/company/name.ts
index 3349005e2ff..d69a650853c 100644
--- a/src/locales/de_AT/company/name.ts
+++ b/src/locales/de_AT/company/name.ts
@@ -1,5 +1,5 @@
 export default [
-  '#{Name.last_name} #{suffix}',
-  '#{Name.last_name}-#{Name.last_name}',
-  '#{Name.last_name}, #{Name.last_name} und #{Name.last_name}',
+  '{{name.last_name}} {{company.suffix}}',
+  '{{name.last_name}}-{{name.last_name}}',
+  '{{name.last_name}}, {{name.last_name}} und {{name.last_name}}',
 ];
diff --git a/src/locales/de_AT/name/name.ts b/src/locales/de_AT/name/name.ts
index 48163910fa4..b21becf1b20 100644
--- a/src/locales/de_AT/name/name.ts
+++ b/src/locales/de_AT/name/name.ts
@@ -1,8 +1,8 @@
 export default [
-  '#{prefix} #{first_name} #{last_name}',
-  '#{first_name} #{nobility_title_prefix} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
+  '{{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.first_name}} {{name.last_name}}',
+  '{{name.first_name}} {{name.last_name}}',
+  '{{name.first_name}} {{name.last_name}}',
 ];
diff --git a/src/locales/de_CH/address/city.ts b/src/locales/de_CH/address/city.ts
index 1af570d730b..e3da346bd1e 100644
--- a/src/locales/de_CH/address/city.ts
+++ b/src/locales/de_CH/address/city.ts
@@ -1 +1 @@
-export default ['#{city_name}'];
+export default ['{{address.city_name}}'];
diff --git a/src/locales/de_CH/company/name.ts b/src/locales/de_CH/company/name.ts
index 3349005e2ff..d69a650853c 100644
--- a/src/locales/de_CH/company/name.ts
+++ b/src/locales/de_CH/company/name.ts
@@ -1,5 +1,5 @@
 export default [
-  '#{Name.last_name} #{suffix}',
-  '#{Name.last_name}-#{Name.last_name}',
-  '#{Name.last_name}, #{Name.last_name} und #{Name.last_name}',
+  '{{name.last_name}} {{company.suffix}}',
+  '{{name.last_name}}-{{name.last_name}}',
+  '{{name.last_name}}, {{name.last_name}} und {{name.last_name}}',
 ];
diff --git a/src/locales/de_CH/name/name.ts b/src/locales/de_CH/name/name.ts
index b5b1f326659..28de3d7aafb 100644
--- a/src/locales/de_CH/name/name.ts
+++ b/src/locales/de_CH/name/name.ts
@@ -1,8 +1,8 @@
 export default [
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
+  '{{name.first_name}} {{name.last_name}}',
+  '{{name.first_name}} {{name.last_name}}',
+  '{{name.first_name}} {{name.last_name}}',
+  '{{name.first_name}} {{name.last_name}}',
+  '{{name.first_name}} {{name.last_name}}',
+  '{{name.first_name}} {{name.last_name}}',
 ];
diff --git a/src/locales/el/app/author.ts b/src/locales/el/app/author.ts
index 8aae597e472..20670ee15bd 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 ['{{name.name}}', '{{company.name}}'];
diff --git a/src/locales/el/company/name.ts b/src/locales/el/company/name.ts
index d5790557c28..cffd6e7018a 100644
--- a/src/locales/el/company/name.ts
+++ b/src/locales/el/company/name.ts
@@ -1,5 +1,5 @@
 export default [
-  '#{Name.last_name} #{suffix}',
-  '#{Name.last_name}-#{Name.last_name}',
-  '#{Name.last_name}, #{Name.last_name} and #{Name.last_name}',
+  '{{name.last_name}} {{company.suffix}}',
+  '{{name.last_name}}-{{name.last_name}}',
+  '{{name.last_name}}, {{name.last_name}} and {{name.last_name}}',
 ];
diff --git a/src/locales/el/name/name.ts b/src/locales/el/name/name.ts
index 0fb3cc8ef98..81a00b73075 100644
--- a/src/locales/el/name/name.ts
+++ b/src/locales/el/name/name.ts
@@ -1,8 +1,8 @@
 export default [
-  '#{prefix} #{first_name} #{last_name}',
-  '#{first_name} #{last_name} #{suffix}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
+  '{{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.first_name}} {{name.last_name}}',
+  '{{name.first_name}} {{name.last_name}}',
 ];
diff --git a/src/locales/el/team/name.ts b/src/locales/el/team/name.ts
index 000c58ec0e1..ed2bdbb53fa 100644
--- a/src/locales/el/team/name.ts
+++ b/src/locales/el/team/name.ts
@@ -1 +1 @@
-export default ['#{Address.state} #{creature}'];
+export default ['{{address.state}} {{team.creature}}'];
diff --git a/src/locales/en/address/city.ts b/src/locales/en/address/city.ts
index a1cd1dc1eb7..d518527b6d1 100644
--- a/src/locales/en/address/city.ts
+++ b/src/locales/en/address/city.ts
@@ -1,6 +1,6 @@
 export default [
-  '#{city_prefix} #{Name.first_name}#{city_suffix}',
-  '#{city_prefix} #{Name.first_name}',
-  '#{Name.first_name}#{city_suffix}',
-  '#{Name.last_name}#{city_suffix}',
+  '{{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}}',
 ];
diff --git a/src/locales/en/address/street_name.ts b/src/locales/en/address/street_name.ts
index 41c23968443..6b2de46532a 100644
--- a/src/locales/en/address/street_name.ts
+++ b/src/locales/en/address/street_name.ts
@@ -1,4 +1,4 @@
 export default [
-  '#{Name.first_name} #{street_suffix}',
-  '#{Name.last_name} #{street_suffix}',
+  '{{name.first_name}} {{address.street_suffix}}',
+  '{{name.last_name}} {{address.street_suffix}}',
 ];
diff --git a/src/locales/en/app/author.ts b/src/locales/en/app/author.ts
index 8aae597e472..20670ee15bd 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 ['{{name.name}}', '{{company.name}}'];
diff --git a/src/locales/en/company/name.ts b/src/locales/en/company/name.ts
index d5790557c28..cffd6e7018a 100644
--- a/src/locales/en/company/name.ts
+++ b/src/locales/en/company/name.ts
@@ -1,5 +1,5 @@
 export default [
-  '#{Name.last_name} #{suffix}',
-  '#{Name.last_name}-#{Name.last_name}',
-  '#{Name.last_name}, #{Name.last_name} and #{Name.last_name}',
+  '{{name.last_name}} {{company.suffix}}',
+  '{{name.last_name}}-{{name.last_name}}',
+  '{{name.last_name}}, {{name.last_name}} and {{name.last_name}}',
 ];
diff --git a/src/locales/en/name/name.ts b/src/locales/en/name/name.ts
index bb00ca57675..080019e2b53 100644
--- a/src/locales/en/name/name.ts
+++ b/src/locales/en/name/name.ts
@@ -1,8 +1,8 @@
 export default [
-  '#{prefix} #{first_name} #{last_name}',
-  '#{first_name} #{last_name} #{suffix}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{male_first_name} #{last_name}',
-  '#{female_first_name} #{last_name}',
+  '{{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.male_first_name}} {{name.last_name}}',
+  '{{name.female_first_name}} {{name.last_name}}',
 ];
diff --git a/src/locales/en/team/name.ts b/src/locales/en/team/name.ts
index 000c58ec0e1..ed2bdbb53fa 100644
--- a/src/locales/en/team/name.ts
+++ b/src/locales/en/team/name.ts
@@ -1 +1 @@
-export default ['#{Address.state} #{creature}'];
+export default ['{{address.state}} {{team.creature}}'];
diff --git a/src/locales/en_AU_ocker/address/city.ts b/src/locales/en_AU_ocker/address/city.ts
index b09ed9d1fd9..db6c26ccbd2 100644
--- a/src/locales/en_AU_ocker/address/city.ts
+++ b/src/locales/en_AU_ocker/address/city.ts
@@ -1 +1 @@
-export default ['#{city_prefix}'];
+export default ['{{address.city_prefix}}'];
diff --git a/src/locales/en_AU_ocker/address/street_name.ts b/src/locales/en_AU_ocker/address/street_name.ts
index 515178fa3f4..ffe0771bd4a 100644
--- a/src/locales/en_AU_ocker/address/street_name.ts
+++ b/src/locales/en_AU_ocker/address/street_name.ts
@@ -1 +1 @@
-export default ['#{street_root}'];
+export default ['{{address.street_root}}'];
diff --git a/src/locales/en_GH/address/city.ts b/src/locales/en_GH/address/city.ts
index 1af570d730b..e3da346bd1e 100644
--- a/src/locales/en_GH/address/city.ts
+++ b/src/locales/en_GH/address/city.ts
@@ -1 +1 @@
-export default ['#{city_name}'];
+export default ['{{address.city_name}}'];
diff --git a/src/locales/en_GH/address/street_name.ts b/src/locales/en_GH/address/street_name.ts
index a4ba31e077d..2450e11079d 100644
--- a/src/locales/en_GH/address/street_name.ts
+++ b/src/locales/en_GH/address/street_name.ts
@@ -1,4 +1,4 @@
 export default [
-  '#{Name.last_name} #{street_suffix}',
-  '#{street_prefix} #{street_suffix}',
+  '{{name.last_name}} {{address.street_suffix}}',
+  '{{address.street_prefix}} {{address.street_suffix}}',
 ];
diff --git a/src/locales/en_GH/company/name.ts b/src/locales/en_GH/company/name.ts
index 272aaa79079..00dbe5ebcf5 100644
--- a/src/locales/en_GH/company/name.ts
+++ b/src/locales/en_GH/company/name.ts
@@ -1,4 +1,4 @@
 export default [
-  '#{Name.last_name} #{suffix}',
-  '#{Name.last_name} and #{Name.last_name}',
+  '{{name.last_name}} {{company.suffix}}',
+  '{{name.last_name}} and {{name.last_name}}',
 ];
diff --git a/src/locales/en_GH/name/first_name.ts b/src/locales/en_GH/name/first_name.ts
index eb3bd4f668a..b20c511df75 100644
--- a/src/locales/en_GH/name/first_name.ts
+++ b/src/locales/en_GH/name/first_name.ts
@@ -1 +1 @@
-export default ['#{female_first_name}', '#{male_first_name}'];
+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
index e9e9dd1feff..a4eeb41d3fd 100644
--- a/src/locales/en_GH/name/name.ts
+++ b/src/locales/en_GH/name/name.ts
@@ -1,6 +1,6 @@
 export default [
-  '#{female_first_name} #{last_name}',
-  '#{female_first_name} #{last_name}-#{last_name}',
-  '#{male_first_name} #{last_name}',
-  '#{male_first_name} #{last_name}-#{last_name}',
+  '{{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_IND/address/city.ts b/src/locales/en_IND/address/city.ts
index 1af570d730b..e3da346bd1e 100644
--- a/src/locales/en_IND/address/city.ts
+++ b/src/locales/en_IND/address/city.ts
@@ -1 +1 @@
-export default ['#{city_name}'];
+export default ['{{address.city_name}}'];
diff --git a/src/locales/en_NG/address/city.ts b/src/locales/en_NG/address/city.ts
index b09ed9d1fd9..db6c26ccbd2 100644
--- a/src/locales/en_NG/address/city.ts
+++ b/src/locales/en_NG/address/city.ts
@@ -1 +1 @@
-export default ['#{city_prefix}'];
+export default ['{{address.city_prefix}}'];
diff --git a/src/locales/en_NG/name/name.ts b/src/locales/en_NG/name/name.ts
index 5f04b2a4122..bfaf2fc6a61 100644
--- a/src/locales/en_NG/name/name.ts
+++ b/src/locales/en_NG/name/name.ts
@@ -1 +1,4 @@
-export default ['#{first_name} #{last_name}', '#{last_name} #{first_name}'];
+export default [
+  '{{name.first_name}} {{name.last_name}}',
+  '{{name.last_name}} {{name.first_name}}',
+];
diff --git a/src/locales/en_ZA/address/city.ts b/src/locales/en_ZA/address/city.ts
index b09ed9d1fd9..db6c26ccbd2 100644
--- a/src/locales/en_ZA/address/city.ts
+++ b/src/locales/en_ZA/address/city.ts
@@ -1 +1 @@
-export default ['#{city_prefix}'];
+export default ['{{address.city_prefix}}'];
diff --git a/src/locales/en_ZA/name/name.ts b/src/locales/en_ZA/name/name.ts
index 5f04b2a4122..bfaf2fc6a61 100644
--- a/src/locales/en_ZA/name/name.ts
+++ b/src/locales/en_ZA/name/name.ts
@@ -1 +1,4 @@
-export default ['#{first_name} #{last_name}', '#{last_name} #{first_name}'];
+export default [
+  '{{name.first_name}} {{name.last_name}}',
+  '{{name.last_name}} {{name.first_name}}',
+];
diff --git a/src/locales/es/address/city.ts b/src/locales/es/address/city.ts
index b09ed9d1fd9..db6c26ccbd2 100644
--- a/src/locales/es/address/city.ts
+++ b/src/locales/es/address/city.ts
@@ -1 +1 @@
-export default ['#{city_prefix}'];
+export default ['{{address.city_prefix}}'];
diff --git a/src/locales/es/address/street_name.ts b/src/locales/es/address/street_name.ts
index 34e67a06d86..89de841dd3f 100644
--- a/src/locales/es/address/street_name.ts
+++ b/src/locales/es/address/street_name.ts
@@ -1,4 +1,4 @@
 export default [
-  '#{street_suffix} #{Name.first_name}',
-  '#{street_suffix} #{Name.first_name} #{Name.last_name}',
+  '{{address.street_suffix}} {{name.first_name}}',
+  '{{address.street_suffix}} {{name.first_name}} {{name.last_name}}',
 ];
diff --git a/src/locales/es/company/name.ts b/src/locales/es/company/name.ts
index 866a9bc4675..a436ce849d6 100644
--- a/src/locales/es/company/name.ts
+++ b/src/locales/es/company/name.ts
@@ -1,6 +1,6 @@
 export default [
-  '#{Name.last_name} #{suffix}',
-  '#{Name.last_name} y #{Name.last_name}',
-  '#{Name.last_name} #{Name.last_name} #{suffix}',
-  '#{Name.last_name}, #{Name.last_name} y #{Name.last_name} Asociados',
+  '{{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',
 ];
diff --git a/src/locales/es/name/name.ts b/src/locales/es/name/name.ts
index c2af6860e52..2a0624da6bd 100644
--- a/src/locales/es/name/name.ts
+++ b/src/locales/es/name/name.ts
@@ -1,7 +1,7 @@
 export default [
-  '#{prefix} #{first_name} #{last_name} #{last_name}',
-  '#{first_name} #{last_name} #{last_name}',
-  '#{first_name} #{last_name} #{last_name}',
-  '#{first_name} #{last_name} #{last_name}',
-  '#{first_name} #{last_name} #{last_name}',
+  '{{name.prefix}} {{name.first_name}} {{name.last_name}} {{name.last_name}}',
+  '{{name.first_name}} {{name.last_name}} {{name.last_name}}',
+  '{{name.first_name}} {{name.last_name}} {{name.last_name}}',
+  '{{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/address/city.ts b/src/locales/es_MX/address/city.ts
index b09ed9d1fd9..db6c26ccbd2 100644
--- a/src/locales/es_MX/address/city.ts
+++ b/src/locales/es_MX/address/city.ts
@@ -1 +1 @@
-export default ['#{city_prefix}'];
+export default ['{{address.city_prefix}}'];
diff --git a/src/locales/es_MX/address/street_name.ts b/src/locales/es_MX/address/street_name.ts
index d6d2baf3770..0ae00a8e366 100644
--- a/src/locales/es_MX/address/street_name.ts
+++ b/src/locales/es_MX/address/street_name.ts
@@ -1,8 +1,8 @@
 export default [
-  '#{street_suffix} #{Name.first_name}',
-  '#{street_suffix} #{Name.first_name} #{Name.last_name}',
-  '#{street_suffix} #{street}',
-  '#{street_suffix} #{street}',
-  '#{street_suffix} #{street}',
-  '#{street_suffix} #{street}',
+  '{{address.street_suffix}} {{name.first_name}}',
+  '{{address.street_suffix}} {{name.first_name}} {{name.last_name}}',
+  '{{address.street_suffix}} {{address.street}}',
+  '{{address.street_suffix}} {{address.street}}',
+  '{{address.street_suffix}} {{address.street}}',
+  '{{address.street_suffix}} {{address.street}}',
 ];
diff --git a/src/locales/es_MX/company/name.ts b/src/locales/es_MX/company/name.ts
index 866a9bc4675..a436ce849d6 100644
--- a/src/locales/es_MX/company/name.ts
+++ b/src/locales/es_MX/company/name.ts
@@ -1,6 +1,6 @@
 export default [
-  '#{Name.last_name} #{suffix}',
-  '#{Name.last_name} y #{Name.last_name}',
-  '#{Name.last_name} #{Name.last_name} #{suffix}',
-  '#{Name.last_name}, #{Name.last_name} y #{Name.last_name} Asociados',
+  '{{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',
 ];
diff --git a/src/locales/es_MX/name/name.ts b/src/locales/es_MX/name/name.ts
index 903c418168c..e50db521665 100644
--- a/src/locales/es_MX/name/name.ts
+++ b/src/locales/es_MX/name/name.ts
@@ -1,7 +1,7 @@
 export default [
-  '#{prefix} #{first_name} #{last_name} #{last_name}',
-  '#{first_name} #{last_name} de #{last_name}',
-  '#{suffix} #{first_name} #{last_name} #{last_name}',
-  '#{first_name} #{last_name} #{last_name}',
-  '#{first_name} #{last_name} #{last_name}',
+  '{{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}}',
+  '{{name.first_name}} {{name.last_name}} {{name.last_name}}',
 ];
diff --git a/src/locales/es_MX/team/name.ts b/src/locales/es_MX/team/name.ts
index 000c58ec0e1..ed2bdbb53fa 100644
--- a/src/locales/es_MX/team/name.ts
+++ b/src/locales/es_MX/team/name.ts
@@ -1 +1 @@
-export default ['#{Address.state} #{creature}'];
+export default ['{{address.state}} {{team.creature}}'];
diff --git a/src/locales/fa/address/city.ts b/src/locales/fa/address/city.ts
index 1af570d730b..e3da346bd1e 100644
--- a/src/locales/fa/address/city.ts
+++ b/src/locales/fa/address/city.ts
@@ -1 +1 @@
-export default ['#{city_name}'];
+export default ['{{address.city_name}}'];
diff --git a/src/locales/fa/address/street_name.ts b/src/locales/fa/address/street_name.ts
index 63dcdc1c323..249fca8630b 100644
--- a/src/locales/fa/address/street_name.ts
+++ b/src/locales/fa/address/street_name.ts
@@ -1 +1 @@
-export default ['#{street_prefix} #{street_suffix}'];
+export default ['{{address.street_prefix}} {{address.street_suffix}}'];
diff --git a/src/locales/fa/company/name.ts b/src/locales/fa/company/name.ts
index 6ec542b9c20..6b30fcd754e 100644
--- a/src/locales/fa/company/name.ts
+++ b/src/locales/fa/company/name.ts
@@ -1,5 +1,5 @@
 export default [
-  '#{Name.last_name} #{suffix}',
-  '#{Name.last_name}-#{Name.last_name}',
-  '#{Name.last_name}, #{Name.last_name} و #{Name.last_name}',
+  '{{name.last_name}} {{company.suffix}}',
+  '{{name.last_name}}-{{name.last_name}}',
+  '{{name.last_name}}, {{name.last_name}} و {{name.last_name}}',
 ];
diff --git a/src/locales/fa/name/name.ts b/src/locales/fa/name/name.ts
index 9641c2e61ba..3568365d25b 100644
--- a/src/locales/fa/name/name.ts
+++ b/src/locales/fa/name/name.ts
@@ -1,7 +1,7 @@
 export default [
-  '#{prefix} #{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{male_first_name} #{last_name}',
-  '#{female_first_name} #{last_name}',
+  '{{name.prefix}} {{name.first_name}} {{name.last_name}}',
+  '{{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/fi/name/name.ts b/src/locales/fi/name/name.ts
index 4b340637313..a27e379dc67 100644
--- a/src/locales/fi/name/name.ts
+++ b/src/locales/fi/name/name.ts
@@ -1,6 +1,6 @@
 export default [
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{male_first_name} #{last_name}',
-  '#{female_first_name} #{last_name}',
+  '{{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/fr/address/city.ts b/src/locales/fr/address/city.ts
index 1af570d730b..e3da346bd1e 100644
--- a/src/locales/fr/address/city.ts
+++ b/src/locales/fr/address/city.ts
@@ -1 +1 @@
-export default ['#{city_name}'];
+export default ['{{address.city_name}}'];
diff --git a/src/locales/fr/address/street_name.ts b/src/locales/fr/address/street_name.ts
index 63dcdc1c323..249fca8630b 100644
--- a/src/locales/fr/address/street_name.ts
+++ b/src/locales/fr/address/street_name.ts
@@ -1 +1 @@
-export default ['#{street_prefix} #{street_suffix}'];
+export default ['{{address.street_prefix}} {{address.street_suffix}}'];
diff --git a/src/locales/fr/company/name.ts b/src/locales/fr/company/name.ts
index 620cdd7cfde..b56c8812401 100644
--- a/src/locales/fr/company/name.ts
+++ b/src/locales/fr/company/name.ts
@@ -1,4 +1,4 @@
 export default [
-  '#{Name.last_name} #{suffix}',
-  '#{Name.last_name} et #{Name.last_name}',
+  '{{name.last_name}} {{company.suffix}}',
+  '{{name.last_name}} et {{name.last_name}}',
 ];
diff --git a/src/locales/fr/name/name.ts b/src/locales/fr/name/name.ts
index ca2412c289e..702d95810ca 100644
--- a/src/locales/fr/name/name.ts
+++ b/src/locales/fr/name/name.ts
@@ -1,5 +1,5 @@
 export default [
-  '#{prefix} #{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{last_name} #{first_name}',
+  '{{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_BE/address/city.ts b/src/locales/fr_BE/address/city.ts
index eaad6eadcd0..5eaa0e417c3 100644
--- a/src/locales/fr_BE/address/city.ts
+++ b/src/locales/fr_BE/address/city.ts
@@ -1 +1,4 @@
-export default ['#{city_prefix}', '#{city_prefix}#{city_suffix}'];
+export default [
+  '{{address.city_prefix}}',
+  '{{address.city_prefix}}{{address.city_suffix}}',
+];
diff --git a/src/locales/fr_BE/address/street_name.ts b/src/locales/fr_BE/address/street_name.ts
index 13bb98b3f11..24b53ad26cd 100644
--- a/src/locales/fr_BE/address/street_name.ts
+++ b/src/locales/fr_BE/address/street_name.ts
@@ -1,5 +1,5 @@
 export default [
-  '#{street_prefix} #{Name.first_name}',
-  '#{street_prefix} #{Name.last_name}',
-  '#{street_prefix} #{street_suffix}',
+  '{{address.street_prefix}} {{name.first_name}}',
+  '{{address.street_prefix}} {{name.last_name}}',
+  '{{address.street_prefix}} {{address.street_suffix}}',
 ];
diff --git a/src/locales/fr_BE/name/name.ts b/src/locales/fr_BE/name/name.ts
index bb00ca57675..080019e2b53 100644
--- a/src/locales/fr_BE/name/name.ts
+++ b/src/locales/fr_BE/name/name.ts
@@ -1,8 +1,8 @@
 export default [
-  '#{prefix} #{first_name} #{last_name}',
-  '#{first_name} #{last_name} #{suffix}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{male_first_name} #{last_name}',
-  '#{female_first_name} #{last_name}',
+  '{{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.male_first_name}} {{name.last_name}}',
+  '{{name.female_first_name}} {{name.last_name}}',
 ];
diff --git a/src/locales/fr_CH/address/city.ts b/src/locales/fr_CH/address/city.ts
index 1af570d730b..e3da346bd1e 100644
--- a/src/locales/fr_CH/address/city.ts
+++ b/src/locales/fr_CH/address/city.ts
@@ -1 +1 @@
-export default ['#{city_name}'];
+export default ['{{address.city_name}}'];
diff --git a/src/locales/ge/address/city.ts b/src/locales/ge/address/city.ts
index b9d7b45f1ac..8fe4be7ffe6 100644
--- a/src/locales/ge/address/city.ts
+++ b/src/locales/ge/address/city.ts
@@ -1,8 +1,8 @@
 export default [
-  '#{city_prefix} #{Name.first_name}#{city_suffix}',
-  '#{city_prefix} #{Name.first_name}',
-  '#{Name.first_name}#{city_suffix}',
-  '#{Name.first_name}#{city_suffix}',
-  '#{Name.last_name}#{city_suffix}',
-  '#{Name.last_name}#{city_suffix}',
+  '{{address.city_prefix}} {{name.first_name}}{{address.city_suffix}}',
+  '{{address.city_prefix}} {{name.first_name}}',
+  '{{name.first_name}}{{address.city_suffix}}',
+  '{{name.first_name}}{{address.city_suffix}}',
+  '{{name.last_name}}{{address.city_suffix}}',
+  '{{name.last_name}}{{address.city_suffix}}',
 ];
diff --git a/src/locales/ge/address/street_name.ts b/src/locales/ge/address/street_name.ts
index eb8dcd96bb8..d9f5f1e6b62 100644
--- a/src/locales/ge/address/street_name.ts
+++ b/src/locales/ge/address/street_name.ts
@@ -1 +1 @@
-export default ['#{street_title} #{street_suffix}'];
+export default ['{{address.street_title}} {{address.street_suffix}}'];
diff --git a/src/locales/ge/company/name.ts b/src/locales/ge/company/name.ts
index adca04aaf99..0bf9d304941 100644
--- a/src/locales/ge/company/name.ts
+++ b/src/locales/ge/company/name.ts
@@ -1,7 +1,7 @@
 export default [
-  '#{prefix} #{Name.first_name}',
-  '#{prefix} #{Name.last_name}',
-  '#{prefix} #{Name.last_name} #{suffix}',
-  '#{prefix} #{Name.first_name} #{suffix}',
-  '#{prefix} #{Name.last_name}-#{Name.last_name}',
+  '{{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}}',
 ];
diff --git a/src/locales/ge/name/name.ts b/src/locales/ge/name/name.ts
index 658fce26772..c3f81378be4 100644
--- a/src/locales/ge/name/name.ts
+++ b/src/locales/ge/name/name.ts
@@ -1,8 +1,8 @@
 export default [
-  '#{prefix} #{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
+  '{{name.prefix}} {{name.first_name}} {{name.last_name}}',
+  '{{name.first_name}} {{name.last_name}}',
+  '{{name.first_name}} {{name.last_name}}',
+  '{{name.first_name}} {{name.last_name}}',
+  '{{name.first_name}} {{name.last_name}}',
+  '{{name.first_name}} {{name.last_name}}',
 ];
diff --git a/src/locales/he/address/city.ts b/src/locales/he/address/city.ts
index d7770de299e..a894878358a 100644
--- a/src/locales/he/address/city.ts
+++ b/src/locales/he/address/city.ts
@@ -1,6 +1,6 @@
 export default [
-  '#{city_prefix} #{Name.first_name}#{Name.last_name}',
-  '#{city_prefix} #{Name.first_name}',
-  '#{Name.first_name}#{city_suffix}',
-  '#{Name.last_name}#{city_suffix}',
+  '{{address.city_prefix}} {{name.first_name}}{{name.last_name}}',
+  '{{address.city_prefix}} {{name.first_name}}',
+  '{{name.first_name}}{{address.city_suffix}}',
+  '{{name.last_name}}{{address.city_suffix}}',
 ];
diff --git a/src/locales/he/address/street_name.ts b/src/locales/he/address/street_name.ts
index 41c23968443..6b2de46532a 100644
--- a/src/locales/he/address/street_name.ts
+++ b/src/locales/he/address/street_name.ts
@@ -1,4 +1,4 @@
 export default [
-  '#{Name.first_name} #{street_suffix}',
-  '#{Name.last_name} #{street_suffix}',
+  '{{name.first_name}} {{address.street_suffix}}',
+  '{{name.last_name}} {{address.street_suffix}}',
 ];
diff --git a/src/locales/he/name/name.ts b/src/locales/he/name/name.ts
index bb00ca57675..080019e2b53 100644
--- a/src/locales/he/name/name.ts
+++ b/src/locales/he/name/name.ts
@@ -1,8 +1,8 @@
 export default [
-  '#{prefix} #{first_name} #{last_name}',
-  '#{first_name} #{last_name} #{suffix}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{male_first_name} #{last_name}',
-  '#{female_first_name} #{last_name}',
+  '{{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.male_first_name}} {{name.last_name}}',
+  '{{name.female_first_name}} {{name.last_name}}',
 ];
diff --git a/src/locales/hr/address/city.ts b/src/locales/hr/address/city.ts
index 1af570d730b..e3da346bd1e 100644
--- a/src/locales/hr/address/city.ts
+++ b/src/locales/hr/address/city.ts
@@ -1 +1 @@
-export default ['#{city_name}'];
+export default ['{{address.city_name}}'];
diff --git a/src/locales/hr/address/street_name.ts b/src/locales/hr/address/street_name.ts
index a178c9ba951..3667961ce48 100644
--- a/src/locales/hr/address/street_name.ts
+++ b/src/locales/hr/address/street_name.ts
@@ -1 +1 @@
-export default ['#{street}'];
+export default ['{{address.street}}'];
diff --git a/src/locales/hr/name/name.ts b/src/locales/hr/name/name.ts
index 59c901451a3..d21c13cebc2 100644
--- a/src/locales/hr/name/name.ts
+++ b/src/locales/hr/name/name.ts
@@ -1,8 +1,8 @@
 export default [
-  '#{prefix} #{first_name} #{last_name}',
-  '#{first_name} #{last_name}, #{suffix}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{male_first_name} #{last_name}',
-  '#{female_first_name} #{last_name}',
+  '{{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.male_first_name}} {{name.last_name}}',
+  '{{name.female_first_name}} {{name.last_name}}',
 ];
diff --git a/src/locales/hu/name/name.ts b/src/locales/hu/name/name.ts
index 05f9c66d453..be3286d4053 100644
--- a/src/locales/hu/name/name.ts
+++ b/src/locales/hu/name/name.ts
@@ -1,4 +1,4 @@
 export default [
-  '#{prefix} #{last_name} #{first_name}',
-  '#{last_name} #{first_name}',
+  '{{name.prefix}} {{name.last_name}} {{name.first_name}}',
+  '{{name.last_name}} {{name.first_name}}',
 ];
diff --git a/src/locales/hy/address/city.ts b/src/locales/hy/address/city.ts
index d3df72b3ac4..70c65be912e 100644
--- a/src/locales/hy/address/city.ts
+++ b/src/locales/hy/address/city.ts
@@ -1,4 +1,4 @@
 export default [
-  '#{city_prefix} #{Name.last_name}',
-  '#{Name.last_name}#{city_suffix}',
+  '{{address.city_prefix}} {{name.last_name}}',
+  '{{name.last_name}}{{address.city_suffix}}',
 ];
diff --git a/src/locales/hy/address/street_name.ts b/src/locales/hy/address/street_name.ts
index 8d4b412921e..cd90bc60ec5 100644
--- a/src/locales/hy/address/street_name.ts
+++ b/src/locales/hy/address/street_name.ts
@@ -1 +1 @@
-export default ['#{Name.last_name} #{street_suffix}'];
+export default ['{{name.last_name}} {{address.street_suffix}}'];
diff --git a/src/locales/hy/name/name.ts b/src/locales/hy/name/name.ts
index bb00ca57675..080019e2b53 100644
--- a/src/locales/hy/name/name.ts
+++ b/src/locales/hy/name/name.ts
@@ -1,8 +1,8 @@
 export default [
-  '#{prefix} #{first_name} #{last_name}',
-  '#{first_name} #{last_name} #{suffix}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{male_first_name} #{last_name}',
-  '#{female_first_name} #{last_name}',
+  '{{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.male_first_name}} {{name.last_name}}',
+  '{{name.female_first_name}} {{name.last_name}}',
 ];
diff --git a/src/locales/id_ID/address/city.ts b/src/locales/id_ID/address/city.ts
index 1af570d730b..e3da346bd1e 100644
--- a/src/locales/id_ID/address/city.ts
+++ b/src/locales/id_ID/address/city.ts
@@ -1 +1 @@
-export default ['#{city_name}'];
+export default ['{{address.city_name}}'];
diff --git a/src/locales/id_ID/address/street_name.ts b/src/locales/id_ID/address/street_name.ts
index cb709b68de5..0b48ceb89d2 100644
--- a/src/locales/id_ID/address/street_name.ts
+++ b/src/locales/id_ID/address/street_name.ts
@@ -1,4 +1,4 @@
 export default [
-  '#{street_prefix} #{Name.first_name}',
-  '#{street_prefix} #{Name.last_name}',
+  '{{address.street_prefix}} {{name.first_name}}',
+  '{{address.street_prefix}} {{name.last_name}}',
 ];
diff --git a/src/locales/id_ID/company/name.ts b/src/locales/id_ID/company/name.ts
index 48a8df2a253..ad727b37907 100644
--- a/src/locales/id_ID/company/name.ts
+++ b/src/locales/id_ID/company/name.ts
@@ -1,5 +1,5 @@
 export default [
-  '#{prefix} #{Name.last_name}',
-  '#{Name.last_name} #{suffix}',
-  '#{prefix} #{Name.last_name} #{suffix}',
+  '{{company.prefix}} {{name.last_name}}',
+  '{{name.last_name}} {{company.suffix}}',
+  '{{company.prefix}} {{name.last_name}} {{company.suffix}}',
 ];
diff --git a/src/locales/id_ID/name/name.ts b/src/locales/id_ID/name/name.ts
index c60c785f2be..ed95e27e50b 100644
--- a/src/locales/id_ID/name/name.ts
+++ b/src/locales/id_ID/name/name.ts
@@ -1,9 +1,9 @@
 export default [
-  '#{male_first_name} #{male_last_name}',
-  '#{male_last_name} #{male_first_name}',
-  '#{male_first_name} #{male_first_name} #{male_last_name}',
-  '#{female_first_name} #{female_last_name}',
-  '#{female_first_name} #{male_last_name}',
-  '#{female_last_name} #{female_first_name}',
-  '#{female_first_name} #{female_first_name} #{female_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.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/it/address/city.ts b/src/locales/it/address/city.ts
index a156eb174d5..a58b8181a1b 100644
--- a/src/locales/it/address/city.ts
+++ b/src/locales/it/address/city.ts
@@ -1,6 +1,6 @@
 export default [
-  '#{city_prefix} #{Name.first_name} #{city_suffix}',
-  '#{city_prefix} #{Name.first_name}',
-  '#{Name.first_name} #{city_suffix}',
-  '#{Name.last_name} #{city_suffix}',
+  '{{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}}',
 ];
diff --git a/src/locales/it/address/street_name.ts b/src/locales/it/address/street_name.ts
index e16614c30ab..831de80161a 100644
--- a/src/locales/it/address/street_name.ts
+++ b/src/locales/it/address/street_name.ts
@@ -1,4 +1,4 @@
 export default [
-  '#{street_suffix} #{Name.first_name}',
-  '#{street_suffix} #{Name.last_name}',
+  '{{address.street_suffix}} {{name.first_name}}',
+  '{{address.street_suffix}} {{name.last_name}}',
 ];
diff --git a/src/locales/it/company/name.ts b/src/locales/it/company/name.ts
index 7f226f7a947..f9d0e1e70f1 100644
--- a/src/locales/it/company/name.ts
+++ b/src/locales/it/company/name.ts
@@ -1,5 +1,5 @@
 export default [
-  '#{Name.last_name} #{suffix}',
-  '#{Name.last_name}-#{Name.last_name} #{suffix}',
-  '#{Name.last_name}, #{Name.last_name} e #{Name.last_name} #{suffix}',
+  '{{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}}',
 ];
diff --git a/src/locales/it/name/name.ts b/src/locales/it/name/name.ts
index 315ca6a9d65..2644c1faa2f 100644
--- a/src/locales/it/name/name.ts
+++ b/src/locales/it/name/name.ts
@@ -1,8 +1,8 @@
 export default [
-  '#{prefix} #{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{male_first_name} #{last_name}',
-  '#{female_first_name} #{last_name}',
+  '{{name.prefix}} {{name.first_name}} {{name.last_name}}',
+  '{{name.first_name}} {{name.last_name}}',
+  '{{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/ja/address/city.ts b/src/locales/ja/address/city.ts
index 9275b127f34..a0aee22ab9a 100644
--- a/src/locales/ja/address/city.ts
+++ b/src/locales/ja/address/city.ts
@@ -1,6 +1,6 @@
 export default [
-  '#{city_prefix}#{Name.first_name}#{city_suffix}',
-  '#{Name.first_name}#{city_suffix}',
-  '#{city_prefix}#{Name.last_name}#{city_suffix}',
-  '#{Name.last_name}#{city_suffix}',
+  '{{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}}',
 ];
diff --git a/src/locales/ja/address/street_name.ts b/src/locales/ja/address/street_name.ts
index b5cd8a5db44..15595bf9f1c 100644
--- a/src/locales/ja/address/street_name.ts
+++ b/src/locales/ja/address/street_name.ts
@@ -1,4 +1,4 @@
 export default [
-  '#{Name.first_name}#{street_suffix}',
-  '#{Name.last_name}#{street_suffix}',
+  '{{name.first_name}}{{address.street_suffix}}',
+  '{{name.last_name}}{{address.street_suffix}}',
 ];
diff --git a/src/locales/ja/name/name.ts b/src/locales/ja/name/name.ts
index afb488486bd..d58f90c6cb0 100644
--- a/src/locales/ja/name/name.ts
+++ b/src/locales/ja/name/name.ts
@@ -1 +1 @@
-export default ['#{last_name} #{first_name}'];
+export default ['{{name.last_name}} {{name.first_name}}'];
diff --git a/src/locales/ko/address/city.ts b/src/locales/ko/address/city.ts
index 39663e2d75f..67bd1b88813 100644
--- a/src/locales/ko/address/city.ts
+++ b/src/locales/ko/address/city.ts
@@ -1 +1 @@
-export default ['#{city_name}#{city_suffix}'];
+export default ['{{address.city_name}}{{address.city_suffix}}'];
diff --git a/src/locales/ko/address/street_name.ts b/src/locales/ko/address/street_name.ts
index a7b26b606a8..9145d844944 100644
--- a/src/locales/ko/address/street_name.ts
+++ b/src/locales/ko/address/street_name.ts
@@ -1 +1 @@
-export default ['#{street_root}#{street_suffix}'];
+export default ['{{address.street_root}}{{address.street_suffix}}'];
diff --git a/src/locales/ko/company/name.ts b/src/locales/ko/company/name.ts
index 971a6fffeb6..f3285bc9282 100644
--- a/src/locales/ko/company/name.ts
+++ b/src/locales/ko/company/name.ts
@@ -1 +1,4 @@
-export default ['#{prefix} #{Name.first_name}', '#{Name.first_name} #{suffix}'];
+export default [
+  '{{company.prefix}} {{name.first_name}}',
+  '{{name.first_name}} {{company.suffix}}',
+];
diff --git a/src/locales/ko/name/name.ts b/src/locales/ko/name/name.ts
index afb488486bd..d58f90c6cb0 100644
--- a/src/locales/ko/name/name.ts
+++ b/src/locales/ko/name/name.ts
@@ -1 +1 @@
-export default ['#{last_name} #{first_name}'];
+export default ['{{name.last_name}} {{name.first_name}}'];
diff --git a/src/locales/lv/address/city.ts b/src/locales/lv/address/city.ts
index 532d780fb90..e3da346bd1e 100644
--- a/src/locales/lv/address/city.ts
+++ b/src/locales/lv/address/city.ts
@@ -1 +1 @@
-export default ['#{Address.city_name}'];
+export default ['{{address.city_name}}'];
diff --git a/src/locales/lv/address/street_name.ts b/src/locales/lv/address/street_name.ts
index 8991d38e48f..d9f5f1e6b62 100644
--- a/src/locales/lv/address/street_name.ts
+++ b/src/locales/lv/address/street_name.ts
@@ -1 +1 @@
-export default ['#{Address.street_title} #{street_suffix}'];
+export default ['{{address.street_title}} {{address.street_suffix}}'];
diff --git a/src/locales/lv/company/name.ts b/src/locales/lv/company/name.ts
index 665ae44288d..c327baf125f 100644
--- a/src/locales/lv/company/name.ts
+++ b/src/locales/lv/company/name.ts
@@ -1,7 +1,7 @@
 export default [
-  '#{prefix} #{Name.male_last_name}',
-  '#{prefix} #{Name.male_last_name} #{suffix}',
-  '#{prefix} #{Name.female_last_name} #{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}} {{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}}',
 ];
diff --git a/src/locales/lv/name/name.ts b/src/locales/lv/name/name.ts
index 6c5384d0904..b89054f251c 100644
--- a/src/locales/lv/name/name.ts
+++ b/src/locales/lv/name/name.ts
@@ -1,13 +1,13 @@
 export default [
-  '#{prefix} #{male_first_name} #{male_last_name}',
-  '#{male_first_name} #{male_last_name}',
-  '#{male_last_name} #{male_first_name}',
-  '#{male_first_name} #{male_first_name} #{male_last_name}',
-  '#{male_first_name} #{male_last_name}-#{male_last_name}',
-  '##{prefix} {female_first_name} #{female_last_name}',
-  '#{female_first_name} #{female_last_name} #{suffix}',
-  '#{female_first_name} #{female_last_name}',
-  '#{female_last_name} #{female_first_name}',
-  '#{female_first_name} #{female_first_name} #{female_last_name}',
-  '#{female_first_name} #{female_last_name}-#{female_last_name}',
+  '{{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}} {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/mk/address/city.ts b/src/locales/mk/address/city.ts
index 1af570d730b..e3da346bd1e 100644
--- a/src/locales/mk/address/city.ts
+++ b/src/locales/mk/address/city.ts
@@ -1 +1 @@
-export default ['#{city_name}'];
+export default ['{{address.city_name}}'];
diff --git a/src/locales/mk/address/street_name.ts b/src/locales/mk/address/street_name.ts
index a178c9ba951..3667961ce48 100644
--- a/src/locales/mk/address/street_name.ts
+++ b/src/locales/mk/address/street_name.ts
@@ -1 +1 @@
-export default ['#{street}'];
+export default ['{{address.street}}'];
diff --git a/src/locales/mk/company/name.ts b/src/locales/mk/company/name.ts
index 178907e59de..ee8262bd0c9 100644
--- a/src/locales/mk/company/name.ts
+++ b/src/locales/mk/company/name.ts
@@ -1,5 +1,5 @@
 export default [
-  '#{Name.last_name} #{suffix}',
-  '#{Address.city_name} #{suffix}',
-  '#{Name.last_name}, #{Name.last_name} и #{Name.last_name}',
+  '{{name.last_name}} {{company.suffix}}',
+  '{{address.city_name}} {{company.suffix}}',
+  '{{name.last_name}}, {{name.last_name}} и {{name.last_name}}',
 ];
diff --git a/src/locales/mk/name/name.ts b/src/locales/mk/name/name.ts
index d5287db5105..585f3ba6928 100644
--- a/src/locales/mk/name/name.ts
+++ b/src/locales/mk/name/name.ts
@@ -1,10 +1,10 @@
 export default [
-  '#{female_prefix} #{female_first_name} #{female_last_name}',
-  '#{male_prefix} #{male_first_name} #{male_last_name}',
-  '#{female_first_name} #{female_last_name}',
-  '#{female_first_name} #{female_last_name}',
-  '#{female_first_name} #{female_last_name}',
-  '#{male_first_name} #{male_last_name}',
-  '#{male_first_name} #{male_last_name}',
-  '#{male_first_name} #{male_last_name}',
+  '{{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.female_first_name}} {{name.female_last_name}}',
+  '{{name.female_first_name}} {{name.female_last_name}}',
+  '{{name.male_first_name}} {{name.male_last_name}}',
+  '{{name.male_first_name}} {{name.male_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
index bdcb42da4cc..a12fcf638c7 100644
--- a/src/locales/mk/name/prefix.ts
+++ b/src/locales/mk/name/prefix.ts
@@ -1 +1 @@
-export default ['#{female_prefix}', '#{male_prefix}'];
+export default ['{{name.female_prefix}}', '{{name.male_prefix}}'];
diff --git a/src/locales/nb_NO/address/city.ts b/src/locales/nb_NO/address/city.ts
index 9a9768c5f4c..f6103caa287 100644
--- a/src/locales/nb_NO/address/city.ts
+++ b/src/locales/nb_NO/address/city.ts
@@ -1 +1 @@
-export default ['#{city_root}#{city_suffix}'];
+export default ['{{address.city_root}}{{address.city_suffix}}'];
diff --git a/src/locales/nb_NO/address/street_name.ts b/src/locales/nb_NO/address/street_name.ts
index c8c7162a288..a44017e0576 100644
--- a/src/locales/nb_NO/address/street_name.ts
+++ b/src/locales/nb_NO/address/street_name.ts
@@ -1,6 +1,6 @@
 export default [
-  '#{street_root}#{street_suffix}',
-  '#{street_prefix} #{street_root}#{street_suffix}',
-  '#{Name.first_name}#{common_street_suffix}',
-  '#{Name.last_name}#{common_street_suffix}',
+  '{{address.street_root}}{{address.street_suffix}}',
+  '{{address.street_prefix}} {{address.street_root}}{{address.street_suffix}}',
+  '{{name.first_name}}{{address.common_street_suffix}}',
+  '{{name.last_name}}{{address.common_street_suffix}}',
 ];
diff --git a/src/locales/nb_NO/company/name.ts b/src/locales/nb_NO/company/name.ts
index 8fccf812d9e..1bdb5e8fdde 100644
--- a/src/locales/nb_NO/company/name.ts
+++ b/src/locales/nb_NO/company/name.ts
@@ -1,5 +1,5 @@
 export default [
-  '#{Name.last_name} #{suffix}',
-  '#{Name.last_name}-#{Name.last_name}',
-  '#{Name.last_name}, #{Name.last_name} og #{Name.last_name}',
+  '{{name.last_name}} {{company.suffix}}',
+  '{{name.last_name}}-{{name.last_name}}',
+  '{{name.last_name}}, {{name.last_name}} og {{name.last_name}}',
 ];
diff --git a/src/locales/nb_NO/name/name.ts b/src/locales/nb_NO/name/name.ts
index dd127edc82e..a7ddf681799 100644
--- a/src/locales/nb_NO/name/name.ts
+++ b/src/locales/nb_NO/name/name.ts
@@ -1,8 +1,8 @@
 export default [
-  '#{prefix} #{first_name} #{last_name}',
-  '#{first_name} #{last_name} #{suffix}',
-  '#{female_first_name} #{female_first_name} #{last_name}',
-  '#{male_first_name} #{male_first_name} #{last_name}',
-  '#{first_name} #{last_name} #{last_name}',
-  '#{first_name} #{last_name}',
+  '{{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/nl/address/city.ts b/src/locales/nl/address/city.ts
index e3698d88748..003651627e7 100644
--- a/src/locales/nl/address/city.ts
+++ b/src/locales/nl/address/city.ts
@@ -1 +1,4 @@
-export default ['#{city_prefix}#{city_suffix}', '#{city_prefix}'];
+export default [
+  '{{address.city_prefix}}{{address.city_suffix}}',
+  '{{address.city_prefix}}',
+];
diff --git a/src/locales/nl/address/street_name.ts b/src/locales/nl/address/street_name.ts
index b5cd8a5db44..15595bf9f1c 100644
--- a/src/locales/nl/address/street_name.ts
+++ b/src/locales/nl/address/street_name.ts
@@ -1,4 +1,4 @@
 export default [
-  '#{Name.first_name}#{street_suffix}',
-  '#{Name.last_name}#{street_suffix}',
+  '{{name.first_name}}{{address.street_suffix}}',
+  '{{name.last_name}}{{address.street_suffix}}',
 ];
diff --git a/src/locales/nl/name/name.ts b/src/locales/nl/name/name.ts
index 7d58207e519..9cdc725ed4b 100644
--- a/src/locales/nl/name/name.ts
+++ b/src/locales/nl/name/name.ts
@@ -1,8 +1,8 @@
 export default [
-  '#{prefix} #{first_name} #{last_name}',
-  '#{first_name} #{last_name} #{suffix}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{tussenvoegsel} #{last_name}',
-  '#{first_name} #{tussenvoegsel} #{last_name}',
+  '{{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.first_name}} {{name.tussenvoegsel}} {{name.last_name}}',
+  '{{name.first_name}} {{name.tussenvoegsel}} {{name.last_name}}',
 ];
diff --git a/src/locales/nl_BE/address/city.ts b/src/locales/nl_BE/address/city.ts
index eaad6eadcd0..5eaa0e417c3 100644
--- a/src/locales/nl_BE/address/city.ts
+++ b/src/locales/nl_BE/address/city.ts
@@ -1 +1,4 @@
-export default ['#{city_prefix}', '#{city_prefix}#{city_suffix}'];
+export default [
+  '{{address.city_prefix}}',
+  '{{address.city_prefix}}{{address.city_suffix}}',
+];
diff --git a/src/locales/nl_BE/address/street_name.ts b/src/locales/nl_BE/address/street_name.ts
index b5cd8a5db44..15595bf9f1c 100644
--- a/src/locales/nl_BE/address/street_name.ts
+++ b/src/locales/nl_BE/address/street_name.ts
@@ -1,4 +1,4 @@
 export default [
-  '#{Name.first_name}#{street_suffix}',
-  '#{Name.last_name}#{street_suffix}',
+  '{{name.first_name}}{{address.street_suffix}}',
+  '{{name.last_name}}{{address.street_suffix}}',
 ];
diff --git a/src/locales/nl_BE/name/name.ts b/src/locales/nl_BE/name/name.ts
index 89f5fa081f4..a201b4be6df 100644
--- a/src/locales/nl_BE/name/name.ts
+++ b/src/locales/nl_BE/name/name.ts
@@ -1,6 +1,6 @@
 export default [
-  '#{prefix} #{first_name} #{last_name}',
-  '#{first_name} #{last_name} #{suffix}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
+  '{{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}}',
 ];
diff --git a/src/locales/pl/address/city.ts b/src/locales/pl/address/city.ts
index 1af570d730b..e3da346bd1e 100644
--- a/src/locales/pl/address/city.ts
+++ b/src/locales/pl/address/city.ts
@@ -1 +1 @@
-export default ['#{city_name}'];
+export default ['{{address.city_name}}'];
diff --git a/src/locales/pl/address/street_name.ts b/src/locales/pl/address/street_name.ts
index 8a084ab739f..279efea8c07 100644
--- a/src/locales/pl/address/street_name.ts
+++ b/src/locales/pl/address/street_name.ts
@@ -1 +1 @@
-export default ['#{street_prefix} #{Name.last_name}'];
+export default ['{{address.street_prefix}} {{name.last_name}}'];
diff --git a/src/locales/pl/company/name.ts b/src/locales/pl/company/name.ts
index d5790557c28..cffd6e7018a 100644
--- a/src/locales/pl/company/name.ts
+++ b/src/locales/pl/company/name.ts
@@ -1,5 +1,5 @@
 export default [
-  '#{Name.last_name} #{suffix}',
-  '#{Name.last_name}-#{Name.last_name}',
-  '#{Name.last_name}, #{Name.last_name} and #{Name.last_name}',
+  '{{name.last_name}} {{company.suffix}}',
+  '{{name.last_name}}-{{name.last_name}}',
+  '{{name.last_name}}, {{name.last_name}} and {{name.last_name}}',
 ];
diff --git a/src/locales/pl/name/name.ts b/src/locales/pl/name/name.ts
index 658fce26772..c3f81378be4 100644
--- a/src/locales/pl/name/name.ts
+++ b/src/locales/pl/name/name.ts
@@ -1,8 +1,8 @@
 export default [
-  '#{prefix} #{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
+  '{{name.prefix}} {{name.first_name}} {{name.last_name}}',
+  '{{name.first_name}} {{name.last_name}}',
+  '{{name.first_name}} {{name.last_name}}',
+  '{{name.first_name}} {{name.last_name}}',
+  '{{name.first_name}} {{name.last_name}}',
+  '{{name.first_name}} {{name.last_name}}',
 ];
diff --git a/src/locales/pt_BR/company/name.ts b/src/locales/pt_BR/company/name.ts
index 3ba349a8e46..d4730827d7a 100644
--- a/src/locales/pt_BR/company/name.ts
+++ b/src/locales/pt_BR/company/name.ts
@@ -1,5 +1,5 @@
 export default [
-  '#{Name.last_name} #{suffix}',
-  '#{Name.last_name}-#{Name.last_name}',
-  '#{Name.last_name}, #{Name.last_name} e #{Name.last_name}',
+  '{{name.last_name}} {{company.suffix}}',
+  '{{name.last_name}}-{{name.last_name}}',
+  '{{name.last_name}}, {{name.last_name}} e {{name.last_name}}',
 ];
diff --git a/src/locales/pt_BR/name/name.ts b/src/locales/pt_BR/name/name.ts
index bb00ca57675..080019e2b53 100644
--- a/src/locales/pt_BR/name/name.ts
+++ b/src/locales/pt_BR/name/name.ts
@@ -1,8 +1,8 @@
 export default [
-  '#{prefix} #{first_name} #{last_name}',
-  '#{first_name} #{last_name} #{suffix}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{male_first_name} #{last_name}',
-  '#{female_first_name} #{last_name}',
+  '{{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.male_first_name}} {{name.last_name}}',
+  '{{name.female_first_name}} {{name.last_name}}',
 ];
diff --git a/src/locales/pt_PT/address/city.ts b/src/locales/pt_PT/address/city.ts
index 1af570d730b..e3da346bd1e 100644
--- a/src/locales/pt_PT/address/city.ts
+++ b/src/locales/pt_PT/address/city.ts
@@ -1 +1 @@
-export default ['#{city_name}'];
+export default ['{{address.city_name}}'];
diff --git a/src/locales/pt_PT/address/street_name.ts b/src/locales/pt_PT/address/street_name.ts
index ab91c89cf17..da37a3beb18 100644
--- a/src/locales/pt_PT/address/street_name.ts
+++ b/src/locales/pt_PT/address/street_name.ts
@@ -1,5 +1,5 @@
 export default [
-  '#{street_prefix} #{Name.first_name} #{Name.last_name}',
+  '{{address.street_prefix}} {{name.first_name}} {{name.last_name}}',
   'N#',
   'N##',
   'N###',
diff --git a/src/locales/pt_PT/name/name.ts b/src/locales/pt_PT/name/name.ts
index a5865a00892..9ec34f9989e 100644
--- a/src/locales/pt_PT/name/name.ts
+++ b/src/locales/pt_PT/name/name.ts
@@ -1,7 +1,7 @@
 export default [
-  '#{first_name} #{last_name}',
-  '#{male_first_name} #{last_name}',
-  '#{female_first_name} #{last_name}',
-  '#{male_prefix} #{male_first_name} #{last_name}',
-  '#{female_prefix} #{female_first_name} #{last_name}',
+  '{{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
index bdcb42da4cc..a12fcf638c7 100644
--- a/src/locales/pt_PT/name/prefix.ts
+++ b/src/locales/pt_PT/name/prefix.ts
@@ -1 +1 @@
-export default ['#{female_prefix}', '#{male_prefix}'];
+export default ['{{name.female_prefix}}', '{{name.male_prefix}}'];
diff --git a/src/locales/ro/address/street_name.ts b/src/locales/ro/address/street_name.ts
index c272fa7294e..6584a4d6031 100644
--- a/src/locales/ro/address/street_name.ts
+++ b/src/locales/ro/address/street_name.ts
@@ -1 +1 @@
-export default ['#{street_suffix} #{streets}'];
+export default ['{{address.street_suffix}} {{address.streets}}'];
diff --git a/src/locales/ro/name/name.ts b/src/locales/ro/name/name.ts
index 4d2d416efa9..f0045e3e1f0 100644
--- a/src/locales/ro/name/name.ts
+++ b/src/locales/ro/name/name.ts
@@ -1,34 +1,34 @@
 export default [
-  '#{male_first_name} #{last_name}',
-  '#{male_first_name} #{last_name}',
-  '#{male_first_name} #{last_name}',
-  '#{male_first_name} #{last_name}',
-  '#{male_first_name} #{last_name}',
-  '#{male_first_name} #{last_name}',
-  '#{last_name} #{male_first_name}',
-  '#{last_name} #{male_first_name}',
-  '#{last_name} #{male_first_name}',
-  '#{last_name} #{male_first_name}',
-  '#{last_name} #{male_first_name}',
-  '#{last_name} #{male_first_name}',
-  '#{prefix} #{male_first_name} #{last_name}',
-  '#{prefix} #{male_first_name} #{last_name}',
-  '#{prefix} #{male_first_name} #{last_name}',
-  '#{male_first_name} #{last_name}, #{suffix}',
-  '#{prefix} #{male_first_name} #{last_name}, #{suffix}',
-  '#{female_first_name} #{last_name}',
-  '#{female_first_name} #{last_name}',
-  '#{female_first_name} #{last_name}',
-  '#{female_first_name} #{last_name}',
-  '#{female_first_name} #{last_name}',
-  '#{female_first_name} #{last_name}',
-  '#{last_name} #{female_first_name}',
-  '#{last_name} #{female_first_name}',
-  '#{last_name} #{female_first_name}',
-  '#{last_name} #{female_first_name}',
-  '#{last_name} #{female_first_name}',
-  '#{last_name} #{female_first_name}',
-  '#{prefix} #{female_first_name} #{last_name}',
-  '#{prefix} #{female_first_name} #{last_name}',
-  '#{prefix} #{female_first_name} #{last_name}',
+  '{{name.male_first_name}} {{name.last_name}}',
+  '{{name.male_first_name}} {{name.last_name}}',
+  '{{name.male_first_name}} {{name.last_name}}',
+  '{{name.male_first_name}} {{name.last_name}}',
+  '{{name.male_first_name}} {{name.last_name}}',
+  '{{name.male_first_name}} {{name.last_name}}',
+  '{{name.last_name}} {{name.male_first_name}}',
+  '{{name.last_name}} {{name.male_first_name}}',
+  '{{name.last_name}} {{name.male_first_name}}',
+  '{{name.last_name}} {{name.male_first_name}}',
+  '{{name.last_name}} {{name.male_first_name}}',
+  '{{name.last_name}} {{name.male_first_name}}',
+  '{{name.prefix}} {{name.male_first_name}} {{name.last_name}}',
+  '{{name.prefix}} {{name.male_first_name}} {{name.last_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.female_first_name}} {{name.last_name}}',
+  '{{name.female_first_name}} {{name.last_name}}',
+  '{{name.female_first_name}} {{name.last_name}}',
+  '{{name.female_first_name}} {{name.last_name}}',
+  '{{name.female_first_name}} {{name.last_name}}',
+  '{{name.last_name}} {{name.female_first_name}}',
+  '{{name.last_name}} {{name.female_first_name}}',
+  '{{name.last_name}} {{name.female_first_name}}',
+  '{{name.last_name}} {{name.female_first_name}}',
+  '{{name.last_name}} {{name.female_first_name}}',
+  '{{name.last_name}} {{name.female_first_name}}',
+  '{{name.prefix}} {{name.female_first_name}} {{name.last_name}}',
+  '{{name.prefix}} {{name.female_first_name}} {{name.last_name}}',
+  '{{name.prefix}} {{name.female_first_name}} {{name.last_name}}',
 ];
diff --git a/src/locales/ru/address/city.ts b/src/locales/ru/address/city.ts
index 532d780fb90..e3da346bd1e 100644
--- a/src/locales/ru/address/city.ts
+++ b/src/locales/ru/address/city.ts
@@ -1 +1 @@
-export default ['#{Address.city_name}'];
+export default ['{{address.city_name}}'];
diff --git a/src/locales/ru/address/street_name.ts b/src/locales/ru/address/street_name.ts
index 9ed5d0f4921..2c86913d02e 100644
--- a/src/locales/ru/address/street_name.ts
+++ b/src/locales/ru/address/street_name.ts
@@ -1,4 +1,4 @@
 export default [
-  '#{street_suffix} #{Address.street_title}',
-  '#{Address.street_title} #{street_suffix}',
+  '{{address.street_suffix}} {{address.street_title}}',
+  '{{address.street_title}} {{address.street_suffix}}',
 ];
diff --git a/src/locales/ru/company/name.ts b/src/locales/ru/company/name.ts
index 10d825eb45f..358d8080bfb 100644
--- a/src/locales/ru/company/name.ts
+++ b/src/locales/ru/company/name.ts
@@ -1,10 +1,10 @@
 export default [
-  '#{prefix} #{Name.female_first_name}',
-  '#{prefix} #{Name.male_first_name}',
-  '#{prefix} #{Name.male_last_name}',
-  '#{prefix} #{suffix}#{suffix}',
-  '#{prefix} #{suffix}#{suffix}#{suffix}',
-  '#{prefix} #{Address.city_name}#{suffix}',
-  '#{prefix} #{Address.city_name}#{suffix}#{suffix}',
-  '#{prefix} #{Address.city_name}#{suffix}#{suffix}#{suffix}',
+  '{{company.prefix}} {{name.female_first_name}}',
+  '{{company.prefix}} {{name.male_first_name}}',
+  '{{company.prefix}} {{name.male_last_name}}',
+  '{{company.prefix}} {{company.suffix}}{{company.suffix}}',
+  '{{company.prefix}} {{company.suffix}}{{company.suffix}}{{company.suffix}}',
+  '{{company.prefix}} {{address.city_name}}{{company.suffix}}',
+  '{{company.prefix}} {{address.city_name}}{{company.suffix}}{{company.suffix}}',
+  '{{company.prefix}} {{address.city_name}}{{company.suffix}}{{company.suffix}}{{company.suffix}}',
 ];
diff --git a/src/locales/ru/name/name.ts b/src/locales/ru/name/name.ts
index 2ccc3d806d0..87c014db8b6 100644
--- a/src/locales/ru/name/name.ts
+++ b/src/locales/ru/name/name.ts
@@ -1,10 +1,10 @@
 export default [
-  '#{male_first_name} #{male_last_name}',
-  '#{male_last_name} #{male_first_name}',
-  '#{male_first_name} #{male_middle_name} #{male_last_name}',
-  '#{male_last_name} #{male_first_name} #{male_middle_name}',
-  '#{female_first_name} #{female_last_name}',
-  '#{female_last_name} #{female_first_name}',
-  '#{female_first_name} #{female_middle_name} #{female_last_name}',
-  '#{female_last_name} #{female_first_name} #{female_middle_name}',
+  '{{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/sk/address/city.ts b/src/locales/sk/address/city.ts
index 1af570d730b..e3da346bd1e 100644
--- a/src/locales/sk/address/city.ts
+++ b/src/locales/sk/address/city.ts
@@ -1 +1 @@
-export default ['#{city_name}'];
+export default ['{{address.city_name}}'];
diff --git a/src/locales/sk/address/street_name.ts b/src/locales/sk/address/street_name.ts
index a178c9ba951..3667961ce48 100644
--- a/src/locales/sk/address/street_name.ts
+++ b/src/locales/sk/address/street_name.ts
@@ -1 +1 @@
-export default ['#{street}'];
+export default ['{{address.street}}'];
diff --git a/src/locales/sk/company/name.ts b/src/locales/sk/company/name.ts
index 3ee3142f0c7..19edcc2ee05 100644
--- a/src/locales/sk/company/name.ts
+++ b/src/locales/sk/company/name.ts
@@ -1,5 +1,5 @@
 export default [
-  '#{Name.last_name} #{suffix}',
-  '#{Name.last_name} #{suffix}',
-  '#{Name.man_last_name} a #{Name.man_last_name} #{suffix}',
+  '{{name.last_name}} {{company.suffix}}',
+  '{{name.last_name}} {{company.suffix}}',
+  '{{name.male_last_name}} a {{name.male_last_name}} {{company.suffix}}',
 ];
diff --git a/src/locales/sk/name/name.ts b/src/locales/sk/name/name.ts
index cee01499484..cb42d811c2e 100644
--- a/src/locales/sk/name/name.ts
+++ b/src/locales/sk/name/name.ts
@@ -1,12 +1,12 @@
 export default [
-  '#{prefix} #{male_first_name} #{male_last_name}',
-  '#{prefix} #{female_first_name} #{female_last_name}',
-  '#{male_first_name} #{male_last_name} #{suffix}',
-  '#{female_first_name} #{female_last_name} #{suffix}',
-  '#{male_first_name} #{male_last_name}',
-  '#{male_first_name} #{male_last_name}',
-  '#{male_first_name} #{male_last_name}',
-  '#{female_first_name} #{female_last_name}',
-  '#{female_first_name} #{female_last_name}',
-  '#{female_first_name} #{female_last_name}',
+  '{{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.male_first_name}} {{name.male_last_name}}',
+  '{{name.male_first_name}} {{name.male_last_name}}',
+  '{{name.female_first_name}} {{name.female_last_name}}',
+  '{{name.female_first_name}} {{name.female_last_name}}',
+  '{{name.female_first_name}} {{name.female_last_name}}',
 ];
diff --git a/src/locales/sv/address/city.ts b/src/locales/sv/address/city.ts
index 2f4c5947b67..b53f9163cf5 100644
--- a/src/locales/sv/address/city.ts
+++ b/src/locales/sv/address/city.ts
@@ -1 +1 @@
-export default ['#{city_prefix}#{city_suffix}'];
+export default ['{{address.city_prefix}}{{address.city_suffix}}'];
diff --git a/src/locales/sv/address/street_name.ts b/src/locales/sv/address/street_name.ts
index c8c7162a288..a44017e0576 100644
--- a/src/locales/sv/address/street_name.ts
+++ b/src/locales/sv/address/street_name.ts
@@ -1,6 +1,6 @@
 export default [
-  '#{street_root}#{street_suffix}',
-  '#{street_prefix} #{street_root}#{street_suffix}',
-  '#{Name.first_name}#{common_street_suffix}',
-  '#{Name.last_name}#{common_street_suffix}',
+  '{{address.street_root}}{{address.street_suffix}}',
+  '{{address.street_prefix}} {{address.street_root}}{{address.street_suffix}}',
+  '{{name.first_name}}{{address.common_street_suffix}}',
+  '{{name.last_name}}{{address.common_street_suffix}}',
 ];
diff --git a/src/locales/sv/cell_phone/formats.ts b/src/locales/sv/cell_phone/formats.ts
index 47a998928db..f6bef78ae95 100644
--- a/src/locales/sv/cell_phone/formats.ts
+++ b/src/locales/sv/cell_phone/formats.ts
@@ -1 +1 @@
-export default ['#{common_cell_prefix}-###-####'];
+export default ['{{cell_phone.common_cell_prefix}}-###-####'];
diff --git a/src/locales/sv/company/name.ts b/src/locales/sv/company/name.ts
index b35dfbb2f57..5202f2fd04a 100644
--- a/src/locales/sv/company/name.ts
+++ b/src/locales/sv/company/name.ts
@@ -1,5 +1,5 @@
 export default [
-  '#{Name.last_name} #{suffix}',
-  '#{Name.last_name}-#{Name.last_name}',
-  '#{Name.last_name}, #{Name.last_name} #{suffix}',
+  '{{name.last_name}} {{company.suffix}}',
+  '{{name.last_name}}-{{name.last_name}}',
+  '{{name.last_name}}, {{name.last_name}} {{company.suffix}}',
 ];
diff --git a/src/locales/sv/name/name.ts b/src/locales/sv/name/name.ts
index 965ae828f04..cf8eaaecf86 100644
--- a/src/locales/sv/name/name.ts
+++ b/src/locales/sv/name/name.ts
@@ -1,9 +1,9 @@
 export default [
-  '#{prefix} #{first_name} #{last_name}',
-  '#{first_name} #{last_name} #{suffix}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name} #{last_name}',
-  '#{male_first_name} #{last_name}',
-  '#{female_first_name} #{last_name}',
+  '{{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.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/team/name.ts b/src/locales/sv/team/name.ts
index 4757ad8ab37..3a0c91edd4b 100644
--- a/src/locales/sv/team/name.ts
+++ b/src/locales/sv/team/name.ts
@@ -1 +1 @@
-export default ['#{Address.city} #{suffix}'];
+export default ['{{address.city}} {{team.suffix}}'];
diff --git a/src/locales/tr/address/street_name.ts b/src/locales/tr/address/street_name.ts
index 515178fa3f4..ffe0771bd4a 100644
--- a/src/locales/tr/address/street_name.ts
+++ b/src/locales/tr/address/street_name.ts
@@ -1 +1 @@
-export default ['#{street_root}'];
+export default ['{{address.street_root}}'];
diff --git a/src/locales/tr/name/name.ts b/src/locales/tr/name/name.ts
index 315ca6a9d65..2644c1faa2f 100644
--- a/src/locales/tr/name/name.ts
+++ b/src/locales/tr/name/name.ts
@@ -1,8 +1,8 @@
 export default [
-  '#{prefix} #{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{male_first_name} #{last_name}',
-  '#{female_first_name} #{last_name}',
+  '{{name.prefix}} {{name.first_name}} {{name.last_name}}',
+  '{{name.first_name}} {{name.last_name}}',
+  '{{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/uk/address/city.ts b/src/locales/uk/address/city.ts
index d941d098bf8..f526335af83 100644
--- a/src/locales/uk/address/city.ts
+++ b/src/locales/uk/address/city.ts
@@ -1 +1,4 @@
-export default ['#{city_name}', '#{city_prefix} #{Name.male_first_name}'];
+export default [
+  '{{address.city_name}}',
+  '{{address.city_prefix}} {{name.male_first_name}}',
+];
diff --git a/src/locales/uk/address/street_name.ts b/src/locales/uk/address/street_name.ts
index 4042eaeac81..5e0b3172d28 100644
--- a/src/locales/uk/address/street_name.ts
+++ b/src/locales/uk/address/street_name.ts
@@ -1,4 +1,4 @@
 export default [
-  '#{street_prefix} #{Address.street_title}',
-  '#{Address.street_title} #{street_suffix}',
+  '{{address.street_prefix}} {{address.street_title}}',
+  '{{address.street_title}} {{address.street_suffix}}',
 ];
diff --git a/src/locales/uk/company/name.ts b/src/locales/uk/company/name.ts
index 10d825eb45f..358d8080bfb 100644
--- a/src/locales/uk/company/name.ts
+++ b/src/locales/uk/company/name.ts
@@ -1,10 +1,10 @@
 export default [
-  '#{prefix} #{Name.female_first_name}',
-  '#{prefix} #{Name.male_first_name}',
-  '#{prefix} #{Name.male_last_name}',
-  '#{prefix} #{suffix}#{suffix}',
-  '#{prefix} #{suffix}#{suffix}#{suffix}',
-  '#{prefix} #{Address.city_name}#{suffix}',
-  '#{prefix} #{Address.city_name}#{suffix}#{suffix}',
-  '#{prefix} #{Address.city_name}#{suffix}#{suffix}#{suffix}',
+  '{{company.prefix}} {{name.female_first_name}}',
+  '{{company.prefix}} {{name.male_first_name}}',
+  '{{company.prefix}} {{name.male_last_name}}',
+  '{{company.prefix}} {{company.suffix}}{{company.suffix}}',
+  '{{company.prefix}} {{company.suffix}}{{company.suffix}}{{company.suffix}}',
+  '{{company.prefix}} {{address.city_name}}{{company.suffix}}',
+  '{{company.prefix}} {{address.city_name}}{{company.suffix}}{{company.suffix}}',
+  '{{company.prefix}} {{address.city_name}}{{company.suffix}}{{company.suffix}}{{company.suffix}}',
 ];
diff --git a/src/locales/uk/name/name.ts b/src/locales/uk/name/name.ts
index 2ccc3d806d0..87c014db8b6 100644
--- a/src/locales/uk/name/name.ts
+++ b/src/locales/uk/name/name.ts
@@ -1,10 +1,10 @@
 export default [
-  '#{male_first_name} #{male_last_name}',
-  '#{male_last_name} #{male_first_name}',
-  '#{male_first_name} #{male_middle_name} #{male_last_name}',
-  '#{male_last_name} #{male_first_name} #{male_middle_name}',
-  '#{female_first_name} #{female_last_name}',
-  '#{female_last_name} #{female_first_name}',
-  '#{female_first_name} #{female_middle_name} #{female_last_name}',
-  '#{female_last_name} #{female_first_name} #{female_middle_name}',
+  '{{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/ur/address/city.ts b/src/locales/ur/address/city.ts
index a1cd1dc1eb7..d518527b6d1 100644
--- a/src/locales/ur/address/city.ts
+++ b/src/locales/ur/address/city.ts
@@ -1,6 +1,6 @@
 export default [
-  '#{city_prefix} #{Name.first_name}#{city_suffix}',
-  '#{city_prefix} #{Name.first_name}',
-  '#{Name.first_name}#{city_suffix}',
-  '#{Name.last_name}#{city_suffix}',
+  '{{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}}',
 ];
diff --git a/src/locales/ur/address/street_name.ts b/src/locales/ur/address/street_name.ts
index 41c23968443..6b2de46532a 100644
--- a/src/locales/ur/address/street_name.ts
+++ b/src/locales/ur/address/street_name.ts
@@ -1,4 +1,4 @@
 export default [
-  '#{Name.first_name} #{street_suffix}',
-  '#{Name.last_name} #{street_suffix}',
+  '{{name.first_name}} {{address.street_suffix}}',
+  '{{name.last_name}} {{address.street_suffix}}',
 ];
diff --git a/src/locales/ur/app/author.ts b/src/locales/ur/app/author.ts
index 8aae597e472..20670ee15bd 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 ['{{name.name}}', '{{company.name}}'];
diff --git a/src/locales/ur/name/name.ts b/src/locales/ur/name/name.ts
index 10fbca6f286..5e568134d28 100644
--- a/src/locales/ur/name/name.ts
+++ b/src/locales/ur/name/name.ts
@@ -1,10 +1,10 @@
 export default [
-  '#{prefix} #{first_name} #{last_name}',
-  '#{first_name} #{last_name} #{suffix}',
-  '#{first_name} #{last_name}',
-  '#{first_name} #{last_name}',
-  '#{male_first_name} #{last_name}',
-  '#{female_first_name} #{last_name}',
-  '#{male_first_name} بن #{male_first_name}',
-  '#{female_first_name} بنت #{male_first_name}',
+  '{{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.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/team/name.ts b/src/locales/ur/team/name.ts
index 000c58ec0e1..ed2bdbb53fa 100644
--- a/src/locales/ur/team/name.ts
+++ b/src/locales/ur/team/name.ts
@@ -1 +1 @@
-export default ['#{Address.state} #{creature}'];
+export default ['{{address.state}} {{team.creature}}'];
diff --git a/src/locales/vi/address/city.ts b/src/locales/vi/address/city.ts
index b2146b39de2..df5dc9ac537 100644
--- a/src/locales/vi/address/city.ts
+++ b/src/locales/vi/address/city.ts
@@ -1 +1 @@
-export default ['#{city_root}'];
+export default ['{{address.city_root}}'];
diff --git a/src/locales/vi/company/name.ts b/src/locales/vi/company/name.ts
index c9f16460c98..ceed90c9b69 100644
--- a/src/locales/vi/company/name.ts
+++ b/src/locales/vi/company/name.ts
@@ -1 +1 @@
-export default ['#{prefix} #{Name.last_name}'];
+export default ['{{company.prefix}} {{name.last_name}}'];
diff --git a/src/locales/vi/name/name.ts b/src/locales/vi/name/name.ts
index 5fa92ac0519..14933b6a804 100644
--- a/src/locales/vi/name/name.ts
+++ b/src/locales/vi/name/name.ts
@@ -1,5 +1,5 @@
 export default [
-  '#{male_first_name} #{last_name}',
-  '#{female_first_name} #{last_name}',
-  '#{first_name} #{last_name}',
+  '{{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/zh_CN/address/city.ts b/src/locales/zh_CN/address/city.ts
index 2f4c5947b67..b53f9163cf5 100644
--- a/src/locales/zh_CN/address/city.ts
+++ b/src/locales/zh_CN/address/city.ts
@@ -1 +1 @@
-export default ['#{city_prefix}#{city_suffix}'];
+export default ['{{address.city_prefix}}{{address.city_suffix}}'];
diff --git a/src/locales/zh_CN/address/street_name.ts b/src/locales/zh_CN/address/street_name.ts
index 110df11f0bd..e046e3a72c5 100644
--- a/src/locales/zh_CN/address/street_name.ts
+++ b/src/locales/zh_CN/address/street_name.ts
@@ -1 +1 @@
-export default ['#{Name.last_name}#{street_suffix}'];
+export default ['{{name.last_name}}{{address.street_suffix}}'];
diff --git a/src/locales/zh_CN/name/name.ts b/src/locales/zh_CN/name/name.ts
index e090c4e2175..f4f67e1ae45 100644
--- a/src/locales/zh_CN/name/name.ts
+++ b/src/locales/zh_CN/name/name.ts
@@ -1 +1 @@
-export default ['#{first_name}#{last_name}'];
+export default ['{{name.first_name}}{{name.last_name}}'];
diff --git a/src/locales/zh_TW/address/city.ts b/src/locales/zh_TW/address/city.ts
index 2f4c5947b67..b53f9163cf5 100644
--- a/src/locales/zh_TW/address/city.ts
+++ b/src/locales/zh_TW/address/city.ts
@@ -1 +1 @@
-export default ['#{city_prefix}#{city_suffix}'];
+export default ['{{address.city_prefix}}{{address.city_suffix}}'];
diff --git a/src/locales/zh_TW/address/street_name.ts b/src/locales/zh_TW/address/street_name.ts
index 110df11f0bd..e046e3a72c5 100644
--- a/src/locales/zh_TW/address/street_name.ts
+++ b/src/locales/zh_TW/address/street_name.ts
@@ -1 +1 @@
-export default ['#{Name.last_name}#{street_suffix}'];
+export default ['{{name.last_name}}{{address.street_suffix}}'];
diff --git a/src/locales/zh_TW/name/name.ts b/src/locales/zh_TW/name/name.ts
index e090c4e2175..f4f67e1ae45 100644
--- a/src/locales/zh_TW/name/name.ts
+++ b/src/locales/zh_TW/name/name.ts
@@ -1 +1 @@
-export default ['#{first_name}#{last_name}'];
+export default ['{{name.first_name}}{{name.last_name}}'];

From 3b2331c264b619c234ffc7e4a992020b215becf5 Mon Sep 17 00:00:00 2001
From: ST-DDT <ST-DDT@gmx.de>
Date: Thu, 5 May 2022 13:39:58 +0200
Subject: [PATCH 3/3] chore(locales): convert locales data to faker.fake format
 - manual fixes

---
 src/locales/lv/name/name.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/locales/lv/name/name.ts b/src/locales/lv/name/name.ts
index b89054f251c..2e9c5e4b82b 100644
--- a/src/locales/lv/name/name.ts
+++ b/src/locales/lv/name/name.ts
@@ -4,7 +4,7 @@ export default [
   '{{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}} {female_first_name} {{name.female_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}}',