Migrate all names to canonical doma.in.yml

382 files changed, 49 insertions, 25 deletions

diff --git a/Pipfile.lock b/Pipfile.lock
index 7552b04..0adc5c6 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -670,12 +670,12 @@
         },
         "ymlstash": {
             "hashes": [
-                "sha256:1f5e801e637cb7426dbe34d117f494bdb856d9660737b743a799b1383a1fb051",
-                "sha256:27bcfeeded909cf60ec9d55ec53852fa21819d6977d2bebdc6890c76cded2c6d"
+                "sha256:80905d7501cfb1d2a3202d80d4b053b6cad1f6825c334f831acf6c22a2de37cd",
+                "sha256:a980fcc59b3a68dbf943520ddab665e7ba93d30de266555372783b2a9ec672c9"
             ],
             "index": "pypi",
             "markers": "python_version >= '3.8' and python_version < '4.0'",
-            "version": "==1.0.2"
+            "version": "==1.2.0"
         }
     },
     "develop": {
diff --git a/cli/base.py b/cli/base.py
index 2098d8d..6250192 100644
--- a/cli/base.py
+++ b/cli/base.py
@@ -1,5 +1,10 @@
 import click
 
+from pathlib import Path
+
+ROOT_PATH = Path(__file__).parents[1]
+NAMES_DIR = ROOT_PATH / "names"
+
 
 @click.group
 def cli():
diff --git a/cli/clean.py b/cli/clean.py
index 09eaa41..facd576 100644
--- a/cli/clean.py
+++ b/cli/clean.py
@@ -1,6 +1,14 @@
-from .base import cli
+import ymlstash
+
+from .base import cli, NAMES_DIR
+from .model import Name
 
 
 @cli.command()
 def clean():
-    print("Cleaning..")
+    stash = ymlstash.YmlStash(Name, NAMES_DIR, filter_none=True)
+    names = stash.list_keys()
+    for name in names:
+        obj = stash.load(name)
+        stash.delete(obj.domain.replace(".", ""))
+        stash.save(obj)
diff --git a/cli/model.py b/cli/model.py
new file mode 100644
index 0000000..728a9d3
--- /dev/null
+++ b/cli/model.py
@@ -0,0 +1,15 @@
+from dataclasses import dataclass
+from typing import ClassVar, Optional
+
+
+@dataclass
+class Name:
+    domain: str
+    name: str
+    title: Optional[str] = None
+    url: Optional[str] = None
+    email: Optional[str] = None
+    github: Optional[str] = None
+    candidate: Optional[bool] = None
+    invalid: Optional[bool] = None
+    key: ClassVar[str] = "domain"
diff --git a/names/abraham.yml b/names/abrah.am.yml
index 970a88e..bf91980 100644
--- a/names/abraham.yml
+++ b/names/abrah.am.yml
@@ -1,4 +1,4 @@
 domain: abrah.am
 name: Abraham Williams
 title: Developer, conference speaker, and open source maintainer.
-github: abraham
\ No newline at end of file
+github: abraham
diff --git a/names/adomas.yml b/names/adom.as.yml
index bf143b3..bf143b3 100644
--- a/names/adomas.yml
+++ b/names/adom.as.yml
diff --git a/names/akash.yml b/names/aka.sh.yml
index d76f731..d76f731 100644
--- a/names/akash.yml
+++ b/names/aka.sh.yml
diff --git a/names/akram.yml b/names/akr.am.yml
index e4e480c..e4e480c 100644
--- a/names/akram.yml
+++ b/names/akr.am.yml
diff --git a/names/akseli.yml b/names/akse.li.yml
index e44e263..e44e263 100644
--- a/names/akseli.yml
+++ b/names/akse.li.yml
diff --git a/names/alberto.yml b/names/alber.to.yml
index 9feb73d..9feb73d 100644
--- a/names/alberto.yml
+++ b/names/alber.to.yml
diff --git a/names/alberich.yml b/names/alberi.ch.yml
index e96aadb..e96aadb 100644
--- a/names/alberich.yml
+++ b/names/alberi.ch.yml
diff --git a/names/aldwin.yml b/names/aldw.in.yml
index de46e9d..de46e9d 100644
--- a/names/aldwin.yml
+++ b/names/aldw.in.yml
diff --git a/names/alejandro.yml b/names/alejand.ro.yml
index 1cfa314..1cfa314 100644
--- a/names/alejandro.yml
+++ b/names/alejand.ro.yml
diff --git a/names/alfredo.yml b/names/alfre.do.yml
index 17304dc..17304dc 100644
--- a/names/alfredo.yml
+++ b/names/alfre.do.yml
diff --git a/names/alistair.yml b/names/alista.ir.yml
index 22be980..22be980 100644
--- a/names/alistair.yml
+++ b/names/alista.ir.yml
diff --git a/names/alperen.yml b/names/alpe.ren.yml
index 26b4cf4..26b4cf4 100644
--- a/names/alperen.yml
+++ b/names/alpe.ren.yml
diff --git a/names/alvin.yml b/names/alv.in.yml
index 2dc176e..2dc176e 100644
--- a/names/alvin.yml
+++ b/names/alv.in.yml
diff --git a/names/alvaro.yml b/names/alva.ro.yml
index f0f2628..f0f2628 100644
--- a/names/alvaro.yml
+++ b/names/alva.ro.yml
diff --git a/names/amato.yml b/names/ama.to.yml
index 93a5d52..93a5d52 100644
--- a/names/amato.yml
+++ b/names/ama.to.yml
diff --git a/names/amedee.yml b/names/amed.ee.yml
index b5537e5..b5537e5 100644
--- a/names/amedee.yml
+++ b/names/amed.ee.yml
diff --git a/names/anastasio.yml b/names/anastas.io.yml
index 6c9b76f..6c9b76f 100644
--- a/names/anastasio.yml
+++ b/names/anastas.io.yml
diff --git a/names/andree.yml b/names/andr.ee.yml
index 4fb1c1d..4fb1c1d 100644
--- a/names/andree.yml
+++ b/names/andr.ee.yml
diff --git a/names/andris.yml b/names/andr.is.yml
index 07ea0e9..07ea0e9 100644
--- a/names/andris.yml
+++ b/names/andr.is.yml
diff --git a/names/angus.yml b/names/ang.us.yml
index 81fafdc..81fafdc 100644
--- a/names/angus.yml
+++ b/names/ang.us.yml
diff --git a/names/anibal.yml b/names/anib.al.yml
index b9faa02..b9faa02 100644
--- a/names/anibal.yml
+++ b/names/anib.al.yml
diff --git a/names/aniela.yml b/names/anie.la.yml
index da20777..da20777 100644
--- a/names/aniela.yml
+++ b/names/anie.la.yml
diff --git a/names/annie.yml b/names/ann.ie.yml
index 8487635..8487635 100644
--- a/names/annie.yml
+++ b/names/ann.ie.yml
diff --git a/names/anneli.yml b/names/anne.li.yml
index be5bbd1..be5bbd1 100644
--- a/names/anneli.yml
+++ b/names/anne.li.yml
diff --git a/names/antonio.yml b/names/anton.io.yml
index 45098b0..45098b0 100644
--- a/names/antonio.yml
+++ b/names/anton.io.yml
diff --git a/names/antwain.yml b/names/antwa.in.yml
index 30d01b3..30d01b3 100644
--- a/names/antwain.yml
+++ b/names/antwa.in.yml
diff --git a/names/aoibhinn.yml b/names/aoibhi.nn.yml
index dbf8229..dbf8229 100644
--- a/names/aoibhinn.yml
+++ b/names/aoibhi.nn.yml
diff --git a/names/apollinaire.yml b/names/apollinai.re.yml
index eb03584..eb03584 100644
--- a/names/apollinaire.yml
+++ b/names/apollinai.re.yml
diff --git a/names/aral.yml b/names/ar.al.yml
index be49a4c..be49a4c 100644
--- a/names/aral.yml
+++ b/names/ar.al.yml
diff --git a/names/arto.yml b/names/ar.to.yml
index f55642a..f55642a 100644
--- a/names/arto.yml
+++ b/names/ar.to.yml
diff --git a/names/arash.yml b/names/ara.sh.yml
index 0f18276..0f18276 100644
--- a/names/arash.yml
+++ b/names/ara.sh.yml
diff --git a/names/aristide.yml b/names/aristi.de.yml
index aadeac7..aadeac7 100644
--- a/names/aristide.yml
+++ b/names/aristi.de.yml
diff --git a/names/aristides.yml b/names/aristid.es.yml
index 2e94493..2e94493 100644
--- a/names/aristides.yml
+++ b/names/aristid.es.yml
diff --git a/names/arnie.yml b/names/arn.ie.yml
index f7d872f..f7d872f 100644
--- a/names/arnie.yml
+++ b/names/arn.ie.yml
diff --git a/names/arush.yml b/names/aru.sh.yml
index 1860493..1860493 100644
--- a/names/arush.yml
+++ b/names/aru.sh.yml
diff --git a/names/arvin.yml b/names/arv.in.yml
index a47ed5e..a47ed5e 100644
--- a/names/arvin.yml
+++ b/names/arv.in.yml
diff --git a/names/attila.yml b/names/atti.la.yml
index 28e8d8f..28e8d8f 100644
--- a/names/attila.yml
+++ b/names/atti.la.yml
diff --git a/names/avital.yml b/names/avit.al.yml
index ee80d09..ee80d09 100644
--- a/names/avital.yml
+++ b/names/avit.al.yml
diff --git a/names/ayham.yml b/names/ayh.am.yml
index 33b3932..33b3932 100644
--- a/names/ayham.yml
+++ b/names/ayh.am.yml
diff --git a/names/balthazar.yml b/names/balthaz.ar.yml
index f2a253d..f2a253d 100644
--- a/names/balthazar.yml
+++ b/names/balthaz.ar.yml
diff --git a/names/barnes.yml b/names/barn.es.yml
index 52d170a..52d170a 100644
--- a/names/barnes.yml
+++ b/names/barn.es.yml
diff --git a/names/bartoli.yml b/names/barto.li.yml
index 0afa686..0afa686 100644
--- a/names/bartoli.yml
+++ b/names/barto.li.yml
diff --git a/names/baudoin.yml b/names/baudo.in.yml
index d8358df..d8358df 100644
--- a/names/baudoin.yml
+++ b/names/baudo.in.yml
diff --git a/names/bellamy.yml b/names/bella.my.yml
index 1883e86..1883e86 100644
--- a/names/bellamy.yml
+++ b/names/bella.my.yml
diff --git a/names/benedetto.yml b/names/benedet.to.yml
index 7d8b298..7d8b298 100644
--- a/names/benedetto.yml
+++ b/names/benedet.to.yml
diff --git a/names/benvenuto.yml b/names/benvenu.to.yml
index ea96516..ea96516 100644
--- a/names/benvenuto.yml
+++ b/names/benvenu.to.yml
diff --git a/names/berto.yml b/names/ber.to.yml
index dffe4be..dffe4be 100644
--- a/names/berto.yml
+++ b/names/ber.to.yml
diff --git a/names/bernardo.yml b/names/bernar.do.yml
index 050da9b..050da9b 100644
--- a/names/bernardo.yml
+++ b/names/bernar.do.yml
diff --git a/names/bertram.yml b/names/bertr.am.yml
index 614454f..614454f 100644
--- a/names/bertram.yml
+++ b/names/bertr.am.yml
diff --git a/names/bilal.yml b/names/bil.al.yml
index d4d981d..d4d981d 100644
--- a/names/bilal.yml
+++ b/names/bil.al.yml
diff --git a/names/birkett.yml b/names/birke.tt.yml
index 6b91c7d..6b91c7d 100644
--- a/names/birkett.yml
+++ b/names/birke.tt.yml
diff --git a/names/blair.yml b/names/bla.ir.yml
index 44a34f4..44a34f4 100644
--- a/names/blair.yml
+++ b/names/bla.ir.yml
diff --git a/names/brett.yml b/names/bre.tt.yml
index db674d4..db674d4 100644
--- a/names/brett.yml
+++ b/names/bre.tt.yml
diff --git a/names/breslin.yml b/names/bresl.in.yml
index a4cd12f..a4cd12f 100644
--- a/names/breslin.yml
+++ b/names/bresl.in.yml
diff --git a/names/brooke.yml b/names/broo.ke.yml
index 7b0fbc5..7b0fbc5 100644
--- a/names/brooke.yml
+++ b/names/broo.ke.yml
diff --git a/names/burnett.yml b/names/burne.tt.yml
index 1e7590c..1e7590c 100644
--- a/names/burnett.yml
+++ b/names/burne.tt.yml
diff --git a/names/calixto.yml b/names/calix.to.yml
index 04747b2..04747b2 100644
--- a/names/calixto.yml
+++ b/names/calix.to.yml
diff --git a/names/calvin.yml b/names/calv.in.yml
index d83fecf..d83fecf 100644
--- a/names/calvin.yml
+++ b/names/calv.in.yml
diff --git a/names/camila.yml b/names/cami.la.yml
index 352f492..352f492 100644
--- a/names/camila.yml
+++ b/names/cami.la.yml
diff --git a/names/carmeli.yml b/names/carme.li.yml
index 4163b29..4163b29 100644
--- a/names/carmeli.yml
+++ b/names/carme.li.yml
diff --git a/names/carola.yml b/names/caro.la.yml
index d6506b3..d6506b3 100644
--- a/names/carola.yml
+++ b/names/caro.la.yml
diff --git a/names/caruso.yml b/names/caru.so.yml
index 89817e0..89817e0 100644
--- a/names/caruso.yml
+++ b/names/caru.so.yml
diff --git a/names/cayla.yml b/names/cay.la.yml
index fe0e9d3..fe0e9d3 100644
--- a/names/cayla.yml
+++ b/names/cay.la.yml
diff --git a/names/caylin.yml b/names/cayl.in.yml
index d3fd78a..d3fd78a 100644
--- a/names/caylin.yml
+++ b/names/cayl.in.yml
diff --git a/names/celso.yml b/names/cel.so.yml
index d6c0a6d..d6c0a6d 100644
--- a/names/celso.yml
+++ b/names/cel.so.yml
diff --git a/names/cemre.yml b/names/cem.re.yml
index 67e060d..67e060d 100644
--- a/names/cemre.yml
+++ b/names/cem.re.yml
diff --git a/names/cesar.yml b/names/cesar.yml
deleted file mode 100644
index ba7a8a5..0000000
--- a/names/cesar.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-domain: cés.ar
-name: César Andino
-url: http://cés.ar
-candidate: true
diff --git a/names/charanjit.yml b/names/charanj.it.yml
index 5253af7..5253af7 100644
--- a/names/charanjit.yml
+++ b/names/charanj.it.yml
diff --git a/names/ciechanowski.yml b/names/ciechanow.ski.yml
index b36231f..13b7a20 100644
--- a/names/ciechanowski.yml
+++ b/names/ciechanow.ski.yml
@@ -1,3 +1,3 @@
 domain: ciechanow.ski
 name: Bartosz Ciechanowski
-title: Writes interactive articles
\ No newline at end of file
+title: Writes interactive articles
diff --git a/names/citlali.yml b/names/citla.li.yml
index 370e9a5..370e9a5 100644
--- a/names/citlali.yml
+++ b/names/citla.li.yml
diff --git a/names/clarke.yml b/names/clar.ke.yml
index 83056f2..83056f2 100644
--- a/names/clarke.yml
+++ b/names/clar.ke.yml
diff --git a/names/conrad.yml b/names/conr.ad.yml
index 393e867..8e09f87 100644
--- a/names/conrad.yml
+++ b/names/conr.ad.yml
@@ -1,5 +1,5 @@
 domain: conr.ad
 name: Conrad Decker
-github: conraddecker
 title: Digital Creator & Technologist
 url: https://conr.ad
+github: conraddecker
diff --git a/names/constantin.yml b/names/constant.in.yml
index 60d579c..60d579c 100644
--- a/names/constantin.yml
+++ b/names/constant.in.yml
diff --git a/names/corentin.yml b/names/corent.in.yml
index 0669ebb..0669ebb 100644
--- a/names/corentin.yml
+++ b/names/corent.in.yml
diff --git a/names/cornelius.yml b/names/corneli.us.yml
index f942591..f942591 100644
--- a/names/cornelius.yml
+++ b/names/corneli.us.yml
diff --git a/names/crist.yml b/names/cri.st.yml
index 6bb6e83..6bb6e83 100644
--- a/names/crist.yml
+++ b/names/cri.st.yml
diff --git a/names/cristobal.yml b/names/cristob.al.yml
index 1d96e55..1d96e55 100644
--- a/names/cristobal.yml
+++ b/names/cristob.al.yml
diff --git a/names/cyrus.yml b/names/cyr.us.yml
index d89e875..d89e875 100644
--- a/names/cyrus.yml
+++ b/names/cyr.us.yml
diff --git a/names/daksh.yml b/names/dak.sh.yml
index bd50ac4..bd50ac4 100644
--- a/names/daksh.yml
+++ b/names/dak.sh.yml
diff --git a/names/dakarai.yml b/names/dakar.ai.yml
index dc03f51..dc03f51 100644
--- a/names/dakarai.yml
+++ b/names/dakar.ai.yml
diff --git a/names/dallin.yml b/names/dall.in.yml
index 387bb14..387bb14 100644
--- a/names/dallin.yml
+++ b/names/dall.in.yml
diff --git a/names/danila.yml b/names/dani.la.yml
index 02a7a5c..02a7a5c 100644
--- a/names/danila.yml
+++ b/names/dani.la.yml
diff --git a/names/daniyal.yml b/names/daniy.al.yml
index 076fb99..076fb99 100644
--- a/names/daniyal.yml
+++ b/names/daniy.al.yml
diff --git a/names/daylin.yml b/names/dayl.in.yml
index 573e106..573e106 100644
--- a/names/daylin.yml
+++ b/names/dayl.in.yml
diff --git a/names/dayrit.yml b/names/dayr.it.yml
index d806912..d806912 100644
--- a/names/dayrit.yml
+++ b/names/dayr.it.yml
diff --git a/names/debby.yml b/names/deb.by.yml
index d6d8d82..d6d8d82 100644
--- a/names/debby.yml
+++ b/names/deb.by.yml
diff --git a/names/delano.yml b/names/dela.no.yml
index 3c9b676..3c9b676 100644
--- a/names/delano.yml
+++ b/names/dela.no.yml
diff --git a/names/delphin.yml b/names/delph.in.yml
index b6b3d67..b6b3d67 100644
--- a/names/delphin.yml
+++ b/names/delph.in.yml
diff --git a/names/delvin.yml b/names/delv.in.yml
index 38ade33..38ade33 100644
--- a/names/delvin.yml
+++ b/names/delv.in.yml
diff --git a/names/demarcus.yml b/names/demarc.us.yml
index b43c57f..b43c57f 100644
--- a/names/demarcus.yml
+++ b/names/demarc.us.yml
diff --git a/names/desiree.yml b/names/desir.ee.yml
index 2239add..2239add 100644
--- a/names/desiree.yml
+++ b/names/desir.ee.yml
diff --git a/names/devin.yml b/names/dev.in.yml
index e3a32e5..e3a32e5 100644
--- a/names/devin.yml
+++ b/names/dev.in.yml
diff --git a/names/devrim.yml b/names/devr.im.yml
index 57a1191..57a1191 100644
--- a/names/devrim.yml
+++ b/names/devr.im.yml
diff --git a/names/diane.yml b/names/dia.ne.yml
index a8ca0db..a8ca0db 100644
--- a/names/diane.yml
+++ b/names/dia.ne.yml
diff --git a/names/dimitre.yml b/names/dimit.re.yml
index bebaae4..bebaae4 100644
--- a/names/dimitre.yml
+++ b/names/dimit.re.yml
diff --git a/names/dinsmore.yml b/names/dinsmo.re.yml
index fea782c..fea782c 100644
--- a/names/dinsmore.yml
+++ b/names/dinsmo.re.yml
diff --git a/names/dmytro.yml b/names/dmyt.ro.yml
index c69e4e7..c69e4e7 100644
--- a/names/dmytro.yml
+++ b/names/dmyt.ro.yml
diff --git a/names/domas.yml b/names/dom.as.yml
index 0ed8b4c..0ed8b4c 100644
--- a/names/domas.yml
+++ b/names/dom.as.yml
diff --git a/names/donato.yml b/names/dona.to.yml
index 00148ab..00148ab 100644
--- a/names/donato.yml
+++ b/names/dona.to.yml
diff --git a/names/earvin.yml b/names/earv.in.yml
index 5cadc60..5cadc60 100644
--- a/names/earvin.yml
+++ b/names/earv.in.yml
diff --git a/names/eduardo.yml b/names/eduar.do.yml
index d7aa465..d7aa465 100644
--- a/names/eduardo.yml
+++ b/names/eduar.do.yml
diff --git a/names/egemen.yml b/names/ege.men.yml
index 7e0064e..7e0064e 100644
--- a/names/egemen.yml
+++ b/names/ege.men.yml
diff --git a/names/eldridge.yml b/names/eldrid.ge.yml
index 770e92c..770e92c 100644
--- a/names/eldridge.yml
+++ b/names/eldrid.ge.yml
diff --git a/names/eligio.yml b/names/elig.io.yml
index 0d927b1..0d927b1 100644
--- a/names/eligio.yml
+++ b/names/elig.io.yml
diff --git a/names/eloise.yml b/names/eloi.se.yml
index f4713d8..f4713d8 100644
--- a/names/eloise.yml
+++ b/names/eloi.se.yml
diff --git a/names/elvio.yml b/names/elv.io.yml
index 7f2edfc..7f2edfc 100644
--- a/names/elvio.yml
+++ b/names/elv.io.yml
diff --git a/names/emilio.yml b/names/emil.io.yml
index d36e1d3..d36e1d3 100644
--- a/names/emilio.yml
+++ b/names/emil.io.yml
diff --git a/names/emmaly.yml b/names/emma.ly.yml
index 32c2906..32c2906 100644
--- a/names/emmaly.yml
+++ b/names/emma.ly.yml
diff --git a/names/ephraim.yml b/names/ephra.im.yml
index cd90bb9..cd90bb9 100644
--- a/names/ephraim.yml
+++ b/names/ephra.im.yml
diff --git a/names/erling.yml b/names/erli.ng.yml
index 01f16bc..01f16bc 100644
--- a/names/erling.yml
+++ b/names/erli.ng.yml
diff --git a/names/ernst.yml b/names/ern.st.yml
index ffcce33..ffcce33 100644
--- a/names/ernst.yml
+++ b/names/ern.st.yml
diff --git a/names/eusebio.yml b/names/euseb.io.yml
index 4a1035a..4a1035a 100644
--- a/names/eusebio.yml
+++ b/names/euseb.io.yml
diff --git a/names/faure.yml b/names/fau.re.yml
index 53ddfbb..53ddfbb 100644
--- a/names/faure.yml
+++ b/names/fau.re.yml
diff --git a/names/feli.pe.yml b/names/feli.pe.yml
new file mode 100644
index 0000000..7441cd3
--- /dev/null
+++ b/names/feli.pe.yml
@@ -0,0 +1,3 @@
+domain: feli.pe
+name: Felipe Oduardo Sierra
+title: Father. Software Engineer. Hopeful Traveler.
diff --git a/names/felipe.yml b/names/felipe.yml
deleted file mode 100644
index cb408dc..0000000
--- a/names/felipe.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-domain: feli.pe
-name: Felipe Oduardo Sierra
-title: Father. Software Engineer. Hopeful Traveler.
\ No newline at end of file
diff --git a/names/filipe.yml b/names/fili.pe.yml
index 72d5a3c..72d5a3c 100644
--- a/names/filipe.yml
+++ b/names/fili.pe.yml
diff --git a/names/filiberto.yml b/names/filiber.to.yml
index d3897b4..d3897b4 100644
--- a/names/filiberto.yml
+++ b/names/filiber.to.yml
diff --git a/names/fleming.yml b/names/flemi.ng.yml
index 7ba3120..7ba3120 100644
--- a/names/fleming.yml
+++ b/names/flemi.ng.yml
diff --git a/names/forrest.yml b/names/forre.st.yml
index 26ace71..26ace71 100644
--- a/names/forrest.yml
+++ b/names/forre.st.yml
diff --git a/names/fortunat.yml b/names/fortun.at.yml
index 6be0a45..6be0a45 100644
--- a/names/fortunat.yml
+++ b/names/fortun.at.yml
diff --git a/names/frances.yml b/names/franc.es.yml
index c7d3deb..c7d3deb 100644
--- a/names/frances.yml
+++ b/names/franc.es.yml
diff --git a/names/fredo.yml b/names/fre.do.yml
index f1c4cde..f1c4cde 100644
--- a/names/fredo.yml
+++ b/names/fre.do.yml
diff --git a/names/gaelin.yml b/names/gael.in.yml
index 5a80659..5a80659 100644
--- a/names/gaelin.yml
+++ b/names/gael.in.yml
diff --git a/names/garrett.yml b/names/garre.tt.yml
index 31a63aa..31a63aa 100644
--- a/names/garrett.yml
+++ b/names/garre.tt.yml
diff --git a/names/garvin.yml b/names/garv.in.yml
index 4a61fb3..4a61fb3 100644
--- a/names/garvin.yml
+++ b/names/garv.in.yml
diff --git a/names/gaspare.yml b/names/gaspa.re.yml
index 3154e03..3154e03 100644
--- a/names/gaspare.yml
+++ b/names/gaspa.re.yml
diff --git a/names/gautam.yml b/names/gaut.am.yml
index 515331b..515331b 100644
--- a/names/gautam.yml
+++ b/names/gaut.am.yml
diff --git a/names/gawin.yml b/names/gaw.in.yml
index ec0d768..ec0d768 100644
--- a/names/gawin.yml
+++ b/names/gaw.in.yml
diff --git a/names/georg.yml b/names/ge.org.yml
index 5adc79e..5adc79e 100644
--- a/names/georg.yml
+++ b/names/ge.org.yml
diff --git a/names/gedimin.yml b/names/gedim.in.yml
index 2de98b2..2de98b2 100644
--- a/names/gedimin.yml
+++ b/names/gedim.in.yml
diff --git a/names/georges.yml b/names/georg.es.yml
index e40d7ed..e40d7ed 100644
--- a/names/georges.yml
+++ b/names/georg.es.yml
diff --git a/names/gervais.yml b/names/gerva.is.yml
index ac7ed2b..ac7ed2b 100644
--- a/names/gervais.yml
+++ b/names/gerva.is.yml
diff --git a/names/gervaise.yml b/names/gervai.se.yml
index bd407d1..bd407d1 100644
--- a/names/gervaise.yml
+++ b/names/gervai.se.yml
diff --git a/names/gervasio.yml b/names/gervas.io.yml
index 9cc8f96..9cc8f96 100644
--- a/names/gervasio.yml
+++ b/names/gervas.io.yml
diff --git a/names/gianluca.yml b/names/gianlu.ca.yml
index 5470d40..5470d40 100644
--- a/names/gianluca.yml
+++ b/names/gianlu.ca.yml
diff --git a/names/gillespie.yml b/names/gillesp.ie.yml
index 94d51be..94d51be 100644
--- a/names/gillespie.yml
+++ b/names/gillesp.ie.yml
diff --git a/names/giulio.yml b/names/giul.io.yml
index 3ffc426..3ffc426 100644
--- a/names/giulio.yml
+++ b/names/giul.io.yml
diff --git a/names/glynnis.yml b/names/glynn.is.yml
index 4bdc249..4bdc249 100644
--- a/names/glynnis.yml
+++ b/names/glynn.is.yml
diff --git a/names/goodwin.yml b/names/goodw.in.yml
index 1c4a8b4..1c4a8b4 100644
--- a/names/goodwin.yml
+++ b/names/goodw.in.yml
diff --git a/names/grantham.yml b/names/granth.am.yml
index f7b506e..f7b506e 100644
--- a/names/grantham.yml
+++ b/names/granth.am.yml
diff --git a/names/gregg.yml b/names/gre.gg.yml
index fbd4f81..fbd4f81 100644
--- a/names/gregg.yml
+++ b/names/gre.gg.yml
diff --git a/names/gregarious.yml b/names/gregario.us.yml
index d3256a7..d3256a7 100644
--- a/names/gregarious.yml
+++ b/names/gregario.us.yml
diff --git a/names/guido.yml b/names/gui.do.yml
index 7d8b743..7d8b743 100644
--- a/names/guido.yml
+++ b/names/gui.do.yml
diff --git a/names/gwyndolin.yml b/names/gwyndol.in.yml
index a5f0a9b..a5f0a9b 100644
--- a/names/gwyndolin.yml
+++ b/names/gwyndol.in.yml
diff --git a/names/hamblin.yml b/names/hambl.in.yml
index c2817f6..c2817f6 100644
--- a/names/hamblin.yml
+++ b/names/hambl.in.yml
diff --git a/names/hamish.yml b/names/hami.sh.yml
index df69fd6..df69fd6 100644
--- a/names/hamish.yml
+++ b/names/hami.sh.yml
diff --git a/names/hampus.yml b/names/hamp.us.yml
index ba34514..ba34514 100644
--- a/names/hampus.yml
+++ b/names/hamp.us.yml
diff --git a/names/harris.yml b/names/harr.is.yml
index 46ca122..46ca122 100644
--- a/names/harris.yml
+++ b/names/harr.is.yml
diff --git a/names/harvie.yml b/names/harv.ie.yml
index 6f9abe9..6f9abe9 100644
--- a/names/harvie.yml
+++ b/names/harv.ie.yml
diff --git a/names/heinz.yml b/names/hei.nz.yml
index f000fbf..f000fbf 100644
--- a/names/heinz.yml
+++ b/names/hei.nz.yml
diff --git a/names/hersh.yml b/names/her.sh.yml
index 8e49cc7..8e49cc7 100644
--- a/names/hersh.yml
+++ b/names/her.sh.yml
diff --git a/names/heracles.yml b/names/heracl.es.yml
index 5c0fcf5..5c0fcf5 100644
--- a/names/heracles.yml
+++ b/names/heracl.es.yml
diff --git a/names/hines.yml b/names/hin.es.yml
index 6bf4add..6bf4add 100644
--- a/names/hines.yml
+++ b/names/hin.es.yml
diff --git a/names/hiram.yml b/names/hir.am.yml
index b71fe46..b71fe46 100644
--- a/names/hiram.yml
+++ b/names/hir.am.yml
diff --git a/names/hollie.yml b/names/holl.ie.yml
index 7a06626..7a06626 100644
--- a/names/hollie.yml
+++ b/names/holl.ie.yml
diff --git a/names/humberto.yml b/names/humber.to.yml
index 4679cc8..4679cc8 100644
--- a/names/humberto.yml
+++ b/names/humber.to.yml
diff --git a/names/hurst.yml b/names/hur.st.yml
index ff3cd73..ff3cd73 100644
--- a/names/hurst.yml
+++ b/names/hur.st.yml
diff --git a/names/ibrahim.yml b/names/ibrah.im.yml
index cfcb01b..cfcb01b 100644
--- a/names/ibrahim.yml
+++ b/names/ibrah.im.yml
diff --git a/names/idris.yml b/names/idr.is.yml
index 6229f99..6229f99 100644
--- a/names/idris.yml
+++ b/names/idr.is.yml
diff --git a/names/ilyas.yml b/names/ily.as.yml
index a040cc9..a040cc9 100644
--- a/names/ilyas.yml
+++ b/names/ily.as.yml
diff --git a/names/imrich.yml b/names/imri.ch.yml
index 26faa02..26faa02 100644
--- a/names/imrich.yml
+++ b/names/imri.ch.yml
diff --git a/names/ippolito.yml b/names/ippoli.to.yml
index ea37d1c..ea37d1c 100644
--- a/names/ippolito.yml
+++ b/names/ippoli.to.yml
diff --git a/names/irfan.yml b/names/ir.fan.yml
index 65f46ab..65f46ab 100644
--- a/names/irfan.yml
+++ b/names/ir.fan.yml
diff --git a/names/irene.yml b/names/ire.ne.yml
index 63be5b2..63be5b2 100644
--- a/names/irene.yml
+++ b/names/ire.ne.yml
diff --git a/names/isabella.yml b/names/isabel.la.yml
index 4b28dce..4b28dce 100644
--- a/names/isabella.yml
+++ b/names/isabel.la.yml
diff --git a/names/itai.yml b/names/it.ai.yml
index 9825d71..54a6b32 100644
--- a/names/itai.yml
+++ b/names/it.ai.yml
@@ -1,4 +1,4 @@
 domain: it.ai
 name: Itai Nathaniel
-email: im@it.ai
 title: Developer, pâtissier, father
+email: im@it.ai
diff --git a/names/izaac.yml b/names/iza.ac.yml
index 2ed1a57..2ed1a57 100644
--- a/names/izaac.yml
+++ b/names/iza.ac.yml
diff --git a/names/jacklin.yml b/names/jackl.in.yml
index 55d9bd5..55d9bd5 100644
--- a/names/jacklin.yml
+++ b/names/jackl.in.yml
diff --git a/names/jacques.yml b/names/jacqu.es.yml
index 2c4d5ff..2c4d5ff 100644
--- a/names/jacques.yml
+++ b/names/jacqu.es.yml
diff --git a/names/jaime.yml b/names/jai.me.yml
index a6bbfc7..a6bbfc7 100644
--- a/names/jaime.yml
+++ b/names/jai.me.yml
diff --git a/names/jamie.yml b/names/jam.ie.yml
index ae8424d..ae8424d 100644
--- a/names/jamie.yml
+++ b/names/jam.ie.yml
diff --git a/names/jamin.yml b/names/jam.in.yml
index 9a7708e..9a7708e 100644
--- a/names/jamin.yml
+++ b/names/jam.in.yml
diff --git a/names/janis.yml b/names/jan.is.yml
index addc342..addc342 100644
--- a/names/janis.yml
+++ b/names/jan.is.yml
diff --git a/names/jannis.yml b/names/jann.is.yml
index 5fc100c..5fc100c 100644
--- a/names/jannis.yml
+++ b/names/jann.is.yml
diff --git a/names/jarvis.yml b/names/jarv.is.yml
index 162e0eb..162e0eb 100644
--- a/names/jarvis.yml
+++ b/names/jarv.is.yml
diff --git a/names/jaylin.yml b/names/jayl.in.yml
index 950c7bc..950c7bc 100644
--- a/names/jaylin.yml
+++ b/names/jayl.in.yml
diff --git a/names/jeremy.yml b/names/jere.my.yml
index 35706d9..35706d9 100644
--- a/names/jeremy.yml
+++ b/names/jere.my.yml
diff --git a/names/jeremias.yml b/names/jeremi.as.yml
index 653528b..653528b 100644
--- a/names/jeremias.yml
+++ b/names/jeremi.as.yml
diff --git a/names/jerome.yml b/names/jero.me.yml
index 501bda6..501bda6 100644
--- a/names/jerome.yml
+++ b/names/jero.me.yml
diff --git a/names/jesal.yml b/names/jes.al.yml
index 3de04db..3de04db 100644
--- a/names/jesal.yml
+++ b/names/jes.al.yml
diff --git a/names/jesse.yml b/names/jes.se.yml
index be731b7..be731b7 100644
--- a/names/jesse.yml
+++ b/names/jes.se.yml
diff --git a/names/jetro.yml b/names/jet.ro.yml
index 3855e7f..3855e7f 100644
--- a/names/jetro.yml
+++ b/names/jet.ro.yml
diff --git a/names/john.yml b/names/jo.hn.yml
index d288a89..d288a89 100644
--- a/names/john.yml
+++ b/names/jo.hn.yml
diff --git a/names/joachin.yml b/names/joach.in.yml
index 4291c32..4291c32 100644
--- a/names/joachin.yml
+++ b/names/joach.in.yml
diff --git a/names/joaquim.yml b/names/joaqu.im.yml
index 7a37bef..7a37bef 100644
--- a/names/joaquim.yml
+++ b/names/joaqu.im.yml
diff --git a/names/jochim.yml b/names/joch.im.yml
index 3242637..3242637 100644
--- a/names/jochim.yml
+++ b/names/joch.im.yml
diff --git a/names/johannes.yml b/names/johann.es.yml
index 337caec..337caec 100644
--- a/names/johannes.yml
+++ b/names/johann.es.yml
diff --git a/names/johnnie.yml b/names/johnn.ie.yml
index 90848af..90848af 100644
--- a/names/johnnie.yml
+++ b/names/johnn.ie.yml
diff --git a/names/joost.yml b/names/joo.st.yml
index 3c9da5d..3c9da5d 100644
--- a/names/joost.yml
+++ b/names/joo.st.yml
diff --git a/names/jorge.yml b/names/jor.ge.yml
index bef9558..bef9558 100644
--- a/names/jorge.yml
+++ b/names/jor.ge.yml
diff --git a/names/joris.yml b/names/jor.is.yml
index b6eb5bc..b6eb5bc 100644
--- a/names/joris.yml
+++ b/names/jor.is.yml
diff --git a/names/jordin.yml b/names/jord.in.yml
index d246042..d246042 100644
--- a/names/jordin.yml
+++ b/names/jord.in.yml
diff --git a/names/joselito.yml b/names/joseli.to.yml
index 90c2d67..90c2d67 100644
--- a/names/joselito.yml
+++ b/names/joseli.to.yml
diff --git a/names/josh.ua.yml b/names/josh.ua.yml
new file mode 100644
index 0000000..8c04dae
--- /dev/null
+++ b/names/josh.ua.yml
@@ -0,0 +1,4 @@
+domain: josh.ua
+name: Joshua Bell
+title: 'Software Engineer (full-stack): mobile, web, blockchain.'
+github: joshuabell
diff --git a/names/joshua.yml b/names/joshua.yml
deleted file mode 100644
index 91f116a..0000000
--- a/names/joshua.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-domain: josh.ua
-name: Joshua Bell
-title: "Software Engineer (full-stack): mobile, web, blockchain."
-github: joshuabell
\ No newline at end of file
diff --git a/names/josias.yml b/names/josi.as.yml
index b03472b..b03472b 100644
--- a/names/josias.yml
+++ b/names/josi.as.yml
diff --git a/names/jurre.yml b/names/jur.re.yml
index 63ea843..63ea843 100644
--- a/names/jurre.yml
+++ b/names/jur.re.yml
diff --git a/names/jussi.yml b/names/jus.si.yml
index eaa9df7..eaa9df7 100644
--- a/names/jussi.yml
+++ b/names/jus.si.yml
diff --git a/names/juuso.yml b/names/juu.so.yml
index 7103e52..7103e52 100644
--- a/names/juuso.yml
+++ b/names/juu.so.yml
diff --git a/names/kage.yml b/names/ka.ge.yml
index a6e999b..a6e999b 100644
--- a/names/kage.yml
+++ b/names/ka.ge.yml
diff --git a/names/kacee.yml b/names/kac.ee.yml
index d6abc11..d6abc11 100644
--- a/names/kacee.yml
+++ b/names/kac.ee.yml
diff --git a/names/kamal.yml b/names/kam.al.yml
index fe12267..fe12267 100644
--- a/names/kamal.yml
+++ b/names/kam.al.yml
diff --git a/names/karch.yml b/names/kar.ch.yml
index e1c9e45..e1c9e45 100644
--- a/names/karch.yml
+++ b/names/kar.ch.yml
diff --git a/names/karla.yml b/names/kar.la.yml
index e53d17e..e53d17e 100644
--- a/names/karla.yml
+++ b/names/kar.la.yml
diff --git a/names/kathie.yml b/names/kath.ie.yml
index d7138d2..d7138d2 100644
--- a/names/kathie.yml
+++ b/names/kath.ie.yml
diff --git a/names/kathrin.yml b/names/kathr.in.yml
index 33a897e..33a897e 100644
--- a/names/kathrin.yml
+++ b/names/kathr.in.yml
diff --git a/names/kaylie.yml b/names/kayl.ie.yml
index 33de8c4..33de8c4 100644
--- a/names/kaylie.yml
+++ b/names/kayl.ie.yml
diff --git a/names/keanu.yml b/names/kea.nu.yml
index 8533a46..8533a46 100644
--- a/names/keanu.yml
+++ b/names/kea.nu.yml
diff --git a/names/keelin.yml b/names/keel.in.yml
index 9e90b4c..9e90b4c 100644
--- a/names/keelin.yml
+++ b/names/keel.in.yml
diff --git a/names/kehinde.yml b/names/kehin.de.yml
index 0233395..0233395 100644
--- a/names/kehinde.yml
+++ b/names/kehin.de.yml
diff --git a/names/kerwin.yml b/names/kerw.in.yml
index 2ce2947..2ce2947 100644
--- a/names/kerwin.yml
+++ b/names/kerw.in.yml
diff --git a/names/kevin.yml b/names/kev.in.yml
index 81d0677..81d0677 100644
--- a/names/kevin.yml
+++ b/names/kev.in.yml
diff --git a/names/khalid.yml b/names/khal.id.yml
index 3bc109b..3bc109b 100644
--- a/names/khalid.yml
+++ b/names/khal.id.yml
diff --git a/names/klaas.yml b/names/kla.as.yml
index 92bc784..92bc784 100644
--- a/names/klaas.yml
+++ b/names/kla.as.yml
diff --git a/names/krasovsky.yml b/names/krasovs.ky.yml
index bc35131..bc35131 100644
--- a/names/krasovsky.yml
+++ b/names/krasovs.ky.yml
diff --git a/names/krystal.yml b/names/kryst.al.yml
index 5b39ea6..5b39ea6 100644
--- a/names/krystal.yml
+++ b/names/kryst.al.yml
diff --git a/names/krystin.yml b/names/kryst.in.yml
index 80df5dc..80df5dc 100644
--- a/names/krystin.yml
+++ b/names/kryst.in.yml
diff --git a/names/kurtis.yml b/names/kurt.is.yml
index eccc6ca..eccc6ca 100644
--- a/names/kurtis.yml
+++ b/names/kurt.is.yml
diff --git a/names/kwame.yml b/names/kwa.me.yml
index 1ec19b9..1ec19b9 100644
--- a/names/kwame.yml
+++ b/names/kwa.me.yml
diff --git a/names/kyla.yml b/names/ky.la.yml
index cdbc14b..cdbc14b 100644
--- a/names/kyla.yml
+++ b/names/ky.la.yml
diff --git a/names/laksh.yml b/names/lak.sh.yml
index a66d183..a66d183 100644
--- a/names/laksh.yml
+++ b/names/lak.sh.yml
diff --git a/names/laurie.yml b/names/laur.ie.yml
index 5d19923..5d19923 100644
--- a/names/laurie.yml
+++ b/names/laur.ie.yml
diff --git a/names/leonie.yml b/names/leon.ie.yml
index 158e19f..158e19f 100644
--- a/names/leonie.yml
+++ b/names/leon.ie.yml
diff --git a/names/lillis.yml b/names/lill.is.yml
index 896c075..896c075 100644
--- a/names/lillis.yml
+++ b/names/lill.is.yml
diff --git a/names/lorin.yml b/names/lor.in.yml
index 21cc590..21cc590 100644
--- a/names/lorin.yml
+++ b/names/lor.in.yml
diff --git a/names/louie.yml b/names/lou.ie.yml
index 2769f3a..2769f3a 100644
--- a/names/louie.yml
+++ b/names/lou.ie.yml
diff --git a/names/louise.yml b/names/loui.se.yml
index 41a9b3a..41a9b3a 100644
--- a/names/louise.yml
+++ b/names/loui.se.yml
diff --git a/names/luis.yml b/names/lu.is.yml
index 6a56d66..6a56d66 100644
--- a/names/luis.yml
+++ b/names/lu.is.yml
diff --git a/names/luke.yml b/names/lu.ke.yml
index fa9f7ba..fa9f7ba 100644
--- a/names/luke.yml
+++ b/names/lu.ke.yml
diff --git a/names/luuk.yml b/names/lu.uk.yml
index 106073f..106073f 100644
--- a/names/luuk.yml
+++ b/names/lu.uk.yml
diff --git a/names/lucila.yml b/names/luci.la.yml
index 9913d09..9913d09 100644
--- a/names/lucila.yml
+++ b/names/luci.la.yml
diff --git a/names/lukas.yml b/names/luk.as.yml
index 4039cc1..4039cc1 100644
--- a/names/lukas.yml
+++ b/names/luk.as.yml
diff --git a/names/manu.yml b/names/ma.nu.yml
index 9de9467..9de9467 100644
--- a/names/manu.yml
+++ b/names/ma.nu.yml
diff --git a/names/matt.yml b/names/ma.tt.yml
index 3704c00..3704c00 100644
--- a/names/matt.yml
+++ b/names/ma.tt.yml
diff --git a/names/maclin.yml b/names/macl.in.yml
index 1f81754..1f81754 100644
--- a/names/maclin.yml
+++ b/names/macl.in.yml
diff --git a/names/macrae.yml b/names/macr.ae.yml
index e49827e..e49827e 100644
--- a/names/macrae.yml
+++ b/names/macr.ae.yml
diff --git a/names/majid.yml b/names/maj.id.yml
index 6d2f86e..6d2f86e 100644
--- a/names/majid.yml
+++ b/names/maj.id.yml
diff --git a/names/maksim.yml b/names/maks.im.yml
index 24ec7e1..24ec7e1 100644
--- a/names/maksim.yml
+++ b/names/maks.im.yml
diff --git a/names/malkin.yml b/names/malk.in.yml
index 9c8e0ea..9c8e0ea 100644
--- a/names/malkin.yml
+++ b/names/malk.in.yml
diff --git a/names/malvin.yml b/names/malv.in.yml
index 31e5a40..31e5a40 100644
--- a/names/malvin.yml
+++ b/names/malv.in.yml
diff --git a/names/manning.yml b/names/manni.ng.yml
index 3ec52d8..3ec52d8 100644
--- a/names/manning.yml
+++ b/names/manni.ng.yml
diff --git a/names/marly.yml b/names/mar.ly.yml
index 1d39d0f..1d39d0f 100644
--- a/names/marly.yml
+++ b/names/mar.ly.yml
diff --git a/names/marcelino.yml b/names/marceli.no.yml
index 80ac105..80ac105 100644
--- a/names/marcelino.yml
+++ b/names/marceli.no.yml
diff --git a/names/marciano.yml b/names/marcia.no.yml
index 769ac9a..769ac9a 100644
--- a/names/marciano.yml
+++ b/names/marcia.no.yml
diff --git a/names/mareli.yml b/names/mare.li.yml
index b94662c..b94662c 100644
--- a/names/mareli.yml
+++ b/names/mare.li.yml
diff --git a/names/markus.yml b/names/mark.us.yml
index 3995030..3995030 100644
--- a/names/markus.yml
+++ b/names/mark.us.yml
diff --git a/names/matias.yml b/names/mati.as.yml
index 616b592..616b592 100644
--- a/names/matias.yml
+++ b/names/mati.as.yml
diff --git a/names/mauro.yml b/names/mau.ro.yml
index 8ba78cf..8ba78cf 100644
--- a/names/mauro.yml
+++ b/names/mau.ro.yml
diff --git a/names/mauricio.yml b/names/mauric.io.yml
index 7ba90ce..7ba90ce 100644
--- a/names/mauricio.yml
+++ b/names/mauric.io.yml
diff --git a/names/mcguire.yml b/names/mcgui.re.yml
index 4344aee..4344aee 100644
--- a/names/mcguire.yml
+++ b/names/mcgui.re.yml
diff --git a/names/melanie.yml b/names/melan.ie.yml
index 5218dd8..5218dd8 100644
--- a/names/melanie.yml
+++ b/names/melan.ie.yml
diff --git a/names/merrin.yml b/names/merr.in.yml
index 2a3fd20..2a3fd20 100644
--- a/names/merrin.yml
+++ b/names/merr.in.yml
diff --git a/names/mikayla.yml b/names/mikay.la.yml
index 8dce022..8dce022 100644
--- a/names/mikayla.yml
+++ b/names/mikay.la.yml
diff --git a/names/milagres.yml b/names/milagr.es.yml
index e1d07d6..e1d07d6 100644
--- a/names/milagres.yml
+++ b/names/milagr.es.yml
diff --git a/names/millar.yml b/names/mill.ar.yml
index 2451178..2451178 100644
--- a/names/millar.yml
+++ b/names/mill.ar.yml
diff --git a/names/millais.yml b/names/milla.is.yml
index cbe05cf..cbe05cf 100644
--- a/names/millais.yml
+++ b/names/milla.is.yml
diff --git a/names/minato.yml b/names/mina.to.yml
index a45a456..a45a456 100644
--- a/names/minato.yml
+++ b/names/mina.to.yml
diff --git a/names/missy.yml b/names/mis.sy.yml
index a617489..a617489 100644
--- a/names/missy.yml
+++ b/names/mis.sy.yml
diff --git a/names/mohammad.yml b/names/mohamm.ad.yml
index 667d932..667d932 100644
--- a/names/mohammad.yml
+++ b/names/mohamm.ad.yml
diff --git a/names/monica.yml b/names/moni.ca.yml
index 3563500..3563500 100644
--- a/names/monica.yml
+++ b/names/moni.ca.yml
diff --git a/names/muhsin.yml b/names/muhs.in.yml
index 75740bb..75740bb 100644
--- a/names/muhsin.yml
+++ b/names/muhs.in.yml
diff --git a/names/nadim.yml b/names/nad.im.yml
index a6ff164..a6ff164 100644
--- a/names/nadim.yml
+++ b/names/nad.im.yml
diff --git a/names/naftali.yml b/names/nafta.li.yml
index bcf044a..bcf044a 100644
--- a/names/naftali.yml
+++ b/names/nafta.li.yml
diff --git a/names/nando.yml b/names/nan.do.yml
index ac5252e..ac5252e 100644
--- a/names/nando.yml
+++ b/names/nan.do.yml
diff --git a/names/nardo.yml b/names/nar.do.yml
index 682b7ed..682b7ed 100644
--- a/names/nardo.yml
+++ b/names/nar.do.yml
diff --git a/names/nathalie.yml b/names/nathal.ie.yml
index ca2cc4f..ca2cc4f 100644
--- a/names/nathalie.yml
+++ b/names/nathal.ie.yml
diff --git a/names/naval.yml b/names/nav.al.yml
index 9a2a828..9a2a828 100644
--- a/names/naval.yml
+++ b/names/nav.al.yml
diff --git a/names/navarro.yml b/names/navar.ro.yml
index 0363aeb..0363aeb 100644
--- a/names/navarro.yml
+++ b/names/navar.ro.yml
diff --git a/names/nestore.yml b/names/nesto.re.yml
index a0084dd..a0084dd 100644
--- a/names/nestore.yml
+++ b/names/nesto.re.yml
diff --git a/names/nils.yml b/names/ni.ls.yml
index 2fcaa89..2fcaa89 100644
--- a/names/nils.yml
+++ b/names/ni.ls.yml
diff --git a/names/nicasio.yml b/names/nicas.io.yml
index 67c5099..67c5099 100644
--- a/names/nicasio.yml
+++ b/names/nicas.io.yml
diff --git a/names/nichola.yml b/names/nicho.la.yml
index 97d7517..97d7517 100644
--- a/names/nichola.yml
+++ b/names/nicho.la.yml
diff --git a/names/nickolas.yml b/names/nickol.as.yml
index ee06ec7..ee06ec7 100644
--- a/names/nickolas.yml
+++ b/names/nickol.as.yml
diff --git a/names/niels.yml b/names/nie.ls.yml
index c52095d..c52095d 100644
--- a/names/niels.yml
+++ b/names/nie.ls.yml
diff --git a/names/nihal.yml b/names/nih.al.yml
index ea3e09f..ea3e09f 100644
--- a/names/nihal.yml
+++ b/names/nih.al.yml
diff --git a/names/nihar.yml b/names/nih.ar.yml
index f2e230a..736a159 100644
--- a/names/nihar.yml
+++ b/names/nih.ar.yml
@@ -1,4 +1,4 @@
 domain: nih.ar
 name: Nihar Samantaray
-email: hello@nihars.com
 title: Yet another hobbyist systems programmer
+email: hello@nihars.com
diff --git a/names/nihaal.yml b/names/niha.al.yml
index fe15620..fe15620 100644
--- a/names/nihaal.yml
+++ b/names/niha.al.yml
diff --git a/names/nikolai.yml b/names/nikol.ai.yml
index 5fae753..5fae753 100644
--- a/names/nikolai.yml
+++ b/names/nikol.ai.yml
diff --git a/names/nitai.yml b/names/nit.ai.yml
index 8dd317b..8dd317b 100644
--- a/names/nitai.yml
+++ b/names/nit.ai.yml
diff --git a/names/odilio.yml b/names/odil.io.yml
index da9acab..da9acab 100644
--- a/names/odilio.yml
+++ b/names/odil.io.yml
diff --git a/names/ollie.yml b/names/oll.ie.yml
index 7bb7fb2..7bb7fb2 100644
--- a/names/ollie.yml
+++ b/names/oll.ie.yml
diff --git a/names/pedro.yml b/names/ped.ro.yml
index f04796c..f04796c 100644
--- a/names/pedro.yml
+++ b/names/ped.ro.yml
diff --git a/names/perris.yml b/names/perr.is.yml
index b2a7889..b2a7889 100644
--- a/names/perris.yml
+++ b/names/perr.is.yml
diff --git a/names/petras.yml b/names/petr.as.yml
index e74ae94..e74ae94 100644
--- a/names/petras.yml
+++ b/names/petr.as.yml
diff --git a/names/phelps.yml b/names/phel.ps.yml
index 793bb97..793bb97 100644
--- a/names/phelps.yml
+++ b/names/phel.ps.yml
diff --git a/names/philipe.yml b/names/phili.pe.yml
index 9cf3349..9cf3349 100644
--- a/names/philipe.yml
+++ b/names/phili.pe.yml
diff --git a/names/pratt.yml b/names/pra.tt.yml
index 76866a4..76866a4 100644
--- a/names/pratt.yml
+++ b/names/pra.tt.yml
diff --git a/names/pratham.yml b/names/prath.am.yml
index dffa950..dffa950 100644
--- a/names/pratham.yml
+++ b/names/prath.am.yml
diff --git a/names/prescott.yml b/names/presco.tt.yml
index fcbbcf0..fcbbcf0 100644
--- a/names/prescott.yml
+++ b/names/presco.tt.yml
diff --git a/names/priscilla.yml b/names/priscil.la.yml
index df0ebef..df0ebef 100644
--- a/names/priscilla.yml
+++ b/names/priscil.la.yml
diff --git a/names/pyke.yml b/names/py.ke.yml
index 09585ea..09585ea 100644
--- a/names/pyke.yml
+++ b/names/py.ke.yml
diff --git a/names/qasim.yml b/names/qas.im.yml
index ee9d472..ee9d472 100644
--- a/names/qasim.yml
+++ b/names/qas.im.yml
diff --git a/names/rabbi.yml b/names/rab.bi.yml
index 3eaa33d..3eaa33d 100644
--- a/names/rabbi.yml
+++ b/names/rab.bi.yml
diff --git a/names/rafal.yml b/names/raf.al.yml
index 7ff8908..7ff8908 100644
--- a/names/rafal.yml
+++ b/names/raf.al.yml
diff --git a/names/rahim.yml b/names/rah.im.yml
index 5ed9734..5ed9734 100644
--- a/names/rahim.yml
+++ b/names/rah.im.yml
diff --git a/names/rasmus.yml b/names/rasm.us.yml
index 97320c9..97320c9 100644
--- a/names/rasmus.yml
+++ b/names/rasm.us.yml
diff --git a/names/renato.yml b/names/rena.to.yml
index 10eb538..10eb538 100644
--- a/names/renato.yml
+++ b/names/rena.to.yml
diff --git a/names/ricardo.yml b/names/ricar.do.yml
index 2054c4b..2054c4b 100644
--- a/names/ricardo.yml
+++ b/names/ricar.do.yml
diff --git a/names/riccardo.yml b/names/riccar.do.yml
index 66a5e51..66a5e51 100644
--- a/names/riccardo.yml
+++ b/names/riccar.do.yml
diff --git a/names/rivers.yml b/names/rive.rs.yml
index 3fc36e4..3fc36e4 100644
--- a/names/rivers.yml
+++ b/names/rive.rs.yml
diff --git a/names/rodolfo.yml b/names/rodol.fo.yml
index 9c9f07d..9c9f07d 100644
--- a/names/rodolfo.yml
+++ b/names/rodol.fo.yml
diff --git a/names/rogelio.yml b/names/rogel.io.yml
index 5fd9d66..5fd9d66 100644
--- a/names/rogelio.yml
+++ b/names/rogel.io.yml
diff --git a/names/rolando.yml b/names/rolan.do.yml
index 1061e97..1061e97 100644
--- a/names/rolando.yml
+++ b/names/rolan.do.yml
diff --git a/names/roope.yml b/names/roo.pe.yml
index 0a60fd0..0a60fd0 100644
--- a/names/roope.yml
+++ b/names/roo.pe.yml
diff --git a/names/ruhee.yml b/names/ruh.ee.yml
index 9583720..9583720 100644
--- a/names/ruhee.yml
+++ b/names/ruh.ee.yml
diff --git a/names/sai.yml b/names/s.ai.yml
index c1728cd..1c61112 100644
--- a/names/sai.yml
+++ b/names/s.ai.yml
@@ -1,6 +1,6 @@
 domain: s.ai
 name: Sai
-github: saizai
 title: mononymous doer of many things
 url: https://s.ai
 email: namehack@s.ai
+github: saizai
diff --git a/names/sahas.yml b/names/sah.as.yml
index e58b4aa..e58b4aa 100644
--- a/names/sahas.yml
+++ b/names/sah.as.yml
diff --git a/names/samal.yml b/names/sam.al.yml
index 817f32d..817f32d 100644
--- a/names/samal.yml
+++ b/names/sam.al.yml
diff --git a/names/saphire.yml b/names/saphi.re.yml
index 3ca78b3..3ca78b3 100644
--- a/names/saphire.yml
+++ b/names/saphi.re.yml
diff --git a/names/sarai.yml b/names/sar.ai.yml
index 8316eee..8316eee 100644
--- a/names/sarai.yml
+++ b/names/sar.ai.yml
diff --git a/names/sarkis.yml b/names/sark.is.yml
index 32fa46c..32fa46c 100644
--- a/names/sarkis.yml
+++ b/names/sark.is.yml
diff --git a/names/scott.yml b/names/sco.tt.yml
index e35c9fd..e35c9fd 100644
--- a/names/scott.yml
+++ b/names/sco.tt.yml
diff --git a/names/selvin.yml b/names/selv.in.yml
index 89b1e3e..89b1e3e 100644
--- a/names/selvin.yml
+++ b/names/selv.in.yml
diff --git a/names/seraphim.yml b/names/seraph.im.yml
index 87b4bc4..87b4bc4 100644
--- a/names/seraphim.yml
+++ b/names/seraph.im.yml
diff --git a/names/sergio.yml b/names/serg.io.yml
index 5671679..5671679 100644
--- a/names/sergio.yml
+++ b/names/serg.io.yml
diff --git a/names/severin.yml b/names/sever.in.yml
index 158443a..158443a 100644
--- a/names/severin.yml
+++ b/names/sever.in.yml
diff --git a/names/shaily.yml b/names/shai.ly.yml
index b71520d..b71520d 100644
--- a/names/shaily.yml
+++ b/names/shai.ly.yml
diff --git a/names/sharla.yml b/names/shar.la.yml
index 049d634..049d634 100644
--- a/names/sharla.yml
+++ b/names/shar.la.yml
diff --git a/names/sherwin.yml b/names/sherw.in.yml
index 71cf530..71cf530 100644
--- a/names/sherwin.yml
+++ b/names/sherw.in.yml
diff --git a/names/shivam.yml b/names/shiv.am.yml
index da7c546..da7c546 100644
--- a/names/shivam.yml
+++ b/names/shiv.am.yml
diff --git a/names/shoval.yml b/names/shov.al.yml
index 47d2a1e..47d2a1e 100644
--- a/names/shoval.yml
+++ b/names/shov.al.yml
diff --git a/names/shyam.yml b/names/shy.am.yml
index c7da3cc..c7da3cc 100644
--- a/names/shyam.yml
+++ b/names/shy.am.yml
diff --git a/names/sima.yml b/names/si.ma.yml
index 8a4b851..8a4b851 100644
--- a/names/sima.yml
+++ b/names/si.ma.yml
diff --git a/names/sigal.yml b/names/sig.al.yml
index 24d1b7d..24d1b7d 100644
--- a/names/sigal.yml
+++ b/names/sig.al.yml
diff --git a/names/silas.yml b/names/sil.as.yml
index 039a734..039a734 100644
--- a/names/silas.yml
+++ b/names/sil.as.yml
diff --git a/names/silje.yml b/names/sil.je.yml
index 7e8284d..7e8284d 100644
--- a/names/silje.yml
+++ b/names/sil.je.yml
diff --git a/names/silvio.yml b/names/silv.io.yml
index ae2a8bf..ae2a8bf 100644
--- a/names/silvio.yml
+++ b/names/silv.io.yml
diff --git a/names/sindre.yml b/names/sind.re.yml
index 142ec90..142ec90 100644
--- a/names/sindre.yml
+++ b/names/sind.re.yml
diff --git a/names/sivers.yml b/names/sive.rs.yml
index 2701e68..00bec96 100644
--- a/names/sivers.yml
+++ b/names/sive.rs.yml
@@ -3,4 +3,4 @@ name: Derek Sivers
 title: Former musician & entrepreneur. Now pluralist author of pop philosophy.
 url: https://sive.rs/
 email: derek@sivers.org
-github: sivers
\ No newline at end of file
+github: sivers
diff --git a/names/soham.yml b/names/soh.am.yml
index 14ca81a..14ca81a 100644
--- a/names/soham.yml
+++ b/names/soh.am.yml
diff --git a/names/sophie.yml b/names/soph.ie.yml
index 8acc8b5..8acc8b5 100644
--- a/names/sophie.yml
+++ b/names/soph.ie.yml
diff --git a/names/stefano.yml b/names/stefa.no.yml
index 23ea740..23ea740 100644
--- a/names/stefano.yml
+++ b/names/stefa.no.yml
diff --git a/names/sukie.yml b/names/suk.ie.yml
index 29be08c..29be08c 100644
--- a/names/sukie.yml
+++ b/names/suk.ie.yml
diff --git a/names/suresh.yml b/names/sure.sh.yml
index b8ccdbb..b8ccdbb 100644
--- a/names/suresh.yml
+++ b/names/sure.sh.yml
diff --git a/names/swithin.yml b/names/swith.in.yml
index 7bae664..7bae664 100644
--- a/names/swithin.yml
+++ b/names/swith.in.yml
diff --git a/names/takala.yml b/names/taka.la.yml
index 23c62bd..23c62bd 100644
--- a/names/takala.yml
+++ b/names/taka.la.yml
diff --git a/names/tanvi.yml b/names/tan.vi.yml
index 622d1ee..622d1ee 100644
--- a/names/tanvi.yml
+++ b/names/tan.vi.yml
diff --git a/names/tancred.yml b/names/tanc.red.yml
index 3a6d5a5..3a6d5a5 100644
--- a/names/tancred.yml
+++ b/names/tanc.red.yml
diff --git a/names/tasnim.yml b/names/tasn.im.yml
index 16e6d87..16e6d87 100644
--- a/names/tasnim.yml
+++ b/names/tasn.im.yml
diff --git a/names/tejas.yml b/names/tej.as.yml
index 77a5b35..77a5b35 100644
--- a/names/tejas.yml
+++ b/names/tej.as.yml
diff --git a/names/terren.yml b/names/ter.ren.yml
index 7dcfe46..7dcfe46 100644
--- a/names/terren.yml
+++ b/names/ter.ren.yml
diff --git a/names/thaddeus.yml b/names/thadde.us.yml
index c10a61b..c10a61b 100644
--- a/names/thaddeus.yml
+++ b/names/thadde.us.yml
diff --git a/names/thames.yml b/names/tham.es.yml
index bcdaaa0..28ae918 100644
--- a/names/thames.yml
+++ b/names/tham.es.yml
@@ -1,6 +1,6 @@
 domain: tham.es
 name: Richard Thames
-url: https://tham.es
 title: Emacs, podcast, and domain name enthusiast
+url: https://tham.es
 email: richard@tham.es
 github: richardthames
diff --git a/names/tiede.yml b/names/tie.de.yml
index bc143c7..bc143c7 100644
--- a/names/tiede.yml
+++ b/names/tie.de.yml
diff --git a/names/travis.yml b/names/trav.is.yml
index 0a89d69..0a89d69 100644
--- a/names/travis.yml
+++ b/names/trav.is.yml
diff --git a/names/trevin.yml b/names/trev.in.yml
index e6db7cb..e6db7cb 100644
--- a/names/trevin.yml
+++ b/names/trev.in.yml
diff --git a/names/tristam.yml b/names/trist.am.yml
index e20d083..e20d083 100644
--- a/names/tristam.yml
+++ b/names/trist.am.yml
diff --git a/names/tylee.yml b/names/tyl.ee.yml
index afbce45..afbce45 100644
--- a/names/tylee.yml
+++ b/names/tyl.ee.yml
diff --git a/names/tyrone.yml b/names/tyr.one.yml
index 90b79e9..90b79e9 100644
--- a/names/tyrone.yml
+++ b/names/tyr.one.yml
diff --git a/names/ullrich.yml b/names/ullri.ch.yml
index 876c2e2..876c2e2 100644
--- a/names/ullrich.yml
+++ b/names/ullri.ch.yml
diff --git a/names/ulysse.yml b/names/ulys.se.yml
index 5856ed6..5856ed6 100644
--- a/names/ulysse.yml
+++ b/names/ulys.se.yml
diff --git a/names/ulysses.yml b/names/ulyss.es.yml
index 3be2629..3be2629 100644
--- a/names/ulysses.yml
+++ b/names/ulyss.es.yml
diff --git a/names/valere.yml b/names/vale.re.yml
index 3d74510..3d74510 100644
--- a/names/valere.yml
+++ b/names/vale.re.yml
diff --git a/names/valerio.yml b/names/valer.io.yml
index ebe4269..ebe4269 100644
--- a/names/valerio.yml
+++ b/names/valer.io.yml
diff --git a/names/vansh.yml b/names/van.sh.yml
index 0877847..0877847 100644
--- a/names/vansh.yml
+++ b/names/van.sh.yml
diff --git a/names/vasili.yml b/names/vasi.li.yml
index 8d16640..8d16640 100644
--- a/names/vasili.yml
+++ b/names/vasi.li.yml
diff --git a/names/veniamin.yml b/names/veniam.in.yml
index 85e77dd..85e77dd 100644
--- a/names/veniamin.yml
+++ b/names/veniam.in.yml
diff --git a/names/vilma.yml b/names/vil.ma.yml
index 14ef97b..14ef97b 100644
--- a/names/vilma.yml
+++ b/names/vil.ma.yml
diff --git a/names/vinnie.yml b/names/vinn.ie.yml
index 1bc6de5..1bc6de5 100644
--- a/names/vinnie.yml
+++ b/names/vinn.ie.yml
diff --git a/names/vuong.yml b/names/vuo.ng.yml
index aabd9e9..aabd9e9 100644
--- a/names/vuong.yml
+++ b/names/vuo.ng.yml
diff --git a/names/walsh.yml b/names/wal.sh.yml
index acb6239..acb6239 100644
--- a/names/walsh.yml
+++ b/names/wal.sh.yml
diff --git a/names/west.yml b/names/we.st.yml
index 8e8aa7d..8e8aa7d 100644
--- a/names/west.yml
+++ b/names/we.st.yml
diff --git a/names/welby.yml b/names/wel.by.yml
index 3c6bb48..3c6bb48 100644
--- a/names/welby.yml
+++ b/names/wel.by.yml
diff --git a/names/witt.yml b/names/wi.tt.yml
index ae42f87..ae42f87 100644
--- a/names/witt.yml
+++ b/names/wi.tt.yml
diff --git a/names/willa.yml b/names/wil.la.yml
index 2d93a96..2d93a96 100644
--- a/names/willa.yml
+++ b/names/wil.la.yml
diff --git a/names/wilkie.yml b/names/wilk.ie.yml
index 5a9a30c..5a9a30c 100644
--- a/names/wilkie.yml
+++ b/names/wilk.ie.yml
diff --git a/names/wilkin.yml b/names/wilk.in.yml
index 26606e2..26606e2 100644
--- a/names/wilkin.yml
+++ b/names/wilk.in.yml
diff --git a/names/william.yml b/names/willi.am.yml
index 1652ea6..1652ea6 100644
--- a/names/william.yml
+++ b/names/willi.am.yml
diff --git a/names/wyatt.yml b/names/wya.tt.yml
index 47048fd..47048fd 100644
--- a/names/wyatt.yml
+++ b/names/wya.tt.yml
diff --git a/names/wylie.yml b/names/wyl.ie.yml
index 90fac74..90fac74 100644
--- a/names/wylie.yml
+++ b/names/wyl.ie.yml
diff --git a/names/xerxes.yml b/names/xerx.es.yml
index 161a37e..161a37e 100644
--- a/names/xerxes.yml
+++ b/names/xerx.es.yml
diff --git a/names/xiola.yml b/names/xio.la.yml
index 4bfdf81..4bfdf81 100644
--- a/names/xiola.yml
+++ b/names/xio.la.yml
diff --git a/names/yamato.yml b/names/yama.to.yml
index bd74d95..bd74d95 100644
--- a/names/yamato.yml
+++ b/names/yama.to.yml
diff --git a/names/yannis.yml b/names/yann.is.yml
index 3648e57..3648e57 100644
--- a/names/yannis.yml
+++ b/names/yann.is.yml
diff --git a/names/yefim.yml b/names/yef.im.yml
index 7fb38d7..7fb38d7 100644
--- a/names/yefim.yml
+++ b/names/yef.im.yml
diff --git a/names/yentl.yml b/names/yen.tl.yml
index 9c7791a..9c7791a 100644
--- a/names/yentl.yml
+++ b/names/yen.tl.yml
diff --git a/names/yuval.yml b/names/yuv.al.yml
index 91e8e84..896e5cd 100644
--- a/names/yuval.yml
+++ b/names/yuv.al.yml
@@ -1,5 +1,5 @@
 domain: yuv.al
 name: Yuval Adam
-email: hello@yuv.al
 title: Full-stack technologist, creator of namehack.club
+email: hello@yuv.al
 github: yuvadm
diff --git a/names/zai.yml b/names/z.ai.yml
index dc79c5e..dc79c5e 100644
--- a/names/zai.yml
+++ b/names/z.ai.yml