massaging glyphs file

22 files changed, 197 insertions, 191 deletions

diff --git a/src/Inter-UI-Black.ufo/features.fea b/src/Inter-UI-Black.ufo/features.fea
index 0b7026d0a..1bb427a24 100644
--- a/src/Inter-UI-Black.ufo/features.fea
+++ b/src/Inter-UI-Black.ufo/features.fea
@@ -74,7 +74,7 @@ languagesystem grek dflt;
 
 @UC_SET1 = [ 
   zero one two three four five six seven eight nine
-  Euro Idotaccent Mu dollar
+  euro Idotaccent Mu dollar
   lira sterling afii10023 afii10051 afii10052 afii10053 afii10054 afii10055
   afii10056 afii10057 afii10058 afii10059 afii10060 afii10061 afii10062
   afii10145 afii10017 afii10018 afii10019 afii10020 afii10021 afii10022
@@ -118,20 +118,20 @@ languagesystem grek dflt;
 @TNUM_L = [ 
   zero one two three four five
   six seven eight nine
-  one.1 four.1 six.1 nine.1
+  one.ss01 four.ss01 six.ss01 nine.ss01
   period comma
  ];
 
 @TNUM_R = [ 
   zero.tnum one.tnum two.tnum three.tnum four.tnum five.tnum
   six.tnum seven.tnum eight.tnum nine.tnum
-  one.tnum.1 four.tnum.1 six.tnum.1 nine.tnum.1
+  one.tnum.ss01 four.tnum.ss01 six.tnum.ss01 nine.tnum.ss01
   period.tnum comma.tnum
  ];
 
 @SS01_L = [  one four six nine  ];
 
-@SS01_R = [  one.1 four.1 six.1 nine.1  ];
+@SS01_R = [  one.ss01 four.ss01 six.ss01 nine.ss01  ];
 
 @NUM = [  zero one two three four five six seven eight nine @TNUM @SS01_R  ];
 
@@ -1017,6 +1017,8 @@ feature calt {
 } calt;
 
 feature ss01 {
+# notes:
+# Name: Alternate digits
   sub @SS01_L by @SS01_R;
 } ss01;
 
diff --git a/src/Inter-UI-Black.ufo/fontinfo.plist b/src/Inter-UI-Black.ufo/fontinfo.plist
index ca9831d15..01968335f 100644
--- a/src/Inter-UI-Black.ufo/fontinfo.plist
+++ b/src/Inter-UI-Black.ufo/fontinfo.plist
@@ -117,9 +117,9 @@
     <key>openTypeNameSampleText</key>
     <string></string>
     <key>openTypeNameUniqueID</key>
-    <string>Inter UI Black:2018:cd784d81</string>
+    <string>Inter UI Black:2018:fabb2241</string>
     <key>openTypeNameVersion</key>
-    <string>2.6;cd784d81</string>
+    <string>2.6;fabb2241</string>
     <key>openTypeOS2CodePageRanges</key>
     <array>
       <integer>0</integer>
@@ -266,6 +266,10 @@
     <integer>2</integer>
     <key>versionMinor</key>
     <integer>6</integer>
+    <key>woffMajorVersion</key>
+    <integer>2</integer>
+    <key>woffMinorVersion</key>
+    <integer>6</integer>
     <key>xHeight</key>
     <real>1536.0</real>
     <key>year</key>
diff --git a/src/Inter-UI-Black.ufo/glyphs/N_.glif b/src/Inter-UI-Black.ufo/glyphs/N_.glif
index 095e59703..4a93c07fc 100644
--- a/src/Inter-UI-Black.ufo/glyphs/N_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/N_.glif
@@ -28,7 +28,7 @@
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2018/09/01 23:10:14</string>
+      <string>2018/09/04 01:13:03</string>
       <key>public.markColor</key>
       <string>0.859,0.922,0.969,0.004</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/contents.plist b/src/Inter-UI-Black.ufo/glyphs/contents.plist
index cfda5ef41..4ee81457d 100644
--- a/src/Inter-UI-Black.ufo/glyphs/contents.plist
+++ b/src/Inter-UI-Black.ufo/glyphs/contents.plist
@@ -242,8 +242,6 @@
     <string>E_tildebelow.glif</string>
     <key>Eturn</key>
     <string>E_turn.glif</string>
-    <key>Euro</key>
-    <string>E_uro.glif</string>
     <key>Ezh</key>
     <string>E_zh.glif</string>
     <key>Ezhcaron</key>
@@ -1676,6 +1674,8 @@
     <string>etildebelow.glif</string>
     <key>eturn</key>
     <string>eturn.glif</string>
+    <key>euro</key>
+    <string>euro.glif</string>
     <key>eurocurrency</key>
     <string>eurocurrency.glif</string>
     <key>exclam</key>
@@ -1738,16 +1738,16 @@
     <string>florin.glif</string>
     <key>four</key>
     <string>four.glif</string>
-    <key>four.1</key>
-    <string>four.1.glif</string>
     <key>four.frac</key>
     <string>four.frac.glif</string>
+    <key>four.ss01</key>
+    <string>four.ss01.glif</string>
     <key>four.sup</key>
     <string>four.sup.glif</string>
     <key>four.tnum</key>
     <string>four.tnum.glif</string>
-    <key>four.tnum.1</key>
-    <string>four.tnum.1.glif</string>
+    <key>four.tnum.ss01</key>
+    <string>four.tnum.ss01.glif</string>
     <key>fourroman</key>
     <string>fourroman.glif</string>
     <key>foursub</key>
@@ -1834,10 +1834,10 @@
     <string>greaterequal.glif</string>
     <key>guarani</key>
     <string>guarani.glif</string>
-    <key>guillemotleft</key>
-    <string>guillemotleft.glif</string>
-    <key>guillemotright</key>
-    <string>guillemotright.glif</string>
+    <key>guillemetleft</key>
+    <string>guillemetleft.glif</string>
+    <key>guillemetright</key>
+    <string>guillemetright.glif</string>
     <key>guilsinglleft</key>
     <string>guilsinglleft.glif</string>
     <key>guilsinglright</key>
@@ -2208,16 +2208,16 @@
     <string>ndotbelow.glif</string>
     <key>nine</key>
     <string>nine.glif</string>
-    <key>nine.1</key>
-    <string>nine.1.glif</string>
     <key>nine.frac</key>
     <string>nine.frac.glif</string>
+    <key>nine.ss01</key>
+    <string>nine.ss01.glif</string>
     <key>nine.sup</key>
     <string>nine.sup.glif</string>
     <key>nine.tnum</key>
     <string>nine.tnum.glif</string>
-    <key>nine.tnum.1</key>
-    <string>nine.tnum.1.glif</string>
+    <key>nine.tnum.ss01</key>
+    <string>nine.tnum.ss01.glif</string>
     <key>nineinferior</key>
     <string>nineinferior.glif</string>
     <key>nineroman</key>
@@ -2344,14 +2344,14 @@
     <string>omicrontonos.glif</string>
     <key>one</key>
     <string>one.glif</string>
-    <key>one.1</key>
-    <string>one.1.glif</string>
+    <key>one.ss01</key>
+    <string>one.ss01.glif</string>
     <key>one.sup</key>
     <string>one.sup.glif</string>
     <key>one.tnum</key>
     <string>one.tnum.glif</string>
-    <key>one.tnum.1</key>
-    <string>one.tnum.1.glif</string>
+    <key>one.tnum.ss01</key>
+    <string>one.tnum.ss01.glif</string>
     <key>onedotleader</key>
     <string>onedotleader.glif</string>
     <key>oneeighth</key>
@@ -2732,16 +2732,16 @@
     <string>sigmalunatesymbolgreek.glif</string>
     <key>six</key>
     <string>six.glif</string>
-    <key>six.1</key>
-    <string>six.1.glif</string>
     <key>six.frac</key>
     <string>six.frac.glif</string>
+    <key>six.ss01</key>
+    <string>six.ss01.glif</string>
     <key>six.sup</key>
     <string>six.sup.glif</string>
     <key>six.tnum</key>
     <string>six.tnum.glif</string>
-    <key>six.tnum.1</key>
-    <string>six.tnum.1.glif</string>
+    <key>six.tnum.ss01</key>
+    <string>six.tnum.ss01.glif</string>
     <key>sixinferior</key>
     <string>sixinferior.glif</string>
     <key>sixroman</key>
diff --git a/src/Inter-UI-Black.ufo/glyphs/E_uro.glif b/src/Inter-UI-Black.ufo/glyphs/euro.glif
index bf825deff..57ff48849 100644
--- a/src/Inter-UI-Black.ufo/glyphs/E_uro.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/euro.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="Euro" format="2">
+<glyph name="euro" format="2">
   <advance width="1864.0"/>
   <unicode hex="20AC"/>
   <guideline x="1092.0" y="616.0" angle="90.0"/>
@@ -54,7 +54,7 @@
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2018/09/01 23:10:14</string>
+      <string>2018/09/04 01:36:45</string>
       <key>public.markColor</key>
       <string>0.8,0.941,0.949,0.004</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/four.1.glif b/src/Inter-UI-Black.ufo/glyphs/four.ss01.glif
index 7653dd01c..8bd79b0ba 100644
--- a/src/Inter-UI-Black.ufo/glyphs/four.1.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/four.ss01.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="four.1" format="2">
+<glyph name="four.ss01" format="2">
   <advance width="1824.0"/>
   <guideline y="1238.875"/>
   <guideline y="895.125"/>
@@ -23,7 +23,7 @@
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2018/09/01 23:10:14</string>
+      <string>2018/09/04 01:25:48</string>
       <key>public.markColor</key>
       <string>0.804,0.965,0.796,0.004</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/four.tnum.1.glif b/src/Inter-UI-Black.ufo/glyphs/four.tnum.ss01.glif
index e26b191d9..505d5dcef 100644
--- a/src/Inter-UI-Black.ufo/glyphs/four.tnum.1.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/four.tnum.ss01.glif
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="four.tnum.1" format="2">
+<glyph name="four.tnum.ss01" format="2">
   <advance width="1824.0"/>
   <guideline y="1238.875"/>
   <guideline y="895.125"/>
   <outline>
-    <component base="four.1"/>
+    <component base="four.ss01"/>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2018/09/01 23:10:14</string>
+      <string>2018/09/04 01:35:13</string>
       <key>public.markColor</key>
       <string>0.922,0.965,0.784,0.004</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/guillemotleft.glif b/src/Inter-UI-Black.ufo/glyphs/guillemetleft.glif
index e068d65c5..7043a857b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/guillemotleft.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/guillemetleft.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="guillemotleft" format="2">
+<glyph name="guillemetleft" format="2">
   <advance width="1568.0"/>
   <unicode hex="00AB"/>
   <guideline y="1238.875"/>
@@ -11,7 +11,7 @@
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2018/09/01 23:10:14</string>
+      <string>2018/09/04 01:38:35</string>
       <key>public.markColor</key>
       <string>0.941,0.941,0.941,0.004</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/guillemotright.glif b/src/Inter-UI-Black.ufo/glyphs/guillemetright.glif
index 9df775c17..6c1fe0969 100644
--- a/src/Inter-UI-Black.ufo/glyphs/guillemotright.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/guillemetright.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="guillemotright" format="2">
+<glyph name="guillemetright" format="2">
   <advance width="1568.0"/>
   <unicode hex="00BB"/>
   <guideline y="134.75"/>
@@ -11,7 +11,7 @@
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2018/09/01 23:10:14</string>
+      <string>2018/09/04 01:38:48</string>
       <key>public.markColor</key>
       <string>0.941,0.941,0.941,0.004</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/nine.1.glif b/src/Inter-UI-Black.ufo/glyphs/nine.ss01.glif
index 02f41fdd1..1cf75ba2a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/nine.1.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/nine.ss01.glif
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="nine.1" format="2">
+<glyph name="nine.ss01" format="2">
   <advance width="1824.0"/>
   <guideline y="763.125"/>
   <guideline y="1238.875"/>
   <outline>
-    <component base="six.1" xScale="-1.0" yScale="-1.0" xOffset="1716.0" yOffset="2048.0"/>
+    <component base="six.ss01" xScale="-1.0" yScale="-1.0" xOffset="1716.0" yOffset="2048.0"/>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2018/09/01 23:10:14</string>
+      <string>2018/09/04 01:26:01</string>
       <key>public.markColor</key>
       <string>0.804,0.965,0.796,0.004</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/nine.tnum.1.glif b/src/Inter-UI-Black.ufo/glyphs/nine.tnum.ss01.glif
index d5d9ab3b8..1e10a4fc8 100644
--- a/src/Inter-UI-Black.ufo/glyphs/nine.tnum.1.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/nine.tnum.ss01.glif
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="nine.tnum.1" format="2">
+<glyph name="nine.tnum.ss01" format="2">
   <advance width="1824.0"/>
   <guideline y="763.125"/>
   <guideline y="1238.875"/>
   <outline>
-    <component base="nine.1"/>
+    <component base="nine.ss01"/>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2018/09/01 23:10:14</string>
+      <string>2018/09/04 01:35:17</string>
       <key>public.markColor</key>
       <string>0.922,0.965,0.784,0.004</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/one.1.glif b/src/Inter-UI-Black.ufo/glyphs/one.ss01.glif
index 94d1cad92..a6c838293 100644
--- a/src/Inter-UI-Black.ufo/glyphs/one.1.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/one.ss01.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="one.1" format="2">
+<glyph name="one.ss01" format="2">
   <advance width="1364.0"/>
   <guideline y="1238.875"/>
   <guideline y="763.125"/>
@@ -18,7 +18,7 @@
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2018/09/01 23:10:14</string>
+      <string>2018/09/04 01:25:09</string>
       <key>public.markColor</key>
       <string>0.804,0.965,0.796,0.004</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/one.tnum.1.glif b/src/Inter-UI-Black.ufo/glyphs/one.tnum.ss01.glif
index b9b699bd6..abf9ed5ea 100644
--- a/src/Inter-UI-Black.ufo/glyphs/one.tnum.1.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/one.tnum.ss01.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="one.tnum.1" format="2">
+<glyph name="one.tnum.ss01" format="2">
   <advance width="1824.0"/>
   <outline>
     <contour>
@@ -22,7 +22,7 @@
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2018/09/01 23:10:14</string>
+      <string>2018/09/04 01:35:10</string>
       <key>public.markColor</key>
       <string>0.922,0.965,0.784,0.004</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/six.glif b/src/Inter-UI-Black.ufo/glyphs/six.glif
index 9e9dbd15e..26c4c9bd0 100644
--- a/src/Inter-UI-Black.ufo/glyphs/six.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/six.glif
@@ -10,7 +10,7 @@
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2018/09/01 23:10:14</string>
+      <string>2018/09/04 01:19:28</string>
       <key>public.markColor</key>
       <string>0.89,0.961,0.922,0.004</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/six.1.glif b/src/Inter-UI-Black.ufo/glyphs/six.ss01.glif
index 766f0fff4..66f3704d0 100644
--- a/src/Inter-UI-Black.ufo/glyphs/six.1.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/six.ss01.glif
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="six.1" format="2">
+<glyph name="six.ss01" format="2">
   <advance width="1696.0"/>
   <guideline y="1238.875"/>
   <guideline y="566.5"/>
@@ -42,7 +42,7 @@
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2018/09/01 23:10:14</string>
+      <string>2018/09/04 01:25:56</string>
       <key>public.markColor</key>
       <string>0.804,0.965,0.796,0.004</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/six.tnum.1.glif b/src/Inter-UI-Black.ufo/glyphs/six.tnum.ss01.glif
index 12171f3a0..9a7970c57 100644
--- a/src/Inter-UI-Black.ufo/glyphs/six.tnum.1.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/six.tnum.ss01.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="six.tnum.1" format="2">
+<glyph name="six.tnum.ss01" format="2">
   <advance width="1824.0"/>
   <outline>
-    <component base="six.1" xOffset="68.0"/>
+    <component base="six.ss01" xOffset="68.0"/>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2018/09/01 23:10:14</string>
+      <string>2018/09/04 01:35:15</string>
       <key>public.markColor</key>
       <string>0.922,0.965,0.784,0.004</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni029D_.ccmp.glif b/src/Inter-UI-Black.ufo/glyphs/uni029D_.ccmp.glif
index 7df3a2b2a..97b977b44 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni029D_.ccmp.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni029D_.ccmp.glif
@@ -32,16 +32,16 @@
       <point x="204.0" y="-600.0"/>
     </contour>
     <contour>
+      <point x="656.0" y="0.0" type="line"/>
+      <point x="1120.0" y="0.0" type="line"/>
       <point x="1116.0" y="1536.0" type="line"/>
       <point x="656.0" y="1536.0" type="line"/>
-      <point x="656.0" y="0.0" type="line"/>
-      <point x="1116.0" y="0.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2018/09/02 00:57:44</string>
+      <string>2018/09/04 01:57:03</string>
       <key>public.markColor</key>
       <string>0.894,0.271,0.843,0.004</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/zero.glif b/src/Inter-UI-Black.ufo/glyphs/zero.glif
index adc45e0fe..6e72ebb87 100644
--- a/src/Inter-UI-Black.ufo/glyphs/zero.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/zero.glif
@@ -41,7 +41,7 @@
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2018/09/01 23:10:14</string>
+      <string>2018/09/04 01:18:16</string>
       <key>public.markColor</key>
       <string>0.89,0.961,0.922,0.004</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/zero.slash.glif b/src/Inter-UI-Black.ufo/glyphs/zero.slash.glif
index cb6a99abe..5ec5b4b11 100644
--- a/src/Inter-UI-Black.ufo/glyphs/zero.slash.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/zero.slash.glif
@@ -46,7 +46,7 @@
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.lastChange</key>
-      <string>2018/09/01 23:10:14</string>
+      <string>2018/09/04 01:18:11</string>
       <key>public.markColor</key>
       <string>0.89,0.961,0.922,0.004</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/groups.plist b/src/Inter-UI-Black.ufo/groups.plist
index 9e499b216..37847467b 100644
--- a/src/Inter-UI-Black.ufo/groups.plist
+++ b/src/Inter-UI-Black.ufo/groups.plist
@@ -559,15 +559,15 @@
       <string>gecyrillic</string>
       <string>gheupturncyrillic</string>
     </array>
-    <key>public.kern1.guillemotleft</key>
+    <key>public.kern1.guillemetleft</key>
     <array>
       <string>guilsinglleft</string>
-      <string>guillemotleft</string>
+      <string>guillemetleft</string>
     </array>
-    <key>public.kern1.guillemotright</key>
+    <key>public.kern1.guillemetright</key>
     <array>
       <string>guilsinglright</string>
-      <string>guillemotright</string>
+      <string>guillemetright</string>
     </array>
     <key>public.kern1.hardsigncyrillic</key>
     <array>
@@ -602,7 +602,7 @@
       <string>zero</string>
       <string>zero.slash</string>
       <string>nine</string>
-      <string>nine.1</string>
+      <string>nine.ss01</string>
     </array>
     <key>public.kern1.ohorn</key>
     <array>
@@ -615,7 +615,7 @@
     <key>public.kern1.one</key>
     <array>
       <string>one</string>
-      <string>one.1</string>
+      <string>one.ss01</string>
     </array>
     <key>public.kern1.psigreek</key>
     <array>
@@ -1222,15 +1222,15 @@
     <array>
       <string>gamma</string>
     </array>
-    <key>public.kern2.guillemotleft</key>
+    <key>public.kern2.guillemetleft</key>
     <array>
       <string>guilsinglleft</string>
-      <string>guillemotleft</string>
+      <string>guillemetleft</string>
     </array>
-    <key>public.kern2.guillemotright</key>
+    <key>public.kern2.guillemetright</key>
     <array>
       <string>guilsinglright</string>
-      <string>guillemotright</string>
+      <string>guillemetright</string>
     </array>
     <key>public.kern2.idieresis</key>
     <array>
@@ -1271,7 +1271,7 @@
     <key>public.kern2.one</key>
     <array>
       <string>one</string>
-      <string>one.1</string>
+      <string>one.ss01</string>
     </array>
     <key>public.kern2.psigreek</key>
     <array>
@@ -1313,7 +1313,7 @@
       <string>zero</string>
       <string>zero.slash</string>
       <string>six</string>
-      <string>six.1</string>
+      <string>six.ss01</string>
     </array>
     <key>public.kern2.t</key>
     <array>
diff --git a/src/Inter-UI-Black.ufo/kerning.plist b/src/Inter-UI-Black.ufo/kerning.plist
index 60c309384..9964396ee 100644
--- a/src/Inter-UI-Black.ufo/kerning.plist
+++ b/src/Inter-UI-Black.ufo/kerning.plist
@@ -54,9 +54,9 @@
       <real>-330.0</real>
       <key>public.kern2.gammagreek</key>
       <real>-159.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-281.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-130.0</real>
       <key>public.kern2.iotadieresisgreek</key>
       <real>-254.0</real>
@@ -202,7 +202,7 @@
       <real>-69.0</real>
       <key>nine</key>
       <real>-34.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-34.0</real>
       <key>pi</key>
       <real>-29.0</real>
@@ -230,9 +230,9 @@
       <real>-295.0</real>
       <key>public.kern2.epsilongreek</key>
       <real>-76.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-240.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-144.0</real>
       <key>public.kern2.iotadieresisgreek</key>
       <real>-54.0</real>
@@ -292,7 +292,7 @@
       <real>-61.0</real>
       <key>public.kern2.gammagreek</key>
       <real>-116.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-70.0</real>
       <key>public.kern2.iotadieresisgreek</key>
       <real>-35.0</real>
@@ -352,7 +352,7 @@
       <real>-96.0</real>
       <key>public.kern2.eightsub</key>
       <real>-192.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-42.0</real>
       <key>public.kern2.quotedblbase</key>
       <real>-165.0</real>
@@ -403,7 +403,7 @@
       <real>-117.0</real>
       <key>public.kern2.eightsuperior</key>
       <real>-34.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-62.0</real>
       <key>public.kern2.quotedblbase</key>
       <real>-295.0</real>
@@ -543,7 +543,7 @@
       <real>-61.0</real>
       <key>nine</key>
       <real>-35.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-35.0</real>
       <key>numbersign</key>
       <real>-13.0</real>
@@ -561,9 +561,9 @@
       <real>-75.0</real>
       <key>public.kern2.elcyrillic</key>
       <real>-14.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-109.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-55.0</real>
       <key>public.kern2.one</key>
       <real>-40.0</real>
@@ -931,7 +931,7 @@
       <real>-75.0</real>
       <key>nine</key>
       <real>-20.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-20.0</real>
       <key>pi</key>
       <real>-83.0</real>
@@ -1152,7 +1152,7 @@
       <key>tenge</key>
       <real>-14.0</real>
     </dict>
-    <key>four.1</key>
+    <key>four.ss01</key>
     <dict>
       <key>Psi</key>
       <real>-82.0</real>
@@ -1511,7 +1511,7 @@
       <real>-15.0</real>
       <key>public.kern2.gammagreek</key>
       <real>-34.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-41.0</real>
       <key>public.kern2.iotadieresisgreek</key>
       <real>-15.0</real>
@@ -1594,19 +1594,19 @@
       <key>slash</key>
       <real>-80.0</real>
     </dict>
-    <key>nine.1</key>
+    <key>nine.ss01</key>
     <dict>
       <key>eight</key>
       <real>-112.0</real>
       <key>four</key>
       <real>-160.0</real>
-      <key>four.1</key>
+      <key>four.ss01</key>
       <real>-160.0</real>
       <key>i</key>
       <real>-64.0</real>
       <key>j</key>
       <real>-224.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-112.0</real>
       <key>period</key>
       <real>-272.0</real>
@@ -1677,7 +1677,7 @@
       <real>-128.0</real>
       <key>nine</key>
       <real>-112.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-176.0</real>
       <key>public.kern2.one</key>
       <real>-112.0</real>
@@ -1685,7 +1685,7 @@
       <real>-96.0</real>
       <key>six</key>
       <real>-96.0</real>
-      <key>six.1</key>
+      <key>six.ss01</key>
       <real>-96.0</real>
       <key>three</key>
       <real>-96.0</real>
@@ -1768,7 +1768,7 @@
       <real>-69.0</real>
       <key>public.kern2.gammagreek</key>
       <real>40.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-40.0</real>
       <key>public.kern2.iotadieresisgreek</key>
       <real>-35.0</real>
@@ -1809,7 +1809,7 @@
       <real>-109.0</real>
       <key>nine</key>
       <real>-41.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-41.0</real>
       <key>periodcentered</key>
       <real>-84.0</real>
@@ -1845,9 +1845,9 @@
       <real>-214.0</real>
       <key>public.kern2.f</key>
       <real>-54.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-84.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-82.0</real>
       <key>public.kern2.one</key>
       <real>-123.0</real>
@@ -1971,7 +1971,7 @@
       <real>-7.0</real>
       <key>public.kern2.eightsub</key>
       <real>-40.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-35.0</real>
       <key>public.kern2.idieresis</key>
       <real>48.0</real>
@@ -2250,7 +2250,7 @@
       <real>-110.0</real>
       <key>nine</key>
       <real>-14.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-14.0</real>
       <key>numbersign</key>
       <real>-35.0</real>
@@ -2274,9 +2274,9 @@
       <real>-221.0</real>
       <key>public.kern2.elcyrillic</key>
       <real>-226.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-281.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-130.0</real>
       <key>public.kern2.one</key>
       <real>-8.0</real>
@@ -2406,7 +2406,7 @@
       <real>-83.0</real>
       <key>nine</key>
       <real>-70.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-70.0</real>
       <key>periodcentered</key>
       <real>-123.0</real>
@@ -2428,7 +2428,7 @@
       <real>-240.0</real>
       <key>public.kern2.f</key>
       <real>-76.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-109.0</real>
       <key>public.kern2.idieresis</key>
       <real>176.0</real>
@@ -2497,7 +2497,7 @@
       <real>-152.0</real>
       <key>public.kern2.eightsuperior</key>
       <real>-310.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-103.0</real>
       <key>public.kern2.one</key>
       <real>-192.0</real>
@@ -2600,7 +2600,7 @@
       <real>-62.0</real>
       <key>public.kern2.eightsuperior</key>
       <real>165.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-75.0</real>
       <key>public.kern2.idieresis</key>
       <real>256.0</real>
@@ -2678,7 +2678,7 @@
       <real>-27.0</real>
       <key>public.kern2.epsilongreek</key>
       <real>-14.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-34.0</real>
       <key>public.kern2.m</key>
       <real>-22.0</real>
@@ -2741,7 +2741,7 @@
       <real>-473.0</real>
       <key>public.kern2.f</key>
       <real>70.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-48.0</real>
       <key>public.kern2.idieresis</key>
       <real>64.0</real>
@@ -2866,9 +2866,9 @@
       <real>-176.0</real>
       <key>public.kern2.eightsub</key>
       <real>-283.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-283.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-130.0</real>
       <key>public.kern2.idieresis</key>
       <real>256.0</real>
@@ -2953,7 +2953,7 @@
       <real>-69.0</real>
       <key>nine</key>
       <real>-34.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-34.0</real>
       <key>numbersign</key>
       <real>-29.0</real>
@@ -2981,9 +2981,9 @@
       <real>-132.0</real>
       <key>public.kern2.elcyrillic</key>
       <real>-186.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-213.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-157.0</real>
       <key>public.kern2.one</key>
       <real>-35.0</real>
@@ -3102,9 +3102,9 @@
       <real>96.0</real>
       <key>public.kern2.f</key>
       <real>-21.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-249.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-137.0</real>
       <key>public.kern2.idieresis</key>
       <real>192.0</real>
@@ -3173,7 +3173,7 @@
       <real>-118.0</real>
       <key>nine</key>
       <real>-21.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-21.0</real>
       <key>odieresis</key>
       <real>-144.0</real>
@@ -3207,9 +3207,9 @@
       <real>-48.0</real>
       <key>public.kern2.eightsub</key>
       <real>-240.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-144.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-54.0</real>
       <key>public.kern2.idieresis</key>
       <real>144.0</real>
@@ -3287,7 +3287,7 @@
       <real>-62.0</real>
       <key>nine</key>
       <real>-35.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-35.0</real>
       <key>periodcentered</key>
       <real>-88.0</real>
@@ -3315,9 +3315,9 @@
       <real>-132.0</real>
       <key>public.kern2.eightsub</key>
       <real>-200.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-157.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-55.0</real>
       <key>public.kern2.idieresis</key>
       <real>160.0</real>
@@ -3364,7 +3364,7 @@
       <real>-173.0</real>
       <key>nine</key>
       <real>-22.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-22.0</real>
       <key>periodcentered</key>
       <real>-144.0</real>
@@ -3390,9 +3390,9 @@
       <real>-192.0</real>
       <key>public.kern2.f</key>
       <real>-48.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-144.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-34.0</real>
       <key>public.kern2.idieresis</key>
       <real>160.0</real>
@@ -3447,7 +3447,7 @@
       <real>-131.0</real>
       <key>nine</key>
       <real>-48.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-48.0</real>
       <key>odieresis</key>
       <real>-144.0</real>
@@ -3489,9 +3489,9 @@
       <real>-296.0</real>
       <key>public.kern2.f</key>
       <real>-68.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-240.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-144.0</real>
       <key>public.kern2.idieresis</key>
       <real>176.0</real>
@@ -3542,7 +3542,7 @@
       <real>-33.0</real>
       <key>public.kern2.divide</key>
       <real>-54.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-69.0</real>
       <key>public.kern2.idieresis</key>
       <real>144.0</real>
@@ -3674,7 +3674,7 @@
       <real>-13.0</real>
       <key>public.kern2.gammagreek</key>
       <real>-33.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-42.0</real>
       <key>public.kern2.iotadieresisgreek</key>
       <real>-15.0</real>
@@ -3789,7 +3789,7 @@
       <real>-14.0</real>
       <key>nine</key>
       <real>-22.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-22.0</real>
       <key>public.kern2.A</key>
       <real>-82.0</real>
@@ -4092,7 +4092,7 @@
       <real>-138.0</real>
       <key>public.kern2.eightsuperior</key>
       <real>212.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-70.0</real>
       <key>public.kern2.one</key>
       <real>90.0</real>
@@ -4146,7 +4146,7 @@
       <real>-104.0</real>
       <key>nine</key>
       <real>-22.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-22.0</real>
       <key>pi</key>
       <real>-70.0</real>
@@ -4298,7 +4298,7 @@
       <real>22.0</real>
       <key>nine</key>
       <real>-8.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-162.0</real>
       <key>public.kern2.A</key>
       <real>-21.0</real>
@@ -4316,7 +4316,7 @@
       <real>-109.0</real>
       <key>public.kern2.dagger</key>
       <real>-14.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-68.0</real>
       <key>public.kern2.quotedbl</key>
       <real>-33.0</real>
@@ -4410,7 +4410,7 @@
       <real>-55.0</real>
       <key>public.kern2.epsilongreek</key>
       <real>-54.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-109.0</real>
       <key>public.kern2.m</key>
       <real>48.0</real>
@@ -4500,7 +4500,7 @@
       <real>31.0</real>
       <key>public.kern2.f</key>
       <real>64.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-87.0</real>
       <key>public.kern2.idieresis</key>
       <real>192.0</real>
@@ -4554,7 +4554,7 @@
       <real>-48.0</real>
       <key>nine</key>
       <real>-22.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-22.0</real>
       <key>pi</key>
       <real>-8.0</real>
@@ -4576,7 +4576,7 @@
       <real>-62.0</real>
       <key>public.kern2.gammagreek</key>
       <real>-28.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-29.0</real>
       <key>public.kern2.iotadieresisgreek</key>
       <real>-35.0</real>
@@ -4647,9 +4647,9 @@
       <real>-55.0</real>
       <key>public.kern2.elcyrillic</key>
       <real>-70.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-96.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-28.0</real>
       <key>public.kern2.quotedblbase</key>
       <real>-323.0</real>
@@ -4664,7 +4664,7 @@
       <key>zhecyrillic</key>
       <real>-27.0</real>
     </dict>
-    <key>public.kern1.guillemotleft</key>
+    <key>public.kern1.guillemetleft</key>
     <dict>
       <key>Psi</key>
       <real>-150.0</real>
@@ -4715,7 +4715,7 @@
       <key>zecyrillic</key>
       <real>-48.0</real>
     </dict>
-    <key>public.kern1.guillemotright</key>
+    <key>public.kern1.guillemetright</key>
     <dict>
       <key>Psi</key>
       <real>-240.0</real>
@@ -4902,7 +4902,7 @@
       <real>-13.0</real>
       <key>public.kern2.gammagreek</key>
       <real>-33.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-40.0</real>
       <key>public.kern2.iotadieresisgreek</key>
       <real>-14.0</real>
@@ -4955,7 +4955,7 @@
       <real>-179.0</real>
       <key>nine</key>
       <real>-20.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-20.0</real>
       <key>parenleft</key>
       <real>-15.0</real>
@@ -4991,7 +4991,7 @@
       <real>-160.0</real>
       <key>public.kern2.f</key>
       <real>-28.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-150.0</real>
       <key>public.kern2.s</key>
       <real>-62.0</real>
@@ -5030,7 +5030,7 @@
       <real>-13.0</real>
       <key>public.kern2.ecyrillic</key>
       <real>-69.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-117.0</real>
       <key>public.kern2.one</key>
       <real>-13.0</real>
@@ -5186,7 +5186,7 @@
       <real>48.0</real>
       <key>public.kern2.f</key>
       <real>40.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-82.0</real>
       <key>public.kern2.quotedblright</key>
       <real>41.0</real>
@@ -5215,7 +5215,7 @@
       <real>-96.0</real>
       <key>nine</key>
       <real>-22.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-22.0</real>
       <key>pi</key>
       <real>-48.0</real>
@@ -5258,13 +5258,13 @@
       <real>-112.0</real>
       <key>four</key>
       <real>-64.0</real>
-      <key>four.1</key>
+      <key>four.ss01</key>
       <real>-112.0</real>
       <key>j</key>
       <real>-128.0</real>
       <key>nine</key>
       <real>-64.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-112.0</real>
       <key>public.kern2.asciicircum</key>
       <real>10.0</real>
@@ -5272,7 +5272,7 @@
       <real>-44.0</real>
       <key>public.kern2.dagger</key>
       <real>17.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-16.0</real>
       <key>public.kern2.one</key>
       <real>-80.0</real>
@@ -5290,7 +5290,7 @@
       <real>-96.0</real>
       <key>six</key>
       <real>-80.0</real>
-      <key>six.1</key>
+      <key>six.ss01</key>
       <real>-80.0</real>
       <key>three</key>
       <real>-64.0</real>
@@ -5305,7 +5305,7 @@
       <real>-125.0</real>
       <key>nine</key>
       <real>-20.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-20.0</real>
       <key>pi</key>
       <real>-34.0</real>
@@ -5507,7 +5507,7 @@
       <real>-63.0</real>
       <key>nine</key>
       <real>-41.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-41.0</real>
       <key>numbersign</key>
       <real>-173.0</real>
@@ -5553,7 +5553,7 @@
       <real>-144.0</real>
       <key>public.kern2.gammagreek</key>
       <real>-34.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-150.0</real>
       <key>public.kern2.iotadieresisgreek</key>
       <real>-88.0</real>
@@ -5642,7 +5642,7 @@
       <real>63.0</real>
       <key>public.kern2.f</key>
       <real>63.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-40.0</real>
       <key>public.kern2.m</key>
       <real>14.0</real>
@@ -5748,7 +5748,7 @@
       <real>48.0</real>
       <key>public.kern2.f</key>
       <real>-16.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-40.0</real>
       <key>public.kern2.m</key>
       <real>16.0</real>
@@ -5789,7 +5789,7 @@
       <real>-8.0</real>
       <key>public.kern2.epsilongreek</key>
       <real>-6.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-70.0</real>
       <key>public.kern2.iotadieresisgreek</key>
       <real>-6.0</real>
@@ -5867,7 +5867,7 @@
       <real>-22.0</real>
       <key>nine</key>
       <real>22.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>22.0</real>
       <key>onehalf</key>
       <real>22.0</real>
@@ -5915,7 +5915,7 @@
       <real>77.0</real>
       <key>public.kern2.f</key>
       <real>41.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-55.0</real>
       <key>public.kern2.one</key>
       <real>48.0</real>
@@ -6002,7 +6002,7 @@
       <real>-124.0</real>
       <key>public.kern2.f</key>
       <real>28.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-118.0</real>
       <key>public.kern2.quotedblbase</key>
       <real>-137.0</real>
@@ -6037,9 +6037,9 @@
       <real>-6.0</real>
       <key>public.kern2.elcyrillic</key>
       <real>-7.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-15.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-15.0</real>
       <key>public.kern2.one</key>
       <real>-13.0</real>
@@ -6112,7 +6112,7 @@
       <real>-83.0</real>
       <key>public.kern2.f</key>
       <real>34.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-82.0</real>
       <key>public.kern2.quotedblbase</key>
       <real>-159.0</real>
@@ -6171,7 +6171,7 @@
       <real>-164.0</real>
       <key>public.kern2.f</key>
       <real>48.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-117.0</real>
       <key>public.kern2.quotedblleft</key>
       <real>-27.0</real>
@@ -6212,7 +6212,7 @@
       <real>-82.0</real>
       <key>public.kern2.dotlessj</key>
       <real>-164.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-83.0</real>
       <key>public.kern2.quotedblleft</key>
       <real>-42.0</real>
@@ -6356,7 +6356,7 @@
       <real>-165.0</real>
       <key>nine</key>
       <real>-28.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-28.0</real>
       <key>numbersign</key>
       <real>-96.0</real>
@@ -6394,9 +6394,9 @@
       <real>-70.0</real>
       <key>public.kern2.epsilongreek</key>
       <real>-83.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-139.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-27.0</real>
       <key>public.kern2.iotadieresisgreek</key>
       <real>-69.0</real>
@@ -6418,7 +6418,7 @@
       <real>-83.0</real>
       <key>seven</key>
       <real>55.0</real>
-      <key>six.1</key>
+      <key>six.ss01</key>
       <real>-160.0</real>
       <key>slash</key>
       <real>-61.0</real>
@@ -6473,7 +6473,7 @@
       <real>-56.0</real>
       <key>public.kern2.gammagreek</key>
       <real>15.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-40.0</real>
       <key>public.kern2.iotadieresisgreek</key>
       <real>-35.0</real>
@@ -6542,7 +6542,7 @@
       <key>underscore</key>
       <real>-144.0</real>
     </dict>
-    <key>six.1</key>
+    <key>six.ss01</key>
     <dict>
       <key>Psi</key>
       <real>-61.0</real>
@@ -6554,7 +6554,7 @@
       <real>22.0</real>
       <key>j</key>
       <real>-160.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-176.0</real>
       <key>public.kern2.A</key>
       <real>-62.0</real>
@@ -6662,7 +6662,7 @@
       <real>-62.0</real>
       <key>public.kern2.gammagreek</key>
       <real>33.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-40.0</real>
       <key>public.kern2.iotadieresisgreek</key>
       <real>-34.0</real>
@@ -6716,9 +6716,9 @@
       <real>-48.0</real>
       <key>public.kern2.elcyrillic</key>
       <real>-62.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-48.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-14.0</real>
       <key>public.kern2.quotedblbase</key>
       <real>-207.0</real>
@@ -6739,7 +6739,7 @@
       <real>-83.0</real>
       <key>nine</key>
       <real>-20.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-20.0</real>
       <key>public.kern2.A</key>
       <real>-83.0</real>
@@ -6780,7 +6780,7 @@
     <dict>
       <key>j</key>
       <real>-160.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-82.0</real>
     </dict>
     <key>two</key>
@@ -6827,7 +6827,7 @@
       <real>-55.0</real>
       <key>nine</key>
       <real>-144.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-144.0</real>
       <key>p</key>
       <real>144.0</real>
@@ -6961,9 +6961,9 @@
       <real>-13.0</real>
       <key>public.kern2.comma</key>
       <real>-240.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-48.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-6.0</real>
       <key>slash</key>
       <real>-77.0</real>
@@ -7098,7 +7098,7 @@
       <real>-75.0</real>
       <key>public.kern2.elcyrillic</key>
       <real>-15.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-75.0</real>
       <key>public.kern2.quotedblbase</key>
       <real>-28.0</real>
diff --git a/src/Inter-UI-Black.ufo/lib.plist b/src/Inter-UI-Black.ufo/lib.plist
index d632d6c19..978192e70 100644
--- a/src/Inter-UI-Black.ufo/lib.plist
+++ b/src/Inter-UI-Black.ufo/lib.plist
@@ -376,7 +376,7 @@
       <string>florin</string>
       <string>uni20BA</string>
       <string>uni20BD</string>
-      <string>Euro</string>
+      <string>euro</string>
       <string>uni20B9</string>
       <string>tenge</string>
       <string>peseta</string>
@@ -403,33 +403,33 @@
       <string>zero.tnum</string>
       <string>zero.tnum.slash</string>
       <string>one</string>
-      <string>one.1</string>
+      <string>one.ss01</string>
       <string>one.tnum</string>
-      <string>one.tnum.1</string>
+      <string>one.tnum.ss01</string>
       <string>two</string>
       <string>two.tnum</string>
       <string>twostroke</string>
       <string>three</string>
       <string>three.tnum</string>
       <string>four</string>
-      <string>four.1</string>
+      <string>four.ss01</string>
       <string>four.tnum</string>
-      <string>four.tnum.1</string>
+      <string>four.tnum.ss01</string>
       <string>five</string>
       <string>five.tnum</string>
       <string>Tonefive</string>
       <string>six</string>
-      <string>six.1</string>
+      <string>six.ss01</string>
       <string>six.tnum</string>
-      <string>six.tnum.1</string>
+      <string>six.tnum.ss01</string>
       <string>seven</string>
       <string>seven.tnum</string>
       <string>eight</string>
       <string>eight.tnum</string>
       <string>nine</string>
-      <string>nine.1</string>
+      <string>nine.ss01</string>
       <string>nine.tnum</string>
-      <string>nine.tnum.1</string>
+      <string>nine.tnum.ss01</string>
       <string>ampersand</string>
       <string>exclam</string>
       <string>exclamdown</string>
@@ -488,8 +488,6 @@
       <string>semicolon</string>
       <string>guilsinglleft</string>
       <string>guilsinglright</string>
-      <string>guillemotleft</string>
-      <string>guillemotright</string>
       <string>less</string>
       <string>greater</string>
       <string>lessequal</string>
@@ -2174,6 +2172,8 @@
       <string>cyrillicbreve</string>
       <string>uni1E2D.ccmp</string>
       <string>uni1ECB.ccmp</string>
+      <string>guillemetleft</string>
+      <string>guillemetright</string>
       <string>tonebarextrahighmod.cn</string>
       <string>tonebarextralowmod.cn</string>
       <string>tonebarhighmod.cn</string>