diff --git a/data/results/glyphs/GF_Arabic_Core.glyphs b/data/results/glyphs/GF_Arabic_Core.glyphs
index 462ffc1d87..4944fb7926 100644
--- a/data/results/glyphs/GF_Arabic_Core.glyphs
+++ b/data/results/glyphs/GF_Arabic_Core.glyphs
@@ -341,43 +341,43 @@ glyphname = "thousandseparator-ar";
 unicode = 1644;
 },
 {
-glyphname = "zero-persian";
+glyphname = "zeroFarsi-ar";
 unicode = 1776;
 },
 {
-glyphname = "one-persian";
+glyphname = "oneFarsi-ar";
 unicode = 1777;
 },
 {
-glyphname = "two-persian";
+glyphname = "twoFarsi-ar";
 unicode = 1778;
 },
 {
-glyphname = "three-persian";
+glyphname = "threeFarsi-ar";
 unicode = 1779;
 },
 {
-glyphname = "four-persian";
+glyphname = "fourFarsi-ar";
 unicode = 1780;
 },
 {
-glyphname = "five-persian";
+glyphname = "fiveFarsi-ar";
 unicode = 1781;
 },
 {
-glyphname = "six-persian";
+glyphname = "sixFarsi-ar";
 unicode = 1782;
 },
 {
-glyphname = "seven-persian";
+glyphname = "sevenFarsi-ar";
 unicode = 1783;
 },
 {
-glyphname = "eight-persian";
+glyphname = "eightFarsi-ar";
 unicode = 1784;
 },
 {
-glyphname = "nine-persian";
+glyphname = "nineFarsi-ar";
 unicode = 1785;
 },
 {
@@ -621,7 +621,7 @@ glyphname = "hehgoal-ar";
 unicode = 1729;
 },
 {
-glyphname = "yeh-farsi";
+glyphname = "yehFarsi-ar";
 unicode = 1740;
 },
 {
diff --git a/data/results/glyphs/GF_Arabic_Plus.glyphs b/data/results/glyphs/GF_Arabic_Plus.glyphs
index 0fca3f0d90..6b32941da4 100644
--- a/data/results/glyphs/GF_Arabic_Plus.glyphs
+++ b/data/results/glyphs/GF_Arabic_Plus.glyphs
@@ -241,43 +241,43 @@ glyphname = "thousandseparator-ar";
 unicode = 1644;
 },
 {
-glyphname = "zero-persian";
+glyphname = "zeroFarsi-ar";
 unicode = 1776;
 },
 {
-glyphname = "one-persian";
+glyphname = "oneFarsi-ar";
 unicode = 1777;
 },
 {
-glyphname = "two-persian";
+glyphname = "twoFarsi-ar";
 unicode = 1778;
 },
 {
-glyphname = "three-persian";
+glyphname = "threeFarsi-ar";
 unicode = 1779;
 },
 {
-glyphname = "four-persian";
+glyphname = "fourFarsi-ar";
 unicode = 1780;
 },
 {
-glyphname = "five-persian";
+glyphname = "fiveFarsi-ar";
 unicode = 1781;
 },
 {
-glyphname = "six-persian";
+glyphname = "sixFarsi-ar";
 unicode = 1782;
 },
 {
-glyphname = "seven-persian";
+glyphname = "sevenFarsi-ar";
 unicode = 1783;
 },
 {
-glyphname = "eight-persian";
+glyphname = "eightFarsi-ar";
 unicode = 1784;
 },
 {
-glyphname = "nine-persian";
+glyphname = "nineFarsi-ar";
 unicode = 1785;
 },
 {
@@ -625,7 +625,7 @@ glyphname = "ve-ar";
 unicode = 1739;
 },
 {
-glyphname = "yeh-farsi";
+glyphname = "yehFarsi-ar";
 unicode = 1740;
 },
 {
diff --git a/data/results/glyphs/GF_Cyrillic_Core.glyphs b/data/results/glyphs/GF_Cyrillic_Core.glyphs
index fc34097f8a..7253fba359 100644
--- a/data/results/glyphs/GF_Cyrillic_Core.glyphs
+++ b/data/results/glyphs/GF_Cyrillic_Core.glyphs
@@ -401,11 +401,11 @@ glyphname = "Ereversed-cy";
 unicode = 1069;
 },
 {
-glyphname = "Iu-cy";
+glyphname = "Yu-cy";
 unicode = 1070;
 },
 {
-glyphname = "Ia-cy";
+glyphname = "Ya-cy";
 unicode = 1071;
 },
 {
@@ -529,11 +529,11 @@ glyphname = "ereversed-cy";
 unicode = 1101;
 },
 {
-glyphname = "iu-cy";
+glyphname = "yu-cy";
 unicode = 1102;
 },
 {
-glyphname = "ia-cy";
+glyphname = "ya-cy";
 unicode = 1103;
 },
 {
@@ -581,11 +581,11 @@ glyphname = "dzhe-cy";
 unicode = 1119;
 },
 {
-glyphname = "Gheupturn-cy";
+glyphname = "Geupturn-cy";
 unicode = 1168;
 },
 {
-glyphname = "gheupturn-cy";
+glyphname = "geupturn-cy";
 unicode = 1169;
 }
 );
