massaging glyphs file

22 files changed, 182 insertions, 176 deletions

diff --git a/src/Inter-UI-Regular.ufo/features.fea b/src/Inter-UI-Regular.ufo/features.fea
index 0b7026d0a..1bb427a24 100644
--- a/src/Inter-UI-Regular.ufo/features.fea
+++ b/src/Inter-UI-Regular.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-Regular.ufo/fontinfo.plist b/src/Inter-UI-Regular.ufo/fontinfo.plist
index 7198d38ff..089a802d7 100644
--- a/src/Inter-UI-Regular.ufo/fontinfo.plist
+++ b/src/Inter-UI-Regular.ufo/fontinfo.plist
@@ -181,9 +181,9 @@
     <key>openTypeNameSampleText</key>
     <string></string>
     <key>openTypeNameUniqueID</key>
-    <string>Inter UI Regular:2018:cd784d81</string>
+    <string>Inter UI Regular:2018:fabb2241</string>
     <key>openTypeNameVersion</key>
-    <string>2.6;cd784d81</string>
+    <string>2.6;fabb2241</string>
     <key>openTypeOS2CodePageRanges</key>
     <array>
       <integer>0</integer>
@@ -330,6 +330,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-Regular.ufo/glyphs/N_.glif b/src/Inter-UI-Regular.ufo/glyphs/N_.glif
index 31db781a1..d47649d82 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/N_.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/N_.glif
@@ -27,7 +27,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-Regular.ufo/glyphs/contents.plist b/src/Inter-UI-Regular.ufo/glyphs/contents.plist
index cfda5ef41..4ee81457d 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/contents.plist
+++ b/src/Inter-UI-Regular.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-Regular.ufo/glyphs/E_uro.glif b/src/Inter-UI-Regular.ufo/glyphs/euro.glif
index 5f3210a73..2fbc70230 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/E_uro.glif
+++ b/src/Inter-UI-Regular.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="1872.0"/>
   <unicode hex="20AC"/>
   <guideline x="1092.0" y="616.0" angle="90.0"/>
@@ -53,7 +53,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-Regular.ufo/glyphs/four.1.glif b/src/Inter-UI-Regular.ufo/glyphs/four.ss01.glif
index ffed10901..03ecc9f18 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/four.1.glif
+++ b/src/Inter-UI-Regular.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="1680.0"/>
   <outline>
     <contour>
@@ -21,7 +21,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-Regular.ufo/glyphs/four.tnum.1.glif b/src/Inter-UI-Regular.ufo/glyphs/four.tnum.ss01.glif
index ec20fce0f..632e8bf31 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/four.tnum.1.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/four.tnum.ss01.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="four.tnum.1" format="2">
+<glyph name="four.tnum.ss01" format="2">
   <advance width="1680.0"/>
   <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-Regular.ufo/glyphs/guillemotleft.glif b/src/Inter-UI-Regular.ufo/glyphs/guillemetleft.glif
index 1f18ae0cb..0e4bfd0e3 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/guillemotleft.glif
+++ b/src/Inter-UI-Regular.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="1264.0"/>
   <unicode hex="00AB"/>
   <outline>
@@ -9,7 +9,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-Regular.ufo/glyphs/guillemotright.glif b/src/Inter-UI-Regular.ufo/glyphs/guillemetright.glif
index 746152148..d308463e3 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/guillemotright.glif
+++ b/src/Inter-UI-Regular.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="1264.0"/>
   <unicode hex="00BB"/>
   <outline>
@@ -9,7 +9,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-Regular.ufo/glyphs/nine.1.glif b/src/Inter-UI-Regular.ufo/glyphs/nine.ss01.glif
index c96a8c44d..121f96d2d 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/nine.1.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/nine.ss01.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="nine.1" format="2">
+<glyph name="nine.ss01" format="2">
   <advance width="1680.0"/>
   <outline>
-    <component base="six.1" xScale="-1.0" yScale="-1.0" xOffset="1664.0" yOffset="2048.0"/>
+    <component base="six.ss01" xScale="-1.0" yScale="-1.0" xOffset="1664.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-Regular.ufo/glyphs/six.tnum.1.glif b/src/Inter-UI-Regular.ufo/glyphs/nine.tnum.ss01.glif
index 9de00678e..f121ead7f 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/six.tnum.1.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/nine.tnum.ss01.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="six.tnum.1" format="2">
+<glyph name="nine.tnum.ss01" format="2">
   <advance width="1680.0"/>
   <outline>
