diff --git a/packages/font-glyphs/src/letter/armenian/eh-liun-hiun.ptl b/packages/font-glyphs/src/letter/armenian/eh-liun-hiun.ptl
index 2b9b7e6a7..074c62a36 100644
--- a/packages/font-glyphs/src/letter/armenian/eh-liun-hiun.ptl
+++ b/packages/font-glyphs/src/letter/armenian/eh-liun-hiun.ptl
@@ -21,8 +21,8 @@ glyph-block Letter-Armenian-Eh-Liun-Hiun : begin
 			local df : include : DivFrame 1
 			include : df.markSet.capital
 			include : VBar.l df.leftSB 0 CAP df.mvs
-			include : [ArmHBar.short df 1].base
-			include : [ArmHBar.normal df 1].high
+			include : [ArmHBar.short df].base
+			include : [ArmHBar.normal df].high
 			if SLAB : begin
 				local sf : SerifFrame.fromDf df CAP 0
 				include : composite-proc sf.lt.full sf.lb.outer
@@ -31,8 +31,8 @@ glyph-block Letter-Armenian-Eh-Liun-Hiun : begin
 			local df : include : DivFrame para.diversityF
 			include : df.markSet.b
 			include : VBar.l df.leftSB 0 Ascender df.mvs
-			include : [ArmHBar.short df 0].base
-			include : [ArmHBar.normal df 0].high
+			include : [ArmHBar.short df].base
+			include : [ArmHBar.normal df].high
 			if SLAB : begin
 				local sf : SerifFrame.fromDf df CAP 0
 				include sf.lt.outer
@@ -43,7 +43,7 @@ glyph-block Letter-Armenian-Eh-Liun-Hiun : begin
 			local df : include : DivFrame 1
 			include : df.markSet.capital
 			include : VBar.l df.leftSB 0 CAP df.mvs
-			include : [ArmHBar.normal df 1].base
+			include : [ArmHBar.normal df].base
 			if SLAB : begin
 				local sf : SerifFrame.fromDf df CAP 0
 				include : composite-proc sf.lt.full sf.lb.outer
@@ -62,7 +62,7 @@ glyph-block Letter-Armenian-Eh-Liun-Hiun : begin
 			local df : include : DivFrame 1
 			include : df.markSet.capital
 			include : VBar.l df.leftSB 0 CAP df.mvs
-			include : [ArmHBar.normal df 1].high
+			include : [ArmHBar.normal df].high
 			if SLAB : begin
 				local sf : SerifFrame.fromDf df CAP 0
 				include : composite-proc sf.lt.full sf.lb.full
@@ -70,7 +70,7 @@ glyph-block Letter-Armenian-Eh-Liun-Hiun : begin
 		create-glyph 'armn/hiun' 0x582 : glyph-proc
 			local df : include : DivFrame para.diversityF
 			include : VBar.l df.leftSB 0 XH df.mvs
-			include : [ArmHBar.normal df 1].base
+			include : [ArmHBar.normal df].base
 			if SLAB : begin
 				local sf : SerifFrame.fromDf df XH 0
 				include sf.lt.outer
diff --git a/packages/font-glyphs/src/letter/armenian/hook-group.ptl b/packages/font-glyphs/src/letter/armenian/hook-group.ptl
index ad4c499e1..37cca6bf1 100644
--- a/packages/font-glyphs/src/letter/armenian/hook-group.ptl
+++ b/packages/font-glyphs/src/letter/armenian/hook-group.ptl
@@ -16,14 +16,14 @@ glyph-block Letter-Armenian-Hook-Group : begin
 			local df : include : DivFrame 1
 			include : df.markSet.capital
 			include : RightHook df CAP df.mvs SLAB 0
-			include : [ArmHBar.normal df 1].mid
+			include : [ArmHBar.normal df].mid
 
 	do "Da"
 		create-glyph 'armn/Da' 0x534 : glyph-proc
 			local df : include : DivFrame 1
 			include : df.markSet.capital
 			include : LeftHook df CAP df.mvs SLAB 0
-			include : [ArmHBar.right df 1 SLAB].mid
+			include : [ArmHBar.right df].mid
 
 	do "Ech"
 		create-glyph 'armn/Ech' 0x535 : glyph-proc
@@ -31,14 +31,14 @@ glyph-block Letter-Armenian-Hook-Group : begin
 			include : df.markSet.capital
 			include : LeftHook df CAP df.mvs SLAB 0
 			include : FlipAround df.middle (CAP / 2)
-			include : [ArmHBar.normal df 1].high
+			include : [ArmHBar.normal df].high
 
 	do "Et"
 		create-glyph 'armn/Et' 0x538 : glyph-proc
 			local df : include : DivFrame 1
 			include : df.markSet.capital
 			include : RightHook df CAP df.mvs
-			include : [ArmHBar.normal df 1].base
+			include : [ArmHBar.normal df].base
 			if SLAB : begin
 				local sf : SerifFrame.fromDf df CAP 0
 				include sf.lb.outer
@@ -85,7 +85,7 @@ glyph-block Letter-Armenian-Hook-Group : begin
 			local df : include : DivFrame 1
 			include : df.markSet.capital
 			include : LeftHook df CAP df.mvs SLAB 0
-			include : [ArmHBar.right df 1 SLAB].base
+			include : [ArmHBar.right df].base
 
 	do "Nu"
 		create-glyph 'armn/Nu' 0x546 : glyph-proc
@@ -93,7 +93,7 @@ glyph-block Letter-Armenian-Hook-Group : begin
 			include : df.markSet.capital
 			include : LeftHook df CAP df.mvs SLAB 0
 			include : FlipAround df.middle (CAP / 2)
-			include : [ArmHBar.left df 1 SLAB].top
+			include : [ArmHBar.left df].cap
 
 	do "Peh"
 		create-glyph 'armn/Peh' 0x54A : glyph-proc
@@ -118,8 +118,7 @@ glyph-block Letter-Armenian-Hook-Group : begin
 				adb -- ArchDepthB
 				stroke -- df.mvs
 			include : VBar.r df.rightSB 0 CAP df.mvs
-			include : [ArmHBar.right df 1 SLAB].base
-
+			include : [ArmHBar.right df].base
 			if SLAB : begin
 				local sf : SerifFrame.fromDf df XH 0
 				local sf2 : SerifFrame.fromDf df CAP 0
