diff --git a/build-plans.toml b/build-plans.toml
index c9f6faa12..16f12d555 100644
--- a/build-plans.toml
+++ b/build-plans.toml
@@ -684,8 +684,8 @@ export-glyph-names = true
 capital-i = "serifless"
 capital-j = "serifless"
 capital-k = "straight-serifless"
-capital-m = "flat-bottom"
-capital-w = "straight-flat-top"
+capital-m = "flat-bottom-serifless"
+capital-w = "straight-flat-top-serifless"
 a = "double-storey-serifless"
 d = "toothed-serifless"
 e = "flat-crossbar"
@@ -697,9 +697,9 @@ k = "straight-serifless"
 l = "serifless"
 r = "compact"
 t = "flat-hook"
-u = "toothed"
-w = "straight-flat-top"
-y = "straight"
+u = "toothed-serifless"
+w = "straight-flat-top-serifless"
+y = "straight-serifless"
 long-s = "flat-hook-serifless"
 eszet = "longs-s-lig"
 lower-iota = "flat-tailed"
@@ -716,8 +716,8 @@ percent = "rings-continuous-slash"
 capital-i = "serifed"
 capital-j = "serifless"
 capital-k = "straight-serifless"
-capital-m = "flat-bottom"
-capital-w = "straight-flat-top"
+capital-m = "flat-bottom-serifless"
+capital-w = "straight-flat-top-serifless"
 a = "double-storey-serifless"
 d = "toothed-serifless"
 e = "flat-crossbar"
@@ -729,9 +729,9 @@ k = "straight-serifless"
 l = "serifed"
 r = "compact"
 t = "flat-hook"
-u = "toothed"
-w = "straight-flat-top"
-y = "straight"
+u = "toothed-serifless"
+w = "straight-flat-top-serifless"
+y = "straight-serifless"
 long-s = "flat-hook-serifless"
 eszet = "longs-s-lig"
 lower-iota = "flat-tailed"
@@ -761,7 +761,7 @@ export-glyph-names = true
 
 [buildPlans.iosevka-etoile.variants.design]
 at = 'fourfold'
-capital-w = 'straight-flat-top'
+capital-w = 'straight-flat-top-serifed'
 f = "flat-hook-serifed"
 j = 'flat-hook-serifed'
 t = "flat-hook"