diff --git a/data/results/glyphs/GF_Cyrillic_Plus.glyphs b/data/results/glyphs/GF_Cyrillic_Plus.glyphs
index cc4b7fa66d..e3ee8674c6 100644
--- a/data/results/glyphs/GF_Cyrillic_Plus.glyphs
+++ b/data/results/glyphs/GF_Cyrillic_Plus.glyphs
@@ -57,33 +57,6 @@ name = Regular;
 );
 glyphs = (
 {
-glyphname = "Gestroke-cy.loclBSH";
-layers = (
-{
-layerId = m01;
-width = 600;
-}
-);
-},
-{
-glyphname = "yu-cy.loclBGR";
-layers = (
-{
-layerId = m01;
-width = 600;
-}
-);
-},
-{
-glyphname = "gestroke-cy.loclBSH";
-layers = (
-{
-layerId = m01;
-width = 600;
-}
-);
-},
-{
 glyphname = tugrik;
 unicode = 8366;
 },
@@ -130,6 +103,33 @@ glyphname = hungarumlautcomb;
 unicode = 779;
 },
 {
+glyphname = "gestroke-cy.loclBSH";
+layers = (
+{
+layerId = m01;
+width = 600;
+}
+);
+},
+{
+glyphname = "yu-cy.loclBGR";
+layers = (
+{
+layerId = m01;
+width = 600;
+}
+);
+},
+{
+glyphname = "Gestroke-cy.loclBSH";
+layers = (
+{
+layerId = m01;
+width = 600;
+}
+);
+},
+{
 glyphname = "De-cy.loclBGR";
 layers = (
 {
diff --git a/data/results/glyphs/GF_Greek_AncientMusicalSymbols.glyphs b/data/results/glyphs/GF_Greek_AncientMusicalSymbols.glyphs
index e05f8afd49..8f6440ea58 100644
--- a/data/results/glyphs/GF_Greek_AncientMusicalSymbols.glyphs
+++ b/data/results/glyphs/GF_Greek_AncientMusicalSymbols.glyphs
@@ -49,1268 +49,1268 @@ name = Regular;
 );
 glyphs = (
 {
-glyphname = uni1D200;
-unicode = 119296;
-},
-{
-glyphname = uni1D201;
-unicode = 119297;
+glyphname = "gorgonNeoKato-byzantineMusic";
+unicode = 119029;
 },
 {
-glyphname = uni1D202;
-unicode = 119298;
+glyphname = "klasmaKato-byzantineMusic";
+unicode = 119028;
 },
 {
-glyphname = uni1D203;
-unicode = 119299;
+glyphname = "kentimaNeoKato-byzantineMusic";
+unicode = 119027;
 },
 {
-glyphname = uni1D204;
-unicode = 119300;
+glyphname = "kentimataNeoKato-byzantineMusic";
+unicode = 119026;
 },
 {
-glyphname = uni1D205;
-unicode = 119301;
+glyphname = "kentimaNeoMeso-byzantineMusic";
+unicode = 119025;
 },
 {
-glyphname = uni1D206;
-unicode = 119302;
+glyphname = "kentimataNeoMeso-byzantineMusic";
+unicode = 119024;
 },
 {
-glyphname = uni1D207;
-unicode = 119303;
+glyphname = "arktikoNi-byzantineMusic";
+unicode = 119023;
 },
 {
-glyphname = uni1D208;
-unicode = 119304;
+glyphname = "arktikoZo-byzantineMusic";
+unicode = 119022;
 },
 {
-glyphname = uni1D209;
-unicode = 119305;
+glyphname = "arktikoKe-byzantineMusic";
+unicode = 119021;
 },
 {
-glyphname = uni1D20A;
-unicode = 119306;
+glyphname = "arktikoDi-byzantineMusic";
+unicode = 119020;
 },
 {
-glyphname = uni1D20B;
-unicode = 119307;
+glyphname = "arktikoGa-byzantineMusic";
+unicode = 119019;
 },
 {
-glyphname = uni1D20C;
-unicode = 119308;
+glyphname = "arktikoVou-byzantineMusic";
+unicode = 119018;
 },
 {
-glyphname = uni1D20D;
-unicode = 119309;
+glyphname = "arktikoPa-byzantineMusic";
+unicode = 119017;
 },
 {
-glyphname = uni1D20E;
-unicode = 119310;
+glyphname = "stigma-byzantineMusic";
+unicode = 119016;
 },
 {
-glyphname = uni1D20F;
-unicode = 119311;
+glyphname = "diftoggosOu-byzantineMusic";
+unicode = 119015;
 },
 {
-glyphname = uni1D210;
-unicode = 119312;
+glyphname = "digrammaGg-byzantineMusic";
+unicode = 119014;
 },
 {
-glyphname = uni1D211;
-unicode = 119313;
+glyphname = "simansisArseosTetrasimou-byzantineMusic";
+unicode = 119013;
 },
 {
-glyphname = uni1D212;
-unicode = 119314;
+glyphname = "simansisArseosTrisimou-byzantineMusic";
+unicode = 119012;
 },
 {
-glyphname = uni1D213;
-unicode = 119315;
+glyphname = "simansisArseosDisimou-byzantineMusic";
+unicode = 119011;
 },
 {
-glyphname = uni1D214;
-unicode = 119316;
+glyphname = "simansisArseos-byzantineMusic";
+unicode = 119010;
 },
 {
-glyphname = uni1D215;
-unicode = 119317;
+glyphname = "simansisTheseosTetrasimou-byzantineMusic";
+unicode = 119009;
 },
 {
-glyphname = uni1D216;
-unicode = 119318;
+glyphname = "simansisTheseosTrisimou-byzantineMusic";
+unicode = 119008;
 },
 {
-glyphname = uni1D217;
-unicode = 119319;
+glyphname = "simansisTheseosDisimou-byzantineMusic";
+unicode = 119007;
 },
 {
-glyphname = uni1D218;
-unicode = 119320;
+glyphname = "simansisTheseos-byzantineMusic";
+unicode = 119006;
 },
 {
-glyphname = uni1D219;
-unicode = 119321;
+glyphname = "diastoliTheseos-byzantineMusic";
+unicode = 119005;
 },
 {
-glyphname = uni1D21A;
-unicode = 119322;
+glyphname = "diastoliDipli-byzantineMusic";
+unicode = 119004;
 },
 {
-glyphname = uni1D21B;
-unicode = 119323;
+glyphname = "diastoliApliMegali-byzantineMusic";
+unicode = 119003;
 },
 {
-glyphname = uni1D21C;
-unicode = 119324;
+glyphname = "diastoliApliMikri-byzantineMusic";
+unicode = 119002;
 },
 {
-glyphname = uni1D21D;
-unicode = 119325;
+glyphname = "genikiYfesis-byzantineMusic";
+unicode = 119001;
 },
 {
-glyphname = uni1D21E;
-unicode = 119326;
+glyphname = "genikiDiesis-byzantineMusic";
+unicode = 119000;
 },
 {
-glyphname = uni1D21F;
-unicode = 119327;
+glyphname = "yfesisTrigrammosOktoDodekata-byzantineMusic";
+unicode = 118999;
 },
 {
-glyphname = uni1D220;
-unicode = 119328;
+glyphname = "yfesisDigrammosExDodekata-byzantineMusic";
+unicode = 118998;
 },
 {
-glyphname = uni1D221;
-unicode = 119329;
+glyphname = "yfesisMonogrammosTesseraDodekata-byzantineMusic";
+unicode = 118997;
 },
 {
-glyphname = uni1D222;
-unicode = 119330;
+glyphname = "yfesisApliDyoDodekata-byzantineMusic";
+unicode = 118996;
 },
 {
-glyphname = uni1D223;
-unicode = 119331;
+glyphname = "diesisTrigrammosOktoDodekata-byzantineMusic";
+unicode = 118995;
 },
 {
-glyphname = uni1D224;
-unicode = 119332;
+glyphname = "diesisDigrammosExDodekata-byzantineMusic";
+unicode = 118994;
 },
 {
-glyphname = uni1D225;
-unicode = 119333;
+glyphname = "diesisMonogrammosTesseraDodekata-byzantineMusic";
+unicode = 118993;
 },
 {
-glyphname = uni1D226;
-unicode = 119334;
+glyphname = "diesisApliDyoDodekata-byzantineMusic";
+unicode = 118992;
 },
 {
-glyphname = uni1D227;
-unicode = 119335;
+glyphname = "diesisTetartimorion-byzantineMusic";
+unicode = 118991;
 },
 {
-glyphname = uni1D228;
-unicode = 119336;
+glyphname = "diesisTritimorion-byzantineMusic";
+unicode = 118990;
 },
 {
-glyphname = uni1D229;
-unicode = 119337;
+glyphname = "yfesisTritimorion-byzantineMusic";
+unicode = 118989;
 },
 {
-glyphname = uni1D22A;
-unicode = 119338;
+glyphname = "fthoraEnarmoniosAntifonia-byzantineMusic";
+unicode = 118988;
 },
 {
-glyphname = uni1D22B;
-unicode = 119339;
+glyphname = "fthoraIYfesisTetartimorion-byzantineMusic";
+unicode = 118987;
 },
 {
-glyphname = uni1D22C;
-unicode = 119340;
+glyphname = "chroaSpathi-byzantineMusic";
+unicode = 118986;
 },
 {
-glyphname = uni1D22D;
-unicode = 119341;
+glyphname = "chroaKliton-byzantineMusic";
+unicode = 118985;
 },
 {
-glyphname = uni1D22E;
-unicode = 119342;
+glyphname = "chroaZygos-byzantineMusic";
+unicode = 118984;
 },
 {
-glyphname = uni1D22F;
-unicode = 119343;
+glyphname = "fthoraNenano-byzantineMusic";
+unicode = 118983;
 },
 {
-glyphname = uni1D230;
-unicode = 119344;
+glyphname = "fthoraSklironChromaSynafi-byzantineMusic";
+unicode = 118982;
 },
 {
-glyphname = uni1D231;
-unicode = 119345;
+glyphname = "fhtoraSklironChromaVasis-byzantineMusic";
+unicode = 118981;
 },
 {
-glyphname = uni1D232;
-unicode = 119346;
+glyphname = "fthoraMalakonChromaMonofonias-byzantineMusic";
+unicode = 118980;
 },
 {
-glyphname = uni1D233;
-unicode = 119347;
+glyphname = "fthoraMalakonChromaDifonias-byzantineMusic";
+unicode = 118979;
 },
 {
-glyphname = uni1D234;
-unicode = 119348;
+glyphname = "fthoraDiatonikiNiAno-byzantineMusic";
+unicode = 118978;
 },
 {
-glyphname = uni1D235;
-unicode = 119349;
+glyphname = "fthoraDiatonikiNiKato-byzantineMusic";
+unicode = 118977;
 },
 {
-glyphname = uni1D236;
-unicode = 119350;
+glyphname = "fthoraDiatonikiZo-byzantineMusic";
+unicode = 118976;
 },
 {
-glyphname = uni1D237;
-unicode = 119351;
+glyphname = "fthoraDiatonikiKe-byzantineMusic";
+unicode = 118975;
 },
 {
-glyphname = uni1D238;
-unicode = 119352;
+glyphname = "fthoraSklironDiatononDi-byzantineMusic";
+unicode = 118974;
 },
 {
-glyphname = uni1D239;
-unicode = 119353;
+glyphname = "fthoraDiatonikiDi-byzantineMusic";
+unicode = 118973;
 },
 {
-glyphname = uni1D23A;
-unicode = 119354;
+glyphname = "fthoraNaosIchos-byzantineMusic";
+unicode = 118972;
 },
 {
-glyphname = uni1D23B;
-unicode = 119355;
+glyphname = "fthoraDiatonikiNana-byzantineMusic";
+unicode = 118971;
 },
 {
-glyphname = uni1D23C;
-unicode = 119356;
+glyphname = "fthoraDiatonikiPa-byzantineMusic";
+unicode = 118970;
 },
 {
-glyphname = uni1D23D;
-unicode = 119357;
+glyphname = "fthoraArchaionDeyterouIchou-byzantineMusic";
+unicode = 118969;
 },
 {
-glyphname = uni1D23E;
-unicode = 119358;
+glyphname = "imifthoron-byzantineMusic";
+unicode = 118968;
 },
 {
-glyphname = uni1D23F;
-unicode = 119359;
+glyphname = "imifonon-byzantineMusic";
+unicode = 118967;
 },
 {
-glyphname = uni1D240;
-unicode = 119360;
+glyphname = "enarxisKaiFthoraVou-byzantineMusic";
+unicode = 118966;
 },
 {
-glyphname = uni1D241;
-unicode = 119361;
+glyphname = "gorthmikonNDiploun-byzantineMusic";
+unicode = 118965;
 },
 {
-glyphname = uni1D242;
-unicode = 119362;
+glyphname = "gorthmikonNAploun-byzantineMusic";
+unicode = 118964;
 },
 {
-glyphname = uni1D243;
-unicode = 119363;
+glyphname = "martyriaPlagiosTetartosIchos-byzantineMusic";
+unicode = 118963;
 },
 {
-glyphname = uni1D244;
-unicode = 119364;
+glyphname = "martyriaProtovarysIchos-byzantineMusic";
+unicode = 118962;
 },
 {
-glyphname = uni1D245;
-unicode = 119365;
+glyphname = "martyriaVarysIchos-byzantineMusic";
+unicode = 118961;
 },
 {
-glyphname = "psili-byzantineMusic";
-unicode = 118784;
+glyphname = "fanerosisDifonias-byzantineMusic";
+unicode = 118960;
 },
 {
-glyphname = "daseia-byzantineMusic";
-unicode = 118785;
+glyphname = "fanerosisMonofonias-byzantineMusic";
+unicode = 118959;
 },
 {
-glyphname = "perispomeni-byzantineMusic";
-unicode = 118786;
+glyphname = "fanerosisTetrafonias-byzantineMusic";
+unicode = 118958;
 },
 {
-glyphname = "oxeiaEkfonitikon-byzantineMusic";
-unicode = 118787;
+glyphname = "apostrofoiTelousIchimatos-byzantineMusic";
+unicode = 118957;
 },
 {
-glyphname = "oxeiaDipli-byzantineMusic";
-unicode = 118788;
+glyphname = "isakiaTelousIchimatos-byzantineMusic";
+unicode = 118956;
 },
 {
-glyphname = "vareiaEkfonitikon-byzantineMusic";
-unicode = 118789;
+glyphname = "martyriaPlagiosIchos-byzantineMusic";
+unicode = 118955;
 },
 {
-glyphname = "vareiaDipli-byzantineMusic";
-unicode = 118790;
+glyphname = "martyriaLegetosIchos-byzantineMusic";
+unicode = 118954;
 },
 {
-glyphname = "kathisti-byzantineMusic";
-unicode = 118791;
+glyphname = "martyriaTetartosLegetosIchos-byzantineMusic";
+unicode = 118953;
 },
 {
-glyphname = "syrmatiki-byzantineMusic";
-unicode = 118792;
+glyphname = "martyriaTetartosIchos-byzantineMusic";
+unicode = 118952;
 },
 {
-glyphname = "paraklitiki-byzantineMusic";
-unicode = 118793;
+glyphname = "martyriaTrifonias-byzantineMusic";
+unicode = 118951;
 },
 {
-glyphname = "ypokrisis-byzantineMusic";
-unicode = 118794;
+glyphname = "martyriaTritosIchos-byzantineMusic";
+unicode = 118950;
 },
 {
-glyphname = "ypokrisisDipli-byzantineMusic";
-unicode = 118795;
+glyphname = "martyriaAlliDeyterosIchos-byzantineMusic";
+unicode = 118949;
 },
 {
-glyphname = "kremasti-byzantineMusic";
-unicode = 118796;
+glyphname = "martyriaDeyterosIchos-byzantineMusic";
+unicode = 118948;
 },
 {
-glyphname = "apesoEkfonitikon-byzantineMusic";
-unicode = 118797;
+glyphname = "martyriaAlliProtosIchos-byzantineMusic";
+unicode = 118947;
 },
 {
-glyphname = "exoEkfonitikon-byzantineMusic";
-unicode = 118798;
+glyphname = "martyriaProtosIchos-byzantineMusic";
+unicode = 118946;
 },
 {
-glyphname = "teleia-byzantineMusic";
-unicode = 118799;
+glyphname = "agogiPoliGorgi-byzantineMusic";
+unicode = 118945;
 },
 {
-glyphname = "kentimata-byzantineMusic";
-unicode = 118800;
+glyphname = "agogiGorgoteri-byzantineMusic";
+unicode = 118944;
 },
 {
-glyphname = "apostrofos-byzantineMusic";
-unicode = 118801;
+glyphname = "agogiGorgi-byzantineMusic";
+unicode = 118943;
 },
 {
-glyphname = "apostrofosDipli-byzantineMusic";
-unicode = 118802;
+glyphname = "agogiMesi-byzantineMusic";
+unicode = 118942;
 },
 {
-glyphname = "synevma-byzantineMusic";
-unicode = 118803;
+glyphname = "agogiMetria-byzantineMusic";
+unicode = 118941;
 },
 {
-glyphname = "thita-byzantineMusic";
-unicode = 118804;
+glyphname = "agogiArgi-byzantineMusic";
+unicode = 118940;
 },
 {
-glyphname = "oligonArchaion-byzantineMusic";
-unicode = 118805;
+glyphname = "agogiArgoteri-byzantineMusic";
+unicode = 118939;
 },
 {
-glyphname = "gorgonArchaion-byzantineMusic";
-unicode = 118806;
+glyphname = "agogiPoliArgi-byzantineMusic";
+unicode = 118938;
 },
 {
-glyphname = "psilon-byzantineMusic";
-unicode = 118807;
+glyphname = "diargon-byzantineMusic";
+unicode = 118937;
 },
 {
-glyphname = "chamilon-byzantineMusic";
-unicode = 118808;
+glyphname = "imidiargon-byzantineMusic";
+unicode = 118936;
 },
 {
-glyphname = "vathy-byzantineMusic";
-unicode = 118809;
+glyphname = "argon-byzantineMusic";
+unicode = 118935;
 },
 {
-glyphname = "isonArchaion-byzantineMusic";
-unicode = 118810;
+glyphname = "trigorgon-byzantineMusic";
+unicode = 118934;
 },
 {
-glyphname = "kentimaArchaion-byzantineMusic";
-unicode = 118811;
+glyphname = "digorgonParestigmenonDexia-byzantineMusic";
+unicode = 118933;
 },
 {
-glyphname = "kentimataArchaion-byzantineMusic";
-unicode = 118812;
+glyphname = "digorgonParestigmenonAristeraAno-byzantineMusic";
+unicode = 118932;
 },
 {
-glyphname = "saximata-byzantineMusic";
-unicode = 118813;
+glyphname = "digorgonParestigmenonAristeraKato-byzantineMusic";
+unicode = 118931;
 },
 {
-glyphname = "parichon-byzantineMusic";
-unicode = 118814;
+glyphname = "digorgon-byzantineMusic";
+unicode = 118930;
 },
 {
-glyphname = "stavrosApodexia-byzantineMusic";
-unicode = 118815;
+glyphname = "gorgonParestigmenonDexia-byzantineMusic";
+unicode = 118929;
 },
 {
-glyphname = "oxeiaiArchaion-byzantineMusic";
-unicode = 118816;
+glyphname = "gorgonParestigmenonAristera-byzantineMusic";
+unicode = 118928;
 },
 {
-glyphname = "vareiaiArchaion-byzantineMusic";
-unicode = 118817;
+glyphname = "gorgonNeoAno-byzantineMusic";
+unicode = 118927;
 },
 {
-glyphname = "apodermaArchaion-byzantineMusic";
-unicode = 118818;
+glyphname = "leimmaImiseosChronou-byzantineMusic";
+unicode = 118926;
 },
 {
-glyphname = "apothema-byzantineMusic";
-unicode = 118819;
+glyphname = "leimmaTessaronChronon-byzantineMusic";
+unicode = 118925;
 },
 {
-glyphname = "klasma-byzantineMusic";
-unicode = 118820;
+glyphname = "leimmaTrionChronon-byzantineMusic";
+unicode = 118924;
 },
 {
-glyphname = "revma-byzantineMusic";
-unicode = 118821;
+glyphname = "leimmaDyoChronon-byzantineMusic";
+unicode = 118923;
 },
 {
-glyphname = "piasmaArchaion-byzantineMusic";
-unicode = 118822;
+glyphname = "leimmaEnosChronou-byzantineMusic";
+unicode = 118922;
 },
 {
-glyphname = "tinagma-byzantineMusic";
-unicode = 118823;
+glyphname = "koronis-byzantineMusic";
+unicode = 118921;
 },
 {
-glyphname = "anatrichisma-byzantineMusic";
-unicode = 118824;
+glyphname = "tetrapli-byzantineMusic";
+unicode = 118920;
 },
 {
-glyphname = "seisma-byzantineMusic";
-unicode = 118825;
+glyphname = "tripli-byzantineMusic";
+unicode = 118919;
 },
 {
-glyphname = "synagmaArchaion-byzantineMusic";
-unicode = 118826;
+glyphname = "dipli-byzantineMusic";
+unicode = 118918;
 },
 {
-glyphname = "synagmaMetaStavrou-byzantineMusic";
-unicode = 118827;
+glyphname = "apli-byzantineMusic";
+unicode = 118917;
 },
 {
-glyphname = "oyranismaArchaion-byzantineMusic";
-unicode = 118828;
+glyphname = "apodermaNeo-byzantineMusic";
+unicode = 118916;
 },
 {
-glyphname = "thema-byzantineMusic";
-unicode = 118829;
+glyphname = "kratimaNeo-byzantineMusic";
+unicode = 118915;
 },
 {
-glyphname = "lemoi-byzantineMusic";
-unicode = 118830;
+glyphname = "kratimaAllo-byzantineMusic";
+unicode = 118914;
 },
 {
-glyphname = "dyo-byzantineMusic";
-unicode = 118831;
+glyphname = "kratimaArchaion-byzantineMusic";
+unicode = 118913;
 },
 {
-glyphname = "tria-byzantineMusic";
-unicode = 118832;
+glyphname = "dipliArchaion-byzantineMusic";
+unicode = 118912;
 },
 {
-glyphname = "tessera-byzantineMusic";
-unicode = 118833;
+glyphname = "klasmaAno-byzantineMusic";
+unicode = 118911;
 },
 {
-glyphname = "kratimata-byzantineMusic";
-unicode = 118834;
+glyphname = "stavros-byzantineMusic";
+unicode = 118910;
 },
 {
-glyphname = "apesoExoNeo-byzantineMusic";
-unicode = 118835;
+glyphname = "yfenAno-byzantineMusic";
+unicode = 118909;
 },
 {
-glyphname = "fthoraArchaion-byzantineMusic";
-unicode = 118836;
+glyphname = "yfenKato-byzantineMusic";
+unicode = 118908;
 },
 {
-glyphname = "imifthora-byzantineMusic";
-unicode = 118837;
+glyphname = "endofonon-byzantineMusic";
+unicode = 118907;
 },
 {
-glyphname = "tromikonArchaion-byzantineMusic";
-unicode = 118838;
+glyphname = "katavasma-byzantineMusic";
+unicode = 118906;
 },
 {
-glyphname = "katavaTromikon-byzantineMusic";
-unicode = 118839;
+glyphname = "thesKaiApothes-byzantineMusic";
+unicode = 118905;
 },
 {
-glyphname = "pelaston-byzantineMusic";
-unicode = 118840;
+glyphname = "themaAploun-byzantineMusic";
+unicode = 118904;
 },
 {
-glyphname = "psifiston-byzantineMusic";
-unicode = 118841;
+glyphname = "thematismosExo-byzantineMusic";
+unicode = 118903;
 },
 {
-glyphname = "kontevma-byzantineMusic";
-unicode = 118842;
+glyphname = "thematismosEso-byzantineMusic";
+unicode = 118902;
 },
 {
-glyphname = "chorevmaArchaion-byzantineMusic";
-unicode = 118843;
+glyphname = "oyranismaNeo-byzantineMusic";
+unicode = 118901;
 },
 {
-glyphname = "rapisma-byzantineMusic";
-unicode = 118844;
+glyphname = "eteronArgosyntheton-byzantineMusic";
+unicode = 118900;
 },
 {
-glyphname = "parakalesmaArchaion-byzantineMusic";
-unicode = 118845;
+glyphname = "argosyntheton-byzantineMusic";
+unicode = 118899;
 },
 {
-glyphname = "paraklitikiArchaion-byzantineMusic";
-unicode = 118846;
+glyphname = "gorgosyntheton-byzantineMusic";
+unicode = 118898;
 },
 {
-glyphname = "ichadin-byzantineMusic";
-unicode = 118847;
+glyphname = "psifistosynagma-byzantineMusic";
+unicode = 118897;
 },
 {
-glyphname = "nana-byzantineMusic";
-unicode = 118848;
+glyphname = "tromikosynagma-byzantineMusic";
+unicode = 118896;
 },
 {
-glyphname = "petasma-byzantineMusic";
-unicode = 118849;
+glyphname = "psifistoparakalesma-byzantineMusic";
+unicode = 118895;
 },
 {
-glyphname = "kontevmaAllo-byzantineMusic";
-unicode = 118850;
+glyphname = "tromikoparakalesma-byzantineMusic";
+unicode = 118894;
 },
 {
-glyphname = "tromikonAllo-byzantineMusic";
-unicode = 118851;
+glyphname = "tromikolygisma-byzantineMusic";
+unicode = 118893;
 },
 {
-glyphname = "straggismata-byzantineMusic";
-unicode = 118852;
+glyphname = "psifistolygisma-byzantineMusic";
+unicode = 118892;
 },
 {
-glyphname = "gronthismata-byzantineMusic";
-unicode = 118853;
+glyphname = "tromikopsifiston-byzantineMusic";
+unicode = 118891;
 },
 {
-glyphname = "isonNeo-byzantineMusic";
-unicode = 118854;
+glyphname = "xironKlasma-byzantineMusic";
+unicode = 118890;
 },
 {
-glyphname = "oligonNeo-byzantineMusic";
-unicode = 118855;
+glyphname = "seismaNeo-byzantineMusic";
+unicode = 118889;
 },
 {
-glyphname = "oxeiaNeo-byzantineMusic";
-unicode = 118856;
+glyphname = "epegerma-byzantineMusic";
+unicode = 118888;
 },
 {
-glyphname = "petasti-byzantineMusic";
-unicode = 118857;
+glyphname = "chorevmaNeo-byzantineMusic";
+unicode = 118887;
 },
 {
-glyphname = "koufisma-byzantineMusic";
-unicode = 118858;
+glyphname = "syrma-byzantineMusic";
+unicode = 118886;
 },
 {
-glyphname = "petastokoufisma-byzantineMusic";
-unicode = 118859;
+glyphname = "synagmaNeo-byzantineMusic";
+unicode = 118885;
 },
 {
-glyphname = "kratimokoufisma-byzantineMusic";
-unicode = 118860;
+glyphname = "ekstrepton-byzantineMusic";
+unicode = 118884;
 },
 {
-glyphname = "pelastonNeo-byzantineMusic";
-unicode = 118861;
+glyphname = "tromikonNeo-byzantineMusic";
+unicode = 118883;
 },
 {
-glyphname = "kentimataNeoAno-byzantineMusic";
-unicode = 118862;
+glyphname = "antikenokylisma-byzantineMusic";
+unicode = 118882;
 },
 {
-glyphname = "kentimaNeoAno-byzantineMusic";
-unicode = 118863;
+glyphname = "kylisma-byzantineMusic";
+unicode = 118881;
 },
 {
-glyphname = "ypsili-byzantineMusic";
-unicode = 118864;
+glyphname = "eteronParakalesma-byzantineMusic";
+unicode = 118880;
 },
 {
-glyphname = "apostrofosNeo-byzantineMusic";
-unicode = 118865;
+glyphname = "parakalesmaNeo-byzantineMusic";
+unicode = 118879;
 },
 {
-glyphname = "apostrofoiSyndesmosNeo-byzantineMusic";
-unicode = 118866;
+glyphname = "paraklitikiNeo-byzantineMusic";
+unicode = 118878;
 },
 {
-glyphname = "yporroi-byzantineMusic";
-unicode = 118867;
+glyphname = "lygisma-byzantineMusic";
+unicode = 118877;
 },
 {
-glyphname = "kratimoyporroon-byzantineMusic";
-unicode = 118868;
+glyphname = "antikenoma-byzantineMusic";
+unicode = 118876;
 },
 {
-glyphname = "elafron-byzantineMusic";
-unicode = 118869;
+glyphname = "omalon-byzantineMusic";
+unicode = 118875;
 },
 {
-glyphname = "chamili-byzantineMusic";
-unicode = 118870;
+glyphname = "psifistonNeo-byzantineMusic";
+unicode = 118874;
 },
 {
-glyphname = "mikronIson-byzantineMusic";
-unicode = 118871;
+glyphname = "piasmaNeo-byzantineMusic";
+unicode = 118873;
 },
 {
 glyphname = "vareiaNeo-byzantineMusic";
 unicode = 118872;
 },
 {
-glyphname = "piasmaNeo-byzantineMusic";
-unicode = 118873;
+glyphname = "mikronIson-byzantineMusic";
+unicode = 118871;
 },
 {
-glyphname = "psifistonNeo-byzantineMusic";
-unicode = 118874;
+glyphname = "chamili-byzantineMusic";
+unicode = 118870;
 },
 {
-glyphname = "omalon-byzantineMusic";
-unicode = 118875;
+glyphname = "elafron-byzantineMusic";
+unicode = 118869;
 },
 {
-glyphname = "antikenoma-byzantineMusic";
-unicode = 118876;
+glyphname = "kratimoyporroon-byzantineMusic";
+unicode = 118868;
 },
 {
-glyphname = "lygisma-byzantineMusic";
-unicode = 118877;
+glyphname = "yporroi-byzantineMusic";
+unicode = 118867;
 },
 {
-glyphname = "paraklitikiNeo-byzantineMusic";
-unicode = 118878;
+glyphname = "apostrofoiSyndesmosNeo-byzantineMusic";
+unicode = 118866;
 },
 {
-glyphname = "parakalesmaNeo-byzantineMusic";
-unicode = 118879;
+glyphname = "apostrofosNeo-byzantineMusic";
+unicode = 118865;
 },
 {
-glyphname = "eteronParakalesma-byzantineMusic";
-unicode = 118880;
+glyphname = "ypsili-byzantineMusic";
+unicode = 118864;
 },
 {
-glyphname = "kylisma-byzantineMusic";
-unicode = 118881;
+glyphname = "kentimaNeoAno-byzantineMusic";
+unicode = 118863;
 },
 {
-glyphname = "antikenokylisma-byzantineMusic";
-unicode = 118882;
+glyphname = "kentimataNeoAno-byzantineMusic";
+unicode = 118862;
 },
 {
-glyphname = "tromikonNeo-byzantineMusic";
-unicode = 118883;
+glyphname = "pelastonNeo-byzantineMusic";
+unicode = 118861;
 },
 {
-glyphname = "ekstrepton-byzantineMusic";
-unicode = 118884;
+glyphname = "kratimokoufisma-byzantineMusic";
+unicode = 118860;
 },
 {
-glyphname = "synagmaNeo-byzantineMusic";
-unicode = 118885;
+glyphname = "petastokoufisma-byzantineMusic";
+unicode = 118859;
 },
 {
-glyphname = "syrma-byzantineMusic";
-unicode = 118886;
+glyphname = "koufisma-byzantineMusic";
+unicode = 118858;
 },
 {
-glyphname = "chorevmaNeo-byzantineMusic";
-unicode = 118887;
+glyphname = "petasti-byzantineMusic";
+unicode = 118857;
 },
 {
-glyphname = "epegerma-byzantineMusic";
-unicode = 118888;
+glyphname = "oxeiaNeo-byzantineMusic";
+unicode = 118856;
 },
 {
-glyphname = "seismaNeo-byzantineMusic";
-unicode = 118889;
+glyphname = "oligonNeo-byzantineMusic";
+unicode = 118855;
 },
 {
-glyphname = "xironKlasma-byzantineMusic";
-unicode = 118890;
+glyphname = "isonNeo-byzantineMusic";
+unicode = 118854;
 },
 {
-glyphname = "tromikopsifiston-byzantineMusic";
-unicode = 118891;
+glyphname = "gronthismata-byzantineMusic";
+unicode = 118853;
 },
 {
-glyphname = "psifistolygisma-byzantineMusic";
-unicode = 118892;
+glyphname = "straggismata-byzantineMusic";
+unicode = 118852;
 },
 {
-glyphname = "tromikolygisma-byzantineMusic";
-unicode = 118893;
+glyphname = "tromikonAllo-byzantineMusic";
+unicode = 118851;
 },
 {
-glyphname = "tromikoparakalesma-byzantineMusic";
-unicode = 118894;
+glyphname = "kontevmaAllo-byzantineMusic";
+unicode = 118850;
 },
 {
-glyphname = "psifistoparakalesma-byzantineMusic";
-unicode = 118895;
+glyphname = "petasma-byzantineMusic";
+unicode = 118849;
 },
 {
-glyphname = "tromikosynagma-byzantineMusic";
-unicode = 118896;
+glyphname = "nana-byzantineMusic";
+unicode = 118848;
 },
 {
-glyphname = "psifistosynagma-byzantineMusic";
-unicode = 118897;
+glyphname = "ichadin-byzantineMusic";
+unicode = 118847;
 },
 {
-glyphname = "gorgosyntheton-byzantineMusic";
-unicode = 118898;
+glyphname = "paraklitikiArchaion-byzantineMusic";
+unicode = 118846;
 },
 {
-glyphname = "argosyntheton-byzantineMusic";
-unicode = 118899;
+glyphname = "parakalesmaArchaion-byzantineMusic";
+unicode = 118845;
 },
 {
-glyphname = "eteronArgosyntheton-byzantineMusic";
-unicode = 118900;
+glyphname = "rapisma-byzantineMusic";
+unicode = 118844;
 },
 {
-glyphname = "oyranismaNeo-byzantineMusic";
-unicode = 118901;
+glyphname = "chorevmaArchaion-byzantineMusic";
+unicode = 118843;
+},
+{
+glyphname = "kontevma-byzantineMusic";
+unicode = 118842;
 },
 {
-glyphname = "thematismosEso-byzantineMusic";
-unicode = 118902;
+glyphname = "psifiston-byzantineMusic";
+unicode = 118841;
 },
 {
-glyphname = "thematismosExo-byzantineMusic";
-unicode = 118903;
+glyphname = "pelaston-byzantineMusic";
+unicode = 118840;
 },
 {
-glyphname = "themaAploun-byzantineMusic";
-unicode = 118904;
+glyphname = "katavaTromikon-byzantineMusic";
+unicode = 118839;
 },
 {
-glyphname = "thesKaiApothes-byzantineMusic";
-unicode = 118905;
+glyphname = "tromikonArchaion-byzantineMusic";
+unicode = 118838;
 },
 {
-glyphname = "katavasma-byzantineMusic";
-unicode = 118906;
+glyphname = "imifthora-byzantineMusic";
+unicode = 118837;
 },
 {
-glyphname = "endofonon-byzantineMusic";
-unicode = 118907;
+glyphname = "fthoraArchaion-byzantineMusic";
+unicode = 118836;
 },
 {
-glyphname = "yfenKato-byzantineMusic";
-unicode = 118908;
+glyphname = "apesoExoNeo-byzantineMusic";
+unicode = 118835;
 },
 {
-glyphname = "yfenAno-byzantineMusic";
-unicode = 118909;
+glyphname = "kratimata-byzantineMusic";
+unicode = 118834;
 },
 {
-glyphname = "stavros-byzantineMusic";
-unicode = 118910;
+glyphname = "tessera-byzantineMusic";
+unicode = 118833;
 },
 {
-glyphname = "klasmaAno-byzantineMusic";
-unicode = 118911;
+glyphname = "tria-byzantineMusic";
+unicode = 118832;
 },
 {
-glyphname = "dipliArchaion-byzantineMusic";
-unicode = 118912;
+glyphname = "dyo-byzantineMusic";
+unicode = 118831;
 },
 {
-glyphname = "kratimaArchaion-byzantineMusic";
-unicode = 118913;
+glyphname = "lemoi-byzantineMusic";
+unicode = 118830;
 },
 {
-glyphname = "kratimaAllo-byzantineMusic";
-unicode = 118914;
+glyphname = "thema-byzantineMusic";
+unicode = 118829;
 },
 {
-glyphname = "kratimaNeo-byzantineMusic";
-unicode = 118915;
+glyphname = "oyranismaArchaion-byzantineMusic";
+unicode = 118828;
 },
 {
-glyphname = "apodermaNeo-byzantineMusic";
-unicode = 118916;
+glyphname = "synagmaMetaStavrou-byzantineMusic";
+unicode = 118827;
 },
 {
-glyphname = "apli-byzantineMusic";
-unicode = 118917;
+glyphname = "synagmaArchaion-byzantineMusic";
+unicode = 118826;
 },
 {
-glyphname = "dipli-byzantineMusic";
-unicode = 118918;
+glyphname = "seisma-byzantineMusic";
+unicode = 118825;
 },
 {
-glyphname = "tripli-byzantineMusic";
-unicode = 118919;
+glyphname = "anatrichisma-byzantineMusic";
+unicode = 118824;
 },
 {
-glyphname = "tetrapli-byzantineMusic";
-unicode = 118920;
+glyphname = "tinagma-byzantineMusic";
+unicode = 118823;
 },
 {
-glyphname = "koronis-byzantineMusic";
-unicode = 118921;
+glyphname = "piasmaArchaion-byzantineMusic";
+unicode = 118822;
 },
 {
-glyphname = "leimmaEnosChronou-byzantineMusic";
-unicode = 118922;
+glyphname = "revma-byzantineMusic";
+unicode = 118821;
 },
 {
-glyphname = "leimmaDyoChronon-byzantineMusic";
-unicode = 118923;
+glyphname = "klasma-byzantineMusic";
+unicode = 118820;
 },
 {
-glyphname = "leimmaTrionChronon-byzantineMusic";
-unicode = 118924;
+glyphname = "apothema-byzantineMusic";
+unicode = 118819;
 },
 {
-glyphname = "leimmaTessaronChronon-byzantineMusic";
-unicode = 118925;
+glyphname = "apodermaArchaion-byzantineMusic";
+unicode = 118818;
 },
 {
-glyphname = "leimmaImiseosChronou-byzantineMusic";
-unicode = 118926;
+glyphname = "vareiaiArchaion-byzantineMusic";
+unicode = 118817;
 },
 {
-glyphname = "gorgonNeoAno-byzantineMusic";
-unicode = 118927;
+glyphname = "oxeiaiArchaion-byzantineMusic";
+unicode = 118816;
 },
 {
-glyphname = "gorgonParestigmenonAristera-byzantineMusic";
-unicode = 118928;
+glyphname = "stavrosApodexia-byzantineMusic";
+unicode = 118815;
 },
 {
-glyphname = "gorgonParestigmenonDexia-byzantineMusic";
-unicode = 118929;
+glyphname = "parichon-byzantineMusic";
+unicode = 118814;
 },
 {
-glyphname = "digorgon-byzantineMusic";
-unicode = 118930;
+glyphname = "saximata-byzantineMusic";
+unicode = 118813;
 },
 {
-glyphname = "digorgonParestigmenonAristeraKato-byzantineMusic";
-unicode = 118931;
+glyphname = "kentimataArchaion-byzantineMusic";
+unicode = 118812;
 },
 {
-glyphname = "digorgonParestigmenonAristeraAno-byzantineMusic";
-unicode = 118932;
+glyphname = "kentimaArchaion-byzantineMusic";
+unicode = 118811;
 },
 {
-glyphname = "digorgonParestigmenonDexia-byzantineMusic";
-unicode = 118933;
+glyphname = "isonArchaion-byzantineMusic";
+unicode = 118810;
 },
 {
-glyphname = "trigorgon-byzantineMusic";
-unicode = 118934;
+glyphname = "vathy-byzantineMusic";
+unicode = 118809;
 },
 {
-glyphname = "argon-byzantineMusic";
-unicode = 118935;
+glyphname = "chamilon-byzantineMusic";
+unicode = 118808;
 },
 {
-glyphname = "imidiargon-byzantineMusic";
-unicode = 118936;
+glyphname = "psilon-byzantineMusic";
+unicode = 118807;
 },
 {
-glyphname = "diargon-byzantineMusic";
-unicode = 118937;
+glyphname = "gorgonArchaion-byzantineMusic";
+unicode = 118806;
 },
 {
-glyphname = "agogiPoliArgi-byzantineMusic";
-unicode = 118938;
+glyphname = "oligonArchaion-byzantineMusic";
+unicode = 118805;
 },
 {
-glyphname = "agogiArgoteri-byzantineMusic";
-unicode = 118939;
+glyphname = "thita-byzantineMusic";
+unicode = 118804;
 },
 {
-glyphname = "agogiArgi-byzantineMusic";
-unicode = 118940;
+glyphname = "synevma-byzantineMusic";
+unicode = 118803;
 },
 {
-glyphname = "agogiMetria-byzantineMusic";
-unicode = 118941;
+glyphname = "apostrofosDipli-byzantineMusic";
+unicode = 118802;
 },
 {
-glyphname = "agogiMesi-byzantineMusic";
-unicode = 118942;
+glyphname = "apostrofos-byzantineMusic";
+unicode = 118801;
 },
 {
-glyphname = "agogiGorgi-byzantineMusic";
-unicode = 118943;
+glyphname = "kentimata-byzantineMusic";
+unicode = 118800;
 },
 {
-glyphname = "agogiGorgoteri-byzantineMusic";
-unicode = 118944;
+glyphname = "teleia-byzantineMusic";
+unicode = 118799;
 },
 {
-glyphname = "agogiPoliGorgi-byzantineMusic";
-unicode = 118945;
+glyphname = "exoEkfonitikon-byzantineMusic";
+unicode = 118798;
 },
 {
-glyphname = "martyriaProtosIchos-byzantineMusic";
-unicode = 118946;
+glyphname = "apesoEkfonitikon-byzantineMusic";
+unicode = 118797;
 },
 {
-glyphname = "martyriaAlliProtosIchos-byzantineMusic";
-unicode = 118947;
+glyphname = "kremasti-byzantineMusic";
+unicode = 118796;
 },
 {
-glyphname = "martyriaDeyterosIchos-byzantineMusic";
-unicode = 118948;
+glyphname = "ypokrisisDipli-byzantineMusic";
+unicode = 118795;
 },
 {
-glyphname = "martyriaAlliDeyterosIchos-byzantineMusic";
-unicode = 118949;
+glyphname = "ypokrisis-byzantineMusic";
+unicode = 118794;
 },
 {
-glyphname = "martyriaTritosIchos-byzantineMusic";
-unicode = 118950;
+glyphname = "paraklitiki-byzantineMusic";
+unicode = 118793;
 },
 {
-glyphname = "martyriaTrifonias-byzantineMusic";
-unicode = 118951;
+glyphname = "syrmatiki-byzantineMusic";
+unicode = 118792;
 },
 {
-glyphname = "martyriaTetartosIchos-byzantineMusic";
-unicode = 118952;
+glyphname = "kathisti-byzantineMusic";
+unicode = 118791;
 },
 {
-glyphname = "martyriaTetartosLegetosIchos-byzantineMusic";
-unicode = 118953;
+glyphname = "vareiaDipli-byzantineMusic";
+unicode = 118790;
 },
 {
-glyphname = "martyriaLegetosIchos-byzantineMusic";
-unicode = 118954;
+glyphname = "vareiaEkfonitikon-byzantineMusic";
+unicode = 118789;
 },
 {
-glyphname = "martyriaPlagiosIchos-byzantineMusic";
-unicode = 118955;
+glyphname = "oxeiaDipli-byzantineMusic";
+unicode = 118788;
 },
 {
-glyphname = "isakiaTelousIchimatos-byzantineMusic";
-unicode = 118956;
+glyphname = "oxeiaEkfonitikon-byzantineMusic";
+unicode = 118787;
 },
 {
-glyphname = "apostrofoiTelousIchimatos-byzantineMusic";
-unicode = 118957;
+glyphname = "perispomeni-byzantineMusic";
+unicode = 118786;
 },
 {
-glyphname = "fanerosisTetrafonias-byzantineMusic";
-unicode = 118958;
+glyphname = "daseia-byzantineMusic";
+unicode = 118785;
 },
 {
-glyphname = "fanerosisMonofonias-byzantineMusic";
-unicode = 118959;
+glyphname = "psili-byzantineMusic";
+unicode = 118784;
 },
 {
-glyphname = "fanerosisDifonias-byzantineMusic";
-unicode = 118960;
+glyphname = uni1D200;
+unicode = 119296;
 },
 {
-glyphname = "martyriaVarysIchos-byzantineMusic";
-unicode = 118961;
+glyphname = uni1D201;
+unicode = 119297;
 },
 {
-glyphname = "martyriaProtovarysIchos-byzantineMusic";
-unicode = 118962;
+glyphname = uni1D202;
+unicode = 119298;
 },
 {
-glyphname = "martyriaPlagiosTetartosIchos-byzantineMusic";
-unicode = 118963;
+glyphname = uni1D203;
+unicode = 119299;
 },
 {
-glyphname = "gorthmikonNAploun-byzantineMusic";
-unicode = 118964;
+glyphname = uni1D204;
+unicode = 119300;
 },
 {
-glyphname = "gorthmikonNDiploun-byzantineMusic";
-unicode = 118965;
+glyphname = uni1D205;
+unicode = 119301;
 },
 {
-glyphname = "enarxisKaiFthoraVou-byzantineMusic";
-unicode = 118966;
+glyphname = uni1D206;
+unicode = 119302;
 },
 {
-glyphname = "imifonon-byzantineMusic";
-unicode = 118967;
+glyphname = uni1D207;
+unicode = 119303;
 },
 {
-glyphname = "imifthoron-byzantineMusic";
-unicode = 118968;
+glyphname = uni1D208;
+unicode = 119304;
 },
 {
-glyphname = "fthoraArchaionDeyterouIchou-byzantineMusic";
-unicode = 118969;
+glyphname = uni1D209;
+unicode = 119305;
 },
 {
-glyphname = "fthoraDiatonikiPa-byzantineMusic";
-unicode = 118970;
+glyphname = uni1D20A;
+unicode = 119306;
 },
 {
-glyphname = "fthoraDiatonikiNana-byzantineMusic";
-unicode = 118971;
+glyphname = uni1D20B;
+unicode = 119307;
 },
 {
-glyphname = "fthoraNaosIchos-byzantineMusic";
-unicode = 118972;
+glyphname = uni1D20C;
+unicode = 119308;
 },
 {
-glyphname = "fthoraDiatonikiDi-byzantineMusic";
-unicode = 118973;
+glyphname = uni1D20D;
+unicode = 119309;
 },
 {
-glyphname = "fthoraSklironDiatononDi-byzantineMusic";
-unicode = 118974;
+glyphname = uni1D20E;
+unicode = 119310;
 },
 {
-glyphname = "fthoraDiatonikiKe-byzantineMusic";
-unicode = 118975;
+glyphname = uni1D20F;
+unicode = 119311;
 },
 {
-glyphname = "fthoraDiatonikiZo-byzantineMusic";
-unicode = 118976;
+glyphname = uni1D210;
+unicode = 119312;
 },
 {
-glyphname = "fthoraDiatonikiNiKato-byzantineMusic";
-unicode = 118977;
+glyphname = uni1D211;
+unicode = 119313;
 },
 {
-glyphname = "fthoraDiatonikiNiAno-byzantineMusic";
-unicode = 118978;
+glyphname = uni1D212;
+unicode = 119314;
 },
 {
-glyphname = "fthoraMalakonChromaDifonias-byzantineMusic";
-unicode = 118979;
+glyphname = uni1D213;
+unicode = 119315;
 },
 {
-glyphname = "fthoraMalakonChromaMonofonias-byzantineMusic";
-unicode = 118980;
+glyphname = uni1D214;
+unicode = 119316;
 },
 {
-glyphname = "fhtoraSklironChromaVasis-byzantineMusic";
-unicode = 118981;
+glyphname = uni1D215;
+unicode = 119317;
 },
 {
-glyphname = "fthoraSklironChromaSynafi-byzantineMusic";
-unicode = 118982;
+glyphname = uni1D216;
+unicode = 119318;
 },
 {
-glyphname = "fthoraNenano-byzantineMusic";
-unicode = 118983;
+glyphname = uni1D217;
+unicode = 119319;
 },
 {
-glyphname = "chroaZygos-byzantineMusic";
-unicode = 118984;
+glyphname = uni1D218;
+unicode = 119320;
 },
 {
-glyphname = "chroaKliton-byzantineMusic";
-unicode = 118985;
+glyphname = uni1D219;
+unicode = 119321;
 },
 {
-glyphname = "chroaSpathi-byzantineMusic";
-unicode = 118986;
+glyphname = uni1D21A;
+unicode = 119322;
 },
 {
-glyphname = "fthoraIYfesisTetartimorion-byzantineMusic";
-unicode = 118987;
+glyphname = uni1D21B;
+unicode = 119323;
 },
 {
-glyphname = "fthoraEnarmoniosAntifonia-byzantineMusic";
-unicode = 118988;
+glyphname = uni1D21C;
+unicode = 119324;
 },
 {
-glyphname = "yfesisTritimorion-byzantineMusic";
-unicode = 118989;
+glyphname = uni1D21D;
+unicode = 119325;
 },
 {
-glyphname = "diesisTritimorion-byzantineMusic";
-unicode = 118990;
+glyphname = uni1D21E;
+unicode = 119326;
 },
 {
-glyphname = "diesisTetartimorion-byzantineMusic";
-unicode = 118991;
+glyphname = uni1D21F;
+unicode = 119327;
 },
 {
-glyphname = "diesisApliDyoDodekata-byzantineMusic";
-unicode = 118992;
+glyphname = uni1D220;
+unicode = 119328;
 },
 {
-glyphname = "diesisMonogrammosTesseraDodekata-byzantineMusic";
-unicode = 118993;
+glyphname = uni1D221;
+unicode = 119329;
 },
 {
-glyphname = "diesisDigrammosExDodekata-byzantineMusic";
-unicode = 118994;
+glyphname = uni1D222;
+unicode = 119330;
 },
 {
-glyphname = "diesisTrigrammosOktoDodekata-byzantineMusic";
-unicode = 118995;
+glyphname = uni1D223;
+unicode = 119331;
 },
 {
-glyphname = "yfesisApliDyoDodekata-byzantineMusic";
-unicode = 118996;
+glyphname = uni1D224;
+unicode = 119332;
 },
 {
-glyphname = "yfesisMonogrammosTesseraDodekata-byzantineMusic";
-unicode = 118997;
+glyphname = uni1D225;
+unicode = 119333;
 },
 {
-glyphname = "yfesisDigrammosExDodekata-byzantineMusic";
-unicode = 118998;
+glyphname = uni1D226;
+unicode = 119334;
 },
 {
-glyphname = "yfesisTrigrammosOktoDodekata-byzantineMusic";
-unicode = 118999;
+glyphname = uni1D227;
+unicode = 119335;
 },
 {
-glyphname = "genikiDiesis-byzantineMusic";
-unicode = 119000;
+glyphname = uni1D228;
+unicode = 119336;
 },
 {
-glyphname = "genikiYfesis-byzantineMusic";
-unicode = 119001;
+glyphname = uni1D229;
+unicode = 119337;
 },
 {
-glyphname = "diastoliApliMikri-byzantineMusic";
-unicode = 119002;
+glyphname = uni1D22A;
+unicode = 119338;
 },
 {
-glyphname = "diastoliApliMegali-byzantineMusic";
-unicode = 119003;
+glyphname = uni1D22B;
+unicode = 119339;
 },
 {
-glyphname = "diastoliDipli-byzantineMusic";
-unicode = 119004;
+glyphname = uni1D22C;
+unicode = 119340;
 },
 {
-glyphname = "diastoliTheseos-byzantineMusic";
-unicode = 119005;
+glyphname = uni1D22D;
+unicode = 119341;
 },
 {
-glyphname = "simansisTheseos-byzantineMusic";
-unicode = 119006;
+glyphname = uni1D22E;
+unicode = 119342;
 },
 {
-glyphname = "simansisTheseosDisimou-byzantineMusic";
-unicode = 119007;
+glyphname = uni1D22F;
+unicode = 119343;
 },
 {
-glyphname = "simansisTheseosTrisimou-byzantineMusic";
-unicode = 119008;
+glyphname = uni1D230;
+unicode = 119344;
 },
 {
-glyphname = "simansisTheseosTetrasimou-byzantineMusic";
-unicode = 119009;
+glyphname = uni1D231;
+unicode = 119345;
 },
 {
-glyphname = "simansisArseos-byzantineMusic";
-unicode = 119010;
+glyphname = uni1D232;
+unicode = 119346;
 },
 {
-glyphname = "simansisArseosDisimou-byzantineMusic";
-unicode = 119011;
+glyphname = uni1D233;
+unicode = 119347;
 },
 {
-glyphname = "simansisArseosTrisimou-byzantineMusic";
-unicode = 119012;
+glyphname = uni1D234;
+unicode = 119348;
 },
 {
-glyphname = "simansisArseosTetrasimou-byzantineMusic";
-unicode = 119013;
+glyphname = uni1D235;
+unicode = 119349;
 },
 {
-glyphname = "digrammaGg-byzantineMusic";
-unicode = 119014;
+glyphname = uni1D236;
+unicode = 119350;
 },
 {
-glyphname = "diftoggosOu-byzantineMusic";
-unicode = 119015;
+glyphname = uni1D237;
+unicode = 119351;
 },
 {
-glyphname = "stigma-byzantineMusic";
-unicode = 119016;
+glyphname = uni1D238;
+unicode = 119352;
 },
 {
-glyphname = "arktikoPa-byzantineMusic";
-unicode = 119017;
+glyphname = uni1D239;
+unicode = 119353;
 },
 {
-glyphname = "arktikoVou-byzantineMusic";
-unicode = 119018;
+glyphname = uni1D23A;
+unicode = 119354;
 },
 {
-glyphname = "arktikoGa-byzantineMusic";
-unicode = 119019;
+glyphname = uni1D23B;
+unicode = 119355;
 },
 {
-glyphname = "arktikoDi-byzantineMusic";
-unicode = 119020;
+glyphname = uni1D23C;
+unicode = 119356;
 },
 {
-glyphname = "arktikoKe-byzantineMusic";
-unicode = 119021;
+glyphname = uni1D23D;
+unicode = 119357;
 },
 {
-glyphname = "arktikoZo-byzantineMusic";
-unicode = 119022;
+glyphname = uni1D23E;
+unicode = 119358;
 },
 {
-glyphname = "arktikoNi-byzantineMusic";
-unicode = 119023;
+glyphname = uni1D23F;
+unicode = 119359;
 },
 {
-glyphname = "kentimataNeoMeso-byzantineMusic";
-unicode = 119024;
+glyphname = uni1D240;
+unicode = 119360;
 },
 {
-glyphname = "kentimaNeoMeso-byzantineMusic";
-unicode = 119025;
+glyphname = uni1D241;
+unicode = 119361;
 },
 {
-glyphname = "kentimataNeoKato-byzantineMusic";
-unicode = 119026;
+glyphname = uni1D242;
+unicode = 119362;
 },
 {
-glyphname = "kentimaNeoKato-byzantineMusic";
-unicode = 119027;
+glyphname = uni1D243;
+unicode = 119363;
 },
 {
-glyphname = "klasmaKato-byzantineMusic";
-unicode = 119028;
+glyphname = uni1D244;
+unicode = 119364;
 },
 {
-glyphname = "gorgonNeoKato-byzantineMusic";
-unicode = 119029;
+glyphname = uni1D245;
+unicode = 119365;
 }
 );
 instances = (
diff --git a/data/results/glyphs/GF_Greek_Coptic.glyphs b/data/results/glyphs/GF_Greek_Coptic.glyphs
index 7db6e083d5..7c69b8c3ef 100644
--- a/data/results/glyphs/GF_Greek_Coptic.glyphs
+++ b/data/results/glyphs/GF_Greek_Coptic.glyphs
@@ -136,6 +136,30 @@ name = Regular;
 );
 glyphs = (
 {
+glyphname = "cryptogrammicni-coptic";
+unicode = 11453;
+},
+{
+glyphname = "Cryptogrammicni-coptic";
+unicode = 11452;
+},
+{
+glyphname = "dialectpni-coptic";
+unicode = 11451;
+},
+{
+glyphname = "dialectPni-coptic";
+unicode = 11450;
+},
+{
+glyphname = "dialectpkapa-coptic";
+unicode = 11449;
+},
+{
+glyphname = "dialectPkapa-coptic";
+unicode = 11448;
+},
+{
 glyphname = "oldNgi-nubian-coptic";
 layers = (
 {
@@ -576,30 +600,6 @@ glyphname = "cryptogrammiceie-coptic";
 unicode = 11447;
 },
 {
-glyphname = "dialectPkapa-coptic";
-unicode = 11448;
-},
-{
-glyphname = "dialectpkapa-coptic";
-unicode = 11449;
-},
-{
-glyphname = "dialectPni-coptic";
-unicode = 11450;
-},
-{
-glyphname = "dialectpni-coptic";
-unicode = 11451;
-},
-{
-glyphname = "Cryptogrammicni-coptic";
-unicode = 11452;
-},
-{
-glyphname = "cryptogrammicni-coptic";
-unicode = 11453;
-},
-{
 glyphname = "OouOld-coptic";
 unicode = 11454;
 },
diff --git a/data/results/glyphs/GF_Latin_African.glyphs b/data/results/glyphs/GF_Latin_African.glyphs
index 8bd2d4dd23..a7ac40efe2 100644
--- a/data/results/glyphs/GF_Latin_African.glyphs
+++ b/data/results/glyphs/GF_Latin_African.glyphs
@@ -1157,7 +1157,7 @@ glyphname = chook;
 unicode = 392;
 },
 {
-glyphname = Dafrican;
+glyphname = Dtail;
 unicode = 393;
 },
 {
@@ -1165,7 +1165,7 @@ glyphname = Dhook;
 unicode = 394;
 },
 {
-glyphname = Ereversed;
+glyphname = Eturned;
 unicode = 398;
 },
 {
@@ -1185,11 +1185,11 @@ glyphname = Ghook;
 unicode = 403;
 },
 {
-glyphname = Gammaafrican;
+glyphname = "Gamma-latin";
 unicode = 404;
 },
 {
-glyphname = Iotaafrican;
+glyphname = "Iota-latin";
 unicode = 406;
 },
 {
@@ -1213,7 +1213,7 @@ glyphname = Nhookleft;
 unicode = 413;
 },
 {
-glyphname = Ocenteredtilde;
+glyphname = Obarred;
 unicode = 415;
 },
 {
@@ -1241,7 +1241,7 @@ glyphname = Tretroflexhook;
 unicode = 430;
 },
 {
-glyphname = Upsilonafrican;
+glyphname = "Upsilon-latin";
 unicode = 433;
 },
 {
@@ -1453,7 +1453,7 @@ glyphname = ymacron;
 unicode = 563;
 },
 {
-glyphname = Glottalstop;
+glyphname = Glottalstopsmall;
 unicode = 577;
 },
 {
@@ -1561,7 +1561,7 @@ glyphname = obarred;
 unicode = 629;
 },
 {
-glyphname = rhook;
+glyphname = rtail;
 unicode = 637;
 },
 {
@@ -1653,11 +1653,11 @@ glyphname = bdotbelow;
 unicode = 7685;
 },
 {
-glyphname = Blinebelow;
+glyphname = Bmacronbelow;
 unicode = 7686;
 },
 {
-glyphname = blinebelow;
+glyphname = bmacronbelow;
 unicode = 7687;
 },
 {
@@ -1677,11 +1677,11 @@ glyphname = ddotbelow;
 unicode = 7693;
 },
 {
-glyphname = Dlinebelow;
+glyphname = Dmacronbelow;
 unicode = 7694;
 },
 {
-glyphname = dlinebelow;
+glyphname = dmacronbelow;
 unicode = 7695;
 },
 {
@@ -1749,11 +1749,11 @@ glyphname = kdotbelow;
 unicode = 7731;
 },
 {
-glyphname = Klinebelow;
+glyphname = Kmacronbelow;
 unicode = 7732;
 },
 {
-glyphname = klinebelow;
+glyphname = kmacronbelow;
 unicode = 7733;
 },
 {
@@ -1805,11 +1805,11 @@ glyphname = ndotbelow;
 unicode = 7751;
 },
 {
-glyphname = Nlinebelow;
+glyphname = Nmacronbelow;
 unicode = 7752;
 },
 {
-glyphname = nlinebelow;
+glyphname = nmacronbelow;
 unicode = 7753;
 },
 {
@@ -1877,11 +1877,11 @@ glyphname = tdotbelow;
 unicode = 7789;
 },
 {
-glyphname = Tlinebelow;
+glyphname = Tmacronbelow;
 unicode = 7790;
 },
 {
-glyphname = tlinebelow;
+glyphname = tmacronbelow;
 unicode = 7791;
 },
 {
@@ -1957,7 +1957,7 @@ glyphname = zdotbelow;
 unicode = 7827;
 },
 {
-glyphname = hlinebelow;
+glyphname = hmacronbelow;
 unicode = 7830;
 },
 {
diff --git a/data/results/plist/CustomFilter_GF_Arabic.plist b/data/results/plist/CustomFilter_GF_Arabic.plist
index a85c5937d8..705aede543 100644
--- a/data/results/plist/CustomFilter_GF_Arabic.plist
+++ b/data/results/plist/CustomFilter_GF_Arabic.plist
@@ -123,19 +123,19 @@
 			<string>gaf-ar</string>
 			<string>hehDoachashmee-ar</string>
 			<string>hehgoal-ar</string>
-			<string>yeh-farsi</string>
+			<string>yehFarsi-ar</string>
 			<string>yehbarree-ar</string>
 			<string>fullstop-ar</string>
-			<string>zero-persian</string>
-			<string>one-persian</string>
-			<string>two-persian</string>
-			<string>three-persian</string>
-			<string>four-persian</string>
-			<string>five-persian</string>
-			<string>six-persian</string>
-			<string>seven-persian</string>
-			<string>eight-persian</string>
-			<string>nine-persian</string>
+			<string>zeroFarsi-ar</string>
+			<string>oneFarsi-ar</string>
+			<string>twoFarsi-ar</string>
+			<string>threeFarsi-ar</string>
+			<string>fourFarsi-ar</string>
+			<string>fiveFarsi-ar</string>
+			<string>sixFarsi-ar</string>
+			<string>sevenFarsi-ar</string>
+			<string>eightFarsi-ar</string>
+			<string>nineFarsi-ar</string>
 			<string>kehehThreedotsabove-ar</string>
 			<string>lefttorightmark</string>
 			<string>endash</string>
@@ -282,22 +282,22 @@
 			<string>u-ar</string>
 			<string>yu-ar</string>
 			<string>ve-ar</string>
-			<string>yeh-farsi</string>
+			<string>yehFarsi-ar</string>
 			<string>yehTail-ar</string>
 			<string>yehVabove-ar</string>
 			<string>e-ar</string>
 			<string>fullstop-ar</string>
 			<string>ae-ar</string>
-			<string>zero-persian</string>
-			<string>one-persian</string>
-			<string>two-persian</string>
-			<string>three-persian</string>
-			<string>four-persian</string>
-			<string>five-persian</string>
-			<string>six-persian</string>
-			<string>seven-persian</string>
-			<string>eight-persian</string>
-			<string>nine-persian</string>
+			<string>zeroFarsi-ar</string>
+			<string>oneFarsi-ar</string>
+			<string>twoFarsi-ar</string>
+			<string>threeFarsi-ar</string>
+			<string>fourFarsi-ar</string>
+			<string>fiveFarsi-ar</string>
+			<string>sixFarsi-ar</string>
+			<string>sevenFarsi-ar</string>
+			<string>eightFarsi-ar</string>
+			<string>nineFarsi-ar</string>
 			<string>sindhiampersand-ar</string>
 			<string>sindhipostpositionmen-ar</string>
 			<string>lefttorightmark</string>
diff --git a/data/results/plist/CustomFilter_GF_Cyrillic.plist b/data/results/plist/CustomFilter_GF_Cyrillic.plist
index 4a06f78cea..18fc7d7148 100644
--- a/data/results/plist/CustomFilter_GF_Cyrillic.plist
+++ b/data/results/plist/CustomFilter_GF_Cyrillic.plist
@@ -84,8 +84,8 @@
 			<string>Yeru-cy</string>
 			<string>Softsign-cy</string>
 			<string>Ereversed-cy</string>
-			<string>Iu-cy</string>
-			<string>Ia-cy</string>
+			<string>Yu-cy</string>
+			<string>Ya-cy</string>
 			<string>a-cy</string>
 			<string>be-cy</string>
 			<string>ve-cy</string>
@@ -116,8 +116,8 @@
 			<string>yeru-cy</string>
 			<string>softsign-cy</string>
 			<string>ereversed-cy</string>
-			<string>iu-cy</string>
-			<string>ia-cy</string>
+			<string>yu-cy</string>
+			<string>ya-cy</string>
 			<string>io-cy</string>
 			<string>dje-cy</string>
 			<string>e-cy</string>
@@ -129,8 +129,8 @@
 			<string>tshe-cy</string>
 			<string>ushort-cy</string>
 			<string>dzhe-cy</string>
-			<string>Gheupturn-cy</string>
-			<string>gheupturn-cy</string>
+			<string>Geupturn-cy</string>
+			<string>geupturn-cy</string>
 			<string>endash</string>
 			<string>emdash</string>
 			<string>quoteleft</string>
@@ -283,10 +283,10 @@
 			<string>tugrik</string>
 			<string>hryvnia</string>
 			<string>tenge</string>
-			<string>Gestroke-cy.loclBSH</string>
-			<string>yu-cy.loclBGR</string>
-			<string>gestroke-cy.loclBSH</string>
 			<string>brevecomb-cy</string>
+			<string>gestroke-cy.loclBSH</string>
+			<string>yu-cy.loclBGR</string>
+			<string>Gestroke-cy.loclBSH</string>
 			<string>De-cy.loclBGR</string>
 			<string>Ii-cy.loclBGR</string>
 			<string>Iishort-cy.loclBGR</string>
diff --git a/data/results/plist/CustomFilter_GF_Latin.plist b/data/results/plist/CustomFilter_GF_Latin.plist
index 3306fd2101..f89e3685e9 100644
--- a/data/results/plist/CustomFilter_GF_Latin.plist
+++ b/data/results/plist/CustomFilter_GF_Latin.plist
@@ -233,29 +233,29 @@
 			<string>Oopen</string>
 			<string>Chook</string>
 			<string>chook</string>
-			<string>Dafrican</string>
+			<string>Dtail</string>
 			<string>Dhook</string>
-			<string>Ereversed</string>
+			<string>Eturned</string>
 			<string>Schwa</string>
 			<string>Eopen</string>
 			<string>Fhook</string>
 			<string>florin</string>
 			<string>Ghook</string>
-			<string>Gammaafrican</string>
-			<string>Iotaafrican</string>
+			<string>Gamma-latin</string>
+			<string>Iota-latin</string>
 			<string>Istroke</string>
 			<string>Khook</string>
 			<string>khook</string>
 			<string>Mturned</string>
 			<string>Nhookleft</string>
-			<string>Ocenteredtilde</string>
+			<string>Obarred</string>
 			<string>Phook</string>
 			<string>phook</string>
 			<string>Esh</string>
 			<string>Thook</string>
 			<string>thook</string>
 			<string>Tretroflexhook</string>
-			<string>Upsilonafrican</string>
+			<string>Upsilon-latin</string>
 			<string>Vhook</string>
 			<string>Yhook</string>
 			<string>yhook</string>
@@ -308,7 +308,7 @@
 			<string>ecedilla</string>
 			<string>Ymacron</string>
 			<string>ymacron</string>
-			<string>Glottalstop</string>
+			<string>Glottalstopsmall</string>
 			<string>glottalstopsmall</string>
 			<string>Ubar</string>
 			<string>Vturned</string>
@@ -335,7 +335,7 @@
 			<string>mturned</string>
 			<string>nhookleft</string>
 			<string>obarred</string>
-			<string>rhook</string>
+			<string>rtail</string>
 			<string>esh</string>
 			<string>tretroflexhook</string>
 			<string>ubar</string>
@@ -392,14 +392,14 @@
 			<string>acutemacroncomb</string>
 			<string>Bdotbelow</string>
 			<string>bdotbelow</string>
-			<string>Blinebelow</string>
-			<string>blinebelow</string>
+			<string>Bmacronbelow</string>
+			<string>bmacronbelow</string>
 			<string>Ddotaccent</string>
 			<string>ddotaccent</string>
 			<string>Ddotbelow</string>
 			<string>ddotbelow</string>
-			<string>Dlinebelow</string>
-			<string>dlinebelow</string>
+			<string>Dmacronbelow</string>
+			<string>dmacronbelow</string>
 			<string>Dcircumflexbelow</string>
 			<string>dcircumflexbelow</string>
 			<string>Emacrongrave</string>
@@ -416,8 +416,8 @@
 			<string>idieresisacute</string>
 			<string>Kdotbelow</string>
 			<string>kdotbelow</string>
-			<string>Klinebelow</string>
-			<string>klinebelow</string>
+			<string>Kmacronbelow</string>
+			<string>kmacronbelow</string>
 			<string>Ldotbelow</string>
 			<string>ldotbelow</string>
 			<string>Lcircumflexbelow</string>
@@ -430,8 +430,8 @@
 			<string>ndotaccent</string>
 			<string>Ndotbelow</string>
 			<string>ndotbelow</string>
-			<string>Nlinebelow</string>
-			<string>nlinebelow</string>
+			<string>Nmacronbelow</string>
+			<string>nmacronbelow</string>
 			<string>Ncircumflexbelow</string>
 			<string>ncircumflexbelow</string>
 			<string>Otildeacute</string>
@@ -448,8 +448,8 @@
 			<string>tdotaccent</string>
 			<string>Tdotbelow</string>
 			<string>tdotbelow</string>
-			<string>Tlinebelow</string>
-			<string>tlinebelow</string>
+			<string>Tmacronbelow</string>
+			<string>tmacronbelow</string>
 			<string>Tcircumflexbelow</string>
 			<string>tcircumflexbelow</string>
 			<string>Udieresisbelow</string>
@@ -468,7 +468,7 @@
 			<string>xdotaccent</string>
 			<string>Zdotbelow</string>
 			<string>zdotbelow</string>
-			<string>hlinebelow</string>
+			<string>hmacronbelow</string>
 			<string>Adotbelow</string>
 			<string>adotbelow</string>
 			<string>Acircumflexdotbelow</string>
diff --git a/data/results/txt/nice-names/GF_Arabic_Core.txt b/data/results/txt/nice-names/GF_Arabic_Core.txt
index da0c5fcc72..2efc47a743 100644
--- a/data/results/txt/nice-names/GF_Arabic_Core.txt
+++ b/data/results/txt/nice-names/GF_Arabic_Core.txt
@@ -117,19 +117,19 @@ keheh-ar
 gaf-ar
 hehDoachashmee-ar
 hehgoal-ar
-yeh-farsi
+yehFarsi-ar
 yehbarree-ar
 fullstop-ar
-zero-persian
-one-persian
-two-persian
-three-persian
-four-persian
-five-persian
-six-persian
-seven-persian
-eight-persian
-nine-persian
+zeroFarsi-ar
+oneFarsi-ar
+twoFarsi-ar
+threeFarsi-ar
+fourFarsi-ar
+fiveFarsi-ar
+sixFarsi-ar
+sevenFarsi-ar
+eightFarsi-ar
+nineFarsi-ar
 kehehThreedotsabove-ar
 lefttorightmark
 endash
diff --git a/data/results/txt/nice-names/GF_Arabic_Plus.txt b/data/results/txt/nice-names/GF_Arabic_Plus.txt
index 38539d976f..9af728dc7b 100644
--- a/data/results/txt/nice-names/GF_Arabic_Plus.txt
+++ b/data/results/txt/nice-names/GF_Arabic_Plus.txt
@@ -124,22 +124,22 @@ oe-ar
 u-ar
 yu-ar
 ve-ar
-yeh-farsi
+yehFarsi-ar
 yehTail-ar
 yehVabove-ar
 e-ar
 fullstop-ar
 ae-ar
-zero-persian
-one-persian
-two-persian
-three-persian
-four-persian
-five-persian
-six-persian
-seven-persian
-eight-persian
-nine-persian
+zeroFarsi-ar
+oneFarsi-ar
+twoFarsi-ar
+threeFarsi-ar
+fourFarsi-ar
+fiveFarsi-ar
+sixFarsi-ar
+sevenFarsi-ar
+eightFarsi-ar
+nineFarsi-ar
 sindhiampersand-ar
 sindhipostpositionmen-ar
 lefttorightmark
diff --git a/data/results/txt/nice-names/GF_Cyrillic_Core.txt b/data/results/txt/nice-names/GF_Cyrillic_Core.txt
index ab8cf088de..11573587c9 100644
--- a/data/results/txt/nice-names/GF_Cyrillic_Core.txt
+++ b/data/results/txt/nice-names/GF_Cyrillic_Core.txt
@@ -78,8 +78,8 @@ Hardsign-cy
 Yeru-cy
 Softsign-cy
 Ereversed-cy
-Iu-cy
-Ia-cy
+Yu-cy
+Ya-cy
 a-cy
 be-cy
 ve-cy
@@ -110,8 +110,8 @@ hardsign-cy
 yeru-cy
 softsign-cy
 ereversed-cy
-iu-cy
-ia-cy
+yu-cy
+ya-cy
 io-cy
 dje-cy
 e-cy
@@ -123,8 +123,8 @@ nje-cy
 tshe-cy
 ushort-cy
 dzhe-cy
-Gheupturn-cy
-gheupturn-cy
+Geupturn-cy
+geupturn-cy
 endash
 emdash
 quoteleft
diff --git a/data/results/txt/nice-names/GF_Cyrillic_Plus.txt b/data/results/txt/nice-names/GF_Cyrillic_Plus.txt
index 86058f4c2d..a6efe54331 100644
--- a/data/results/txt/nice-names/GF_Cyrillic_Plus.txt
+++ b/data/results/txt/nice-names/GF_Cyrillic_Plus.txt
@@ -92,10 +92,10 @@ we-cy
 tugrik
 hryvnia
 tenge
-Gestroke-cy.loclBSH
-yu-cy.loclBGR
-gestroke-cy.loclBSH
 brevecomb-cy
+gestroke-cy.loclBSH
+yu-cy.loclBGR
+Gestroke-cy.loclBSH
 De-cy.loclBGR
 Ii-cy.loclBGR
 Iishort-cy.loclBGR
diff --git a/data/results/txt/nice-names/GF_Latin_African.txt b/data/results/txt/nice-names/GF_Latin_African.txt
index 35aa8a593c..e263b8dcdc 100644
--- a/data/results/txt/nice-names/GF_Latin_African.txt
+++ b/data/results/txt/nice-names/GF_Latin_African.txt
@@ -227,29 +227,29 @@ btopbar
 Oopen
 Chook
 chook
-Dafrican
+Dtail
 Dhook
-Ereversed
+Eturned
 Schwa
 Eopen
 Fhook
 florin
 Ghook
-Gammaafrican
-Iotaafrican
+Gamma-latin
+Iota-latin
 Istroke
 Khook
 khook
 Mturned
 Nhookleft
-Ocenteredtilde
+Obarred
 Phook
 phook
 Esh
 Thook
 thook
 Tretroflexhook
-Upsilonafrican
+Upsilon-latin
 Vhook
 Yhook
 yhook
@@ -302,7 +302,7 @@ Ecedilla
 ecedilla
 Ymacron
 ymacron
-Glottalstop
+Glottalstopsmall
 glottalstopsmall
 Ubar
 Vturned
@@ -329,7 +329,7 @@ Ismall
 mturned
 nhookleft
 obarred
-rhook
+rtail
 esh
 tretroflexhook
 ubar
@@ -386,14 +386,14 @@ macrongravecomb
 acutemacroncomb
 Bdotbelow
 bdotbelow
-Blinebelow
-blinebelow
+Bmacronbelow
+bmacronbelow
 Ddotaccent
 ddotaccent
 Ddotbelow
 ddotbelow
-Dlinebelow
-dlinebelow
+Dmacronbelow
+dmacronbelow
 Dcircumflexbelow
 dcircumflexbelow
 Emacrongrave
@@ -410,8 +410,8 @@ Idieresisacute
 idieresisacute
 Kdotbelow
 kdotbelow
-Klinebelow
-klinebelow
+Kmacronbelow
+kmacronbelow
 Ldotbelow
 ldotbelow
 Lcircumflexbelow
@@ -424,8 +424,8 @@ Ndotaccent
 ndotaccent
 Ndotbelow
 ndotbelow
-Nlinebelow
-nlinebelow
+Nmacronbelow
+nmacronbelow
 Ncircumflexbelow
 ncircumflexbelow
 Otildeacute
@@ -442,8 +442,8 @@ Tdotaccent
 tdotaccent
 Tdotbelow
 tdotbelow
-Tlinebelow
-tlinebelow
+Tmacronbelow
+tmacronbelow
 Tcircumflexbelow
 tcircumflexbelow
 Udieresisbelow
@@ -462,7 +462,7 @@ Xdotaccent
 xdotaccent
 Zdotbelow
 zdotbelow
-hlinebelow
+hmacronbelow
 Adotbelow
 adotbelow
 Acircumflexdotbelow
diff --git a/data/results/txt/prod-names/GF_Cyrillic_Plus.txt b/data/results/txt/prod-names/GF_Cyrillic_Plus.txt
index f45faeb070..4d53b6a26a 100644
--- a/data/results/txt/prod-names/GF_Cyrillic_Plus.txt
+++ b/data/results/txt/prod-names/GF_Cyrillic_Plus.txt
@@ -92,10 +92,10 @@ uni051D
 uni20AE
 uni20B4
 uni20B8
-Gestrokecy.loclBSH
-yucy.loclBGR
-gestrokecy.loclBSH
-brevecombcy
+uni0306.cy
+uni0493.loclBSH
+uni044E.loclBGR
+uni0492.loclBSH
 uni0414.loclBGR
 uni0418.loclBGR
 uni0419.loclBGR
diff --git a/data/results/txt/prod-names/GF_Greek_AncientMusicalSymbols.txt b/data/results/txt/prod-names/GF_Greek_AncientMusicalSymbols.txt
index b4828990c6..8efb2131a5 100644
--- a/data/results/txt/prod-names/GF_Greek_AncientMusicalSymbols.txt
+++ b/data/results/txt/prod-names/GF_Greek_AncientMusicalSymbols.txt
@@ -1,250 +1,250 @@
 # This file is auto-generated; do not edit. See /README.md for instructions.
-u1D000
-u1D001
-u1D002
-u1D003
-u1D004
-u1D005
-u1D006
-u1D007
-u1D008
-u1D009
-u1D00A
-u1D00B
-u1D00C
-u1D00D
-u1D00E
-u1D00F
-u1D010
-u1D011
-u1D012
-u1D013
-u1D014
-u1D015
-u1D016
-u1D017
-u1D018
-u1D019
-u1D01A
-u1D01B
-u1D01C
-u1D01D
-u1D01E
-u1D01F
-u1D020
-u1D021
-u1D022
-u1D023
-u1D024
-u1D025
-u1D026
-u1D027
-u1D028
-u1D029
-u1D02A
-u1D02B
-u1D02C
-u1D02D
-u1D02E
-u1D02F
-u1D030
-u1D031
-u1D032
-u1D033
-u1D034
-u1D035
-u1D036
-u1D037
-u1D038
-u1D039
-u1D03A
-u1D03B
-u1D03C
-u1D03D
-u1D03E
-u1D03F
-u1D040
-u1D041
-u1D042
-u1D043
-u1D044
-u1D045
-u1D046
-u1D047
-u1D048
-u1D049
-u1D04A
-u1D04B
-u1D04C
-u1D04D
-u1D04E
-u1D04F
-u1D050
-u1D051
-u1D052
-u1D053
-u1D054
-u1D055
-u1D056
-u1D057
-u1D058
-u1D059
-u1D05A
-u1D05B
-u1D05C
-u1D05D
-u1D05E
-u1D05F
-u1D060
-u1D061
-u1D062
-u1D063
-u1D064
-u1D065
-u1D066
-u1D067
-u1D068
-u1D069
-u1D06A
-u1D06B
-u1D06C
-u1D06D
-u1D06E
-u1D06F
-u1D070
-u1D071
-u1D072
-u1D073
-u1D074
-u1D075
-u1D076
-u1D077
-u1D078
-u1D079
-u1D07A
-u1D07B
-u1D07C
-u1D07D
-u1D07E
-u1D07F
-u1D080
-u1D081
-u1D082
-u1D083
-u1D084
-u1D085
-u1D086
-u1D087
-u1D088
-u1D089
-u1D08A
-u1D08B
-u1D08C
-u1D08D
-u1D08E
-u1D08F
-u1D090
-u1D091
-u1D092
-u1D093
-u1D094
-u1D095
-u1D096
-u1D097
-u1D098
-u1D099
-u1D09A
-u1D09B
-u1D09C
-u1D09D
-u1D09E
-u1D09F
-u1D0A0
-u1D0A1
-u1D0A2
-u1D0A3
-u1D0A4
-u1D0A5
-u1D0A6
-u1D0A7
-u1D0A8
-u1D0A9
-u1D0AA
-u1D0AB
-u1D0AC
-u1D0AD
-u1D0AE
-u1D0AF
-u1D0B0
-u1D0B1
-u1D0B2
-u1D0B3
-u1D0B4
-u1D0B5
-u1D0B6
-u1D0B7
-u1D0B8
-u1D0B9
-u1D0BA
-u1D0BB
-u1D0BC
-u1D0BD
-u1D0BE
-u1D0BF
-u1D0C0
-u1D0C1
-u1D0C2
-u1D0C3
-u1D0C4
-u1D0C5
-u1D0C6
-u1D0C7
-u1D0C8
-u1D0C9
-u1D0CA
-u1D0CB
-u1D0CC
-u1D0CD
-u1D0CE
-u1D0CF
-u1D0D0
-u1D0D1
-u1D0D2
-u1D0D3
-u1D0D4
-u1D0D5
-u1D0D6
-u1D0D7
-u1D0D8
-u1D0D9
-u1D0DA
-u1D0DB
-u1D0DC
-u1D0DD
-u1D0DE
-u1D0DF
-u1D0E0
-u1D0E1
-u1D0E2
-u1D0E3
-u1D0E4
-u1D0E5
-u1D0E6
-u1D0E7
-u1D0E8
-u1D0E9
-u1D0EA
-u1D0EB
-u1D0EC
-u1D0ED
-u1D0EE
-u1D0EF
-u1D0F0
-u1D0F1
-u1D0F2
-u1D0F3
-u1D0F4
-u1D0F5
+psilibyzantineMusic
+daseiabyzantineMusic
+perispomenibyzantineMusic
+oxeiaEkfonitikonbyzantineMusic
+oxeiaDiplibyzantineMusic
+vareiaEkfonitikonbyzantineMusic
+vareiaDiplibyzantineMusic
+kathistibyzantineMusic
+syrmatikibyzantineMusic
+paraklitikibyzantineMusic
+ypokrisisbyzantineMusic
+ypokrisisDiplibyzantineMusic
+kremastibyzantineMusic
+apesoEkfonitikonbyzantineMusic
+exoEkfonitikonbyzantineMusic
+teleiabyzantineMusic
+kentimatabyzantineMusic
+apostrofosbyzantineMusic
+apostrofosDiplibyzantineMusic
+synevmabyzantineMusic
+thitabyzantineMusic
+oligonArchaionbyzantineMusic
+gorgonArchaionbyzantineMusic
+psilonbyzantineMusic
+chamilonbyzantineMusic
+vathybyzantineMusic
+isonArchaionbyzantineMusic
+kentimaArchaionbyzantineMusic
+kentimataArchaionbyzantineMusic
+saximatabyzantineMusic
+parichonbyzantineMusic
+stavrosApodexiabyzantineMusic
+oxeiaiArchaionbyzantineMusic
+vareiaiArchaionbyzantineMusic
+apodermaArchaionbyzantineMusic
+apothemabyzantineMusic
+klasmabyzantineMusic
+revmabyzantineMusic
+piasmaArchaionbyzantineMusic
+tinagmabyzantineMusic
+anatrichismabyzantineMusic
+seismabyzantineMusic
+synagmaArchaionbyzantineMusic
+synagmaMetaStavroubyzantineMusic
+oyranismaArchaionbyzantineMusic
+themabyzantineMusic
+lemoibyzantineMusic
+dyobyzantineMusic
+triabyzantineMusic
+tesserabyzantineMusic
+kratimatabyzantineMusic
+apesoExoNeobyzantineMusic
+fthoraArchaionbyzantineMusic
+imifthorabyzantineMusic
+tromikonArchaionbyzantineMusic
+katavaTromikonbyzantineMusic
+pelastonbyzantineMusic
+psifistonbyzantineMusic
+kontevmabyzantineMusic
+chorevmaArchaionbyzantineMusic
+rapismabyzantineMusic
+parakalesmaArchaionbyzantineMusic
+paraklitikiArchaionbyzantineMusic
+ichadinbyzantineMusic
+nanabyzantineMusic
+petasmabyzantineMusic
+kontevmaAllobyzantineMusic
+tromikonAllobyzantineMusic
+straggismatabyzantineMusic
+gronthismatabyzantineMusic
+isonNeobyzantineMusic
+oligonNeobyzantineMusic
+oxeiaNeobyzantineMusic
+petastibyzantineMusic
+koufismabyzantineMusic
+petastokoufismabyzantineMusic
+kratimokoufismabyzantineMusic
+pelastonNeobyzantineMusic
+kentimataNeoAnobyzantineMusic
+kentimaNeoAnobyzantineMusic
+ypsilibyzantineMusic
+apostrofosNeobyzantineMusic
+apostrofoiSyndesmosNeobyzantineMusic
+yporroibyzantineMusic
+kratimoyporroonbyzantineMusic
+elafronbyzantineMusic
+chamilibyzantineMusic
+mikronIsonbyzantineMusic
+vareiaNeobyzantineMusic
+piasmaNeobyzantineMusic
+psifistonNeobyzantineMusic
+omalonbyzantineMusic
+antikenomabyzantineMusic
+lygismabyzantineMusic
+paraklitikiNeobyzantineMusic
+parakalesmaNeobyzantineMusic
+eteronParakalesmabyzantineMusic
+kylismabyzantineMusic
+antikenokylismabyzantineMusic
+tromikonNeobyzantineMusic
+ekstreptonbyzantineMusic
+synagmaNeobyzantineMusic
+syrmabyzantineMusic
+chorevmaNeobyzantineMusic
+epegermabyzantineMusic
+seismaNeobyzantineMusic
+xironKlasmabyzantineMusic
+tromikopsifistonbyzantineMusic
+psifistolygismabyzantineMusic
+tromikolygismabyzantineMusic
+tromikoparakalesmabyzantineMusic
+psifistoparakalesmabyzantineMusic
+tromikosynagmabyzantineMusic
+psifistosynagmabyzantineMusic
+gorgosynthetonbyzantineMusic
+argosynthetonbyzantineMusic
+eteronArgosynthetonbyzantineMusic
+oyranismaNeobyzantineMusic
+thematismosEsobyzantineMusic
+thematismosExobyzantineMusic
+themaAplounbyzantineMusic
+thesKaiApothesbyzantineMusic
+katavasmabyzantineMusic
+endofononbyzantineMusic
+yfenKatobyzantineMusic
+yfenAnobyzantineMusic
+stavrosbyzantineMusic
+klasmaAnobyzantineMusic
+dipliArchaionbyzantineMusic
+kratimaArchaionbyzantineMusic
+kratimaAllobyzantineMusic
+kratimaNeobyzantineMusic
+apodermaNeobyzantineMusic
+aplibyzantineMusic
+diplibyzantineMusic
+triplibyzantineMusic
+tetraplibyzantineMusic
+koronisbyzantineMusic
+leimmaEnosChronoubyzantineMusic
+leimmaDyoChrononbyzantineMusic
+leimmaTrionChrononbyzantineMusic
+leimmaTessaronChrononbyzantineMusic
+leimmaImiseosChronoubyzantineMusic
+gorgonNeoAnobyzantineMusic
+gorgonParestigmenonAristerabyzantineMusic
+gorgonParestigmenonDexiabyzantineMusic
+digorgonbyzantineMusic
+digorgonParestigmenonAristeraKatobyzantineMusic
+digorgonParestigmenonAristeraAnobyzantineMusic
+digorgonParestigmenonDexiabyzantineMusic
+trigorgonbyzantineMusic
+argonbyzantineMusic
+imidiargonbyzantineMusic
+diargonbyzantineMusic
+agogiPoliArgibyzantineMusic
+agogiArgoteribyzantineMusic
+agogiArgibyzantineMusic
+agogiMetriabyzantineMusic
+agogiMesibyzantineMusic
+agogiGorgibyzantineMusic
+agogiGorgoteribyzantineMusic
+agogiPoliGorgibyzantineMusic
+martyriaProtosIchosbyzantineMusic
+martyriaAlliProtosIchosbyzantineMusic
+martyriaDeyterosIchosbyzantineMusic
+martyriaAlliDeyterosIchosbyzantineMusic
+martyriaTritosIchosbyzantineMusic
+martyriaTrifoniasbyzantineMusic
+martyriaTetartosIchosbyzantineMusic
+martyriaTetartosLegetosIchosbyzantineMusic
+martyriaLegetosIchosbyzantineMusic
+martyriaPlagiosIchosbyzantineMusic
+isakiaTelousIchimatosbyzantineMusic
+apostrofoiTelousIchimatosbyzantineMusic
+fanerosisTetrafoniasbyzantineMusic
+fanerosisMonofoniasbyzantineMusic
+fanerosisDifoniasbyzantineMusic
+martyriaVarysIchosbyzantineMusic
+martyriaProtovarysIchosbyzantineMusic
+martyriaPlagiosTetartosIchosbyzantineMusic
+gorthmikonNAplounbyzantineMusic
+gorthmikonNDiplounbyzantineMusic
+enarxisKaiFthoraVoubyzantineMusic
+imifononbyzantineMusic
+imifthoronbyzantineMusic
+fthoraArchaionDeyterouIchoubyzantineMusic
+fthoraDiatonikiPabyzantineMusic
+fthoraDiatonikiNanabyzantineMusic
+fthoraNaosIchosbyzantineMusic
+fthoraDiatonikiDibyzantineMusic
+fthoraSklironDiatononDibyzantineMusic
+fthoraDiatonikiKebyzantineMusic
+fthoraDiatonikiZobyzantineMusic
+fthoraDiatonikiNiKatobyzantineMusic
+fthoraDiatonikiNiAnobyzantineMusic
+fthoraMalakonChromaDifoniasbyzantineMusic
+fthoraMalakonChromaMonofoniasbyzantineMusic
+fhtoraSklironChromaVasisbyzantineMusic
+fthoraSklironChromaSynafibyzantineMusic
+fthoraNenanobyzantineMusic
+chroaZygosbyzantineMusic
+chroaKlitonbyzantineMusic
+chroaSpathibyzantineMusic
+fthoraIYfesisTetartimorionbyzantineMusic
+fthoraEnarmoniosAntifoniabyzantineMusic
+yfesisTritimorionbyzantineMusic
+diesisTritimorionbyzantineMusic
+diesisTetartimorionbyzantineMusic
+diesisApliDyoDodekatabyzantineMusic
+diesisMonogrammosTesseraDodekatabyzantineMusic
+diesisDigrammosExDodekatabyzantineMusic
+diesisTrigrammosOktoDodekatabyzantineMusic
+yfesisApliDyoDodekatabyzantineMusic
+yfesisMonogrammosTesseraDodekatabyzantineMusic
+yfesisDigrammosExDodekatabyzantineMusic
+yfesisTrigrammosOktoDodekatabyzantineMusic
+genikiDiesisbyzantineMusic
+genikiYfesisbyzantineMusic
+diastoliApliMikribyzantineMusic
+diastoliApliMegalibyzantineMusic
+diastoliDiplibyzantineMusic
+diastoliTheseosbyzantineMusic
+simansisTheseosbyzantineMusic
+simansisTheseosDisimoubyzantineMusic
+simansisTheseosTrisimoubyzantineMusic
+simansisTheseosTetrasimoubyzantineMusic
+simansisArseosbyzantineMusic
+simansisArseosDisimoubyzantineMusic
+simansisArseosTrisimoubyzantineMusic
+simansisArseosTetrasimoubyzantineMusic
+digrammaGgbyzantineMusic
+diftoggosOubyzantineMusic
+stigmabyzantineMusic
+arktikoPabyzantineMusic
+arktikoVoubyzantineMusic
+arktikoGabyzantineMusic
+arktikoDibyzantineMusic
+arktikoKebyzantineMusic
+arktikoZobyzantineMusic
+arktikoNibyzantineMusic
+kentimataNeoMesobyzantineMusic
+kentimaNeoMesobyzantineMusic
+kentimataNeoKatobyzantineMusic
+kentimaNeoKatobyzantineMusic
+klasmaKatobyzantineMusic
+gorgonNeoKatobyzantineMusic
 uni1D200
 uni1D201
 uni1D202
diff --git a/data/results/txt/prod-names/GF_Greek_Coptic.txt b/data/results/txt/prod-names/GF_Greek_Coptic.txt
index ea20453eff..713420a8cc 100644
--- a/data/results/txt/prod-names/GF_Greek_Coptic.txt
+++ b/data/results/txt/prod-names/GF_Greek_Coptic.txt
@@ -69,12 +69,12 @@ uni2CB4
 uni2CB5
 uni2CB6
 uni2CB7
-uni2CB8
-uni2CB9
-uni2CBA
-uni2CBB
-uni2CBC
-uni2CBD
+dialectPkapacoptic
+dialectpkapacoptic
+dialectPnicoptic
+dialectpnicoptic
+Cryptogrammicnicoptic
+cryptogrammicnicoptic
 uni2CBE
 uni2CBF
 uni2CC0