diff --git a/packages/font-glyphs/src/letter/armenian/lower-q-group.ptl b/packages/font-glyphs/src/letter/armenian/lower-q-group.ptl
index 3b7947206..ff1ac5826 100644
--- a/packages/font-glyphs/src/letter/armenian/lower-q-group.ptl
+++ b/packages/font-glyphs/src/letter/armenian/lower-q-group.ptl
@@ -17,7 +17,7 @@ glyph-block Letter-Armenian-Lower-Q-Group : begin
 			include : df.markSet.p
 			include : OBarRight.shape (top -- XH)
 			include : VBar.r df.rightSB Descender XH
-			include : [ArmHBar.right df 0 SLAB].base
+			include : [ArmHBar.right df].base
 			if SLAB : begin
 				local sf : SerifFrame.fromDf df XH Descender
 				include sf.rb.fullSide
@@ -30,7 +30,7 @@ glyph-block Letter-Armenian-Lower-Q-Group : begin
 			include : df.markSet.p
 			include : OBarRight.shape (top -- XH)
 			include : VBar.r df.rightSB Descender XH
-			include : [ArmHBar.right df 0 SLAB].desc
+			include : [ArmHBar.right df].desc
 			if (SLAB && [not para.isItalic]) : begin
 				local sf : SerifFrame.fromDf df XH Descender
 				include sf.rt.outer
diff --git a/packages/font-glyphs/src/letter/armenian/lower-sha-group.ptl b/packages/font-glyphs/src/letter/armenian/lower-sha-group.ptl
index c7a41b5f1..97d7da313 100644
--- a/packages/font-glyphs/src/letter/armenian/lower-sha-group.ptl
+++ b/packages/font-glyphs/src/letter/armenian/lower-sha-group.ptl
@@ -25,7 +25,7 @@ glyph-block Letter-Armenian-Lower-Sha-Group : begin
 				g4 df.leftSB (XH - SHook)
 				hookstart XH (sw -- df.mvs)
 				TwoNeck df XH Descender
-			include : [ArmHBar.normal df 0].desc
+			include : [ArmHBar.normal df].desc
 
 	do "Ch'a"
 		create-glyph 'armn/cha' 0x579 : glyph-proc
@@ -44,7 +44,7 @@ glyph-block Letter-Armenian-Lower-Sha-Group : begin
 				widths.rhs df.mvs
 				flat x2 (y2 - df.mvs / 2)
 				curl df.leftSB (Descender + df.mvs) [widths.lhs df.mvs]
-			include : [ArmHBar.normal df 0].desc
+			include : [ArmHBar.normal df].desc
 
 	do "Jheh"
 		create-glyph 'armn/jheh' 0x57B : glyph-proc
@@ -75,4 +75,4 @@ glyph-block Letter-Armenian-Lower-Sha-Group : begin
 				straight.down.start (x1 - [HSwToV df.mvs]) y1 [heading Downward]
 				flat joinX joinY [widths.lhs fine]
 				curl df.leftSB (Descender + df.mvs)
-			include : [ArmHBar.normal df 0].desc
+			include : [ArmHBar.normal df].desc
diff --git a/packages/font-glyphs/src/letter/armenian/lower-u-group.ptl b/packages/font-glyphs/src/letter/armenian/lower-u-group.ptl
index ee8d2326e..cfac26619 100644
--- a/packages/font-glyphs/src/letter/armenian/lower-u-group.ptl
+++ b/packages/font-glyphs/src/letter/armenian/lower-u-group.ptl
@@ -54,7 +54,7 @@ glyph-block Letter-Armenian-Lower-U-Group : begin
 				top -- XH
 				bottom -- (XH / 2)
 				stroke -- df.mvs
-			include : [ArmHBar.normal df 0].base
+			include : [ArmHBar.normal df].base
 			if SLAB : begin
 				local sf : SerifFrame.fromDf df XH Descender
 				include : composite-proc sf.lt.outer sf.lb.fullSide
@@ -70,7 +70,7 @@ glyph-block Letter-Armenian-Lower-U-Group : begin
 				top -- XH
 				bottom -- Descender
 				stroke -- df.mvs
-			include : [ArmHBar.right df 0 SLAB].base
+			include : [ArmHBar.right df].base
 			if SLAB : begin
 				local sf : SerifFrame.fromDf df XH 0
 				local sf2 : SerifFrame.fromDf df XH Descender
@@ -90,7 +90,7 @@ glyph-block Letter-Armenian-Lower-U-Group : begin
 				right -- (df.rightSB - [HSwToV df.mvs])
 				stroke -- df.mvs
 			include : VBar.r df.rightSB 0 [mix 0 XH 0.6] df.mvs
-			include : [ArmHBar.normal df 0].high
+			include : [ArmHBar.normal df].high
 			if SLAB : include : USerifs.Toothed df Ascender df.mvs
 			eject-contour 'serifRT'
 
@@ -105,7 +105,7 @@ glyph-block Letter-Armenian-Lower-U-Group : begin
 				top -- XH
 				bottom -- 0
 				stroke -- df.mvs
-			include : [ArmHBar.normal df 0].desc
+			include : [ArmHBar.normal df].desc
 			if SLAB : begin
 				local sf : SerifFrame.fromDf df XH Descender
 				local sf2 : SerifFrame.fromDf df XH 0
@@ -202,7 +202,7 @@ glyph-block Letter-Armenian-Lower-U-Group : begin
 				top -- XH
 				bottom -- Descender
 				stroke -- df.mvs
-			include : [ArmHBar.right df 0 SLAB].desc
+			include : [ArmHBar.right df].desc
 			if SLAB : begin
 				local sf : SerifFrame.fromDf df XH 0
 				include sf.lt.outer
@@ -219,7 +219,7 @@ glyph-block Letter-Armenian-Lower-U-Group : begin
 				right -- (df.rightSB - [HSwToV df.mvs])
 				stroke -- df.mvs
 			include : VBar.r df.rightSB 0 Ascender df.mvs
-			include : [ArmHBar.right df 0 SLAB].top
+			include : [ArmHBar.right df].asc
 			if SLAB : begin
 				local sf : SerifFrame.fromDf df XH 0
 				local sf2 : SerifFrame.fromDf df Ascender 0
@@ -236,7 +236,7 @@ glyph-block Letter-Armenian-Lower-U-Group : begin
 				right -- (df.rightSB - [HSwToV df.mvs])
 				stroke -- df.mvs
 			include : VBar.r df.rightSB 0 XH df.mvs
-			include : [ArmHBar.left df 0 SLAB].top
+			include : [ArmHBar.left df].asc
 			if SLAB : begin
 				local sf : SerifFrame.fromDf df XH 0
 				include sf.rb.outer
@@ -301,7 +301,7 @@ glyph-block Letter-Armenian-Lower-U-Group : begin
 			# 	top -- XH
 			# 	bottom -- 0
 			# 	stroke -- df.mvs
