From 69c9a4bdd00a8c7fdff2d86cad5d0b87144bfb5c Mon Sep 17 00:00:00 2001
From: Leendert de Borst <ldeborst@xivisoft.com>
Date: Sat, 1 Feb 2025 19:58:21 +0100
Subject: [PATCH] Move identity generator dictionaries to root for reuse (#541)

---
 .../chrome/src/components/Layout/Header.tsx   |   1 +
 .../__tests__/IdentityGenerator.test.ts       |   4 +
 .../implementations/IdentityGeneratorEn.ts    |  12 +-
 .../implementations/IdentityGeneratorNl.ts    |  14 +-
 .../chrome/src/utils/FormDetector.ts          |   2 +-
 .../chrome/vite-plugins/dictionary-loader.ts  |  13 +-
 dictionaries/README.md                        |   9 +
 .../en/firstnames_female                      |   0
 .../en/firstnames_male                        |   0
 .../en/lastnames                              |   0
 .../nl/firstnames_female                      |   0
 .../nl/firstnames_male                        |   0
 .../nl/lastnames                              |   0
 .../AliasVault.Generators.Identity.csproj     |  30 +-
 .../Dictionaries/en/firstnames_female         | 259 -----------------
 .../Dictionaries/en/firstnames_male           | 247 ----------------
 .../Implementations/Dictionaries/en/lastnames | 271 ------------------
 .../Dictionaries/nl/firstnames_female         | 211 --------------
 .../Dictionaries/nl/firstnames_male           | 212 --------------
 .../Implementations/Dictionaries/nl/lastnames | 207 -------------
 20 files changed, 58 insertions(+), 1434 deletions(-)
 create mode 100644 dictionaries/README.md
 rename {browser-extensions/chrome/src/generators/Identity/implementations/dictionaries => dictionaries}/en/firstnames_female (100%)
 rename {browser-extensions/chrome/src/generators/Identity/implementations/dictionaries => dictionaries}/en/firstnames_male (100%)
 rename {browser-extensions/chrome/src/generators/Identity/implementations/dictionaries => dictionaries}/en/lastnames (100%)
 rename {browser-extensions/chrome/src/generators/Identity/implementations/dictionaries => dictionaries}/nl/firstnames_female (100%)
 rename {browser-extensions/chrome/src/generators/Identity/implementations/dictionaries => dictionaries}/nl/firstnames_male (100%)
 rename {browser-extensions/chrome/src/generators/Identity/implementations/dictionaries => dictionaries}/nl/lastnames (100%)
 delete mode 100644 src/Generators/AliasVault.Generators.Identity/Implementations/Dictionaries/en/firstnames_female
 delete mode 100644 src/Generators/AliasVault.Generators.Identity/Implementations/Dictionaries/en/firstnames_male
 delete mode 100644 src/Generators/AliasVault.Generators.Identity/Implementations/Dictionaries/en/lastnames
 delete mode 100644 src/Generators/AliasVault.Generators.Identity/Implementations/Dictionaries/nl/firstnames_female
 delete mode 100644 src/Generators/AliasVault.Generators.Identity/Implementations/Dictionaries/nl/firstnames_male
 delete mode 100644 src/Generators/AliasVault.Generators.Identity/Implementations/Dictionaries/nl/lastnames

diff --git a/browser-extensions/chrome/src/components/Layout/Header.tsx b/browser-extensions/chrome/src/components/Layout/Header.tsx
index 7e0233e8e..869bb4280 100644
--- a/browser-extensions/chrome/src/components/Layout/Header.tsx
+++ b/browser-extensions/chrome/src/components/Layout/Header.tsx
@@ -47,6 +47,7 @@ const Header: React.FC<HeaderProps> = ({
       <div className="flex items-center h-16 px-4">
         {currentRoute?.showBackButton ? (
         <button
+        id="back"
         onClick={() => navigate(-1)}
         className="flex items-center gap-2 hover:bg-gray-100 dark:hover:bg-gray-700 pr-2 pt-1.5 pb-1.5 rounded-lg group"
         >
diff --git a/browser-extensions/chrome/src/generators/Identity/__tests__/IdentityGenerator.test.ts b/browser-extensions/chrome/src/generators/Identity/__tests__/IdentityGenerator.test.ts
index febbf0ff7..bcac62586 100644
--- a/browser-extensions/chrome/src/generators/Identity/__tests__/IdentityGenerator.test.ts
+++ b/browser-extensions/chrome/src/generators/Identity/__tests__/IdentityGenerator.test.ts
@@ -35,6 +35,10 @@ const testIdentityGenerator = (
           expect(value).not.toBeNull();
           expect(value).not.toBeUndefined();
         });
+
+        // Add length checks for first and last names
+        expect(identity.firstName.length).toBeGreaterThan(1);
+        expect(identity.lastName.length).toBeGreaterThan(1);
       });
     });
   });
