diff --git a/Lib/glyphsLib/data/GlyphData.xml b/Lib/glyphsLib/data/GlyphData.xml
index d98af0d2b..15cd62a5a 100644
--- a/Lib/glyphsLib/data/GlyphData.xml
+++ b/Lib/glyphsLib/data/GlyphData.xml
@@ -3882,18 +3882,18 @@
 	<glyph unicode="05D7" name="het-hb" category="Letter" script="hebrew" production="uni05D7" altNames="afii57671, het, hethebrew" description="HEBREW LETTER HET" />
 	<glyph unicode="05D8" name="tet-hb" category="Letter" script="hebrew" production="uni05D8" altNames="afii57672, tet, tethebrew" description="HEBREW LETTER TET" />
 	<glyph unicode="05D9" name="yod-hb" category="Letter" script="hebrew" production="uni05D9" altNames="afii57673, yod, yodhebrew" description="HEBREW LETTER YOD" />
-	<glyph unicode="05DA" name="finalkaf-hb" category="Letter" script="hebrew" production="uni05DA" altNames="afii57674, finalkaf, finalkafhebrew" description="HEBREW LETTER FINAL KAF" />
+	<glyph unicode="05DA" name="kafFinal-hb" category="Letter" script="hebrew" production="uni05DA" altNames="afii57674, finalkaf, finalkafhebrew, finalkaf-hb" description="HEBREW LETTER FINAL KAF" />
 	<glyph unicode="05DB" name="kaf-hb" category="Letter" script="hebrew" production="uni05DB" altNames="afii57675, kaf, kafhebrew" description="HEBREW LETTER KAF" />
 	<glyph unicode="05DC" name="lamed-hb" category="Letter" script="hebrew" production="uni05DC" altNames="afii57676, lamed, lamedhebrew" description="HEBREW LETTER LAMED" />
-	<glyph unicode="05DD" name="finalmem-hb" category="Letter" script="hebrew" production="uni05DD" altNames="afii57677, finalmem, finalmemhebrew" description="HEBREW LETTER FINAL MEM" />
+	<glyph unicode="05DD" name="memFinal-hb" category="Letter" script="hebrew" production="uni05DD" altNames="afii57677, finalmem, finalmemhebrew, finalmem-hb" description="HEBREW LETTER FINAL MEM" />
 	<glyph unicode="05DE" name="mem-hb" category="Letter" script="hebrew" production="uni05DE" altNames="afii57678, mem, memhebrew" description="HEBREW LETTER MEM" />
-	<glyph unicode="05DF" name="finalnun-hb" category="Letter" script="hebrew" production="uni05DF" altNames="afii57679, finalnun, finalnunhebrew" description="HEBREW LETTER FINAL NUN" />
+	<glyph unicode="05DF" name="nunFinal-hb" category="Letter" script="hebrew" production="uni05DF" altNames="afii57679, finalnun, finalnunhebrew, finalnun-hb" description="HEBREW LETTER FINAL NUN" />
 	<glyph unicode="05E0" name="nun-hb" category="Letter" script="hebrew" production="uni05E0" altNames="afii57680, nun, nunhebrew" description="HEBREW LETTER NUN" />
 	<glyph unicode="05E1" name="samekh-hb" category="Letter" script="hebrew" production="uni05E1" altNames="afii57681, samekh, samekhhebrew" description="HEBREW LETTER SAMEKH" />
 	<glyph unicode="05E2" name="ayin-hb" category="Letter" script="hebrew" production="uni05E2" altNames="afii57682, ayin, ayinhebrew" description="HEBREW LETTER AYIN" />