-			# include : [ArmHBar.right df 0 SLAB].base
+			# include : [ArmHBar.right df].base
 			# if SLAB : begin
 			# 	local sf : SerifFrame.fromDf df XH 0
 			# 	include sf.lt.outer
@@ -336,8 +336,7 @@ glyph-block Letter-Armenian-Lower-U-Group : begin
 				right -- (df.rightSB - [HSwToV df.mvs])
 				stroke -- df.mvs
 			include : VBar.r df.rightSB Descender Ascender df.mvs
-			include : [ArmHBar.right df 0 SLAB].desc
-
+			include : [ArmHBar.right df].desc
 			if SLAB : begin
 				local sf : SerifFrame.fromDf df XH 0
 				local sf2 : SerifFrame.fromDf df Ascender Descender
diff --git a/packages/font-glyphs/src/letter/armenian/shared.ptl b/packages/font-glyphs/src/letter/armenian/shared.ptl
index ca9c02514..88fab155c 100644
--- a/packages/font-glyphs/src/letter/armenian/shared.ptl
+++ b/packages/font-glyphs/src/letter/armenian/shared.ptl
@@ -15,24 +15,26 @@ glyph-block Letter-Armenian-Shared-Shapes : begin
 	define jut Jut
 
 	define JUT-NORMAL 0
-	define JUT-SHORT 1
-	define JUT-RIGHT 2
-	define JUT-LEFT 3
+	define JUT-SHORT  1
+	define JUT-RIGHT  2
+	define JUT-LEFT   3
 
 	glyph-block-export ArmHBar
-	define [ArmHBar hPos df fCapital fOverslab] : namespace
+	define [ArmHBar hPos df] : namespace
 		define left : match hPos
-			[Just JUT-RIGHT] df.rightSB
-			[Just JUT-LEFT]  (df.leftSB - (jut * [if fOverslab 1.5 1]) + [HSwToV : 0.5 * df.mvs])
-			--               df.leftSB
+			[Just JUT-RIGHT]  df.rightSB
+			[Just JUT-LEFT]  (df.leftSB - (jut * [if SLAB 1.5 1]) + [HSwToV : 0.5 * df.mvs])
+			--                df.leftSB
 		define right : match hPos
-			[Just JUT-RIGHT]  (df.rightSB + (jut * [if fOverslab 1.5 1]) - [HSwToV : 0.5 * df.mvs])
-			[Just JUT-SHORT]  (df.rightSB - (jut - [HSwToV : 0.5 * df.mvs]) * df.div)
+			[Just JUT-RIGHT] (df.rightSB + (jut * [if SLAB 1.5 1]) - [HSwToV : 0.5 * df.mvs])
+			[Just JUT-SHORT] (df.rightSB - (jut - [HSwToV : 0.5 * df.mvs]) * df.div)
 			[Just JUT-LEFT]   df.leftSB
 			--                df.rightSB
 
-		export : define [top] : glyph-proc
-			include : HBar.t left right [if fCapital CAP Ascender] df.mvs
+		export : define [cap] : glyph-proc
+			include : HBar.t left right CAP df.mvs
+		export : define [asc] : glyph-proc
+			include : HBar.t left right Ascender df.mvs
 		export : define [high] : glyph-proc
 			include : HBar.t left right highBarPos df.mvs
 		export : define [mid] : glyph-proc
@@ -44,10 +46,10 @@ glyph-block Letter-Armenian-Shared-Shapes : begin
 		export : define [at y] : glyph-proc
 			include : HBar.m left right y df.mvs
 
-	set [ArmHBar.normal df fCapital fOverslab] : ArmHBar JUT-NORMAL df fCapital fOverslab
-	set [ArmHBar.short  df fCapital fOverslab] : ArmHBar JUT-SHORT  df fCapital fOverslab
-	set [ArmHBar.right  df fCapital fOverslab] : ArmHBar JUT-RIGHT  df fCapital fOverslab
-	set [ArmHBar.left   df fCapital fOverslab] : ArmHBar JUT-LEFT   df fCapital fOverslab
+	set [ArmHBar.normal df] : ArmHBar JUT-NORMAL df
+	set [ArmHBar.short  df] : ArmHBar JUT-SHORT  df
+	set [ArmHBar.right  df] : ArmHBar JUT-RIGHT  df
+	set [ArmHBar.left   df] : ArmHBar JUT-LEFT   df
 
 	glyph-block-export RightHook
 	define [RightHook df top sw baseSerif hookSerif _base _hookY _ada _adb] : glyph-proc
diff --git a/packages/font-glyphs/src/letter/armenian/to.ptl b/packages/font-glyphs/src/letter/armenian/to.ptl
index 72a9eef08..d24044082 100644
--- a/packages/font-glyphs/src/letter/armenian/to.ptl
+++ b/packages/font-glyphs/src/letter/armenian/to.ptl
@@ -9,7 +9,6 @@ glyph-block Letter-Armenian-To : begin
 	glyph-block-import CommonShapes
 	glyph-block-import Common-Derivatives
 	glyph-block-import Letter-Shared-Shapes : nShoulder SerifFrame
-	glyph-block-import Letter-Armenian-Shared-Shapes : ArmHBar
 
 	# Common Params
 	define barPos : XH / 2
@@ -32,8 +31,7 @@ glyph-block Letter-Armenian-To : begin
 				g4 (df.middle - [HSwToV : fine / 2]) [mix 0 barPosT 0.5] [widths.rhs fine]
 				arcvh
 				flat [mix df.leftSB df.rightSB 0.7] barPosT [widths.rhs df.mvs]
-				curl df.rightSB barPosT
-			include : [ArmHBar.right df 1].mid
+				curl (df.rightSB + jut - [HSwToV : 0.5 * df.mvs]) barPosT
 			if SLAB : begin
 				local sf : SerifFrame.fromDf df CAP 0
 				include sf.lb.full
diff --git a/packages/font-glyphs/src/letter/armenian/upper-cheh.ptl b/packages/font-glyphs/src/letter/armenian/upper-cheh.ptl
index f353fbb0c..cb8e94137 100644
--- a/packages/font-glyphs/src/letter/armenian/upper-cheh.ptl
+++ b/packages/font-glyphs/src/letter/armenian/upper-cheh.ptl
@@ -31,8 +31,8 @@ glyph-block Letter-Armenian-Upper-Cheh : begin
 				curl df.rightSB 0
 			include : dispiro
 				widths.rhs df.mvs