diff --git a/browser-extensions/chrome/src/generators/Identity/implementations/IdentityGeneratorEn.ts b/browser-extensions/chrome/src/generators/Identity/implementations/IdentityGeneratorEn.ts
index a00cb5024..401984714 100644
--- a/browser-extensions/chrome/src/generators/Identity/implementations/IdentityGeneratorEn.ts
+++ b/browser-extensions/chrome/src/generators/Identity/implementations/IdentityGeneratorEn.ts
@@ -2,14 +2,20 @@ import { BaseIdentityGenerator } from "./base/BaseIdentityGenerator";
 
 export class IdentityGeneratorEn extends BaseIdentityGenerator {
   protected getFirstNamesMaleJson(): string[] {
-    return '__FIRSTNAMES_MALE_EN__';  // This will be replaced by dictionary-loader
+    // This is a placeholder for the dictionary-loader to replace with the actual data.
+    // See vite-plugins/dictionary-loader.ts for more information.
+    return '__FIRSTNAMES_MALE_EN__';
   }
 
   protected getFirstNamesFemaleJson(): string[] {
-    return '__FIRSTNAMES_FEMALE_EN__';  // This will be replaced by dictionary-loader
+    // This is a placeholder for the dictionary-loader to replace with the actual data.
+    // See vite-plugins/dictionary-loader.ts for more information.
+    return '__FIRSTNAMES_FEMALE_EN__';
   }
 
   protected getLastNamesJson(): string[] {
-    return '__LASTNAMES_EN__';  // This will be replaced by dictionary-loader
+    // This is a placeholder for the dictionary-loader to replace with the actual data.
+    // See vite-plugins/dictionary-loader.ts for more information.
+    return '__LASTNAMES_EN__';
   }
 }
diff --git a/browser-extensions/chrome/src/generators/Identity/implementations/IdentityGeneratorNl.ts b/browser-extensions/chrome/src/generators/Identity/implementations/IdentityGeneratorNl.ts
index 0ae28d102..3ac0c78f1 100644
--- a/browser-extensions/chrome/src/generators/Identity/implementations/IdentityGeneratorNl.ts
+++ b/browser-extensions/chrome/src/generators/Identity/implementations/IdentityGeneratorNl.ts
@@ -2,14 +2,20 @@ import { BaseIdentityGenerator } from "./base/BaseIdentityGenerator";
 
 export class IdentityGeneratorNl extends BaseIdentityGenerator {
   protected getFirstNamesMaleJson(): string[] {
-    return '__FIRSTNAMES_MALE_NL__';  // This will be replaced by dictionary-loader
+    // This is a placeholder for the dictionary-loader to replace with the actual data.
+    // See vite-plugins/dictionary-loader.ts for more information.
+    return '__FIRSTNAMES_MALE_NL__';
   }
 
-  protected getFirstNamesFemaleJson(): string[]  {
-    return '__FIRSTNAMES_FEMALE_NL__';  // This will be replaced by dictionary-loader
+  protected getFirstNamesFemaleJson(): string[] {
+    // This is a placeholder for the dictionary-loader to replace with the actual data.
+    // See vite-plugins/dictionary-loader.ts for more information.
+    return '__FIRSTNAMES_FEMALE_NL__';
   }
 
   protected getLastNamesJson(): string[] {
-    return '__LASTNAMES_NL__';  // This will be replaced by dictionary-loader
+    // This is a placeholder for the dictionary-loader to replace with the actual data.
+    // See vite-plugins/dictionary-loader.ts for more information.
+    return '__LASTNAMES_NL__';
   }
 }
diff --git a/browser-extensions/chrome/src/utils/FormDetector.ts b/browser-extensions/chrome/src/utils/FormDetector.ts
index 8232b335d..6bf4d6bbd 100644
--- a/browser-extensions/chrome/src/utils/FormDetector.ts
+++ b/browser-extensions/chrome/src/utils/FormDetector.ts
@@ -49,7 +49,7 @@ function findUsernameField(passwordField: HTMLInputElement): HTMLInputElement |
         input.placeholder
       ].map(attr => attr?.toLowerCase() || '');
 
-      const patterns = ['user', 'email', 'login', 'identifier'];
+      const patterns = ['user', 'username', 'mail', 'email', 'login', 'identifier'];
       if (patterns.some(pattern => attributes.some(attr => attr.includes(pattern)))) {
         return input;
       }
