chore(locales): convert locales data to faker.fake format (#927)

161 files changed, 516 insertions, 495 deletions

diff --git a/src/locales/ar/address/city.ts b/src/locales/ar/address/city.ts
index 1af570d7..e3da346b 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 cb709b68..0b48ceb8 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 ca2412c2..702d9581 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 000c58ec..ed2bdbb5 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 532d780f..e3da346b 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 9ed5d0f4..2c86913d 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 10d825eb..358d8080 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 7994e6d9..da4da07a 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 1af570d7..e3da346b 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 a178c9ba..3667961c 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 3ee3142f..19edcc2e 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 cee01499..cb42d811 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 a1cd1dc1..d518527b 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 515178fa..ffe0771b 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 3349005e..d69a6508 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 072c7954..69197fbf 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 1af570d7..e3da346b 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 515178fa..ffe0771b 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 3349005e..d69a6508 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 48163910..b21becf1 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 1af570d7..e3da346b 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 3349005e..d69a6508 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 b5b1f326..28de3d7a 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 8aae597e..20670ee1 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 d5790557..cffd6e70 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 0fb3cc8e..81a00b73 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 000c58ec..ed2bdbb5 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 a1cd1dc1..d518527b 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 41c23968..6b2de465 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 8aae597e..20670ee1 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 d5790557..cffd6e70 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 bb00ca57..080019e2 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 000c58ec..ed2bdbb5 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 b09ed9d1..db6c26cc 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 515178fa..ffe0771b 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 1af570d7..e3da346b 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 a4ba31e0..2450e110 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 272aaa79..00dbe5eb 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 eb3bd4f6..b20c511d 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 e9e9dd1f..a4eeb41d 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 1af570d7..e3da346b 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 b09ed9d1..db6c26cc 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 5f04b2a4..bfaf2fc6 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 b09ed9d1..db6c26cc 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 5f04b2a4..bfaf2fc6 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 b09ed9d1..db6c26cc 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 34e67a06..89de841d 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 866a9bc4..a436ce84 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 c2af6860..2a0624da 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 b09ed9d1..db6c26cc 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 d6d2baf3..0ae00a8e 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 866a9bc4..a436ce84 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 903c4181..e50db521 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 000c58ec..ed2bdbb5 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 1af570d7..e3da346b 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 63dcdc1c..249fca86 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 6ec542b9..6b30fcd7 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 9641c2e6..3568365d 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 4b340637..a27e379d 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 1af570d7..e3da346b 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 63dcdc1c..249fca86 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 620cdd7c..b56c8812 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 ca2412c2..702d9581 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 eaad6ead..5eaa0e41 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 13bb98b3..24b53ad2 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 bb00ca57..080019e2 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 1af570d7..e3da346b 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 b9d7b45f..8fe4be7f 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 eb8dcd96..d9f5f1e6 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 adca04aa..0bf9d304 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 658fce26..c3f81378 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 d7770de2..a8948783 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 41c23968..6b2de465 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 bb00ca57..080019e2 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 1af570d7..e3da346b 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 a178c9ba..3667961c 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 59c90145..d21c13ce 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 05f9c66d..be3286d4 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 d3df72b3..70c65be9 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 8d4b4129..cd90bc60 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 bb00ca57..080019e2 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 1af570d7..e3da346b 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 cb709b68..0b48ceb8 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 48a8df2a..ad727b37 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 c60c785f..ed95e27e 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 a156eb17..a58b8181 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 e16614c3..831de801 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 7f226f7a..f9d0e1e7 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 315ca6a9..2644c1fa 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 9275b127..a0aee22a 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 b5cd8a5d..15595bf9 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 afb48848..d58f90c6 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 39663e2d..67bd1b88 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 a7b26b60..9145d844 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 971a6fff..f3285bc9 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 afb48848..d58f90c6 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 532d780f..e3da346b 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 8991d38e..d9f5f1e6 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 665ae442..c327baf1 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 6c5384d0..2e9c5e4b 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}} {{name.female_first_name}} {{name.female_last_name}}',
+  '{{name.female_first_name}} {{name.female_last_name}} {{name.suffix}}',
+  '{{name.female_first_name}} {{name.female_last_name}}',
+  '{{name.female_last_name}} {{name.female_first_name}}',
+  '{{name.female_first_name}} {{name.female_first_name}} {{name.female_last_name}}',
+  '{{name.female_first_name}} {{name.female_last_name}}-{{name.female_last_name}}',
 ];
diff --git a/src/locales/mk/address/city.ts b/src/locales/mk/address/city.ts
index 1af570d7..e3da346b 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 a178c9ba..3667961c 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 178907e5..ee8262bd 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 d5287db5..585f3ba6 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 bdcb42da..a12fcf63 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 9a9768c5..f6103caa 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 c8c7162a..a44017e0 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 8fccf812..1bdb5e8f 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 dd127edc..a7ddf681 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 e3698d88..00365162 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 b5cd8a5d..15595bf9 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 7d58207e..9cdc725e 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 eaad6ead..5eaa0e41 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 b5cd8a5d..15595bf9 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 89f5fa08..a201b4be 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 1af570d7..e3da346b 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 8a084ab7..279efea8 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 d5790557..cffd6e70 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 658fce26..c3f81378 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 3ba349a8..d4730827 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 bb00ca57..080019e2 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 1af570d7..e3da346b 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 ab91c89c..da37a3be 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 a5865a00..9ec34f99 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 bdcb42da..a12fcf63 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 c272fa72..6584a4d6 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 4d2d416e..f0045e3e 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 532d780f..e3da346b 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 9ed5d0f4..2c86913d 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 10d825eb..358d8080 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 2ccc3d80..87c014db 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 1af570d7..e3da346b 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 a178c9ba..3667961c 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 3ee3142f..19edcc2e 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 cee01499..cb42d811 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 2f4c5947..b53f9163 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 c8c7162a..a44017e0 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 47a99892..f6bef78a 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 b35dfbb2..5202f2fd 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 965ae828..cf8eaaec 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 4757ad8a..3a0c91ed 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 515178fa..ffe0771b 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 315ca6a9..2644c1fa 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 d941d098..f526335a 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 4042eaea..5e0b3172 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 10d825eb..358d8080 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 2ccc3d80..87c014db 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 a1cd1dc1..d518527b 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 41c23968..6b2de465 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 8aae597e..20670ee1 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 10fbca6f..5e568134 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 000c58ec..ed2bdbb5 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 b2146b39..df5dc9ac 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 c9f16460..ceed90c9 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 5fa92ac0..14933b6a 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 2f4c5947..b53f9163 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 110df11f..e046e3a7 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 e090c4e2..f4f67e1a 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 2f4c5947..b53f9163 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 110df11f..e046e3a7 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 e090c4e2..f4f67e1a 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}}'];