-				flat (df.leftSB - jut + [HSwToV : 0.5 * df.mvs]) XH
-				curl df.middle XH
+				flat (df.leftSB - jut + [HSwToV : 0.5 * df.mvs]) highBarPos
+				curl df.middle highBarPos
 				archv
-				flat df.rightSB (XH - ArchDepthA)
+				flat df.rightSB (highBarPos - ArchDepthA)
 				curl df.rightSB 0 [heading Downward]
diff --git a/packages/font-glyphs/src/letter/armenian/upper-co.ptl b/packages/font-glyphs/src/letter/armenian/upper-co.ptl
index 151388f56..362be907d 100644
--- a/packages/font-glyphs/src/letter/armenian/upper-co.ptl
+++ b/packages/font-glyphs/src/letter/armenian/upper-co.ptl
@@ -9,7 +9,11 @@ glyph-block Letter-Armenian-Upper-Co : begin
 	glyph-block-import CommonShapes
 	glyph-block-import Common-Derivatives
 	glyph-block-import Letter-Shared-Shapes : SerifFrame
-	glyph-block-import Letter-Armenian-Shared-Shapes : ArmHBar
+
+	# Common Params
+	define barPos : XH / 2
+	define highBarPos XH
+	define jut Jut
 
 	do "C'o"
 		create-glyph 'armn/Co' 0x551 : glyph-proc
@@ -18,10 +22,9 @@ glyph-block Letter-Armenian-Upper-Co : begin
 			local midy : CAP * HBarPos
 			local midyTop : midy + 0.5 * df.mvs
 			local midyBot : midy - 0.5 * df.mvs
-			include : [ArmHBar.left df 1].at midy
 			include : dispiro
 				widths.lhs df.mvs
-				flat df.leftSB midyBot
+				flat (df.leftSB - jut + [HSwToV : 0.5 * df.mvs]) midyBot
 				curl df.middle midyBot
 				archv
 				flatside.ru df.rightSB midyBot CAP ArchDepthA ArchDepthB 0
diff --git a/packages/font-glyphs/src/letter/armenian/upper-ho.ptl b/packages/font-glyphs/src/letter/armenian/upper-ho.ptl
index 175054924..6d065fed7 100644
--- a/packages/font-glyphs/src/letter/armenian/upper-ho.ptl
+++ b/packages/font-glyphs/src/letter/armenian/upper-ho.ptl
@@ -22,21 +22,23 @@ glyph-block Letter-Armenian-Upper-Ho : begin
 
 			local x1 : mix df.leftSB df.rightSB 0.1
 			local midy : CAP * HBarPos
+			local midyTop : midy + 0.5 * df.mvs
+			local midyBot : midy - 0.5 * df.mvs
 			include : dispiro
 				widths.rhs df.mvs
 				flat x1 CAP
-				curl df.middle CAP
+				curl df.middle CAP [heading Rightward]
 				archv
-				g4 df.rightSB [YSmoothMidR CAP (midy - df.mvs / 2) ArchDepthA ArchDepthB]
-				flat df.middle (midy - df.mvs / 2) [heading Downward]
+				flatside.rd df.rightSB midyBot CAP ArchDepthA ArchDepthB
+				straight.left.end df.middle midyBot
 
 			include : dispiro
 				widths.rhs df.mvs
-				flat (df.leftSB - jut + [HSwToV : 0.5 * df.mvs]) (midy + df.mvs / 2)
-				curl df.middle (midy + df.mvs / 2)
+				flat (df.leftSB - jut + [HSwToV : 0.5 * df.mvs]) midyTop
+				curl df.middle midyTop [heading Rightward]
 				archv
-				flat (df.rightSB - O * 2) [YSmoothMidR (midy + df.mvs / 2) 0 ArchDepthA ArchDepthB]
-				curl (df.rightSB - O * 2) 0
+				flat (df.rightSB - O * 2) [YSmoothMidR midyTop 0 ArchDepthA ArchDepthB]
+				curl (df.rightSB - O * 2) 0 [heading Downward]
 
 			if SLAB : begin
 				local sf : SerifFrame.fromDf df CAP 0
diff --git a/packages/font-glyphs/src/letter/armenian/upper-u-group.ptl b/packages/font-glyphs/src/letter/armenian/upper-u-group.ptl
index 74768b238..5ad04abf1 100644
--- a/packages/font-glyphs/src/letter/armenian/upper-u-group.ptl
+++ b/packages/font-glyphs/src/letter/armenian/upper-u-group.ptl
@@ -26,7 +26,7 @@ glyph-block Letter-Armenian-Upper-U-Group : begin
 			local df : include : DivFrame 1
 			include : df.markSet.capital
 			include : UShape df CAP 0 df.mvs
-			include : [ArmHBar.right df 1 SLAB].top
+			include : [ArmHBar.right df].cap
 			if SLAB : begin
 				include : USerifs.Toothless df CAP df.mvs
 
@@ -46,7 +46,7 @@ glyph-block Letter-Armenian-Upper-U-Group : begin
 			include : df.markSet.capital
 			include : UShape df CAP 1 df.mvs
 			include : FlipAround Middle (CAP / 2)
-			include : [ArmHBar.right df 1 SLAB].mid
+			include : [ArmHBar.right df].mid
 			if SLAB : begin
 				local sf : SerifFrame.fromDf df CAP 0
 				include : composite-proc sf.lb.full sf.rb.full
diff --git a/packages/font-glyphs/src/letter/armenian/upper-za-group.ptl b/packages/font-glyphs/src/letter/armenian/upper-za-group.ptl
index 6f38482ea..c70fa98d4 100644
--- a/packages/font-glyphs/src/letter/armenian/upper-za-group.ptl
+++ b/packages/font-glyphs/src/letter/armenian/upper-za-group.ptl
@@ -15,24 +15,24 @@ glyph-block Letter-Armenian-Upper-Za-Group : begin
 		create-glyph 'armn/Za' 0x536 : glyph-proc
 			local df : include : DivFrame 1
 			include : df.markSet.capital
-			local fine : df.mvs * (ShoulderFine / Stroke)
+			local fine : ShoulderFine * (df.mvs / Stroke)
 			local fine2 : df.adviceStroke 4
 			include : dispiro
 				widths.rhs df.mvs
-				straight.up.start df.leftSB (CAP - ArchDepthA)
-				arch.rhs CAP (sw -- df.mvs)
+				g4 df.leftSB (CAP - Hook)
+				hookstart CAP (sw -- df.mvs)
 				flat df.rightSB (CAP - ArchDepthB)
 				curl df.rightSB (df.mvs - fine + ArchDepthA)
 				arcvh