-    <component base="six.1" xOffset="-28.0"/>
+    <component base="nine.ss01" xOffset="28.0"/>
   </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-Regular.ufo/glyphs/one.1.glif b/src/Inter-UI-Regular.ufo/glyphs/one.ss01.glif
index d2e54843a..5376ca81f 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/one.1.glif
+++ b/src/Inter-UI-Regular.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="1260.0"/>
   <outline>
     <contour>
@@ -16,7 +16,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-Regular.ufo/glyphs/one.tnum.1.glif b/src/Inter-UI-Regular.ufo/glyphs/one.tnum.ss01.glif
index ee0bdb7cf..668f49b0b 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/one.tnum.1.glif
+++ b/src/Inter-UI-Regular.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="1680.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-Regular.ufo/glyphs/six.glif b/src/Inter-UI-Regular.ufo/glyphs/six.glif
index 625070299..bfd02e292 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/six.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/six.glif
@@ -8,7 +8,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-Regular.ufo/glyphs/six.1.glif b/src/Inter-UI-Regular.ufo/glyphs/six.ss01.glif
index ee7ca7054..a46187d86 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/six.1.glif
+++ b/src/Inter-UI-Regular.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="1680.0"/>
   <outline>
     <contour>
@@ -40,7 +40,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-Regular.ufo/glyphs/nine.tnum.1.glif b/src/Inter-UI-Regular.ufo/glyphs/six.tnum.ss01.glif
index d9c22254a..36cac5c1b 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/nine.tnum.1.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/six.tnum.ss01.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<glyph name="nine.tnum.1" format="2">
+<glyph name="six.tnum.ss01" format="2">
   <advance width="1680.0"/>
   <outline>
-    <component base="nine.1" xOffset="28.0"/>
+    <component base="six.ss01" xOffset="-28.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-Regular.ufo/glyphs/uni029D_.ccmp.glif b/src/Inter-UI-Regular.ufo/glyphs/uni029D_.ccmp.glif
index ae8f2d1ce..a95009120 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/uni029D_.ccmp.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/uni029D_.ccmp.glif
@@ -32,16 +32,16 @@
       <point x="116.0" y="-576.0"/>
     </contour>
     <contour>
-      <point x="760.0" y="1536.0" type="line"/>
-      <point x="524.0" y="1536.0" type="line"/>
       <point x="524.0" y="0.0" type="line"/>
       <point x="760.0" y="0.0" type="line"/>
+      <point x="760.0" y="1536.0" type="line"/>
+      <point x="524.0" y="1536.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-Regular.ufo/glyphs/zero.glif b/src/Inter-UI-Regular.ufo/glyphs/zero.glif
index ee60ebb59..b551a1395 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/zero.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/zero.glif
@@ -39,7 +39,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-Regular.ufo/glyphs/zero.slash.glif b/src/Inter-UI-Regular.ufo/glyphs/zero.slash.glif
index d39be9ee5..fe6cabd5b 100644
--- a/src/Inter-UI-Regular.ufo/glyphs/zero.slash.glif
+++ b/src/Inter-UI-Regular.ufo/glyphs/zero.slash.glif
@@ -44,7 +44,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-Regular.ufo/groups.plist b/src/Inter-UI-Regular.ufo/groups.plist
index 9e499b216..37847467b 100644
--- a/src/Inter-UI-Regular.ufo/groups.plist
+++ b/src/Inter-UI-Regular.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-Regular.ufo/kerning.plist b/src/Inter-UI-Regular.ufo/kerning.plist
index 501084829..f4e8451a0 100644
--- a/src/Inter-UI-Regular.ufo/kerning.plist
+++ b/src/Inter-UI-Regular.ufo/kerning.plist
@@ -62,9 +62,9 @@
       <real>-288.0</real>
       <key>public.kern2.gammagreek</key>
       <real>-288.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-357.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-139.0</real>
       <key>public.kern2.iotadieresisgreek</key>
       <real>-359.0</real>
@@ -184,9 +184,9 @@
       <real>-83.0</real>
       <key>public.kern2.etagreek</key>
       <real>-29.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>-166.0</real>
       <key>public.kern2.iotadieresisgreek</key>
       <real>-82.0</real>