-	<glyph unicode="05E3" name="finalpe-hb" category="Letter" script="hebrew" production="uni05E3" altNames="afii57683, finalpe, finalpehebrew" description="HEBREW LETTER FINAL PE" />
+	<glyph unicode="05E3" name="peFinal-hb" category="Letter" script="hebrew" production="uni05E3" altNames="afii57683, finalpe, finalpehebrew, finalpe-hb" description="HEBREW LETTER FINAL PE" />
 	<glyph unicode="05E4" name="pe-hb" category="Letter" script="hebrew" production="uni05E4" altNames="afii57684, pe, pehebrew" description="HEBREW LETTER PE" />
-	<glyph unicode="05E5" name="finaltsadi-hb" category="Letter" script="hebrew" production="uni05E5" altNames="afii57685, finaltsadi, finaltsadihebrew" description="HEBREW LETTER FINAL TSADI" />
+	<glyph unicode="05E5" name="tsadiFinal-hb" category="Letter" script="hebrew" production="uni05E5" altNames="afii57685, finaltsadi, finaltsadihebrew, finaltsadi-hb" description="HEBREW LETTER FINAL TSADI" />
 	<glyph unicode="05E6" name="tsadi-hb" category="Letter" script="hebrew" production="uni05E6" altNames="afii57686, tsadi, tsadihebrew" description="HEBREW LETTER TSADI" />
 	<glyph unicode="05E7" name="qof-hb" category="Letter" script="hebrew" production="uni05E7" altNames="afii57687, qof, qofhebrew" description="HEBREW LETTER QOF" />
 	<glyph unicode="05E8" name="resh-hb" category="Letter" script="hebrew" production="uni05E8" altNames="afii57688, resh, reshhebrew" description="HEBREW LETTER RESH" />
@@ -3905,14 +3905,14 @@
 	<glyph unicode="FB1D" name="yodhiriq-hb" category="Letter" script="hebrew" production="uniFB1D" description="HEBREW LETTER YOD WITH HIRIQ" />
 	<glyph unicode="FB1F" name="yodyodpatah-hb" category="Letter" script="hebrew" production="uniFB1F" altNames="afii57705, doubleyodpatah, doubleyodpatahhebrew, yodyodpatahhebrew" description="HEBREW LIGATURE YIDDISH YOD YOD PATAH" />
 	<glyph unicode="FB20" name="ayinaltone-hb" category="Letter" script="hebrew" production="uniFB20" altNames="ayinaltonehebrew" description="HEBREW LETTER ALTERNATIVE AYIN" />