-				flat df.leftSB (df.mvs - fine) [widths.rhs fine]
+				g4 df.leftSB (df.mvs - fine) [widths.rhs fine]
 			include : VBar.l df.leftSB 0 VJut fine2
-			include : [ArmHBar.normal df 1].base
+			include : [ArmHBar.normal df].base
 
 	do "Jheh"
 		create-glyph 'armn/Jheh' 0x54B : glyph-proc
 			local df : include : DivFrame 1
 			include : df.markSet.capital
-			local fine : df.mvs * (ShoulderFine / Stroke)
+			local fine : ShoulderFine * (df.mvs / Stroke)
 			local fine2 : df.adviceStroke 4
 			local x1 : df.middle + [HSwToV : [StrokeWidthBlend 0 0.5] * fine2]
 			include : dispiro
@@ -42,7 +42,7 @@ glyph-block Letter-Armenian-Upper-Za-Group : begin
 				flat df.rightSB (CAP - ArchDepthB)
 				curl df.rightSB (df.mvs - fine + ArchDepthA)
 				arcvh
-				flat df.leftSB (df.mvs - fine) [widths.rhs fine]
+				g4 df.leftSB (df.mvs - fine) [widths.rhs fine]
 			include : intersection
 				spiro-outline
 					flat df.rightSB CAP
@@ -58,6 +58,6 @@ glyph-block Letter-Armenian-Upper-Za-Group : begin
 					flat x1 (0.55 * ArchDepthB) [widths.rhs fine2]
 					curl x1 (0.5 * ArchDepthB) [widths.rhs fine2]
 					arcvh
-					flat df.leftSB (df.mvs - fine) [widths.rhs fine]
+					g4 df.leftSB (df.mvs - fine) [widths.rhs fine]
 			include : VBar.l df.leftSB 0 VJut fine2
-			include : [ArmHBar.normal df 1].base
+			include : [ArmHBar.normal df].base
diff --git a/packages/font-glyphs/src/letter/greek/lower-epsilon.ptl b/packages/font-glyphs/src/letter/greek/lower-epsilon.ptl
index b03df37e3..5da77dfcb 100644
--- a/packages/font-glyphs/src/letter/greek/lower-epsilon.ptl
+++ b/packages/font-glyphs/src/letter/greek/lower-epsilon.ptl
@@ -516,8 +516,8 @@ glyph-block Letter-Greek-Lower-Epsilon : begin
 				include : Base df XH Slabs SHook SmallArchDepthA SmallArchDepthB
 
 
-	select-variant 'AeVolapuk' 0xA79A (follow -- [conditional-follow SLAB 'a/single/autoSerifed/slab' 'a/single/autoSerifed/sans'])
-	select-variant 'aeVolapuk' 0xA79B (follow -- [conditional-follow SLAB 'a/single/autoSerifed/slab' 'a/single/autoSerifed/sans'])
+	select-variant 'AeVolapuk' 0xA79A (follow -- [conditional-follow SLAB 'a/singleStorey/autoSerifed/slab' 'a/singleStorey/autoSerifed/sans'])
+	select-variant 'aeVolapuk' 0xA79B (follow -- [conditional-follow SLAB 'a/singleStorey/autoSerifed/slab' 'a/singleStorey/autoSerifed/sans'])
 	select-variant 'UeVolapuk' 0xA79E (follow -- 'u')
 	select-variant 'ueVolapuk' 0xA79F (follow -- 'u')
 
diff --git a/packages/font-glyphs/src/letter/latin/lower-g.ptl b/packages/font-glyphs/src/letter/latin/lower-g.ptl
index 541aaa674..c0cb558bb 100644
--- a/packages/font-glyphs/src/letter/latin/lower-g.ptl
+++ b/packages/font-glyphs/src/letter/latin/lower-g.ptl
@@ -200,7 +200,7 @@ glyph-block Letter-Latin-Lower-G : begin
 	select-variant 'GScript' 0xA7AC (follow -- 'gScript')
 	select-variant 'gScriptPalatalHook' 0x1D83 (follow -- 'gScript')
 
-	select-variant 'cyrl/de.BGR' (shapeFrom -- 'g') (follow -- [conditional-follow SLAB 'g/single/autoSerifed/slab' 'g/single/autoSerifed/sans'])
+	select-variant 'cyrl/de.BGR' (shapeFrom -- 'g') (follow -- [conditional-follow SLAB 'g/singleStorey/autoSerifed/slab' 'g/singleStorey/autoSerifed/sans'])
 	alias 'cyrl/de.SRB' null 'cyrl/de.BGR'
 
 	select-variant 'g/hookTopBase' (shapeFrom -- 'g')
diff --git a/packages/font-glyphs/src/letter/latin/lower-j.ptl b/packages/font-glyphs/src/letter/latin/lower-j.ptl
index 86daa4013..5d7468b06 100644
--- a/packages/font-glyphs/src/letter/latin/lower-j.ptl
+++ b/packages/font-glyphs/src/letter/latin/lower-j.ptl
@@ -95,18 +95,18 @@ glyph-block Letter-Latin-Lower-J : begin
 		export : define FlatHookSerifed   para.diversityI
 
 	define JConfig : object