@@ -237,7 +237,7 @@
       <real>-68.0</real>
       <key>public.kern2.gammagreek</key>
       <real>-137.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-96.0</real>
       <key>public.kern2.iotadieresisgreek</key>
       <real>-69.0</real>
@@ -435,7 +435,7 @@
       <real>-125.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>-29.0</real>
@@ -451,9 +451,9 @@
       <real>-304.0</real>
       <key>public.kern2.ecyrillic</key>
       <real>-68.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-137.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-70.0</real>
       <key>public.kern2.one</key>
       <real>-54.0</real>
@@ -801,7 +801,7 @@
     </dict>
     <key>eight</key>
     <dict>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-66.0</real>
     </dict>
     <key>ellipsis</key>
@@ -853,7 +853,7 @@
       <real>-96.0</real>
       <key>public.kern2.dagger</key>
       <real>-13.0</real>
-      <key>six.1</key>
+      <key>six.ss01</key>
       <real>-80.0</real>
       <key>underscore</key>
       <real>-40.0</real>
@@ -907,7 +907,7 @@
       <key>tenge</key>
       <real>-28.0</real>
     </dict>
-    <key>four.1</key>
+    <key>four.ss01</key>
     <dict>
       <key>Psi</key>
       <real>-42.0</real>
@@ -1173,7 +1173,7 @@
       <real>-54.0</real>
       <key>public.kern2.gammagreek</key>
       <real>-55.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-56.0</real>
       <key>public.kern2.iotadieresisgreek</key>
       <real>-29.0</real>
@@ -1234,17 +1234,17 @@
       <key>slash</key>
       <real>-48.0</real>
     </dict>
-    <key>nine.1</key>
+    <key>nine.ss01</key>
     <dict>
       <key>four</key>
       <real>-176.0</real>
-      <key>four.1</key>
+      <key>four.ss01</key>
       <real>-176.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-64.0</real>
       <key>seven</key>
       <real>-103.0</real>
-      <key>six.1</key>
+      <key>six.ss01</key>
       <real>-176.0</real>
       <key>slash</key>
       <real>-48.0</real>
@@ -1308,18 +1308,16 @@
       <real>-64.0</real>
       <key>nine</key>
       <real>-32.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-144.0</real>
       <key>public.kern2.one</key>
       <real>-144.0</real>
       <key>six</key>
       <real>-112.0</real>
-      <key>six.1</key>
+      <key>six.ss01</key>
       <real>-112.0</real>
       <key>three</key>
       <real>-96.0</real>
-      <key>zero</key>
-      <real>-110.0</real>
     </dict>
     <key>periodcentered</key>
     <dict>
@@ -1383,7 +1381,7 @@
       <real>96.0</real>
       <key>public.kern2.epsilongreek</key>
       <real>-69.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-54.0</real>
       <key>public.kern2.iotadieresisgreek</key>
       <real>-68.0</real>
@@ -1420,7 +1418,7 @@
       <real>-82.0</real>
       <key>nine</key>
       <real>-82.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-28.0</real>
       <key>periodcentered</key>
       <real>-84.0</real>
@@ -1452,9 +1450,9 @@
       <real>-249.0</real>
       <key>public.kern2.f</key>
       <real>-42.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>-96.0</real>
       <key>public.kern2.one</key>
       <real>-96.0</real>
@@ -1502,7 +1500,7 @@
       <real>-82.0</real>
       <key>nine</key>
       <real>-15.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-15.0</real>
       <key>pi</key>
       <real>-83.0</real>
@@ -1526,9 +1524,9 @@
       <real>-83.0</real>
       <key>public.kern2.gammagreek</key>
       <real>-192.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>-96.0</real>
       <key>public.kern2.iotadieresisgreek</key>
       <real>-82.0</real>
@@ -1623,7 +1621,7 @@
       <real>-15.0</real>
       <key>public.kern2.eight.subs</key>
       <real>-29.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-40.0</real>
       <key>public.kern2.idieresis</key>
       <real>48.0</real>
@@ -1871,7 +1869,7 @@
       <real>-219.0</real>
       <key>nine</key>
       <real>-29.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-29.0</real>
       <key>numbersign</key>
       <real>-70.0</real>