-	<glyph unicode="FB21" name="widealef-hb" category="Letter" script="hebrew" production="uniFB21" description="HEBREW LETTER WIDE ALEF" />
-	<glyph unicode="FB22" name="widedalet-hb" category="Letter" script="hebrew" production="uniFB22" description="HEBREW LETTER WIDE DALET" />
-	<glyph unicode="FB23" name="widehe-hb" category="Letter" script="hebrew" production="uniFB23" description="HEBREW LETTER WIDE HE" />
-	<glyph unicode="FB24" name="widekaf-hb" category="Letter" script="hebrew" production="uniFB24" description="HEBREW LETTER WIDE KAF" />
-	<glyph unicode="FB25" name="widelamed-hb" category="Letter" script="hebrew" production="uniFB25" description="HEBREW LETTER WIDE LAMED" />
-	<glyph unicode="FB26" name="finalwidemem-hb" category="Letter" script="hebrew" production="uniFB26" description="HEBREW LETTER WIDE FINAL MEM" />
-	<glyph unicode="FB27" name="wideresh-hb" category="Letter" script="hebrew" production="uniFB27" description="HEBREW LETTER WIDE RESH" />
-	<glyph unicode="FB28" name="widetav-hb" category="Letter" script="hebrew" production="uniFB28" description="HEBREW LETTER WIDE TAV" />
+	<glyph unicode="FB21" name="alefWide-hb" category="Letter" script="hebrew" production="uniFB21" altNames="widealef-hb" description="HEBREW LETTER WIDE ALEF" />
+	<glyph unicode="FB22" name="daletWide-hb" category="Letter" script="hebrew" production="uniFB22" altNames="widedalet-hb" description="HEBREW LETTER WIDE DALET" />
+	<glyph unicode="FB23" name="heWide-hb" category="Letter" script="hebrew" production="uniFB23" altNames="widehe-hb" description="HEBREW LETTER WIDE HE" />
+	<glyph unicode="FB24" name="kafWide-hb" category="Letter" script="hebrew" production="uniFB24" altNames="widekaf-hb" description="HEBREW LETTER WIDE KAF" />
+	<glyph unicode="FB25" name="lamedWide-hb" category="Letter" script="hebrew" production="uniFB25" altNames="widelamed-hb" description="HEBREW LETTER WIDE LAMED" />
+	<glyph unicode="FB26" name="memFinalWide-hb" category="Letter" script="hebrew" production="uniFB26" altNames="finalwidemem-hb" description="HEBREW LETTER WIDE FINAL MEM" />
+	<glyph unicode="FB27" name="reshWide-hb" category="Letter" script="hebrew" production="uniFB27" altNames="wideresh-hb" description="HEBREW LETTER WIDE RESH" />
+	<glyph unicode="FB28" name="tavWide-hb" category="Letter" script="hebrew" production="uniFB28" altNames="widetav-hb" description="HEBREW LETTER WIDE TAV" />
 	<glyph unicode="FB2A" name="shinshindot-hb" category="Letter" script="hebrew" production="uniFB2A" altNames="afii57694, shinshindot, shinshindothebrew" description="HEBREW LETTER SHIN WITH SHIN DOT" />
 	<glyph unicode="FB2B" name="shinsindot-hb" category="Letter" script="hebrew" production="uniFB2B" altNames="afii57695, shinsindot, shinsindothebrew" description="HEBREW LETTER SHIN WITH SIN DOT" />
 	<glyph unicode="FB2C" name="shindageshshindot-hb" category="Letter" script="hebrew" production="uniFB2C" altNames="shindageshshindot, shindageshshindothebrew" description="HEBREW LETTER SHIN WITH DAGESH AND SHIN DOT" />
@@ -3928,13 +3928,13 @@
 	<glyph unicode="FB36" name="zayindagesh-hb" category="Letter" script="hebrew" production="uniFB36" altNames="zayindagesh, zayindageshhebrew" description="HEBREW LETTER ZAYIN WITH DAGESH" />
 	<glyph unicode="FB38" name="tetdagesh-hb" category="Letter" script="hebrew" production="uniFB38" altNames="tetdagesh, tetdageshhebrew" description="HEBREW LETTER TET WITH DAGESH" />
 	<glyph unicode="FB39" name="yoddagesh-hb" category="Letter" script="hebrew" production="uniFB39" altNames="yoddagesh, yoddageshhebrew" description="HEBREW LETTER YOD WITH DAGESH" />
-	<glyph unicode="FB3A" name="finalkafdagesh-hb" category="Letter" script="hebrew" production="uniFB3A" altNames="finalkafdagesh, finalkafdageshhebrew" description="HEBREW LETTER FINAL KAF WITH DAGESH" />
+	<glyph unicode="FB3A" name="kafdageshFinal-hb" category="Letter" script="hebrew" production="uniFB3A" altNames="finalkafdagesh, finalkafdageshhebrew, finalkafdagesh-hb" description="HEBREW LETTER FINAL KAF WITH DAGESH" />
 	<glyph unicode="FB3B" name="kafdagesh-hb" category="Letter" script="hebrew" production="uniFB3B" altNames="kafdagesh, kafdageshhebrew" description="HEBREW LETTER KAF WITH DAGESH" />
 	<glyph unicode="FB3C" name="lameddagesh-hb" category="Letter" script="hebrew" production="uniFB3C" altNames="lameddagesh, lameddageshhebrew" description="HEBREW LETTER LAMED WITH DAGESH" />
 	<glyph unicode="FB3E" name="memdagesh-hb" category="Letter" script="hebrew" production="uniFB3E" altNames="memdagesh, memdageshhebrew" description="HEBREW LETTER MEM WITH DAGESH" />
 	<glyph unicode="FB40" name="nundagesh-hb" category="Letter" script="hebrew" production="uniFB40" altNames="nundagesh, nundageshhebrew" description="HEBREW LETTER NUN WITH DAGESH" />
 	<glyph unicode="FB41" name="samekhdagesh-hb" category="Letter" script="hebrew" production="uniFB41" altNames="samekhdagesh, samekhdageshhebrew" description="HEBREW LETTER SAMEKH WITH DAGESH" />