-		'bentHookSerifless'          { "BentHook"        Serifs.None   XMiddle.BentHook            Marks.Serifless   Div.BentHook          }
-		'bentHookSerifed'            { "BentHook"        Serifs.Long   XMiddle.BentHook            Marks.Serifed     Div.BentHook          }
-		'bentHookShortSerifed'       { "BentHook"        Serifs.Short  XMiddle.BentHook            Marks.Serifed     Div.BentHook          }
-		'straightSerifless'          { "Straight"        Serifs.None   XMiddle.StraightSerifless   Marks.Serifless   Div.StraightSerifless }
-		'straightSerifed'            { "Straight"        Serifs.Long   XMiddle.StraightSerifed     Marks.Serifed     Div.StraightSerifed   }
-		'straightShortSerifed'       { "Straight"        Serifs.Short  XMiddle.StraightSerifed     Marks.Serifed     Div.StraightSerifed   }
-		'flatHookSerifless'          { "FlatHook"        Serifs.None   XMiddle.FlatHookSerifless   Marks.Serifless   Div.FlatHookSerifless }
-		'flatHookSerifed'            { "FlatHook"        Serifs.Long   XMiddle.FlatHookSerifed     Marks.Serifed     Div.FlatHookSerifed   }
-		'flatHookShortSerifed'       { "FlatHook"        Serifs.Short  XMiddle.FlatHookSerifed     Marks.Serifed     Div.FlatHookSerifed   }
-		'diagonalTailedSerifless'    { "DiagonalTailed"  Serifs.None   XMiddle.FlatHookSerifless   Marks.Serifless   Div.FlatHookSerifless }
-		'diagonalTailedSerifed'      { "DiagonalTailed"  Serifs.Long   XMiddle.FlatHookSerifed     Marks.Serifed     Div.FlatHookSerifed   }
-		'diagonalTailedShortSerifed' { "DiagonalTailed"  Serifs.Short  XMiddle.FlatHookSerifed     Marks.Serifed     Div.FlatHookSerifed   }
+		'bentHookSerifless'          { "BentHook"        Serifs.None   XMiddle.BentHook           Marks.Serifless  Div.BentHook          }
+		'bentHookSerifed'            { "BentHook"        Serifs.Long   XMiddle.BentHook           Marks.Serifed    Div.BentHook          }
+		'bentHookShortSerifed'       { "BentHook"        Serifs.Short  XMiddle.BentHook           Marks.Serifed    Div.BentHook          }
+		'straightSerifless'          { "Straight"        Serifs.None   XMiddle.StraightSerifless  Marks.Serifless  Div.StraightSerifless }
+		'straightSerifed'            { "Straight"        Serifs.Long   XMiddle.StraightSerifed    Marks.Serifed    Div.StraightSerifed   }
+		'straightShortSerifed'       { "Straight"        Serifs.Short  XMiddle.StraightSerifed    Marks.Serifed    Div.StraightSerifed   }
+		'flatHookSerifless'          { "FlatHook"        Serifs.None   XMiddle.FlatHookSerifless  Marks.Serifless  Div.FlatHookSerifless }
+		'flatHookSerifed'            { "FlatHook"        Serifs.Long   XMiddle.FlatHookSerifed    Marks.Serifed    Div.FlatHookSerifed   }
+		'flatHookShortSerifed'       { "FlatHook"        Serifs.Short  XMiddle.FlatHookSerifed    Marks.Serifed    Div.FlatHookSerifed   }
+		'diagonalTailedSerifless'    { "DiagonalTailed"  Serifs.None   XMiddle.FlatHookSerifless  Marks.Serifless  Div.FlatHookSerifless }
+		'diagonalTailedSerifed'      { "DiagonalTailed"  Serifs.Long   XMiddle.FlatHookSerifed    Marks.Serifed    Div.FlatHookSerifed   }
+		'diagonalTailedShortSerifed' { "DiagonalTailed"  Serifs.Short  XMiddle.FlatHookSerifed    Marks.Serifed    Div.FlatHookSerifed   }
 
 	foreach { suffix { shapeId Serif xMiddleT Marks div } } [Object.entries JConfig] : do
 		local df : DivFrame div
diff --git a/params/variants.toml b/params/variants.toml
index 1d6802a4e..ef28a81e0 100644
--- a/params/variants.toml
+++ b/params/variants.toml
@@ -2137,8 +2137,8 @@ selectorAffix."ae/a" = "doubleStorey"
 selectorAffix."a/sansSerif" = "doubleStorey"
 selectorAffix."a/rtailBase" = "doubleStorey"
 selectorAffix."a/turnABase" = "doubleStorey"
-selectorAffix."a/single/autoSerifed/slab" = "singleStorey"
-selectorAffix."a/single/autoSerifed/sans" = "singleStorey"
+selectorAffix."a/singleStorey/autoSerifed/slab" = "singleStorey"
+selectorAffix."a/singleStorey/autoSerifed/sans" = "singleStorey"
 selectorAffix."scripta/autoSerifed/slab" = "singleStorey"
 selectorAffix."scripta/autoSerifed/sans" = "singleStorey"
 
@@ -2151,8 +2151,8 @@ selectorAffix."ae/a" = "doubleStorey"
 selectorAffix."a/sansSerif" = "singleStorey"
 selectorAffix."a/rtailBase" = "singleStorey"
 selectorAffix."a/turnABase" = "doubleStorey"
-selectorAffix."a/single/autoSerifed/slab" = "singleStorey"
-selectorAffix."a/single/autoSerifed/sans" = "singleStorey"
+selectorAffix."a/singleStorey/autoSerifed/slab" = "singleStorey"
+selectorAffix."a/singleStorey/autoSerifed/sans" = "singleStorey"
 selectorAffix."scripta/autoSerifed/slab" = "singleStorey"
 selectorAffix."scripta/autoSerifed/sans" = "singleStorey"
 
@@ -2168,8 +2168,8 @@ selectorAffix."ae/a" = ""
 selectorAffix."a/sansSerif" = ""
 selectorAffix."a/rtailBase" = ""
 selectorAffix."a/turnABase" = ""
-selectorAffix."a/single/autoSerifed/slab" = ""
-selectorAffix."a/single/autoSerifed/sans" = ""
+selectorAffix."a/singleStorey/autoSerifed/slab" = ""
+selectorAffix."a/singleStorey/autoSerifed/sans" = ""
 selectorAffix."scripta/autoSerifed/slab" = ""
 selectorAffix."scripta/autoSerifed/sans" = ""
 
@@ -2182,8 +2182,8 @@ selectorAffix."ae/a" = "hookInwardSerifed"
 selectorAffix."a/sansSerif" = ""
 selectorAffix."a/rtailBase" = "hookInwardSerifed"
 selectorAffix."a/turnABase" = "hookInwardSerifed"
-selectorAffix."a/single/autoSerifed/slab" = ""
-selectorAffix."a/single/autoSerifed/sans" = ""
+selectorAffix."a/singleStorey/autoSerifed/slab" = ""
+selectorAffix."a/singleStorey/autoSerifed/sans" = ""
 selectorAffix."scripta/autoSerifed/slab" = ""
 selectorAffix."scripta/autoSerifed/sans" = ""
 
@@ -2198,8 +2198,8 @@ selectorAffix."ae/a" = ""
 selectorAffix."a/sansSerif" = ""
 selectorAffix."a/rtailBase" = ""
 selectorAffix."a/turnABase" = ""
-selectorAffix."a/single/autoSerifed/slab" = ""
-selectorAffix."a/single/autoSerifed/sans" = ""
+selectorAffix."a/singleStorey/autoSerifed/slab" = ""
+selectorAffix."a/singleStorey/autoSerifed/sans" = ""
 selectorAffix."scripta/autoSerifed/slab" = ""
 selectorAffix."scripta/autoSerifed/sans" = ""
 
@@ -2211,8 +2211,8 @@ selectorAffix."ae/a" = ""
 selectorAffix."a/sansSerif" = "earlessCorner"
 selectorAffix."a/rtailBase" = "earlessCorner"
 selectorAffix."a/turnABase" = ""