@@ -1895,9 +1893,9 @@
       <real>-234.0</real>
       <key>public.kern2.elcyrillic</key>
       <real>-235.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-357.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-137.0</real>
       <key>public.kern2.quotedblbase</key>
       <real>-412.0</real>
@@ -2009,7 +2007,7 @@
       <real>-54.0</real>
       <key>nine</key>
       <real>-42.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-42.0</real>
       <key>periodcentered</key>
       <real>-123.0</real>
@@ -2029,7 +2027,7 @@
       <real>-304.0</real>
       <key>public.kern2.f</key>
       <real>-41.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-139.0</real>
       <key>public.kern2.idieresis</key>
       <real>240.0</real>
@@ -2094,7 +2092,7 @@
       <real>-234.0</real>
       <key>public.kern2.eight.sups</key>
       <real>-425.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-165.0</real>
       <key>public.kern2.one</key>
       <real>-124.0</real>
@@ -2173,7 +2171,7 @@
       <real>-42.0</real>
       <key>public.kern2.eight.sups</key>
       <real>139.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-152.0</real>
       <key>public.kern2.idieresis</key>
       <real>256.0</real>
@@ -2217,7 +2215,7 @@
       <real>-13.0</real>
       <key>public.kern2.etagreek</key>
       <real>-29.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-41.0</real>
       <key>public.kern2.quotedblleft</key>
       <real>-84.0</real>
@@ -2272,7 +2270,7 @@
       <real>-219.0</real>
       <key>public.kern2.f</key>
       <real>68.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-55.0</real>
       <key>public.kern2.idieresis</key>
       <real>96.0</real>
@@ -2379,9 +2377,9 @@
       <real>-206.0</real>
       <key>public.kern2.eight.subs</key>
       <real>-343.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-357.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-137.0</real>
       <key>public.kern2.idieresis</key>
       <real>256.0</real>
@@ -2464,7 +2462,7 @@
       <real>-138.0</real>
       <key>nine</key>
       <real>-13.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-13.0</real>
       <key>numbersign</key>
       <real>-55.0</real>
@@ -2490,9 +2488,9 @@
       <real>-260.0</real>
       <key>public.kern2.elcyrillic</key>
       <real>-164.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-180.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-137.0</real>
       <key>public.kern2.one</key>
       <real>-28.0</real>
@@ -2581,9 +2579,9 @@
       <real>42.0</real>
       <key>public.kern2.f</key>
       <real>-40.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-276.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-139.0</real>
       <key>public.kern2.idieresis</key>
       <real>192.0</real>
@@ -2640,7 +2638,7 @@
       <real>-109.0</real>
       <key>nine</key>
       <real>-15.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-15.0</real>
       <key>ntilde</key>
       <real>-48.0</real>
@@ -2676,9 +2674,9 @@
       <real>-138.0</real>
       <key>public.kern2.eight.subs</key>
       <real>-260.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-151.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-68.0</real>
       <key>public.kern2.idieresis</key>
       <real>240.0</real>
@@ -2770,9 +2768,9 @@
       <real>-139.0</real>
       <key>public.kern2.eight.subs</key>
       <real>-249.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-150.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-69.0</real>
       <key>public.kern2.idieresis</key>
       <real>256.0</real>
@@ -2837,9 +2835,9 @@
       <real>-28.0</real>
       <key>public.kern2.divide</key>
       <real>-180.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-111.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-40.0</real>
       <key>public.kern2.idieresis</key>
       <real>256.0</real>
@@ -2890,7 +2888,7 @@
       <real>-125.0</real>
       <key>nine</key>
       <real>-28.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-28.0</real>
       <key>ntilde</key>
       <real>-64.0</real>
@@ -2934,9 +2932,9 @@
       <real>-317.0</real>
       <key>public.kern2.f</key>
       <real>-64.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-248.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-164.0</real>
       <key>public.kern2.idieresis</key>
       <real>256.0</real>
@@ -2985,7 +2983,7 @@
       <real>-40.0</real>
       <key>public.kern2.divide</key>
       <real>-109.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-96.0</real>
       <key>public.kern2.idieresis</key>
       <real>240.0</real>
@@ -3089,7 +3087,7 @@
       <real>-55.0</real>
       <key>public.kern2.gammagreek</key>
       <real>-56.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-54.0</real>
       <key>public.kern2.iotadieresisgreek</key>
       <real>-29.0</real>