-	<glyph unicode="FB43" name="finalpedagesh-hb" category="Letter" script="hebrew" production="uniFB43" altNames="pefinaldageshhebrew" description="HEBREW LETTER FINAL PE WITH DAGESH" />
+	<glyph unicode="FB43" name="pedageshFinal-hb" category="Letter" script="hebrew" production="uniFB43" altNames="pefinaldageshhebrew, finalpedagesh-hb" description="HEBREW LETTER FINAL PE WITH DAGESH" />
 	<glyph unicode="FB44" name="pedagesh-hb" category="Letter" script="hebrew" production="uniFB44" altNames="pedagesh, pedageshhebrew" description="HEBREW LETTER PE WITH DAGESH" />
 	<glyph unicode="FB46" name="tsadidagesh-hb" category="Letter" script="hebrew" production="uniFB46" altNames="tsadidagesh, tsadidageshhebrew" description="HEBREW LETTER TSADI WITH DAGESH" />
 	<glyph unicode="FB47" name="qofdagesh-hb" category="Letter" script="hebrew" production="uniFB47" altNames="qofdagesh, qofdageshhebrew" description="HEBREW LETTER QOF WITH DAGESH" />
@@ -3968,7 +3968,7 @@
 	<glyph unicode="05A4" name="mahapakhleft-hb" category="Mark" subCategory="Nonspacing" script="hebrew" production="uni05A4" altNames="mahapakhhebrew, mahapakhlefthebrew" description="HEBREW ACCENT MAHAPAKH" />
 	<glyph unicode="05A5" name="merkhaleft-hb" category="Mark" subCategory="Nonspacing" script="hebrew" production="uni05A5" altNames="merkhahebrew, merkhalefthebrew" description="HEBREW ACCENT MERKHA" />
 	<glyph unicode="05A6" name="merkhakefulaleft-hb" category="Mark" subCategory="Nonspacing" script="hebrew" production="uni05A6" altNames="merkhakefulahebrew, merkhakefulalefthebrew" description="HEBREW ACCENT MERKHA KEFULA" />
-	<glyph unicode="05A7" name="dargaleft-hb" category="Mark" subCategory="Nonspacing" script="hebrew" production="uni05A7" altNames="dargahebrew, dargalefthebrew" description="HEBREW ACCENT DARGA" />
+	<glyph unicode="05A7" name="darga-hb" category="Mark" subCategory="Nonspacing" script="hebrew" production="uni05A7" altNames="dargahebrew, dargalefthebrew, dargaleft-hb" description="HEBREW ACCENT DARGA" />
 	<glyph unicode="05A8" name="qadma-hb" category="Mark" subCategory="Nonspacing" script="hebrew" production="uni05A8" altNames="qadmahebrew" description="HEBREW ACCENT QADMA" />
 	<glyph unicode="05A9" name="telishaqetana-hb" category="Mark" subCategory="Nonspacing" script="hebrew" production="uni05A9" altNames="telishaqetanahebrew" description="HEBREW ACCENT TELISHA QETANA" />
 	<glyph unicode="05AA" name="yerahbenyomoleft-hb" category="Mark" subCategory="Nonspacing" script="hebrew" production="uni05AA" altNames="yerahbenyomohebrew, yerahbenyomolefthebrew" description="HEBREW ACCENT YERAH BEN YOMO" />