diff --git a/src/boot/types.r b/src/boot/types.r
index c7d6011524..e4d077b5d9 100644
--- a/src/boot/types.r
+++ b/src/boot/types.r
@@ -232,7 +232,7 @@ pair        "two dimensional point or size"
 ; BEGIN BINDABLE TYPES - SEE Is_Bindable() - Cell's "extra" USED FOR BINDING
 ; ============================================================================
 
-<ANY-BINDABLE?>
+<BINDABLE?>
 
 <ANY-WORD?>  ; (order matters, see Sigilize_Any_Plain_Kind())
 
@@ -440,7 +440,7 @@ pair        "two dimensional point or size"
 
 </ANY-ARRAY?>
 
-</ANY-BINDABLE?>
+</BINDABLE?>
 
 
 ; ============================================================================
diff --git a/tests/datatypes/sigil.test.reb b/tests/datatypes/sigil.test.reb
index 4fb19550c8..535c905a60 100644
--- a/tests/datatypes/sigil.test.reb
+++ b/tests/datatypes/sigil.test.reb
@@ -77,18 +77,18 @@
 
 ; Test SIGIL OF for each bindable type
 (
-    for-each [sigil' items] [
-        ~null~ [  word   tu.p.le   pa/th   [bl o ck]   (gr o up)  ]
-        '::    [  word:  tu.p.le:  pa/th:  [bl o ck]:  (gr o up): ]
-        ':     [ :word  :tu.p.le  :pa/th  :[bl o ck]  :(gr o up)  ]
-        '^     [ ^word  ^tu.p.le  ^pa/th  ^[bl o ck]  ^(gr o up)  ]
-        '&     [ &word  &tu.p.le  &pa/th  &[bl o ck]  &(gr o up)  ]
-        '@     [ @word  @tu.p.le  @pa/th  @[bl o ck]  @(gr o up)  ]
-        '$     [ $word  $tu.p.le  $pa/th  $[bl o ck]  $(gr o up)  ]
+    for-each [sigil items] [
+        ~null~  [  word   tu.p.le   pa/th   [bl o ck]   (gr o up)  ]
+        ::      [  word:  tu.p.le:  pa/th:  [bl o ck]:  (gr o up): ]
+        :       [ :word  :tu.p.le  :pa/th  :[bl o ck]  :(gr o up)  ]
+        ^       [ ^word  ^tu.p.le  ^pa/th  ^[bl o ck]  ^(gr o up)  ]
+        &       [ &word  &tu.p.le  &pa/th  &[bl o ck]  &(gr o up)  ]
+        @       [ @word  @tu.p.le  @pa/th  @[bl o ck]  @(gr o up)  ]
+        $       [ $word  $tu.p.le  $pa/th  $[bl o ck]  $(gr o up)  ]
     ][
         for-each item items [
-            assert [any-bindable? item]
-            if (unmeta sigil') <> sigil of item [
+            assert [bindable? item]
+            if (degrade sigil) <> sigil of item [
                 fail [mold item]
             ]
         ]
diff --git a/tools/make-boot.r b/tools/make-boot.r
index e79694c89e..9af510360a 100644
--- a/tools/make-boot.r
+++ b/tools/make-boot.r
@@ -225,7 +225,7 @@ for-each-typerange: func [
                 ; ANY_META() in the C code.  Extract relevant name part.
                 ;
                 parse2 name* [
-                    remove "any-"
+                    opt remove "any-"
                     to "?"  ; once dropped -VALUE from e.g. ANY-META-VALUE?
                     remove "?"
                 ] else [