@@ -3355,6 +3353,8 @@
     <dict>
       <key>grave</key>
       <real>-384.0</real>
+      <key>public.kern2.six</key>
+      <real>-112.0</real>
       <key>quotedblreversed</key>
       <real>-384.0</real>
       <key>quotereversed</key>
@@ -3605,7 +3605,7 @@
       <real>-69.0</real>
       <key>public.kern2.comma</key>
       <real>-96.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-96.0</real>
       <key>public.kern2.quotedbl</key>
       <real>-40.0</real>
@@ -3687,7 +3687,7 @@
       <real>-304.0</real>
       <key>public.kern2.etagreek</key>
       <real>96.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-96.0</real>
       <key>public.kern2.quotedblbase</key>
       <real>-400.0</real>
@@ -3758,7 +3758,7 @@
       <real>-110.0</real>
       <key>public.kern2.eight.sups</key>
       <real>69.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-111.0</real>
       <key>public.kern2.idieresis</key>
       <real>288.0</real>
@@ -3820,7 +3820,7 @@
       <real>-42.0</real>
       <key>public.kern2.gammagreek</key>
       <real>-54.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-56.0</real>
       <key>public.kern2.iotadieresisgreek</key>
       <real>-69.0</real>
@@ -3885,7 +3885,7 @@
       <real>-110.0</real>
       <key>public.kern2.elcyrillic</key>
       <real>-69.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-109.0</real>
       <key>public.kern2.quotedblbase</key>
       <real>-330.0</real>
@@ -3898,7 +3898,7 @@
       <key>zhecyrillic</key>
       <real>-28.0</real>
     </dict>
-    <key>public.kern1.guillemotleft</key>
+    <key>public.kern1.guillemetleft</key>
     <dict>
       <key>Psi</key>
       <real>-166.0</real>
@@ -3949,7 +3949,7 @@
       <key>zecyrillic</key>
       <real>-40.0</real>
     </dict>
-    <key>public.kern1.guillemotright</key>
+    <key>public.kern1.guillemetright</key>
     <dict>
       <key>Psi</key>
       <real>-249.0</real>
@@ -4118,7 +4118,7 @@
       <real>-55.0</real>
       <key>public.kern2.gammagreek</key>
       <real>-54.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-54.0</real>
       <key>public.kern2.iotadieresisgreek</key>
       <real>-29.0</real>
@@ -4175,7 +4175,7 @@
       <real>-70.0</real>
       <key>public.kern2.divide</key>
       <real>-124.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-138.0</real>
       <key>public.kern2.s</key>
       <real>-55.0</real>
@@ -4208,7 +4208,7 @@
       <real>-27.0</real>
       <key>public.kern2.ecyrillic</key>
       <real>-70.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-70.0</real>
       <key>tecyrillic</key>
       <real>-54.0</real>
@@ -4306,7 +4306,7 @@
       <real>42.0</real>
       <key>public.kern2.f</key>
       <real>42.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-54.0</real>
       <key>public.kern2.quotedblright</key>
       <real>82.0</real>
@@ -4356,7 +4356,7 @@
       <real>-28.0</real>
       <key>public.kern2.comma</key>
       <real>-70.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-70.0</real>
       <key>public.kern2.quotedbl</key>
       <real>-56.0</real>
@@ -4557,7 +4557,7 @@
       <real>-123.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>-345.0</real>
@@ -4605,7 +4605,7 @@
       <real>-178.0</real>
       <key>public.kern2.gammagreek</key>
       <real>-70.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-233.0</real>
       <key>public.kern2.iotadieresisgreek</key>
       <real>-179.0</real>
@@ -4690,7 +4690,7 @@
       <real>124.0</real>
       <key>public.kern2.f</key>
       <real>84.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-56.0</real>
       <key>public.kern2.m</key>
       <real>27.0</real>
@@ -4785,7 +4785,7 @@
       <real>-54.0</real>
       <key>public.kern2.eight.subs</key>
       <real>96.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-56.0</real>
       <key>public.kern2.quotedblleft</key>
       <real>-111.0</real>
@@ -4845,7 +4845,7 @@
       <real>-41.0</real>
       <key>nine</key>
       <real>40.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>40.0</real>
       <key>onehalf</key>
       <real>40.0</real>
