diff --git a/vars.yml b/vars.yml
index 6766647..a6b0eff 100644
--- a/vars.yml
+++ b/vars.yml
@@ -39,42 +39,42 @@ charvars:
   capital-k: curly-top-left-serifed
   capital-l: serifless
   capital-m: hanging-motion-serifed
-  capital-n: standard
+  capital-n: standard-serifless
   capital-p: closed-motion-serifed
   capital-q: open-swash
-  capital-r: straight-open
+  capital-r: straight-open-serifless
   capital-s: serifless
   capital-t: serifless
-  capital-u: toothless-rounded
-  capital-v: curly
-  capital-w: straight-asymmetric
+  capital-u: toothless-rounded-serifless
+  capital-v: curly-serifless
+  capital-w: straight-asymmetric-serifless
   capital-x: curly-serifless
   capital-y: curly-serifless
   capital-z: straight-serifless-with-crossbar
   a: double-storey-tailed
-  b: toothless-corner
+  b: toothless-corner-serifless
   c: serifless
   d: tailed-serifless
   e: rounded
   f: flat-hook-tailed
   g: double-storey-open
-  h: straight
+  h: straight-serifless
   i: hooky
   j: serifless
   k: curly-serifless
   l: flat-tailed
-  m: short-leg
-  n: earless-corner-tailed
-  p: motion-serifed
-  q: earless-corner-diagonal-tailed
-  r: corner-hooked
+  m: short-leg-serifless
+  n: earless-corner-tailed-serifless
+  p: eared-motion-serifed
+  q: earless-corner-diagonal-tailed-serifless
+  r: corner-hooked-serifless
   s: serifless
   t: standard
-  u: toothless-rounded
-  v: curly
-  w: cursive
+  u: toothless-rounded-serifless
+  v: curly-serifless
+  w: cursive-serifless
   x: curly-serifless
-  y: curly
+  y: curly-serifless
   z: straight-serifless-with-crossbar
   long-s: flat-hook-tailed
   eszet: longs-s-lig-tailed
@@ -96,11 +96,12 @@ charvars:
   cyrl-en: tailed-top-left-serifed
   cyrl-ef: cursive
   cyrl-che: tailed
-  cyrl-capital-u: curly-turn
-  cyrl-ya: straight-tailed
+  cyrl-capital-u: curly-turn-serifless
+  cyrl-capital-ya: straight-serifless
+  cyrl-ya: straight-tailed-serifless
   cyrl-yeri: round
   cyrl-yery: round
-  zero: slashed-split-oval
+  zero: oval-slashed-split
   one: no-base
   two: curly-neck
   three: flat-top
@@ -110,10 +111,11 @@ charvars:
   seven: curly-serifless
   eight: crossing-asymmetric
   nine: straight-bar
+  diacritic-dot: round
+  punctuation-dot: round
   tilde: low
   asterisk: turn-hex-high
   underscore: high
-  pilcrow: low
   caret: high
   paren: normal
   brace: curly
@@ -121,15 +123,15 @@ charvars:
   ampersand: flat-top
   at: fourfold-solid-inner-tall
   dollar: open-cap
-  cent: open
   percent: rings-segmented-slash
   bar: natural-slope
   ascii-single-quote: raised-comma
   ascii-grave: straight
   question: smooth
-  punctuation-dot: round
-  diacritic-dot: round
+  pilcrow: low
+  cent: open
   partial-derivative: curly-bar
+  lower-eth: straight-bar
   micro-sign: tailless
   lig-ltgteq: flat
   lig-neq: slightly-slanted