-selectorAffix."a/single/autoSerifed/slab" = "earlessCorner"
-selectorAffix."a/single/autoSerifed/sans" = "earlessCorner"
+selectorAffix."a/singleStorey/autoSerifed/slab" = "earlessCorner"
+selectorAffix."a/singleStorey/autoSerifed/sans" = "earlessCorner"
 selectorAffix."scripta/autoSerifed/slab" = ""
 selectorAffix."scripta/autoSerifed/sans" = ""
 
@@ -2224,8 +2224,8 @@ selectorAffix."ae/a" = ""
 selectorAffix."a/sansSerif" = "earlessRounded"
 selectorAffix."a/rtailBase" = "earlessRounded"
 selectorAffix."a/turnABase" = ""
-selectorAffix."a/single/autoSerifed/slab" = "earlessRounded"
-selectorAffix."a/single/autoSerifed/sans" = "earlessRounded"
+selectorAffix."a/singleStorey/autoSerifed/slab" = "earlessRounded"
+selectorAffix."a/singleStorey/autoSerifed/sans" = "earlessRounded"
 selectorAffix."scripta/autoSerifed/slab" = ""
 selectorAffix."scripta/autoSerifed/sans" = ""
 
@@ -2238,8 +2238,8 @@ selectorAffix."ae/a" = "serifless"
 selectorAffix."a/sansSerif" = "serifless"
 selectorAffix."a/rtailBase" = "serifless"
 selectorAffix."a/turnABase" = "serifless"
-selectorAffix."a/single/autoSerifed/slab" = "serifless"
-selectorAffix."a/single/autoSerifed/sans" = "serifless"
+selectorAffix."a/singleStorey/autoSerifed/slab" = "serifless"
+selectorAffix."a/singleStorey/autoSerifed/sans" = "serifless"
 selectorAffix."scripta/autoSerifed/slab" = "serifless"
 selectorAffix."scripta/autoSerifed/sans" = "serifless"
 
@@ -2251,8 +2251,8 @@ selectorAffix."ae/a" = "serifless"
 selectorAffix."a/sansSerif" = "serifless"
 selectorAffix."a/rtailBase" = "serifless"
 selectorAffix."a/turnABase" = "serifed"
-selectorAffix."a/single/autoSerifed/slab" = { if = [{ storey = "double-storey" }], then = "doubleSerifed", else = "serifed" }
-selectorAffix."a/single/autoSerifed/sans" = "serifed"
+selectorAffix."a/singleStorey/autoSerifed/slab" = { if = [{ storey = "double-storey" }], then = "doubleSerifed", else = "serifed" }
+selectorAffix."a/singleStorey/autoSerifed/sans" = "serifed"
 selectorAffix."scripta/autoSerifed/slab" = "serifed"
 selectorAffix."scripta/autoSerifed/sans" = "serifed"
 
@@ -2265,8 +2265,8 @@ selectorAffix."ae/a" = "serifless"
 selectorAffix."a/sansSerif" = "serifless"
 selectorAffix."a/rtailBase" = "topSerifed"
 selectorAffix."a/turnABase" = "serifed"
-selectorAffix."a/single/autoSerifed/slab" = "doubleSerifed"
-selectorAffix."a/single/autoSerifed/sans" = "doubleSerifed"
+selectorAffix."a/singleStorey/autoSerifed/slab" = "doubleSerifed"
+selectorAffix."a/singleStorey/autoSerifed/sans" = "doubleSerifed"
 selectorAffix."scripta/autoSerifed/slab" = "serifed"
 selectorAffix."scripta/autoSerifed/sans" = "serifed"
 
@@ -2278,8 +2278,8 @@ selectorAffix."ae/a" = "serifless"
 selectorAffix."a/sansSerif" = "tailed"
 selectorAffix."a/rtailBase" = "serifless"
 selectorAffix."a/turnABase" = "tailed"
-selectorAffix."a/single/autoSerifed/slab" = { if = [{ storey = "double-storey" }], then = "tailedSerifed", else = "tailed" }
-selectorAffix."a/single/autoSerifed/sans" = "tailed"
+selectorAffix."a/singleStorey/autoSerifed/slab" = { if = [{ storey = "double-storey" }], then = "tailedSerifed", else = "tailed" }
+selectorAffix."a/singleStorey/autoSerifed/sans" = "tailed"
 selectorAffix."scripta/autoSerifed/slab" = "tailed"
 selectorAffix."scripta/autoSerifed/sans" = "tailed"
 
@@ -2292,8 +2292,8 @@ selectorAffix."ae/a" = "serifless"
 selectorAffix."a/sansSerif" = "tailed"
 selectorAffix."a/rtailBase" = "topSerifed"
 selectorAffix."a/turnABase" = "tailed"
-selectorAffix."a/single/autoSerifed/slab" = "tailedSerifed"
-selectorAffix."a/single/autoSerifed/sans" = "tailedSerifed"
+selectorAffix."a/singleStorey/autoSerifed/slab" = "tailedSerifed"
+selectorAffix."a/singleStorey/autoSerifed/sans" = "tailedSerifed"
 selectorAffix."scripta/autoSerifed/slab" = "tailed"
 selectorAffix."scripta/autoSerifed/sans" = "tailed"
 
@@ -2306,8 +2306,8 @@ selectorAffix."ae/a" = "serifless"
 selectorAffix."a/sansSerif" = "toothlessCorner"
 selectorAffix."a/rtailBase" = "serifless"
 selectorAffix."a/turnABase" = "toothlessCorner"
-selectorAffix."a/single/autoSerifed/slab" = "doubleSerifed"
-selectorAffix."a/single/autoSerifed/sans" = "serifless"
+selectorAffix."a/singleStorey/autoSerifed/slab" = "doubleSerifed"
+selectorAffix."a/singleStorey/autoSerifed/sans" = "serifless"
 selectorAffix."scripta/autoSerifed/slab" = "serifed"
 selectorAffix."scripta/autoSerifed/sans" = "serifless"
 
@@ -2320,8 +2320,8 @@ selectorAffix."ae/a" = "serifless"
 selectorAffix."a/sansSerif" = "toothlessRounded"
 selectorAffix."a/rtailBase" = "serifless"
 selectorAffix."a/turnABase" = "toothlessRounded"
-selectorAffix."a/single/autoSerifed/slab" = "doubleSerifed"
-selectorAffix."a/single/autoSerifed/sans" = "serifless"
+selectorAffix."a/singleStorey/autoSerifed/slab" = "doubleSerifed"
+selectorAffix."a/singleStorey/autoSerifed/sans" = "serifless"
 selectorAffix."scripta/autoSerifed/slab" = "serifed"
 selectorAffix."scripta/autoSerifed/sans" = "serifless"
 