@@ -4889,7 +4889,7 @@
       <real>42.0</real>
       <key>public.kern2.f</key>
       <real>41.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-27.0</real>
       <key>public.kern2.one</key>
       <real>96.0</real>
@@ -4962,7 +4962,7 @@
       <real>-27.0</real>
       <key>public.kern2.eight.subs</key>
       <real>-139.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-110.0</real>
       <key>public.kern2.quotedblbase</key>
       <real>-219.0</real>
@@ -5036,7 +5036,7 @@
       <real>-27.0</real>
       <key>public.kern2.eight.subs</key>
       <real>-82.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-96.0</real>
       <key>public.kern2.quotedblbase</key>
       <real>-219.0</real>
@@ -5083,7 +5083,7 @@
       <real>-54.0</real>
       <key>public.kern2.f</key>
       <real>56.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-96.0</real>
       <key>public.kern2.quotedblleft</key>
       <real>-54.0</real>
@@ -5177,7 +5177,7 @@
       <real>-247.0</real>
       <key>nine</key>
       <real>-27.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-11.0</real>
       <key>numbersign</key>
       <real>-151.0</real>
@@ -5213,9 +5213,9 @@
       <real>-69.0</real>
       <key>public.kern2.epsilongreek</key>
       <real>-137.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-166.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-54.0</real>
       <key>public.kern2.iotadieresisgreek</key>
       <real>-138.0</real>
@@ -5237,7 +5237,7 @@
       <real>-139.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>-82.0</real>
@@ -5282,7 +5282,7 @@
       <real>124.0</real>
       <key>public.kern2.epsilongreek</key>
       <real>-70.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-56.0</real>
       <key>public.kern2.iotadieresisgreek</key>
       <real>-70.0</real>
@@ -5335,7 +5335,7 @@
       <key>underscore</key>
       <real>-123.0</real>
     </dict>
-    <key>six.1</key>
+    <key>six.ss01</key>
     <dict>
       <key>Psi</key>
       <real>-28.0</real>
@@ -5343,7 +5343,7 @@
       <real>-40.0</real>
       <key>backslash</key>
       <real>40.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-64.0</real>
       <key>public.kern2.A</key>
       <real>-15.0</real>
@@ -5400,7 +5400,7 @@
       <real>-55.0</real>
       <key>public.kern2.epsilongreek</key>
       <real>-70.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-55.0</real>
       <key>public.kern2.iotadieresisgreek</key>
       <real>-70.0</real>
@@ -5448,9 +5448,9 @@
       <real>-54.0</real>
       <key>public.kern2.elcyrillic</key>
       <real>-56.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-27.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-29.0</real>
       <key>public.kern2.quotedblbase</key>
       <real>-207.0</real>
@@ -5510,7 +5510,7 @@
       <real>-14.0</real>
       <key>public.kern2.epsilongreek</key>
       <real>-13.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-68.0</real>
       <key>public.kern2.iotadieresisgreek</key>
       <real>-14.0</real>
@@ -5556,7 +5556,7 @@
       <real>-40.0</real>
       <key>nine</key>
       <real>-123.0</real>
-      <key>nine.1</key>
+      <key>nine.ss01</key>
       <real>-123.0</real>
       <key>p</key>
       <real>123.0</real>
@@ -5663,9 +5663,9 @@
       <real>-56.0</real>
       <key>public.kern2.comma</key>
       <real>-180.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-41.0</real>
-      <key>public.kern2.guillemotright</key>
+      <key>public.kern2.guillemetright</key>
       <real>-13.0</real>
       <key>slash</key>
       <real>-111.0</real>
@@ -5785,7 +5785,7 @@
       <real>-69.0</real>
       <key>public.kern2.elcyrillic</key>
       <real>-28.0</real>
-      <key>public.kern2.guillemotleft</key>
+      <key>public.kern2.guillemetleft</key>
       <real>-69.0</real>
       <key>tecyrillic</key>
       <real>-68.0</real>
diff --git a/src/Inter-UI-Regular.ufo/lib.plist b/src/Inter-UI-Regular.ufo/lib.plist
index d632d6c19..978192e70 100644
--- a/src/Inter-UI-Regular.ufo/lib.plist
+++ b/src/Inter-UI-Regular.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>