diff --git a/browser-extensions/chrome/vite-plugins/dictionary-loader.ts b/browser-extensions/chrome/vite-plugins/dictionary-loader.ts
index 5745fcdf0..860286963 100644
--- a/browser-extensions/chrome/vite-plugins/dictionary-loader.ts
+++ b/browser-extensions/chrome/vite-plugins/dictionary-loader.ts
@@ -18,7 +18,9 @@ export default function dictionaryLoader() {
       // instead of hardcoding the languages here.
       if (id.includes('IdentityGeneratorEn.ts') || id.includes('IdentityGeneratorNl.ts')) {
         const lang = id.includes('IdentityGeneratorEn.ts') ? 'en' : 'nl';
-        const dictionaryPath = path.resolve(__dirname, `../src/generators/Identity/implementations/dictionaries/${lang}`);
+        // Load dictionaries from the repository root 'dictionaries' folder. These dictionaries
+        // are used by both .NET and JavaScript code.
+        const dictionaryPath = path.resolve(__dirname, `../../../dictionaries/${lang}`);
 
         try {
           // Read dictionary files and clean up entries
@@ -37,13 +39,6 @@ export default function dictionaryLoader() {
             .filter(name => name.trim())
             .map(name => name.trim());
 
-          console.log('Raw code:', code);
-          console.log('Searching for placeholders:', {
-            male: `__FIRSTNAMES_MALE_${lang.toUpperCase()}__`,
-            female: `__FIRSTNAMES_FEMALE_${lang.toUpperCase()}__`,
-            last: `__LASTNAMES_${lang.toUpperCase()}__`
-          });
-
           // Replace the placeholder strings with stringified arrays
           code = code.replace(
             new RegExp(`['"\`]__FIRSTNAMES_MALE_${lang.toUpperCase()}__['"\`]`, 'g'),
@@ -60,8 +55,6 @@ export default function dictionaryLoader() {
             `[${lastNames.map(name => `"${name}"`).join(',')}]`
           );
 
-          console.log('Transformed code:', code);
-
           return {
             code,
             map: null
diff --git a/dictionaries/README.md b/dictionaries/README.md
new file mode 100644
index 000000000..07a3e3858
--- /dev/null
+++ b/dictionaries/README.md
@@ -0,0 +1,9 @@
+This folder contains the dictionaries used by the identity generator.
+
+These dictionaries are used by both .NET and JavaScript code.
+
+For .NET these dictionaries are linked by the `AliasVault.Generators.Identity` project:
+- `src/generators/AliasVault.Generators.Identity/Implementations/Dictionaries`.
+
+For JavaScript, these dictionaries are injected into the code by the `dictionary-loader.ts` plugin:
+- `browser-extensions/chrome/vite-plugins/dictionary-loader.ts`
diff --git a/browser-extensions/chrome/src/generators/Identity/implementations/dictionaries/en/firstnames_female b/dictionaries/en/firstnames_female
similarity index 100%
rename from browser-extensions/chrome/src/generators/Identity/implementations/dictionaries/en/firstnames_female
rename to dictionaries/en/firstnames_female
diff --git a/browser-extensions/chrome/src/generators/Identity/implementations/dictionaries/en/firstnames_male b/dictionaries/en/firstnames_male
similarity index 100%
rename from browser-extensions/chrome/src/generators/Identity/implementations/dictionaries/en/firstnames_male
rename to dictionaries/en/firstnames_male
diff --git a/browser-extensions/chrome/src/generators/Identity/implementations/dictionaries/en/lastnames b/dictionaries/en/lastnames
similarity index 100%
rename from browser-extensions/chrome/src/generators/Identity/implementations/dictionaries/en/lastnames
rename to dictionaries/en/lastnames
diff --git a/browser-extensions/chrome/src/generators/Identity/implementations/dictionaries/nl/firstnames_female b/dictionaries/nl/firstnames_female
similarity index 100%
rename from browser-extensions/chrome/src/generators/Identity/implementations/dictionaries/nl/firstnames_female
rename to dictionaries/nl/firstnames_female
diff --git a/browser-extensions/chrome/src/generators/Identity/implementations/dictionaries/nl/firstnames_male b/dictionaries/nl/firstnames_male
similarity index 100%
rename from browser-extensions/chrome/src/generators/Identity/implementations/dictionaries/nl/firstnames_male
rename to dictionaries/nl/firstnames_male
diff --git a/browser-extensions/chrome/src/generators/Identity/implementations/dictionaries/nl/lastnames b/dictionaries/nl/lastnames
similarity index 100%
rename from browser-extensions/chrome/src/generators/Identity/implementations/dictionaries/nl/lastnames
rename to dictionaries/nl/lastnames
diff --git a/src/Generators/AliasVault.Generators.Identity/AliasVault.Generators.Identity.csproj b/src/Generators/AliasVault.Generators.Identity/AliasVault.Generators.Identity.csproj
index cb882c5df..4b9284257 100644
--- a/src/Generators/AliasVault.Generators.Identity/AliasVault.Generators.Identity.csproj
+++ b/src/Generators/AliasVault.Generators.Identity/AliasVault.Generators.Identity.csproj
@@ -17,15 +17,6 @@
       <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     </PropertyGroup>
 
-    <ItemGroup>
-      <EmbeddedResource Include="Implementations\Dictionaries\en\firstnames_female" />
-      <EmbeddedResource Include="Implementations\Dictionaries\en\firstnames_male" />
-      <EmbeddedResource Include="Implementations\Dictionaries\en\lastnames" />
-      <EmbeddedResource Include="Implementations\Dictionaries\nl\firstnames_female" />
-      <EmbeddedResource Include="Implementations\Dictionaries\nl\firstnames_male" />
-      <EmbeddedResource Include="Implementations\Dictionaries\nl\lastnames" />
-    </ItemGroup>
-
     <ItemGroup>
       <AdditionalFiles Include="..\..\stylecop.json">
         <Link>stylecop.json</Link>
@@ -39,4 +30,25 @@
       </PackageReference>
     </ItemGroup>
 
+    <ItemGroup>
+      <EmbeddedResource Include="..\..\..\dictionaries\en\firstnames_female">
+        <Link>Implementations/Dictionaries/en/firstnames_female</Link>
+      </EmbeddedResource>
+      <EmbeddedResource Include="..\..\..\dictionaries\en\firstnames_male">
+        <Link>Implementations/Dictionaries/en/firstnames_male</Link>
+      </EmbeddedResource>
+      <EmbeddedResource Include="..\..\..\dictionaries\en\lastnames">
+        <Link>Implementations/Dictionaries/en/lastnames</Link>
+      </EmbeddedResource>
+      <EmbeddedResource Include="..\..\..\dictionaries\nl\firstnames_female">
+        <Link>Implementations/Dictionaries/nl/firstnames_female</Link>
+      </EmbeddedResource>
+      <EmbeddedResource Include="..\..\..\dictionaries\nl\firstnames_male">
+        <Link>Implementations/Dictionaries/nl/firstnames_male</Link>
+      </EmbeddedResource>
+      <EmbeddedResource Include="..\..\..\dictionaries\nl\lastnames">
+        <Link>Implementations/Dictionaries/nl/lastnames</Link>
+      </EmbeddedResource>
+    </ItemGroup>
+
 </Project>
diff --git a/src/Generators/AliasVault.Generators.Identity/Implementations/Dictionaries/en/firstnames_female b/src/Generators/AliasVault.Generators.Identity/Implementations/Dictionaries/en/firstnames_female
deleted file mode 100644
index 4f10e1992..000000000
--- a/src/Generators/AliasVault.Generators.Identity/Implementations/Dictionaries/en/firstnames_female
+++ /dev/null
@@ -1,259 +0,0 @@
-Emily
-Emma
-Olivia
-Ava
-Sophia
-Isabella
-Mia
-Charlotte
-Amelia
-Harper
-Evelyn
-Abigail
-Elizabeth
-Sofia
-Avery
-Ella
-Madison
-Scarlett
-Victoria
-Aria
-Grace
-Chloe
-Camila
-Penelope
-Riley
-Layla
-Zoey
-Nora
-Lily
-Eleanor
-Hannah
-Lillian
-Addison
-Aubrey
-Ellie
-Stella
-Natalie
-Zoe
-Leah
-Hazel
-Violet
-Aurora
-Savannah
-Audrey
-Brooklyn
-Bella
-Claire
-Skylar
-Lucy
-Paisley
-Everly
-Anna
-Caroline
-Nova
-Genesis
-Emilia
-Kennedy
-Samantha
-Maya
-Willow
-Kinsley
-Naomi
-Aaliyah
-Elena
-Sarah
-Ariana
-Allison
-Gabriella
-Alice
-Madelyn
-Cora
-Ruby
-Eva
-Serenity
-Autumn
-Adeline
-Hailey
-Gianna
-Valentina
-Isla
-Eliana
-Quinn
-Nevaeh
-Ivy
-Sadie
-Piper
-Lydia
-Alexa
-Josephine
-Emery
-Julia
-Delilah
-Arianna
-Vivian
-Kaylee
-Sophie
-Brielle
-Madeline
-Peyton
-Rylee
-Clara
-Hadley
-Melanie
-Mackenzie
-Reagan
-Adalyn
-Liliana
-Aubree
-Jade
-Katherine
-Isabelle
-Natalia
-Raelynn
-Maria
-Athena
-Ximena
-Arya
-Leilani
-Taylor
-Faith
-Rose
-Kylie
-Alexandra
-Mary
-Margaret
-Lyla
-Ashley
-Amaya
-Eliza
-Brianna
-Bailey
-Andrea
-Khloe
-Jasmine
-Melody
-Iris
-Isabel
-Norah
-Annabelle
-Valeria
-Emerson
-Adalynn
-Ryleigh
-Eden
-Emersyn
-Anastasia
-Kayla
-Alyssa
-Anna
-Juliana
-Charlie
-Lucia
-Stella
-Adriana
-Beatrice
-Bianca
-Calliope
-Carmen
-Celeste
-Dakota
-Diana
-Esther
-Florence
-Francesca
-Georgia
-Harlow
-Haven
-Holly
-Hope
-India
-Indie
-Iris
-Juniper
-Kaia
-Keira
-Lara
-Laura
-Laurel
-Luna
-Magnolia
-Maeve
-Marina
-Marlowe
-Nina
-Noelle
-Octavia
-Olive
-Ophelia
-Phoenix
-Poppy
-Primrose
-Ramona
-River
-Rosalie
-Rosemary
-Sage
-Salem
-Selena
-Sienna
-Summer
-Sylvie
-Thea
-Tessa
-Wren
-Winter
-Willa
-Ada
-Aspen
-Blair
-Brynn
-Cassidy
-Cecilia
-Daisy
-Dawn
-Daphne
-Ember
-Fiona
-Flora
-Freya
-Gemma
-Giselle
-Harmony
-Heidi
-Imogen
-Indie
-Jessie
-June
-Kaia
-Lena
-Lola
-Mabel
-Maisie
-Margot
-Matilda
-Mira
-Morgan
-Nell
-Nadia
-Odette
-Opal
-Pearl
-Phoebe
-Raven
-Reese
-Robin
-Rowan
-Ruth
-Sabrina
-Sasha
-Sierra
-Skye
-Sloane
-Talia
-Thora
-Vera
-Willa
-Winnie
-Yara
-Zara
diff --git a/src/Generators/AliasVault.Generators.Identity/Implementations/Dictionaries/en/firstnames_male b/src/Generators/AliasVault.Generators.Identity/Implementations/Dictionaries/en/firstnames_male
deleted file mode 100644
index 69cec3610..000000000
--- a/src/Generators/AliasVault.Generators.Identity/Implementations/Dictionaries/en/firstnames_male
+++ /dev/null
@@ -1,247 +0,0 @@
-Michael
-Christopher
-Matthew
-Joshua
-Daniel
-David
-Andrew
-Joseph
-James
-John
-Robert
-William
-Ryan
-Jason
-Nicholas
-Jonathan
-Jacob
-Brandon
-Tyler
-Zachary
-Kevin
-Justin
-Benjamin
-Anthony
-Samuel
-Thomas
-Alexander
-Ethan
-Noah
-Dylan
-Nathan
-Christian
-Austin
-Adam
-Caleb
-Cody
-Jordan
-Logan
-Aaron
-Kyle
-Jose
-Brian
-Gabriel
-Timothy
-Luke
-Jared
-Connor
-Sean
-Evan
-Isaac
-Jack
-Cameron
-Hunter
-Jackson
-Charles
-Devin
-Stephen
-Patrick
-Steven
-Elijah
-Scott
-Mark
-Jeffrey
-Corey
-Juan
-Luis
-Derek
-Chase
-Travis
-Alex
-Spencer
-Ian
-Trevor
-Bryan
-Tanner
-Marcus
-Jeremy
-Eric
-Jaden
-Garrett
-Isaiah
-Dustin
-Jesse
-Seth
-Blake
-Nathaniel
-Mason
-Liam
-Paul
-Carlos
-Mitchell
-Parker
-Lucas
-Richard
-Cole
-Adrian
-Colin
-Bradley
-Jesus
-Peter
-Kenneth
-Joel
-Victor
-Bryce
-Casey
-Vincent
-Edward
-Henry
-Dominic
-Riley
-Shane
-Dalton
-Grant
-Shawn
-Braden
-Caden
-Max
-Hayden
-Owen
-Brett
-Trevor
-Philip
-Brendan
-Wesley
-Aidan
-Brady
-Colton
-Tristan
-George
-Gavin
-Dawson
-Miguel
-Antonio
-Nolan
-Dakota
-Jace
-Collin
-Preston
-Levi
-Alan
-Jorge
-Carson
-Felix
-Oliver
-Theodore
-Harrison
-Maxwell
-Sebastian
-Xavier
-Dominick
-Lincoln
-Elliott
-Walter
-Simon
-Dean
-Hugo
-Malcolm
-Leon
-Oscar
-Calvin
-Raymond
-Edgar
-Franklin
-Arthur
-Lawrence
-Dennis
-Russell
-Douglas
-Leonard
-Gregory
-Harold
-Frederick
-Martin
-Curtis
-Stanley
-Gilbert
-Harvey
-Francis
-Eugene
-Ralph
-Roy
-Albert
-Bruce
-Ronald
-Keith
-Craig
-Roger
-Randy
-Gary
-Dennis
-Edwin
-Don
-Glen
-Gordon
-Howard
-Earl
-Leo
-Lloyd
-Milton
-Norman
-Roland
-Vernon
-Warren
-Alfred
-Bernard
-Chester
-Clarence
-Clifford
-Clyde
-Dale
-Dan
-Darrell
-Floyd
-Herman
-Jerome
-Maurice
-Neil
-Ray
-Rodney
-Roland
-Stuart
-Wallace
-Wayne
-Wendell
-Barry
-Cecil
-Claude
-Daryl
-Edmund
-Everett
-Ferdinand
-Forrest
-Gerald
-Hugh
-Irving
-Leslie
-Marvin
-Morris
-Nelson
-Perry
-Phillip
-Roderick
-Ross
-Terrence
-Wade
-Winston
-Zachariah
diff --git a/src/Generators/AliasVault.Generators.Identity/Implementations/Dictionaries/en/lastnames b/src/Generators/AliasVault.Generators.Identity/Implementations/Dictionaries/en/lastnames
deleted file mode 100644
index 1e007ecc9..000000000
--- a/src/Generators/AliasVault.Generators.Identity/Implementations/Dictionaries/en/lastnames
+++ /dev/null
@@ -1,271 +0,0 @@
-Smith
-Johnson
-Williams
-Brown
-Jones
-Garcia
-Miller
-Davis
-Rodriguez
-Martinez
-Hernandez
-Lopez
-Gonzalez
-Wilson
-Anderson
-Thomas
-Taylor
-Moore
-Jackson
-Martin
-Lee
-Perez
-Thompson
-White
-Harris
-Sanchez
-Clark
-Ramirez
-Lewis
-Robinson
-Walker
-Young
-Allen
-King
-Wright
-Scott
-Torres
-Nguyen
-Hill
-Flores
-Green
-Adams
-Nelson
-Baker
-Hall
-Rivera
-Campbell
-Mitchell
-Carter
-Roberts
-Gomez
-Phillips
-Evans
-Turner
-Diaz
-Parker
-Cruz
-Edwards
-Collins
-Reyes
-Stewart
-Morris
-Morales
-Murphy
-Cook
-Rogers
-Gutierrez
-Ortiz
-Morgan
-Cooper
-Peterson
-Bailey
-Reed
-Kelly
-Howard
-Ramos
-Kim
-Cox
-Ward
-Richardson
-Watson
-Brooks
-Chavez
-Wood
-James
-Bennett
-Gray
-Mendoza
-Ruiz
-Hughes
-Price
-Alvarez
-Castillo
-Sanders
-Patel
-Myers
-Long
-Ross
-Foster
-Jimenez
-Powell
-Jenkins
-Perry
-Russell
-Sullivan
-Bell
-Coleman
-Butler
-Henderson
-Barnes
-Gonzales
-Fisher
-Vasquez
-Simmons
-Romero
-Jordan
-Patterson
-Alexander
-Hamilton
-Graham
-Reynolds
-Griffin
-Wallace
-Moreno
-West
-Cole
-Hayes
-Bryant
-Herrera
-Gibson
-Ellis
-Tran
-Medina
-Aguilar
-Stevens
-Murray
-Ford
-Castro
-Marshall
-Owens
-Harrison
-Fernandez
-McDonald
-Woods
-Washington
-Kennedy
-Wells
-Vargas
-Henry
-Chen
-Freeman
-Webb
-Tucker
-Guzman
-Burns
-Crawford
-Olson
-Simpson
-Porter
-Hunter
-Gordon
-Mendez
-Silva
-Shaw
-Snyder
-Mason
-Dixon
-Blackwood
-Shepherd
-Frost
-Hawkins
-Pearson
-Fleming
-Dawson
-Palmer
-Nash
-Barker
-Thornton
-Fitzgerald
-Winters
-Mckenzie
-Chandler
-Griffith
-Cunningham
-Doyle
-Fletcher
-Hicks
-Walton
-Briggs
-Pearce
-Nichols
-Blake
-Hodges
-Benson
-Marsh
-Whitaker
-Skinner
-Robbins
-Goodwin
-Kirby
-Savage
-Hensley
-Hancock
-Pratt
-Gallagher
-Yates
-Dennis
-Swanson
-Steele
-Bauer
-Holt
-Barber
-Schultz
-Foley
-Fowler
-Wise
-Malone
-Cannon
-Tate
-Stark
-Welch
-Dyer
-Booth
-Payne
-Shannon
-Harmon
-Woodward
-Morse
-Jacobson
-Knowles
-Blanchard
-Dillon
-Stokes
-Buckley
-Dickerson
-Middleton
-Sellers
-Cobb
-Stephenson
-Roach
-Moody
-Beard
-Mccarthy
-Garner
-Mcguire
-Sloan
-Ballard
-Shields
-Orr
-Savage
-Graves
-Dempsey
-Weeks
-Mckay
-Cooke
-Riddle
-Gates
-Atkins
-Farrell
-Lowery
-Huffman
-Livingston
-Davenport
-Hendricks
-Kerr
-Pollard
-Hoover
-Wolfe
-Bowman
-Underwood
-Frazier
diff --git a/src/Generators/AliasVault.Generators.Identity/Implementations/Dictionaries/nl/firstnames_female b/src/Generators/AliasVault.Generators.Identity/Implementations/Dictionaries/nl/firstnames_female
deleted file mode 100644
index 265cef9a5..000000000
--- a/src/Generators/AliasVault.Generators.Identity/Implementations/Dictionaries/nl/firstnames_female
+++ /dev/null
@@ -1,211 +0,0 @@
-Emma
-Sophie
-Julia
-Mila
-Tess
-Sara
-Anna
-Noor
-Lotte
-Liv
-Eva
-Nora
-Zoë
-Evi
-Yara
-Saar
-Nina
-Fenna
-Lieke
-Fleur
-Isa
-Roos
-Lynn
-Sofie
-Sarah
-Milou
-Olivia
-Maud
-Lisa
-Vera
-Luna
-Lina
-Noa
-Feline
-Loïs
-Lena
-Floor
-Charlotte
-Esmee
-Julie
-Iris
-Lara
-Amber
-Hailey
-Mia
-Lize
-Isabelle
-Cato
-Fenne
-Sanne
-Norah
-Sophia
-Ella
-Nova
-Elin
-Femke
-Lizzy
-Linde
-Lauren
-Rosalie
-Lana
-Emily
-Elise
-Esmée
-Anne
-Isabelle
-Demi
-Hannah
-Liva
-Suze
-Fay
-Isabel
-Benthe
-Evi
-Amy
-Jasmijn
-Niene
-Sterre
-Fenna
-Fiene
-Liz
-Ise
-Mara
-Nienke
-Indy
-Romy
-Lola
-Puck
-Nora
-Merel
-Bente
-Eline
-Lily
-Leah
-Naomi
-Mirthe
-Valerie
-Noor
-Liva
-Jade
-Juul
-Lise
-Myrthe
-Veerle
-Aafke
-Alicia
-Amira
-Aniek
-Annabel
-Annelies
-Anouk
-Astrid
-Babette
-Bianca
-Britt
-Carlijn
-Chantal
-Claire
-Dagmar
-Danique
-Daphne
-Denise
-Dominique
-Doris
-Eefje
-Elena
-Eline
-Elisa
-Elisabeth
-Ellen
-Esther
-Eveline
-Fabienne
-Felice
-Fleur
-Frederique
-Gwen
-Hanna
-Heleen
-Helena
-Ilona
-Imke
-Inge
-Irene
-Iris
-Janna
-Janneke
-Jasmine
-Jennifer
-Jessica
-Joelle
-Judith
-Julia
-Karin
-Karlijn
-Kim
-Kirsten
-Kyra
-Laura
-Lena
-Lianne
-Liesbeth
-Linda
-Lisanne
-Lisette
-Louise
-Maartje
-Manon
-Margot
-Marieke
-Marijke
-Marlies
-Marloes
-Marthe
-Melissa
-Michelle
-Nadine
-Natalie
-Nicole
-Nina
-Noortje
-Paulien
-Petra
-Rachel
-Renee
-Robin
-Rosa
-Roxanne
-Sabine
-Sandra
-Saskia
-Silke
-Simone
-Suzanne
-Sylvie
-Tamara
-Tanja
-Tara
-Thea
-Thirza
-Tina
-Tineke
-Ursula
-Victoria
-Wendy
-Wilma
-Xandra
-Yasmin
-Yvette
-Yvonne
-Zara
diff --git a/src/Generators/AliasVault.Generators.Identity/Implementations/Dictionaries/nl/firstnames_male b/src/Generators/AliasVault.Generators.Identity/Implementations/Dictionaries/nl/firstnames_male
deleted file mode 100644
index 288c81a86..000000000
--- a/src/Generators/AliasVault.Generators.Identity/Implementations/Dictionaries/nl/firstnames_male
+++ /dev/null
@@ -1,212 +0,0 @@
-Daan
-Luuk
-Sem
-Finn
-Milan
-Levi
-Noah
-Lucas
-Jesse
-Thijs
-Jayden
-Bram
-Lars
-Ruben
-Thomas
-Tim
-Sam
-Liam
-Julian
-Mees
-Ties
-Sven
-Max
-Gijs
-David
-Stijn
-Jasper
-Niels
-Jens
-Timo
-Cas
-Joep
-Roan
-Tom
-Tygo
-Teun
-Siem
-Mats
-Thijmen
-Rens
-Niek
-Tobias
-Dex
-Hugo
-Robin
-Nick
-Floris
-Pepijn
-Boaz
-Olivier
-Luca
-Jurre
-Jelle
-Guus
-Koen
-Bart
-Olaf
-Wessel
-Daniël
-Job
-Sander
-Tijmen
-Kai
-Quinten
-Owen
-Morris
-Fedde
-Joris
-Jesper
-Mick
-Ryan
-Milo
-Stan
-Benjamin
-Melle
-Jip
-Dylan
-Brent
-Mick
-Dean
-Otis
-Abel
-Luc
-Sepp
-Vince
-Rayan
-Noud
-Hidde
-Fabian
-Jort
-Damian
-Boris
-Sil
-Moos
-Aiden
-Sep
-Mika
-Mijs
-Mika
-Felix
-Merlijn
-Alexander
-Aron
-Arthur
-Axel
-Bas
-Bastiaan
-Berend
-Björn
-Casper
-Cees
-Chris
-Christian
-Christiaan
-Colin
-Cornelis
-Dani
-Dennis
-Dirk
-Dominic
-Eduard
-Eelco
-Erik
-Erwin
-Ezra
-Faas
-Filip
-Florian
-Frank
-Frederik
-Freek
-Gerard
-Gerrit
-Giel
-Gijs
-Glenn
-Govert
-Harm
-Harold
-Hendrik
-Henrik
-Huub
-Ian
-Ivo
-Jacob
-Jake
-Jan
-Jarno
-Jason
-Jeffrey
-Jeremy
-Jim
-Jimmy
-Johan
-Johannes
-Jonas
-Jonathan
-Jos
-Joshua
-Justin
-Kay
-Kevin
-Kjeld
-Klaas
-Lennard
-Lennart
-Leon
-Lex
-Liam
-Loek
-Lorenzo
-Louis
-Lowie
-Maarten
-Magnus
-Maikel
-Marc
-Marcel
-Marco
-Martijn
-Mathias
-Matthijs
-Maurits
-Menno
-Michiel
-Nathan
-Nico
-Oscar
-Pascal
-Patrick
-Paul
-Peter
-Philip
-Pieter
-Pim
-Quincy
-Remco
-Rick
-Rik
-Robert
-Rogier
-Rowan
-Ruud
-Simon
-Stefan
-Steven
-Thom
-Victor
-Vincent
-Willem
-Wouter
-Yannick
diff --git a/src/Generators/AliasVault.Generators.Identity/Implementations/Dictionaries/nl/lastnames b/src/Generators/AliasVault.Generators.Identity/Implementations/Dictionaries/nl/lastnames
deleted file mode 100644
index 5769c4ffd..000000000
--- a/src/Generators/AliasVault.Generators.Identity/Implementations/Dictionaries/nl/lastnames
+++ /dev/null
@@ -1,207 +0,0 @@
-de Jong
-Jansen
-de Vries
-van den Berg
-van Dijk
-Bakker
-Janssen
-Visser
-Smit
-Meijer
-de Boer
-Mulder
-de Groot
-Bos
-Vos
-Peters
-Hendriks
-van Leeuwen
-Dekker
-Brouwer
-de Wit
-Dijkstra
-Smits
-de Graaf
-van der Meer
-van der Linden
-Kok
-Jacobs
-de Haan
-Vermeulen
-van den Heuvel
-van der Veen
-van den Broek
-de Bruijn
-de Bruin
-van der Heijden
-Schouten
-van Beek
-Willems
-van Vliet
-van de Ven
-Hoekstra
-Maas
-Verhoeven
-Koster
-van Dam
-van der Wal
-Prins
-Blom
-Huisman
-Peeters
-Kuipers
-van Veen
-van Dongen
-Veenstra
-Kramer
-van den Bosch
-van der Meulen
-Mol
-Zwart
-van der Laan
-Martens
-van de Pol
-Postma
-Tromp
-Borst
-Boon
-van Doorn
-Jonker
-van der Velden
-Willemsen
-van Wijk
-Groen
-Gerritsen
-Bosch
-van Loon
-van der Ploeg
-de Ruiter
-Molenaar
-Boer
-Klein
-de Koning
-van de Kamp
-van der Horst
-Verbeek
-Vink
-Goossens
-Scholten
-Hartman
-van Dalen
-van Elst
-Brink
-Boekel
-van de Berg
-Berends
-van der Hoek
-Kuiper
-Kooijman
-de Lange
-van der Sluis
-van Gelder
-Martens
-van Asselt
-Timmermans
-van Vliet
-van Rijn
-van Schaik
-Bosman
-Wolters
-van Hout
-Hermans
-van Rooij
-de Vos
-van Donselaar
-Evers
-van den Brink
-Verkerk
-Groeneveld
-van Duijn
-Schuurman
-Hoogendoorn
-van Zanten
-Koopman
-Cornelissen
-van Driel
-Teunissen
-Versteeg
-van Deursen
-Schipper
-van Kempen
-Bouwman
-van der Valk
-Nijhuis
-van der Werf
-van den Akker
-Verhoef
-Wessels
-van der Poel
-Driessen
-van Oosten
-Lambrechts
-van der Vlist
-Hoogeveen
-van Gils
-Rietveld
-Barendrecht
-van der Spek
-Stam
-van der Linde
-Boersma
-van Dijk
-Schepers
-van der Kolk
-Roelofs
-van der Velden
-van den Burg
-Westra
-van der Steen
-Pronk
-van der Veer
-Rozendaal
-van den Bos
-Konings
-van der Wiel
-Noordam
-van der Laan
-Schut
-van der Vlugt
-Witteveen
-van der Zwan
-Boogaard
-van der Waal
-Stolk
-van der Windt
-Rutten
-van der Zanden
-Spaans
-van der Zwaan
-Roos
-van der Zijl
-Schoenmaker
-van Diepen
-Romeijn
-van Doesburg
-Schippers
-van Eck
-Rijken
-van Egmond
-Schrama
-van Eijk
-Ruijter
-van Engelen
-Sanders
-van Es
-Schenk
-van Essen
-van Gaal
-van Geenen
-van Gent
-van Gestel
-van Gool
-van Grinsven
-van Gurp
-van Haaften
-van Haren
-van Hattem
-van Hees