@@ -2767,8 +2767,8 @@ selectorAffix.g = "doubleStorey"
 selectorAffix."g/sansSerif" = "doubleStorey"
 selectorAffix."g/hookTopBase" = "singleStoreySerifless"
 selectorAffix."gScript" = "singleStoreyScriptCut"
-selectorAffix."g/single/autoSerifed/slab" = "singleStoreySerifed"
-selectorAffix."g/single/autoSerifed/sans" = "singleStoreySerifless"
+selectorAffix."g/singleStorey/autoSerifed/slab" = "singleStoreySerifed"
+selectorAffix."g/singleStorey/autoSerifed/sans" = "singleStoreySerifless"
 
 [prime.g.variants-buildup.stages.openness."*"]
 next = "END"
@@ -2780,8 +2780,8 @@ selectorAffix.g = ""
 selectorAffix."g/sansSerif" = ""
 selectorAffix."g/hookTopBase" = ""
 selectorAffix."gScript" = ""
-selectorAffix."g/single/autoSerifed/slab" = ""
-selectorAffix."g/single/autoSerifed/sans" = ""
+selectorAffix."g/singleStorey/autoSerifed/slab" = ""
+selectorAffix."g/singleStorey/autoSerifed/sans" = ""
 
 [prime.g.variants-buildup.stages.openness.open]
 rank = 1
@@ -2790,8 +2790,8 @@ selectorAffix.g = "open"
 selectorAffix."g/sansSerif" = "open"
 selectorAffix."g/hookTopBase" = ""
 selectorAffix."gScript" = ""
-selectorAffix."g/single/autoSerifed/slab" = ""
-selectorAffix."g/single/autoSerifed/sans" = ""
+selectorAffix."g/singleStorey/autoSerifed/slab" = ""
+selectorAffix."g/singleStorey/autoSerifed/sans" = ""
 
 [prime.g.variants-buildup.stages.storey.single-storey]
 next = "hook"
@@ -2801,8 +2801,8 @@ selectorAffix.g = "singleStorey"
 selectorAffix."g/sansSerif" = "singleStorey"
 selectorAffix."g/hookTopBase" = "singleStorey"
 selectorAffix."gScript" = "singleStorey"
-selectorAffix."g/single/autoSerifed/slab" = "singleStorey"
-selectorAffix."g/single/autoSerifed/sans" = "singleStorey"
+selectorAffix."g/singleStorey/autoSerifed/slab" = "singleStorey"
+selectorAffix."g/singleStorey/autoSerifed/sans" = "singleStorey"
 
 [prime.g.variants-buildup.stages.hook."*"]
 next = "ear"
@@ -2814,8 +2814,8 @@ selectorAffix.g = ""
 selectorAffix."g/sansSerif" = ""
 selectorAffix."g/hookTopBase" = ""
 selectorAffix."gScript" = ""
-selectorAffix."g/single/autoSerifed/slab" = ""
-selectorAffix."g/single/autoSerifed/sans" = ""
+selectorAffix."g/singleStorey/autoSerifed/slab" = ""
+selectorAffix."g/singleStorey/autoSerifed/sans" = ""
 
 [prime.g.variants-buildup.stages.hook.flat-hook]
 rank = 2
@@ -2824,8 +2824,8 @@ selectorAffix.g = "flatHook"
 selectorAffix."g/sansSerif" = "flatHook"
 selectorAffix."g/hookTopBase" = "flatHook"
 selectorAffix."gScript" = "flatHook"
-selectorAffix."g/single/autoSerifed/slab" = "flatHook"
-selectorAffix."g/single/autoSerifed/sans" = "flatHook"
+selectorAffix."g/singleStorey/autoSerifed/slab" = "flatHook"
+selectorAffix."g/singleStorey/autoSerifed/sans" = "flatHook"
 
 [prime.g.variants-buildup.stages.ear.serifless]
 rank = 1
@@ -2833,8 +2833,8 @@ selectorAffix.g = "serifless"
 selectorAffix."g/sansSerif" = "serifless"
 selectorAffix."g/hookTopBase" = "serifless"
 selectorAffix."gScript" = "scriptCut"
-selectorAffix."g/single/autoSerifed/slab" = "serifless"
-selectorAffix."g/single/autoSerifed/sans" = "serifless"
+selectorAffix."g/singleStorey/autoSerifed/slab" = "serifless"
+selectorAffix."g/singleStorey/autoSerifed/sans" = "serifless"
 
 [prime.g.variants-buildup.stages.ear.serifed]
 rank = 2
@@ -2843,8 +2843,8 @@ selectorAffix.g = "serifed"
 selectorAffix."g/sansSerif" = "serifless"
 selectorAffix."g/hookTopBase" = "serifless"
 selectorAffix."gScript" = "scriptCut"
-selectorAffix."g/single/autoSerifed/slab" = "serifed"
-selectorAffix."g/single/autoSerifed/sans" = "serifed"
+selectorAffix."g/singleStorey/autoSerifed/slab" = "serifed"
+selectorAffix."g/singleStorey/autoSerifed/sans" = "serifed"
 
 [prime.g.variants-buildup.stages.ear.earless-corner]
 rank = 3
@@ -2853,8 +2853,8 @@ selectorAffix.g = "earlessCorner"
 selectorAffix."g/sansSerif" = "earlessCorner"
 selectorAffix."g/hookTopBase" = "earlessCornerHTB"
 selectorAffix."gScript" = "scriptCut"
-selectorAffix."g/single/autoSerifed/slab" = "earlessCorner"
-selectorAffix."g/single/autoSerifed/sans" = "earlessCorner"
+selectorAffix."g/singleStorey/autoSerifed/slab" = "earlessCorner"
+selectorAffix."g/singleStorey/autoSerifed/sans" = "earlessCorner"
 
 [prime.g.variants-buildup.stages.ear.earless-rounded]
 rank = 4
@@ -2863,8 +2863,8 @@ selectorAffix.g = "earlessRounded"
 selectorAffix."g/sansSerif" = "earlessRounded"
 selectorAffix."g/hookTopBase" = "serifless"
 selectorAffix."gScript" = "scriptCut"
-selectorAffix."g/single/autoSerifed/slab" = "earlessRounded"
-selectorAffix."g/single/autoSerifed/sans" = "earlessRounded"
+selectorAffix."g/singleStorey/autoSerifed/slab" = "earlessRounded"
+selectorAffix."g/singleStorey/autoSerifed/sans" = "earlessRounded"