diff --git a/faberge/sections/01/music.ily b/faberge/sections/01/music.ily
index b2353482de..28401526f5 100644
--- a/faberge/sections/01/music.ily
+++ b/faberge/sections/01/music.ily
@@ -351,7 +351,7 @@ number.1.EnglishHorn.Music = {
         \baca-f-parenthesized
         - \tweak parent-alignment-X 0
         - \tweak staff-padding 6
-        ^ \baca-ratchet-markup
+        ^ \baca-boxed-ratchet-markup
           %! DURATION_MULTIPLIER
         %@% ^ \baca-duration-multiplier-markup #"187" #"32"
         [
diff --git a/faberge/sections/01/music.py b/faberge/sections/01/music.py
index 0eb5890a8d..15eddaf9e4 100644
--- a/faberge/sections/01/music.py
+++ b/faberge/sections/01/music.py
@@ -124,7 +124,7 @@ def eh(m):
         baca.staff_position(o, 0)
         baca.markup(
             o.pleaf(0),
-            r"\baca-ratchet-markup",
+            r"\baca-boxed-ratchet-markup",
             abjad.Tweak(r"- \tweak parent-alignment-X 0"),
             abjad.Tweak(r"- \tweak staff-padding 6"),
         )
diff --git a/faberge/sections/02/music.ily b/faberge/sections/02/music.ily
index 3104c6683f..195a39e8c3 100644
--- a/faberge/sections/02/music.ily
+++ b/faberge/sections/02/music.ily
@@ -8195,7 +8195,7 @@ number.2.Percussion.Music = {
     \laissezVibrer
     - \tweak extra-offset #'(-6 . 0)
     - \tweak staff-padding 6
-    ^ \baca-crotales-bowed-markup
+    ^ \baca-boxed-crotales-bowed-markup
       %! EXPLICIT_DYNAMIC
       %! SPANNER_START
     - \tweak circled-tip ##t
@@ -9945,7 +9945,7 @@ number.2.Percussion.Music = {
           %! EXPLICIT_DYNAMIC
         \ff
         - \tweak staff-padding 8
-        ^ \baca-castanets-markup
+        ^ \baca-boxed-castanets-markup
           %! SPANNER_START
         - \tweak bound-details.right.padding 2
           %! SPANNER_START
@@ -9970,7 +9970,7 @@ number.2.Percussion.Music = {
     \laissezVibrer
     - \tweak parent-alignment-X 0
     - \tweak staff-padding 8
-    ^ \baca-bd-struck-markup
+    ^ \baca-boxed-bd-struck-markup
       %! SPANNER_STOP
     \stopTrillSpan
 
@@ -10004,7 +10004,7 @@ number.2.Percussion.Music = {
         fs'!8
         \laissezVibrer
         - \tweak staff-padding 6
-        ^ \baca-crotales-bowed-markup
+        ^ \baca-boxed-crotales-bowed-markup
           %! EXPLICIT_DYNAMIC
           %! SPANNER_START
         - \tweak circled-tip ##t
diff --git a/faberge/sections/02/music.py b/faberge/sections/02/music.py
index f91e5b80e4..2dc6d7c964 100644
--- a/faberge/sections/02/music.py
+++ b/faberge/sections/02/music.py
@@ -622,7 +622,7 @@ def perc(m):
         baca.dynamic(o.phead(0), "ff")
         baca.markup(
             o.pleaf(0),
-            r"\baca-castanets-markup",
+            r"\baca-boxed-castanets-markup",
             abjad.Tweak(r"- \tweak staff-padding 8"),
         )
         baca.staff_position(o, 1)
@@ -637,7 +637,7 @@ def perc(m):
         baca.laissez_vibrer(o.ptails())
         baca.markup(
             o.plt(-1),
-            r"\baca-bd-struck-markup",
+            r"\baca-boxed-bd-struck-markup",
             abjad.Tweak(r"- \tweak parent-alignment-X 0"),
             abjad.Tweak(r"- \tweak staff-padding 8"),
         )
@@ -650,7 +650,7 @@ def perc(m):
         baca.pitch(o, "F#4")
         baca.markup(
             o.pleaf(0),
-            r"\baca-crotales-bowed-markup",
+            r"\baca-boxed-crotales-bowed-markup",
             abjad.Tweak(r"- \tweak staff-padding 6"),
         )
         library.dal_niente_hairpins(o, "f")
@@ -659,7 +659,7 @@ def perc(m):
         baca.laissez_vibrer(o.ptails())
         baca.markup(
             o.pleaf(0),
-            r"\baca-crotales-bowed-markup",
+            r"\baca-boxed-crotales-bowed-markup",
             abjad.Tweak(r"- \tweak extra-offset #'(-6 . 0)"),
             abjad.Tweak(r"- \tweak staff-padding 6"),
         )
diff --git a/faberge/sections/03/music.ily b/faberge/sections/03/music.ily
index c73365a441..cf5364500e 100644
--- a/faberge/sections/03/music.ily
+++ b/faberge/sections/03/music.ily
@@ -5646,7 +5646,7 @@ number.3.EnglishHorn.Music = {
         \baca-f-parenthesized
         - \tweak padding 1.5
         - \tweak parent-alignment-X 0
-        ^ \baca-ratchet-markup
+        ^ \baca-boxed-ratchet-markup
           %! DURATION_MULTIPLIER
         %@% ^ \baca-duration-multiplier-markup #"381" #"64"
         [
@@ -7053,7 +7053,7 @@ number.3.Piano.RH.Music = {
         \baca-effort-mf
         - \tweak parent-alignment-X 0
         - \tweak staff-padding 8
-        ^ \baca-tuning-pegs-markup
+        ^ \baca-boxed-tuning-pegs-markup
         [
           %! -PARTS
           %! EXPLICIT_BAR_EXTENT
@@ -8443,7 +8443,7 @@ number.3.Percussion.Music = {
               %! REST_VOICE
             R1 * 4/4
             - \tweak staff-padding 6
-            ^ \baca-to-marimba-markup
+            ^ \baca-boxed-to-marimba-markup
               %! DURATION_MULTIPLIER
               %! MULTIMEASURE_REST
               %! REST_VOICE
@@ -8979,7 +8979,7 @@ number.3.Percussion.Music = {
     \baca-effort-mf
     - \tweak parent-alignment-X 0
     - \tweak staff-padding 6
-    ^ \baca-bd-sponge-markup
+    ^ \baca-boxed-bd-sponge-markup
     - \tweak stencil ##f
     ~
       %! -PARTS
@@ -9052,7 +9052,7 @@ number.3.Percussion.Music = {
               %! EXPLICIT_DYNAMIC
             \f
             - \tweak staff-padding 8
-            ^ \baca-woodblock-markup
+            ^ \baca-boxed-woodblock-markup
               %! MATERIAL_ANNOTATION_SPANNER
               %! SPANNER_START
             - \baca-dashed-line-with-hook
diff --git a/faberge/sections/03/music.py b/faberge/sections/03/music.py
index 013fc3db97..27d69f7d78 100644
--- a/faberge/sections/03/music.py
+++ b/faberge/sections/03/music.py
@@ -479,7 +479,7 @@ def eh(m):
         )
         baca.markup(
             o.pleaf(0),
-            r"\baca-ratchet-markup",
+            r"\baca-boxed-ratchet-markup",
             abjad.Tweak(r"- \tweak padding 1.5"),
             abjad.Tweak(r"- \tweak parent-alignment-X 0"),
         )
@@ -620,7 +620,7 @@ def pf(cache):
         )
         baca.markup(
             o.pleaf(0),
-            r"\baca-tuning-pegs-markup",
+            r"\baca-boxed-tuning-pegs-markup",
             abjad.Tweak(r"- \tweak parent-alignment-X 0"),
             abjad.Tweak(r"- \tweak staff-padding 8"),
         )
@@ -663,7 +663,7 @@ def perc(cache):
     with baca.scope(m[2]) as o:
         baca.markup(
             o.mmrest(0),
-            r"\baca-to-marimba-markup",
+            r"\baca-boxed-to-marimba-markup",
             abjad.Tweak(r"- \tweak staff-padding 6"),
         )
     m = cache["perc"]
@@ -720,7 +720,7 @@ def perc(cache):
         )
         baca.markup(
             o.pleaf(0),
-            r"\baca-bd-sponge-markup",
+            r"\baca-boxed-bd-sponge-markup",
             abjad.Tweak(r"- \tweak parent-alignment-X 0"),
             abjad.Tweak(r"- \tweak staff-padding 6"),
         )
@@ -731,7 +731,7 @@ def perc(cache):
         baca.dynamic(o.pleaf(0), "f")
         baca.markup(
             o.pleaf(0),
-            r"\baca-woodblock-markup",
+            r"\baca-boxed-woodblock-markup",
             abjad.Tweak(r"- \tweak staff-padding 8"),
         )
         baca.rspanners.material_annotation(
diff --git a/faberge/sections/05/music.ily b/faberge/sections/05/music.ily
index 6b95fe6ac9..5e65823336 100644
--- a/faberge/sections/05/music.ily
+++ b/faberge/sections/05/music.ily
@@ -1489,7 +1489,7 @@ number.5.Percussion.Music = {
     \p
     - \tweak parent-alignment-X 0
     - \tweak staff-padding 8
-    ^ \baca-bd-rolled-markup
+    ^ \baca-boxed-bd-rolled-markup
     \glissando
 
     % [Percussion.Music measure 4]
diff --git a/faberge/sections/05/music.py b/faberge/sections/05/music.py
index 982863338d..2195e8f5cf 100644
--- a/faberge/sections/05/music.py
+++ b/faberge/sections/05/music.py
@@ -271,7 +271,7 @@ def perc(m):
         baca.glissando(o, "B3")
         baca.markup(
             o.pleaf(0),
-            r"\baca-bd-rolled-markup",
+            r"\baca-boxed-bd-rolled-markup",
             abjad.Tweak(r"- \tweak parent-alignment-X 0"),
             abjad.Tweak(r"- \tweak staff-padding 8"),
         )
diff --git a/faberge/sections/06/music.ily b/faberge/sections/06/music.ily
index 42dc99165c..834e5ebc26 100644
--- a/faberge/sections/06/music.ily
+++ b/faberge/sections/06/music.ily
@@ -1742,7 +1742,7 @@ number.6.Piano.RH.Music = {
         \baca-effort-mf
         - \tweak parent-alignment-X 0
         - \tweak staff-padding 8
-        ^ \baca-tuning-pegs-markup
+        ^ \baca-boxed-tuning-pegs-markup
           %! SPANNER_START
         [
           %! EXPLICIT_CLEF_REDRAW_COLOR
@@ -2284,7 +2284,7 @@ number.6.Percussion.Music = {
     \laissezVibrer
     - \tweak parent-alignment-X 0
     - \tweak staff-padding 8
-    ^ \baca-bd-struck-markup
+    ^ \baca-boxed-bd-struck-markup
       %! MATERIAL_ANNOTATION_SPANNER
       %! SPANNER_START
     - \baca-solid-line-with-hook
@@ -2368,7 +2368,7 @@ number.6.Percussion.Music = {
     \f
     - \tweak parent-alignment-X 0
     - \tweak staff-padding 8
-    ^ \baca-castanets-markup
+    ^ \baca-boxed-castanets-markup
       %! MATERIAL_ANNOTATION_SPANNER
       %! SPANNER_START
     - \baca-solid-line-with-hook
@@ -2443,7 +2443,7 @@ number.6.Percussion.Music = {
             \baca-f-ancora
             - \tweak parent-alignment-X 0
             - \tweak staff-padding 8
-            ^ \baca-woodblock-markup
+            ^ \baca-boxed-woodblock-markup
               %! MATERIAL_ANNOTATION_SPANNER
               %! SPANNER_STOP
             \bacaStopTextSpanMaterialAnnotation
diff --git a/faberge/sections/06/music.py b/faberge/sections/06/music.py
index b81be9430a..5721f849e1 100644
--- a/faberge/sections/06/music.py
+++ b/faberge/sections/06/music.py
@@ -322,7 +322,7 @@ def pf(cache):
         )
         baca.markup(
             o.pleaf(0),
-            r"\baca-tuning-pegs-markup",
+            r"\baca-boxed-tuning-pegs-markup",
             abjad.Tweak(r"- \tweak parent-alignment-X 0"),
             abjad.Tweak(r"- \tweak staff-padding 8"),
         ),
@@ -371,7 +371,7 @@ def perc(m):
         baca.laissez_vibrer(o.ptails())
         baca.markup(
             o.pleaf(0),
-            r"\baca-bd-struck-markup",
+            r"\baca-boxed-bd-struck-markup",
             abjad.Tweak(r"- \tweak parent-alignment-X 0"),
             abjad.Tweak(r"- \tweak staff-padding 8"),
         )
@@ -398,7 +398,7 @@ def perc(m):
         baca.dynamic(o.phead(0), "f")
         baca.markup(
             o.pleaf(0),
-            r"\baca-castanets-markup",
+            r"\baca-boxed-castanets-markup",
             abjad.Tweak(r"- \tweak parent-alignment-X 0"),
             abjad.Tweak(r"- \tweak staff-padding 8"),
         )
@@ -407,7 +407,7 @@ def perc(m):
         baca.dynamic(o.phead(0), "f-ancora")
         baca.markup(
             o.pleaf(0),
-            r"\baca-woodblock-markup",
+            r"\baca-boxed-woodblock-markup",
             abjad.Tweak(r"- \tweak parent-alignment-X 0"),
             abjad.Tweak(r"- \tweak staff-padding 8"),
         )
diff --git a/faberge/sections/07/music.ily b/faberge/sections/07/music.ily
index c9fcba9090..0d8a21fa3c 100644
--- a/faberge/sections/07/music.ily
+++ b/faberge/sections/07/music.ily
@@ -2044,7 +2044,7 @@ number.7.Percussion.Music = {
     \f
     - \tweak parent-alignment-X 0
     - \tweak staff-padding 8
-    ^ \baca-castanets-markup
+    ^ \baca-boxed-castanets-markup
       %! MATERIAL_ANNOTATION_SPANNER
       %! SPANNER_START
     - \baca-solid-line-with-hook
@@ -2089,7 +2089,7 @@ number.7.Percussion.Music = {
     b2
     - \tweak parent-alignment-X 0
     - \tweak staff-padding 8
-    ^ \baca-bd-superball-markup
+    ^ \baca-boxed-bd-superball-markup
       %! MATERIAL_ANNOTATION_SPANNER
       %! SPANNER_START
     - \baca-solid-line-with-hook
diff --git a/faberge/sections/07/music.py b/faberge/sections/07/music.py
index 8414c4b8c5..67dbfee707 100644
--- a/faberge/sections/07/music.py
+++ b/faberge/sections/07/music.py
@@ -409,7 +409,7 @@ def perc(m):
         baca.dynamic(o.phead(0), "f")
         baca.markup(
             o.pleaf(0),
-            r"\baca-castanets-markup",
+            r"\baca-boxed-castanets-markup",
             abjad.Tweak(r"- \tweak parent-alignment-X 0"),
             abjad.Tweak(r"- \tweak staff-padding 8"),
         )
@@ -429,7 +429,7 @@ def perc(m):
     with baca.scope(m[5]) as o:
         baca.markup(
             o.pleaf(0),
-            r"\baca-bd-superball-markup",
+            r"\baca-boxed-bd-superball-markup",
             abjad.Tweak(r"- \tweak parent-alignment-X 0"),
             abjad.Tweak(r"- \tweak staff-padding 8"),
         )
diff --git a/faberge/sections/08/music.ily b/faberge/sections/08/music.ily
index 48b2251113..5b9ea9ff14 100644
--- a/faberge/sections/08/music.ily
+++ b/faberge/sections/08/music.ily
@@ -1970,7 +1970,7 @@ number.8.Percussion.Music = {
     \mf
     - \tweak parent-alignment-X 0
     - \tweak staff-padding 8
-    ^ \baca-castanets-markup
+    ^ \baca-boxed-castanets-markup
       %! REAPPLIED_INSTRUMENT_ALERT
     ^ \baca-reapplied-instrument-markup "(“Percussion”)"
       %! MATERIAL_ANNOTATION_SPANNER
@@ -2028,7 +2028,7 @@ number.8.Percussion.Music = {
     \laissezVibrer
     - \tweak parent-alignment-X 0
     - \tweak staff-padding 8
-    ^ \baca-bd-struck-markup
+    ^ \baca-boxed-bd-struck-markup
 
     r\breve
       %! MATERIAL_ANNOTATION_SPANNER
@@ -2041,7 +2041,7 @@ number.8.Percussion.Music = {
     \override Stem.direction = #down
     b2
     - \tweak staff-padding 8
-    ^ \baca-bd-sponge-markup
+    ^ \baca-boxed-bd-sponge-markup
       %! MATERIAL_ANNOTATION_SPANNER
       %! SPANNER_START
     - \baca-solid-line-with-hook
diff --git a/faberge/sections/08/music.py b/faberge/sections/08/music.py
index 62ca16c949..be1a1203e5 100644
--- a/faberge/sections/08/music.py
+++ b/faberge/sections/08/music.py
@@ -335,7 +335,7 @@ def perc(m):
     with baca.scope(m[1]) as o:
         baca.markup(
             o.pleaf(0),
-            r"\baca-castanets-markup",
+            r"\baca-boxed-castanets-markup",
             abjad.Tweak(r"- \tweak parent-alignment-X 0"),
             abjad.Tweak(r"- \tweak staff-padding 8"),
         )
@@ -350,7 +350,7 @@ def perc(m):
         baca.override.stem_down(o.pleaves())
         baca.markup(
             o.pleaf(0),
-            r"\baca-bd-struck-markup",
+            r"\baca-boxed-bd-struck-markup",
             abjad.Tweak(r"- \tweak parent-alignment-X 0"),
             abjad.Tweak(r"- \tweak staff-padding 8"),
         )
@@ -368,7 +368,7 @@ def perc(m):
         baca.override.stem_down(o.pleaves())
         baca.markup(
             o.pleaf(0),
-            r"\baca-bd-sponge-markup",
+            r"\baca-boxed-bd-sponge-markup",
             abjad.Tweak(r"- \tweak staff-padding 8"),
         )
         baca.rspanners.material_annotation(
diff --git a/faberge/sections/09/music.ily b/faberge/sections/09/music.ily
index 9562eaa336..6e9608e2c5 100644
--- a/faberge/sections/09/music.ily
+++ b/faberge/sections/09/music.ily
@@ -1690,7 +1690,7 @@ number.9.Percussion.Music = {
       %! EXPLICIT_DYNAMIC
     \f
     - \tweak padding 1.5
-    ^ \baca-castanets-markup
+    ^ \baca-boxed-castanets-markup
       %! REAPPLIED_INSTRUMENT_ALERT
     ^ \baca-reapplied-instrument-markup "(“Percussion”)"
       %! MATERIAL_ANNOTATION_SPANNER
@@ -1817,7 +1817,7 @@ number.9.Percussion.Music = {
     fs'!2
     \laissezVibrer
     - \tweak staff-padding 6
-    ^ \baca-crotales-bowed-markup
+    ^ \baca-boxed-crotales-bowed-markup
       %! MATERIAL_ANNOTATION_SPANNER
       %! SPANNER_START
     - \baca-solid-line-with-hook
diff --git a/faberge/sections/09/music.py b/faberge/sections/09/music.py
index d9294aef79..4ac30035ca 100644
--- a/faberge/sections/09/music.py
+++ b/faberge/sections/09/music.py
@@ -307,7 +307,7 @@ def perc(m):
     with baca.scope(m.get(1)) as o:
         baca.markup(
             o.pleaf(0),
-            r"\baca-castanets-markup",
+            r"\baca-boxed-castanets-markup",
             abjad.Tweak(r"- \tweak padding 1.5"),
         )
     for n in [1, 2]:
@@ -339,7 +339,7 @@ def perc(m):
         baca.laissez_vibrer(o.ptails())
         baca.markup(
             o.pleaf(0),
-            r"\baca-crotales-bowed-markup",
+            r"\baca-boxed-crotales-bowed-markup",
             abjad.Tweak(r"- \tweak staff-padding 6"),
         )
         baca.rspanners.material_annotation(
diff --git a/faberge/sections/10/music.ily b/faberge/sections/10/music.ily
index 4b4d083f70..f1a65ad47a 100644
--- a/faberge/sections/10/music.ily
+++ b/faberge/sections/10/music.ily
@@ -2248,7 +2248,7 @@ number.10.Percussion.Music = {
     \laissezVibrer
     - \tweak parent-alignment-X 0
     - \tweak staff-padding 8
-    ^ \baca-bd-struck-markup
+    ^ \baca-boxed-bd-struck-markup
       %! MATERIAL_ANNOTATION_SPANNER
       %! SPANNER_START
     - \baca-solid-line-with-hook
@@ -2332,7 +2332,7 @@ number.10.Percussion.Music = {
         \f
         - \tweak parent-alignment-X 0
         - \tweak staff-padding 8
-        ^ \baca-woodblock-markup
+        ^ \baca-boxed-woodblock-markup
           %! MATERIAL_ANNOTATION_SPANNER
           %! SPANNER_START
         - \baca-dashed-line-with-hook
diff --git a/faberge/sections/10/music.py b/faberge/sections/10/music.py
index 6a5b097f80..e49197b840 100644
--- a/faberge/sections/10/music.py
+++ b/faberge/sections/10/music.py
@@ -351,7 +351,7 @@ def perc(m):
         baca.laissez_vibrer(o.ptails())
         baca.markup(
             o.pleaf(0),
-            r"\baca-bd-struck-markup",
+            r"\baca-boxed-bd-struck-markup",
             abjad.Tweak(r"- \tweak parent-alignment-X 0"),
             abjad.Tweak(r"- \tweak staff-padding 8"),
         )
@@ -368,7 +368,7 @@ def perc(m):
         baca.dynamic(o.phead(0), "f")
         baca.markup(
             o.pleaf(0),
-            r"\baca-woodblock-markup",
+            r"\baca-boxed-woodblock-markup",
             abjad.Tweak(r"- \tweak parent-alignment-X 0"),
             abjad.Tweak(r"- \tweak staff-padding 8"),
         )
diff --git a/faberge/sections/11/music.ily b/faberge/sections/11/music.ily
index b7b239f191..63c738174b 100644
--- a/faberge/sections/11/music.ily
+++ b/faberge/sections/11/music.ily
@@ -2212,7 +2212,7 @@ number.11.Percussion.Music = {
         \baca-pp-whiteout
         - \tweak parent-alignment-X 0
         - \tweak staff-padding 10
-        ^ \baca-castanets-markup
+        ^ \baca-boxed-castanets-markup
           %! MATERIAL_ANNOTATION_SPANNER
           %! SPANNER_STOP
         \bacaStopTextSpanMaterialAnnotation
@@ -2344,7 +2344,7 @@ number.11.Percussion.Music = {
     b2
     - \tweak parent-alignment-X 0
     - \tweak staff-padding 10
-    ^ \baca-bd-superball-markup
+    ^ \baca-boxed-bd-superball-markup
       %! MATERIAL_ANNOTATION_SPANNER
       %! SPANNER_START
     - \baca-dashed-line-with-hook
diff --git a/faberge/sections/11/music.py b/faberge/sections/11/music.py
index 393f165fab..af9cd73b30 100644
--- a/faberge/sections/11/music.py
+++ b/faberge/sections/11/music.py
@@ -367,7 +367,7 @@ def perc(m):
         )
         baca.markup(
             o.pleaf(0),
-            r"\baca-castanets-markup",
+            r"\baca-boxed-castanets-markup",
             abjad.Tweak(r"- \tweak parent-alignment-X 0"),
             abjad.Tweak(r"- \tweak staff-padding 10"),
         )
@@ -395,7 +395,7 @@ def perc(m):
     with baca.scope(m.get(5, 8)) as o:
         baca.markup(
             o.pleaf(0),
-            r"\baca-bd-superball-markup",
+            r"\baca-boxed-bd-superball-markup",
             abjad.Tweak(r"- \tweak parent-alignment-X 0"),
             abjad.Tweak(r"- \tweak staff-padding 10"),
         )
diff --git a/faberge/sections/12/music.ily b/faberge/sections/12/music.ily
index 317b4ef33b..093d5a6180 100644
--- a/faberge/sections/12/music.ily
+++ b/faberge/sections/12/music.ily
@@ -1237,7 +1237,7 @@ number.12.Piano.RH.Music = {
         \baca-effort-mf
         - \tweak parent-alignment-X 0
         - \tweak staff-padding 8
-        ^ \baca-tuning-pegs-markup
+        ^ \baca-boxed-tuning-pegs-markup
           %! MATERIAL_ANNOTATION_SPANNER
           %! SPANNER_STOP
         \bacaStopTextSpanMaterialAnnotation
@@ -1648,7 +1648,7 @@ number.12.Percussion.Music = {
     \p
     \laissezVibrer
     - \tweak staff-padding 6
-    ^ \baca-bd-struck-markup
+    ^ \baca-boxed-bd-struck-markup
       %! MATERIAL_ANNOTATION_SPANNER
       %! SPANNER_STOP
     \bacaStopTextSpanMaterialAnnotation
@@ -1682,7 +1682,7 @@ number.12.Percussion.Music = {
       %! EXPLICIT_DYNAMIC
     \mp
     - \tweak staff-padding 6
-    ^ \baca-bd-sponge-markup
+    ^ \baca-boxed-bd-sponge-markup
       %! EXPLICIT_DYNAMIC
       %! SPANNER_START
     - \tweak circled-tip ##t
diff --git a/faberge/sections/12/music.py b/faberge/sections/12/music.py
index 6c5e527667..314255cc96 100644
--- a/faberge/sections/12/music.py
+++ b/faberge/sections/12/music.py
@@ -277,7 +277,7 @@ def pf(cache):
         )
         baca.markup(
             o.pleaf(0),
-            r"\baca-tuning-pegs-markup",
+            r"\baca-boxed-tuning-pegs-markup",
             abjad.Tweak(r"- \tweak parent-alignment-X 0"),
             abjad.Tweak(r"- \tweak staff-padding 8"),
         )
@@ -325,7 +325,7 @@ def perc(m):
         baca.laissez_vibrer(o.ptails())
         baca.markup(
             o.pleaf(0),
-            r"\baca-bd-struck-markup",
+            r"\baca-boxed-bd-struck-markup",
             abjad.Tweak(r"- \tweak staff-padding 6"),
         )
         baca.rspanners.material_annotation(
@@ -349,7 +349,7 @@ def perc(m):
         )
         baca.markup(
             o.pleaf(0),
-            r"\baca-bd-sponge-markup",
+            r"\baca-boxed-bd-sponge-markup",
             abjad.Tweak(r"- \tweak staff-padding 6"),
         )
         baca.override.stem_down(o.pleaves())
diff --git a/faberge/sections/13/music.ily b/faberge/sections/13/music.ily
index df03ca1810..49fc718dae 100644
--- a/faberge/sections/13/music.ily
+++ b/faberge/sections/13/music.ily
@@ -1449,7 +1449,7 @@ number.13.Piano.RH.Music = {
         \baca-effort-mf
         - \tweak parent-alignment-X 0
         - \tweak staff-padding 8
-        ^ \baca-tuning-pegs-markup
+        ^ \baca-boxed-tuning-pegs-markup
         [
           %! -PARTS
           %! EXPLICIT_BAR_EXTENT
@@ -1746,7 +1746,7 @@ number.13.Percussion.Music = {
     \baca-f-sempre
     - \tweak parent-alignment-X 0
     - \tweak staff-padding 8
-    ^ \baca-castanets-markup
+    ^ \baca-boxed-castanets-markup
       %! REAPPLIED_INSTRUMENT_ALERT
     ^ \baca-reapplied-instrument-markup "(“Percussion”)"
       %! MATERIAL_ANNOTATION_SPANNER
@@ -1850,7 +1850,7 @@ number.13.Percussion.Music = {
         \baca-p-sempre
         - \tweak parent-alignment-X 0
         - \tweak staff-padding 8
-        ^ \baca-woodblock-markup
+        ^ \baca-boxed-woodblock-markup
           %! SPANNER_START
         - \tweak bound-details.right.padding 2
           %! SPANNER_START
diff --git a/faberge/sections/13/music.py b/faberge/sections/13/music.py
index aedcf5f5a3..894ebe27f2 100644
--- a/faberge/sections/13/music.py
+++ b/faberge/sections/13/music.py
@@ -383,7 +383,7 @@ def pf(cache):
         )
         baca.markup(
             o.pleaf(0),
-            r"\baca-tuning-pegs-markup",
+            r"\baca-boxed-tuning-pegs-markup",
             abjad.Tweak(r"- \tweak parent-alignment-X 0"),
             abjad.Tweak(r"- \tweak staff-padding 8"),
         )
@@ -421,7 +421,7 @@ def perc(m):
     with baca.scope(m[7]) as o:
         baca.markup(
             o.pleaf(0),
-            r"\baca-woodblock-markup",
+            r"\baca-boxed-woodblock-markup",
             abjad.Tweak(r"- \tweak parent-alignment-X 0"),
             abjad.Tweak(r"- \tweak staff-padding 8"),
         )
@@ -437,7 +437,7 @@ def perc(m):
     with baca.scope(m.leaves()) as o:
         baca.markup(
             o.pleaf(0),
-            r"\baca-castanets-markup",
+            r"\baca-boxed-castanets-markup",
             abjad.Tweak(r"- \tweak parent-alignment-X 0"),
             abjad.Tweak(r"- \tweak staff-padding 8"),
         )
diff --git a/faberge/sections/14/music.ily b/faberge/sections/14/music.ily
index 0d9404f6fb..5f30e1ae3d 100644
--- a/faberge/sections/14/music.ily
+++ b/faberge/sections/14/music.ily
@@ -1561,7 +1561,7 @@ number.14.Piano.RH.Music = {
           %! EXPLICIT_DYNAMIC
         \f
         - \tweak staff-padding 8
-        ^ \baca-woodblock-markup
+        ^ \baca-boxed-woodblock-markup
           %! MATERIAL_ANNOTATION_SPANNER
           %! SPANNER_START
         - \baca-dashed-line-with-hook
@@ -2180,7 +2180,7 @@ number.14.Violin.Music = {
           %! EXPLICIT_DYNAMIC
         \f
         - \tweak staff-padding 8
-        ^ \baca-woodblock-markup
+        ^ \baca-boxed-woodblock-markup
           %! MATERIAL_ANNOTATION_SPANNER
           %! SPANNER_START
         - \baca-dashed-line-with-hook
diff --git a/faberge/sections/14/music.py b/faberge/sections/14/music.py
index 5e391f68c1..c8ca6a0b58 100644
--- a/faberge/sections/14/music.py
+++ b/faberge/sections/14/music.py
@@ -295,7 +295,7 @@ def pf(cache):
         baca.dynamic(o.phead(0), "f")
         baca.markup(
             o.pleaf(0),
-            r"\baca-woodblock-markup",
+            r"\baca-boxed-woodblock-markup",
             abjad.Tweak(r"- \tweak staff-padding 8"),
         )
         baca.rspanners.material_annotation(
@@ -346,7 +346,7 @@ def vn(m):
         baca.dynamic(o.phead(0), "f")
         baca.markup(
             o.pleaf(0),
-            r"\baca-woodblock-markup",
+            r"\baca-boxed-woodblock-markup",
             abjad.Tweak(r"- \tweak staff-padding 8"),
         )
         baca.rspanners.material_annotation(
diff --git a/faberge/sections/15/music.ily b/faberge/sections/15/music.ily
index 266bb9c46a..042be326ce 100644
--- a/faberge/sections/15/music.ily
+++ b/faberge/sections/15/music.ily
@@ -1310,7 +1310,7 @@ number.15.Piano.RH.Music = {
         \baca-f-whiteout
         - \tweak parent-alignment-X 0
         - \tweak staff-padding 8
-        ^ \baca-woodblock-markup
+        ^ \baca-boxed-woodblock-markup
           %! MATERIAL_ANNOTATION_SPANNER
           %! SPANNER_START
         - \baca-dashed-line-with-hook
@@ -1669,7 +1669,7 @@ number.15.Percussion.Music = {
     \laissezVibrer
     - \tweak parent-alignment-X 0
     - \tweak staff-padding 6
-    ^ \baca-crotales-bowed-markup
+    ^ \baca-boxed-crotales-bowed-markup
       %! MATERIAL_ANNOTATION_SPANNER
       %! SPANNER_START
     - \baca-solid-line-with-hook
@@ -1794,7 +1794,7 @@ number.15.Percussion.Music = {
             \f
             - \tweak parent-alignment-X 0
             - \tweak staff-padding 8
-            ^ \baca-woodblock-markup
+            ^ \baca-boxed-woodblock-markup
               %! MATERIAL_ANNOTATION_SPANNER
               %! SPANNER_START
             - \baca-dashed-line-with-hook
diff --git a/faberge/sections/15/music.py b/faberge/sections/15/music.py
index 7c9b2ea12f..d8bbe43c95 100644
--- a/faberge/sections/15/music.py
+++ b/faberge/sections/15/music.py
@@ -222,7 +222,7 @@ def pf(cache):
         baca.override.dls_staff_padding(o, 8)
         baca.markup(
             o.pleaf(0),
-            r"\baca-woodblock-markup",
+            r"\baca-boxed-woodblock-markup",
             abjad.Tweak(r"- \tweak parent-alignment-X 0"),
             abjad.Tweak(r"- \tweak staff-padding 8"),
         )
@@ -249,7 +249,7 @@ def perc(m):
         baca.laissez_vibrer(o.ptails())
         baca.markup(
             o.pleaf(0),
-            r"\baca-crotales-bowed-markup",
+            r"\baca-boxed-crotales-bowed-markup",
             abjad.Tweak(r"- \tweak parent-alignment-X 0"),
             abjad.Tweak(r"- \tweak staff-padding 6"),
         )
@@ -267,7 +267,7 @@ def perc(m):
         baca.dynamic(o.phead(0), "f")
         baca.markup(
             o.pleaf(0),
-            r"\baca-woodblock-markup",
+            r"\baca-boxed-woodblock-markup",
             abjad.Tweak(r"- \tweak parent-alignment-X 0"),
             abjad.Tweak(r"- \tweak staff-padding 8"),
         )
diff --git a/faberge/sections/16/music.ily b/faberge/sections/16/music.ily
index 1146145f9e..0c90301d3a 100644
--- a/faberge/sections/16/music.ily
+++ b/faberge/sections/16/music.ily
@@ -345,7 +345,7 @@ number.16.Flute.Music = {
     \baca-effort-ff
     - \tweak padding 1.5
     - \tweak parent-alignment-X 0
-    ^ \baca-very-small-maraca-markup
+    ^ \baca-boxed-very-small-maraca-markup
       %! REAPPLIED_INSTRUMENT_ALERT
     ^ \baca-reapplied-instrument-markup "(“BassFlute”)"
     - \tweak stencil ##f
@@ -454,7 +454,7 @@ number.16.EnglishHorn.Music = {
     \baca-effort-ff
     - \tweak padding 1.5
     - \tweak parent-alignment-X 0
-    ^ \baca-very-small-maraca-markup
+    ^ \baca-boxed-very-small-maraca-markup
       %! REAPPLIED_INSTRUMENT_ALERT
     ^ \baca-reapplied-instrument-markup "(“EnglishHorn”)"
     - \tweak stencil ##f
@@ -653,7 +653,7 @@ number.16.Piano.RH.Music = {
     \baca-effort-ff
     - \tweak padding 1.5
     - \tweak parent-alignment-X 0
-    ^ \baca-very-small-maraca-markup
+    ^ \baca-boxed-very-small-maraca-markup
       %! REAPPLIED_INSTRUMENT_ALERT
     ^ \baca-reapplied-instrument-markup "(“Piano”)"
     - \tweak stencil ##f
@@ -886,7 +886,7 @@ number.16.Percussion.Music = {
     \p
     - \tweak padding 1.5
     - \tweak parent-alignment-X 0
-    ^ \baca-bd-sponge-markup
+    ^ \baca-boxed-bd-sponge-markup
       %! REAPPLIED_INSTRUMENT_ALERT
     ^ \baca-reapplied-instrument-markup "(“Percussion”)"
     \glissando
diff --git a/faberge/sections/16/music.py b/faberge/sections/16/music.py
index 4394ff4919..2c36573b6a 100644
--- a/faberge/sections/16/music.py
+++ b/faberge/sections/16/music.py
@@ -165,7 +165,7 @@ def fl_eh_rh(cache):
             baca.dynamic(o.phead(0), '"ff"')
             baca.markup(
                 o.pleaf(0),
-                r"\baca-very-small-maraca-markup",
+                r"\baca-boxed-very-small-maraca-markup",
                 abjad.Tweak(r"- \tweak padding 1.5"),
                 abjad.Tweak(r"- \tweak parent-alignment-X 0"),
             )
@@ -183,7 +183,7 @@ def perc(m):
         baca.glissando(o, "B3", hide_middle_stems=True)
         baca.markup(
             o.pleaf(0),
-            r"\baca-bd-sponge-markup",
+            r"\baca-boxed-bd-sponge-markup",
             abjad.Tweak(r"- \tweak padding 1.5"),
             abjad.Tweak(r"- \tweak parent-alignment-X 0"),
         )