diff --git a/design/mvp/Binary.md b/design/mvp/Binary.md
index 3a2fa83b..8d037cea 100644
--- a/design/mvp/Binary.md
+++ b/design/mvp/Binary.md
@@ -389,10 +389,12 @@ in the explainer.)
 import         ::= in:<importname'> ed:<externdesc>                     => (import in ed)
 export         ::= en:<exportname'> si:<sortidx> ed?:<externdesc>?      => (export en si ed?)
 importname'    ::= 0x00 len:<u32> in:<importname>                       => in     (if len = |in|)
-                 | 0x01 len:<u32> in:<importname> vs:<versionsuffix'>   => in vs  (if len = |in|) 🔗
-exportname'    ::= 0x00 len:<u32> en:<exportname>                       => en     (if len = |en|)
-                 | 0x01 len:<u32> en:<exportname> vs:<versionsuffix'>   => in vs  (if len = |in|) 🔗
-versionsuffix' ::= len:<u32> vs:<semversuffix>                          => (versionsuffix vs)  (if len = |vs|) 🔗
+                 | 0x01 len:<u32> in:<importname>                       => in     (if len = |in|)
+                 | 0x02 len:<u32> in:<importname> vs:<versionsuffix>    => in vs  (if len = |in|) 🔗
+exportname'    ::= 0x00 len:<u32> in:<exportname>                       => in     (if len = |in|)
+                 | 0x01 len:<u32> in:<exportname>                       => in     (if len = |in|)
+                 | 0x02 len:<u32> in:<exportname> vs:<versionsuffix>    => in vs  (if len = |in|) 🔗
+versionsuffix  ::= len:<u32> vs:<semversuffix>                          => (versionsuffix vs)  (if len = |vs|) 🔗
 ```
 
 Notes:
@@ -406,6 +408,8 @@ Notes:
   of the inferred `externdesc` of the `sortidx`.
 * `<importname>` and `<exportname>` refer to the productions defined in the
   [text format](Explainer.md#import-and-export-definitions).
+* `<importname'>` and `<exportname'>` will [be cleaned up for a 1.0
+  release](##binary-format-warts-to-fix-in-a-10-release).
 * The `<importname>`s of a component must all be [strongly-unique]. Separately,
   the `<exportname>`s of a component must also all be [strongly-unique].
 * Validation requires that annotated `plainname`s only occur on `func` imports
@@ -519,9 +523,9 @@ named once.
 * The two `depname` cases should be merged into one (`dep=<...>`)
 * The two `list` type codes should be merged into one with an optional immediate
   and similarly for `func`.
-* The `0x00` variant of `importname'` and `exportname'` will be removed. Any
-  remaining variant(s) will be renumbered or the prefix byte will be removed or
-  repurposed.
+* The `0x00` and `0x01` variant of `importname'` and `exportname'` will be
+  removed. Any remaining variant(s) will be renumbered or the prefix byte will
+  be removed or repurposed.
 * Most built-ins should have a `<canonopt>*` immediate instead of an ad hoc
   subset of `canonopt`s.
 * Add optional `shared` immediate to all canonical definitions (explicitly or