From f754b7f3204446d62f31d89f9dd29e9bada18d33 Mon Sep 17 00:00:00 2001
From: Luke Wagner <mail@lukewagner.name>
Date: Thu, 28 Sep 2023 16:59:42 -0500
Subject: [PATCH 1/2] Move structured import/export name information into the
 string

Resolves #253
---
 design/mvp/Binary.md                          |  86 ++---
 design/mvp/Explainer.md                       | 361 +++++++++---------
 design/mvp/WIT.md                             |  89 ++---
 design/mvp/examples/LinkTimeVirtualization.md |   8 +-
 4 files changed, 255 insertions(+), 289 deletions(-)

diff --git a/design/mvp/Binary.md b/design/mvp/Binary.md
index b8799257..6f193931 100644
--- a/design/mvp/Binary.md
+++ b/design/mvp/Binary.md
@@ -73,6 +73,7 @@ instance            ::= ie:<instanceexpr>                                  => (i
 instanceexpr        ::= 0x00 c:<componentidx> arg*:vec(<instantiatearg>)   => (instantiate c arg*)
                       | 0x01 e*:vec(<inlineexport>)                        => e*
 instantiatearg      ::= n:<string>  si:<sortidx>                           => (with n si)
+string              ::= s:<core:name>                                      => s
 sortidx             ::= sort:<sort> idx:<u32>                              => (sort idx)
 sort                ::= 0x00 cs:<core:sort>                                => core cs
                       | 0x01                                               => func
@@ -81,16 +82,6 @@ sort                ::= 0x00 cs:<core:sort>                                => co
                       | 0x04                                               => component
                       | 0x05                                               => instance
 inlineexport        ::= n:<exportname> si:<sortidx>                        => (export n si)
-string              ::= s:<core:name>                                      => s
-name                ::= len:<u32> n:<name-chars>                           => n (if len = |n|)
-name-chars          ::= l:<label>                                          => l
-                      | '[constructor]' r:<label>                          => [constructor]r
-                      | '[method]' r:<label> '.' m:<label>                 => [method]r.m
-                      | '[static]' r:<label> '.' s:<label>                 => [static]r.s
-label               ::= w:<word>                                           => w
-                      | l:<label> '-' w:<word>                             => l-w
-word                ::= w:[0x61-0x7a] x*:[0x30-0x39,0x61-0x7a]*            => char(w)char(x)*
-                      | W:[0x41-0x5a] X*:[0x30-0x39,0x41-0x5a]*            => char(W)char(X)*
 ```
 Notes:
 * Reused Core binary rules: [`core:name`], (variable-length encoded) [`core:u32`]
@@ -104,25 +95,15 @@ Notes:
   for aliases (below).
 * Validation of `core:instantiatearg` initially only allows the `instance`
   sort, but would be extended to accept other sorts as core wasm is extended.
-* Validation of `instantiate` requires each `<name>`, `<iid>`, `<pkgid>` or
-  `<pkgidset>` in an `importname` in `c` to match a `string` in a `with`
-  argument and for the types to match.
+* Validation of `instantiate` requires each `<importname>` in `c` to match a
+  `string` in a `with` argument (compared as strings) and for the types to
+  match.
 * When validating `instantiate`, after each individual type-import is supplied
   via `with`, the actual type supplied is immediately substituted for all uses
   of the import, so that subsequent imports and all exports are now specialized
   to the actual type.
 * The indices in `sortidx` are validated according to their `sort`'s index
   spaces, which are built incrementally as each definition is validated.
-* Validation requires that annotated `name`s only occur on `func` imports or
-  exports and that the `r:<label>` matches the `name` of a preceding `resource`
-  import or export, respectively, in the same scope (component, component type
-  or instance type).
-* Validation of `[constructor]` names requires that the `func` returns a
-  `(result (own $R))`, where `$R` is the resource labeled `r`.
-* Validation of `[method]` names requires the first parameter of the function
-  to be `(param "self" (borrow $R))`, where `$R` is the resource labeled `r`.
-* Validation of `[method]` and `[static]` names ensures that all field names
-  are disjoint.
 
 
 ## Alias Definitions
@@ -202,14 +183,15 @@ defvaltype    ::= pvt:<primvaltype>                       => pvt
                 | 0x71 case*:vec(<case>)                  => (variant case*)
                 | 0x70 t:<valtype>                        => (list t)
                 | 0x6f t*:vec(<valtype>)                  => (tuple t+)    (if |t*| > 0)
-                | 0x6e l*:vec(<label>)                    => (flags l+)    (if |l*| > 0)
-                | 0x6d l*:vec(<label>)                    => (enum l*)
+                | 0x6e l*:vec(<label'>)                   => (flags l+)    (if |l*| > 0)
+                | 0x6d l*:vec(<label'>)                   => (enum l*)
                 | 0x6b t:<valtype>                        => (option t)
                 | 0x6a t?:<valtype>? u?:<valtype>?        => (result t? (error u)?)
                 | 0x69 i:<typeidx>                        => (own i)
                 | 0x68 i:<typeidx>                        => (borrow i)
-labelvaltype  ::= l:<label> t:<valtype>                   => l t
-case          ::= l:<label> t?:<valtype>? 0x00            => (case l t?)
+labelvaltype  ::= l:<label'> t:<valtype>                  => l t
+case          ::= l:<label'> t?:<valtype>? 0x00           => (case l t?)
+label'        ::= len:<u32> l:<label>                     => l    (if len = |l|)
 <T>?          ::= 0x00                                    =>
                 | 0x01 t:<T>                              => t
 valtype       ::= i:<typeidx>                             => i
@@ -264,13 +246,12 @@ Notes:
 * Validation rejects `resourcetype` type definitions inside `componenttype` and
   `instancettype`. Thus, handle types inside a `componenttype` can only refer
   to resource types that are imported or exported.
-* The uniqueness validation rules for `importname` and `exportname`
-  described below are also applied at the instance- and component-type level.
+* All parameter labels, result labels, record field labels, variant case
+  labels, flag labels, enum case labels, component import names, component
+  export names, instance import names and instance export names must be
+  unique in their containing scope.
 * Validation of `externdesc` requires the various `typeidx` type constructors
   to match the preceding `sort`.
-* Validation of function parameter and result names, record field names,
-  variant case names, flag names, and enum case names requires that the name be
-  unique for the func, record, variant, flags, or enum type definition.
 * (The `0x00` immediate of `case` may be reinterpreted in the future as the
   `none` case of an optional immediate.)
 
@@ -327,20 +308,12 @@ flags are set.
 (See [Import and Export Definitions](Explainer.md#import-and-export-definitions)
 in the explainer.)
 ```ebnf
-import      ::= in:<importname> ed:<externdesc>                      => (import in ed)
-export      ::= en:<exportname> si:<sortidx> ed?:<externdesc>?       => (export en si ed?)
-exportname  ::= 0x00 n:<name>                                        => n
-              | 0x01 i:<iid'>                                        => (interface i)
-iid'        ::= len:<u32> i:<iid>                                    => "i" (if len = |i|)
-importname  ::= en:<exportname>                                      => en
-              | 0x02 n:<name> s:<string> i?:<integrity'>?            => n (url s i?)
-              | 0x03 n:<name> s:<string> i?:<integrity'>?            => n (relative-url s i?)
-              | 0x04 n:<name> i:<integrity'>                         => n i
-              | 0x05 p:<pkgid'> i?:<integrity'>?                     => (locked-dep p i?)
-              | 0x06 p:<pkgidset'>                                   => (unlocked-dep p)
-pkgid'      ::= len:<u32> p:<pkgid>                                  => "p" (if len = |p|)
-pkgidset'   ::= len:<u32> p:<pkgidset>                               => "p" (if len = |p|)
-integrity'  ::= len:<u32> im:<integrity-metadata>                    => (integrity "im") (if len = |im|)
+import      ::= en:<importname'> ed:<externdesc>                     => (import in ed)
+export      ::= en:<exportname'> si:<sortidx> ed?:<externdesc>?      => (export en si ed?)
+importname' ::= <junk> len:<u32> in:<importname>                     => in  (if len = |in|)
+exportname' ::= <junk> len:<u32> en:<exportname>                     => en  (if len = |en|)
+junk        ::= 0x00
+              | 0x01
 ```
 
 Notes:
@@ -352,13 +325,26 @@ Notes:
   (which disallows core sorts other than `core module`). When the optional
   `externdesc` immediate is present, validation requires it to be a supertype
   of the inferred `externdesc` of the `sortidx`.
-* The `<name>`, `<iid>`, `<pkgid>` and `<pkgidset>` of imports must be relatively unique.
-* The `<name>` and `<iid>` of exports must be relatively unique.
-* `<iid>`, `<pkgid>` and `<pkgidset>` refer to the grammatical productions defined in
-  the [text format](#import-and-export-definitions).
+* `<importname>` and `<exportname>` refer to the productions defined in the
+  [text format](Explainer.md#import-and-export-definitions).
+* The `<importname>`s of a component must be unique and the `<exportname>`s of
+  a component must be unique as well (defined in terms of raw string equality).
+* Validation requires that annotated `plainname`s only occur on `func` imports
+  or exports and that the first label of a `[constructor]`, `[method]` or
+  `[static]` matches the `plainname` of a preceding `resource` import or
+  export, respectively, in the same scope (component, component type or
+  instance type).
+* Validation of `[constructor]` names requires that the `func` returns a
+  `(result (own $R))`, where `$R` is the resource labeled `r`.
+* Validation of `[method]` names requires the first parameter of the function
+  to be `(param "self" (borrow $R))`, where `$R` is the resource labeled `r`.
+* Validation of `[method]` and `[static]` names ensures that all field names
+  are disjoint.
 * `<valid semver>` is as defined by [https://semver.org](https://semver.org/)
 * `<integrity-metadata>` is as defined by the
   [SRI](https://www.w3.org/TR/SRI/#dfn-integrity-metadata) spec.
+* The `junk` byte is leftover from a previous iteration and will be removed at
+  the next breaking binary format change.
 
 ## Name Section
 
diff --git a/design/mvp/Explainer.md b/design/mvp/Explainer.md
index 517416bc..fd1086c7 100644
--- a/design/mvp/Explainer.md
+++ b/design/mvp/Explainer.md
@@ -253,14 +253,14 @@ an example of these, we'll also need the `alias` definitions introduced in the
 next section.
 
 The syntax for defining component instances is symmetric to core module
-instances, but with an expanded component-level definition of `sort` and
-more restricted version of `name`:
+instances, but with an expanded component-level definition of `sort`:
 ```ebnf
 instance       ::= (instance <id>? <instanceexpr>)
 instanceexpr   ::= (instantiate <componentidx> <instantiatearg>*)
                  | <inlineexport>*
 instantiatearg ::= (with <string> <sortidx>)
                  | (with <string> (instance <inlineexport>*))
+string         ::= <core:name>
 sortidx        ::= (<sort> <u32>)
 sort           ::= core <core:sort>
                  | func
@@ -269,15 +269,6 @@ sort           ::= core <core:sort>
                  | component
                  | instance
 inlineexport   ::= (export <exportname> <sortidx>)
-string         ::= <core:name>
-name           ::= <label>
-                 | [constructor]<label>
-                 | [method]<label>.<label>
-                 | [static]<label>.<label>
-label          ::= <word>
-                 | <label>-<word>
-word           ::= [a-z][0-9a-z]*
-                 | [A-Z][0-9A-Z]*
 ```
 Because component-level function, type and instance definitions are different
 than core-level function, type and instance definitions, they are put into
@@ -288,40 +279,14 @@ future include `data`). Thus, component-level `sort` injects the full set
 of `core:sort`, so that they may be referenced (leaving it up to validation
 rules to throw out the core sorts that aren't allowed in various contexts).
 
+The `string` production reuses the `core:name` quoted-string-literal syntax of
+Core WebAssembly (which appears in core module imports and exports and can
+contain any valid UTF-8 string).
+
 🪙 The `value` sort refers to a value that is provided and consumed during
 instantiation. How this works is described in the
 [start definitions](#start-definitions) section.
 
-The component-level definition of `name` captures several language-neutral
-syntactic hints that allow bindings generators to produce more idiomatic
-bindings in their target language. Having this structured data encoded as a
-plain string provides a single canonical name for use in tools and
-language-agnostic contexts, without requiring each to invent its own custom
-interpretation which would likely lead to inconsistencies followed by a need to
-canonicalize.
-
-At the top-level, a `name` allows functions to be annotated as being a
-constructor, method or static function of a preceding resource. In each of
-these cases, the first `label` is the name of the resource and the second
-`label` is the logical field name of the function. This additional nesting
-information allows bindings generators to insert the function into the nested
-scope of a class, abstract data type, object, namespace, package, module or
-whatever resources get bound to. For example, a function named `[method]C.foo`
-could be bound in C++ to a member function `foo` in a class `C`. The JS API
-[below](#JS-API) describes how the native JavaScript bindings could look.
-Validation described in [Binary.md](Binary.md) inspects the contents of `name`
-and ensures that the function has a compatible signature.
-
-The `label`s inside a `name` are required to have [kebab case]. The reason
-for this particular form of casing is to unambiguously separate words and
-acronyms (represented as all-caps words) so that source language bindings can
-convert a `name` into the idiomatic casing of that language. (Indeed, because
-hyphens are often invalid in identifiers, kebab case practically forces
-language bindings to make such a conversion.) For example, the `label` `is-XML`
-could be mapped to `isXML`, `IsXml` or `is_XML`, depending on the target
-language. The highly-restricted character set ensures that capitalization is
-trivial and does not require consulting Unicode tables.
-
 To see a non-trivial example of component instantiation, we'll first need to
 introduce a few other definitions below that allow components to import, define
 and export component functions.
@@ -371,7 +336,7 @@ sortidx     ::= (<sort> <u32>)          ;; as above
               | <inlinealias>
 Xidx        ::= <u32>                   ;; as above
               | <inlinealias>
-inlinealias ::= (<sort> <u32> <name>+)
+inlinealias ::= (<sort> <u32> <string>+)
 ```
 If `<sort>` refers to a `<core:sort>`, then the `<u32>` of `inlinealias` is a
 `<core:instanceidx>`; otherwise it's an `<instanceidx>`. For example, the
@@ -555,12 +520,12 @@ defvaltype    ::= bool
                 | s8 | u8 | s16 | u16 | s32 | u32 | s64 | u64
                 | float32 | float64
                 | char | string
-                | (record (field <label> <valtype>)+)
-                | (variant (case <id>? <label> <valtype>?)+)
+                | (record (field "<label>" <valtype>)+)
+                | (variant (case <id>? "<label>" <valtype>?)+)
                 | (list <valtype>)
                 | (tuple <valtype>+)
-                | (flags <label>+)
-                | (enum <label>+)
+                | (flags "<label>"+)
+                | (enum "<label>"+)
                 | (option <valtype>)
                 | (result <valtype>? (error <valtype>)?)
                 | (own <typeidx>)
@@ -569,8 +534,8 @@ valtype       ::= <typeidx>
                 | <defvaltype>
 resourcetype  ::= (resource (rep i32) (dtor <funcidx>)?)
 functype      ::= (func <paramlist> <resultlist>)
-paramlist     ::= (param <label> <valtype>)*
-resultlist    ::= (result <label> <valtype>)*
+paramlist     ::= (param "<label>" <valtype>)*
+resultlist    ::= (result "<label>" <valtype>)*
                 | (result <valtype>)
 componenttype ::= (component <componentdecl>*)
 instancetype  ::= (instance <instancedecl>*)
@@ -636,8 +601,8 @@ The sets of values allowed for the remaining *specialized value types* are
 defined by the following mapping:
 ```
                     (tuple <valtype>*) ↦ (record (field "𝒊" <valtype>)*) for 𝒊=0,1,...
-                      (flags <label>*) ↦ (record (field <label> bool)*)
-                       (enum <label>+) ↦ (variant (case <label>)+)
+                    (flags "<label>"*) ↦ (record (field "<label>" bool)*)
+                     (enum "<label>"+) ↦ (variant (case "<label>")+)
                     (option <valtype>) ↦ (variant (case "none") (case "some" <valtype>))
 (result <valtype>? (error <valtype>)?) ↦ (variant (case "ok" <valtype>?) (case "error" <valtype>?))
                                 string ↦ (list char)
@@ -693,11 +658,11 @@ capabilities of the component model.
 
 The `importdecl` and `exportdecl` declarators correspond to component `import`
 and `export` definitions, respectively, allowing an identifier to be bound for
-use by subsequent declarators. The definition of `importname` and `exportname`
-are given in the [imports and exports](#import-and-export-definitions) section
-below. Following the precedent of [`core:typeuse`], the text format allows both
-references to out-of-line type definitions (via `(type <typeidx>)`) and inline
-type expressions that the text format desugars into out-of-line type
+use by subsequent declarators. The definitions of `label`, `importname` and
+`exportname` are given in the [imports and exports](#import-and-export-definitions)
+section below. Following the precedent of [`core:typeuse`], the text format
+allows both references to out-of-line type definitions (via `(type <typeidx>)`)
+and inline type expressions that the text format desugars into out-of-line type
 definitions.
 
 🪙 The `value` case of `externdesc` describes a runtime value that is imported or
@@ -1359,84 +1324,109 @@ of core linear memory.
 Both import and export definitions append a new element to the index space of
 the imported/exported `sort` which can be optionally bound to an identifier in
 the text format. In the case of imports, the identifier is bound just like Core
-WebAssembly, as part of the `externdesc` (e.g., `(import "x" (func $iden))`).
-In the case of exports, the `<id>?` right after the `export` is bound (the
-`<id>` inside the `<sortidx>` is a reference to the preceding definition being
-exported). The grammar for imports and exports is:
+WebAssembly, as part of the `externdesc` (e.g., `(import "x" (func $x))` binds
+the identifier `$x`). In the case of exports, the `<id>?` right after the
+`export` is bound while the `<id>` inside the `<sortidx>` is a reference to the
+preceding definition being exported (e.g., `(export $x "x" (func $f))` binds a
+new identifier `$x`).
 ```ebnf
-import     ::= (import <importname> bind-id(<externdesc>))
-export     ::= (export <id>? <exportname> <sortidx> <externdesc>?)
-exportname ::= <name>
-             | (interface "<iid>")
-iid        ::= <namespace><label><projection><version>?
-             | <namespace>+<label><projection>+<version>? 🪺
-namespace  ::= <label>:
-projection ::= /<label>
-version    ::= @<valid semver>
-importname ::= <exportname>
-             | <name> (url <string> <integrity>?)
-             | <name> (relative-url <string> <integrity>?)
-             | <name> <integrity>
-             | (locked-dep "<pkgid>" <integrity>?)
-             | (unlocked-dep "<pkgidset>")
-pkgname    ::= <namespace><label>
-             | <namespace>+<label><projection>* 🪺
-pkgid      ::= <pkgname><version>?
-pkgidset   ::= <pkgname><verrange>?
-verrange   ::= <version>
-             | @*
-             | @{<verlower>}
-             | @{<verupper>}
-             | @{<verlower> <verupper>}
-verlower   ::= >=<valid semver>
-verupper   ::= <<valid semver>
-integrity  ::= (integrity "<integrity-metadata>")
+import ::= (import "<importname>" bind-id(<externdesc>))
+export ::= (export <id>? "<exportname>" <sortidx> <externdesc>?)
+```
+All import names are required to be unique and all export names are required to
+be unique. The rest of the grammar for imports and exports defines a structured
+syntax for the contents of import and export names. Syntactically, these names
+appear inside quoted string literals. The grammar thus restricts the contents
+of these string literals to provide more structured information that can be
+mechanically interpreted by toolchains and runtimes to support idiomatic
+developer workflows and source-language bindings. The rules defining this
+structured name syntax below are to be interpreted as a *lexical* grammar
+defining a single token and thus whitespace is not automatically inserted, all
+terminals are single-quoted, and everything unquoted is a meta-character.
+```ebnf
+exportname    ::= <plainname>
+                | <interfacename>
+importname    ::= <exportname>
+                | <depname>
+                | <urlname>
+                | <hashname>
+plainname     ::= <label>
+                | '[constructor]' <label>
+                | '[method]' <label> '.' <label>
+                | '[static]' <label> '.' <label>
+label         ::= <word>
+                | <label> '-' <word>
+word          ::= [a-z] [0-9a-z]*
+                | [A-Z] [0-9A-Z]*
+interfacename ::= <namespace> <label> <projection> <version>?
+                | <namespace>+ <label> <projection>+ <version>? 🪺
+namespace     ::= <label> ':'
+projection    ::= '/' <label>
+version       ::= '@' <valid semver>
+depname       ::= 'unlocked-dep=<' <pkgidset> '>'
+                | 'locked-dep=<' <pkgid> '>' ( ',' <hashname> )?
+pkgidset      ::= <pkgname> <verrange>?
+pkgid         ::= <pkgname> <version>?
+pkgname       ::= <namespace> <label>
+                | <namespace>+ <label> <projection>* 🪺
+verrange      ::= '@*'
+                | '@{' <verlower> '}'
+                | '@{' <verupper> '}'
+                | '@{' <verlower> ' ' <verupper> '}'
+verlower      ::= '>=' <valid semver>
+verupper      ::= '<' <valid semver>
+urlname       ::= 'url=<' <nonbrackets> '>' (',' <hashname>)?
+                | 'relative-url=<' <nonbrackets> '>' (',' <hashname>)?
+nonbrackets   ::= [^<>]*
+hashname      ::= 'integrity=<' <integrity-metadata> '>'
 ```
 Components provide seven options for naming imports:
-* a **naked kebab-name** that leaves it up to the developer to "read the docs"
+* a **plain name** that leaves it up to the developer to "read the docs"
   or otherwise figure out what to supply for the import;
-* an **interface id** that is assumed to uniquely identify a higher-level
+* an **interface name** that is assumed to uniquely identify a higher-level
   semantic contract that the component is requesting an *unspecified* wasm
   or native implementation of;
-* a **URL** that the component is requesting be resolved to a *particular* wasm
-  implementation by [fetching] the URL.
-* a **relative URL** that the component is requesting be resolved to a
+* a **URL name** that the component is requesting be resolved to a *particular*
+  wasm implementation by [fetching] the URL.
+* a **relative URL name** that the component is requesting be resolved to a
   *particular* wasm implementation by [fetching] the URL using the importing
   component's URL as the [base URL];
-* a **naked integrity hash** of the contents of a *particular* wasm
-  implemenentation without specifying where to locate those bytes.
-* a **locked dependency** that the component is requesting be resolved via
+* a **hash name** containing a content-hash of the bytes of a *particular*
+  wasm implemenentation but not specifying location of the bytes.
+* a **locked dependency name** that the component is requesting be resolved via
   some contextually-supplied registry to a *particular* wasm implementation
   using the given hierarchical name and version; and
-* an **unlocked dependency** that the component is requesting be resolved via
-  some contextually-supplied registry to *one of a set of possible* of wasm
+* an **unlocked dependency name** that the component is requesting be resolved
+  via some contextually-supplied registry to *one of a set of possible* of wasm
   implementations using the given hierarchical name and version range.
 
 Not all hosts are expected to support all seven import naming options and, in
 general, build tools may need to wrap a to-be-deployed component with an outer
 component that only uses import names that are understood by the target host.
 For example:
-* an offline host may only provide a fixed set of `interface` imports,
-  requiring a build tool to **bundle** all other imports (replacing component
-  imports with component definitions);
-* browsers may only support URL imports and naked kebab-names (resolved via
-  import map), requiring the deployment process to make registry dependencies
-  available via URL (as usual);
+* an offline host may only implement a fixed set of interface names, requiring
+  a build tool to **bundle** URL, dependency and hash names (replacing the
+  imports with nested definitions);
+* browsers may only support plain and URL names (with plain names resolved via
+  import map or [JS API]), requiring the build process to publish or bundle
+  dependencies, converting dependency names into nested definitions or URL
+  names;
 * a production server environment may only allow deployment of components
-  importing from a fixed set of `interface` imports and `locked-dep` imports,
-  thereby requiring all dependencies to be locked and deployed beforehand;
+  importing from a fixed set of interface and locked dependency names, thereby
+  requiring all dependencies to be locked and deployed beforehand;
 * host embeddings without a direct developer interface (such as the JS API or
-  import maps) may reject all naked kebab-names, requiring the programmer to
-  fix these beforehand;
-* hosts without content-addressable storage may reject naked integrity hash
-  imports (as they have no way to locate the contents).
-
-The Component Model's grammar and validation rules allow URLs to be any
-`string` (i.e., length-prefixed UTF-8 string), leaving the well-formedness of
-the URL to be checked as part of the process of fetching the URL (which can
-fail for any number of additional reasons beyond validation).
-
-When a *particular* implementation is indicated (via URL or registry id),
+  import maps) may reject all plain names, requiring the build process to
+  resolve these beforehand;
+* hosts without content-addressable storage may reject hash names (as they have
+  no way to locate the contents).
+
+The grammar and validation of URL names allows the embedded URLs to contain any
+sequence of UTF-8 characters (other than angle brackets, which are used to
+[delimit the URL]), leaving the well-formedness of the URL to be checked as
+part of the process of fetching the URL (which can fail for any number of
+additional reasons beyond validation).
+
+When a particular implementation is indicated via URL or dependency name,
 `importname` allows the component to additionally specify a cryptographic hash
 of the expected binary representation of the wasm implementation, reusing the
 [`integrity-metadata`] production defined by the W3C Subresource Integrity
@@ -1444,17 +1434,17 @@ specification. When this hash is present, a component can express its intention
 to reuse another component or core module with the same degree of specificity
 as if the component or core module was nested directly, thereby allowing
 components to factor out common dependencies without compromising runtime
-behavior. When an `integrity` hash is present without a registry name, the
-host must locate the contents using the hash (e.g., using an [OCI Registry]).
+behavior. When *only* the hash is present (in a `hashname`), the host must
+locate the contents using the hash (e.g., using an [OCI Registry]).
 
 The "registry" referred to by dependency names serves to map a hierarchical
-name and version to either a component or an export of a component. For
-example, in the full generality of nested namespaces and packages (🪺),
-in a registry name `a:b:c/d/e/f`, `a:b:c` traverses a path through namespaces
-`a` and `b` to a component `c` and `/d/e/f` traverses the exports of `c` (where
-`d` and `e` must be component exports but `f` can be anything). Given this
-abstract definition, a number of concrete data sources can be interpreted by
-developer tooling as "registries":
+name and version to a particular module, component or exported definition. For
+example, in the full generality of nested namespaces and packages (🪺), in a
+registry name `a:b:c/d/e/f`, `a:b:c` traverses a path through namespaces `a`
+and `b` to a component `c` and `/d/e/f` traverses the exports of `c` (where `d`
+and `e` must be component exports but `f` can be anything). Given this abstract
+definition, a number of concrete data sources can be interpreted by developer
+tooling as "registries":
 * a live registry (perhaps accessed via [`warg`])
 * a local filesystem directory (perhaps containing vendored dependencies)
 * a fixed set of host-provided functionality (see also the [built-in modules] proposal)
@@ -1469,65 +1459,73 @@ interpreted with the same [semantics][SemVerRange]. (Mostly this
 interpretation is the usual SemVer-spec-defined ordering, but note the
 particular behavior of pre-release tags.)
 
-For the 4 cases where an `importname` contains a kebab-`name`, that `name` is
-required to be unique within the component's imports so that it can be used as
-the primary name of the import both in source-language bindings and when
-supplying a component's imports via `instantiate`. In the other 3 cases where
-the import contains a structured, versioned registry name, that string serves
-as the primary name for use in source-language bindings and `instantiate` and
-is also required to be unique among imports. For source-language bindings, the
-sequence of labels in a registry name can be translated to nested scopes in the
-source language, thereby leveraging existing namespacing in the registry to
-avoid conflicts in the source bindings. Note that, because of the mandatory `:`
-in registry names, the set of kebab names and registry names is disjoint and so
-no discriminant is required to distinguish between a `name`, `iid` or `pkgid`;
-a plain `string` covers both cases.
+The `plainname` production captures several language-neutral syntactic hints
+that allow bindings generators to produce more idiomatic bindings in their
+target language. At the top-level, a `plainname` allows functions to be
+annotated as being a constructor, method or static function of a preceding
+resource. In each of these cases, the first `label` is the name of the resource
+and the second `label` is the logical field name of the function. This
+additional nesting information allows bindings generators to insert the
+function into the nested scope of a class, abstract data type, object,
+namespace, package, module or whatever resources get bound to. For example, a
+function named `[method]C.foo` could be bound in C++ to a member function `foo`
+in a class `C`. The JS API [below](#JS-API) describes how the native JavaScript
+bindings could look. Validation described in [Binary.md](Binary.md) inspects
+the contents of `plainname` and ensures that the function has a compatible
+signature.
+
+The `label` production used inside `plainname` as well as the labels of
+`record` and `variant` types are required to have [kebab case]. The reason for
+this particular form of casing is to unambiguously separate words and acronyms
+(represented as all-caps words) so that source language bindings can convert a
+`label` into the idiomatic casing of that language. (Indeed, because hyphens
+are often invalid in identifiers, kebab case practically forces language
+bindings to make such a conversion.) For example, the `label` `is-XML` could be
+mapped to `isXML`, `IsXml`, `is_XML` or `is_xml`, depending on the target
+language/convention. The highly-restricted character set ensures that
+capitalization is trivial and does not require consulting Unicode tables.
 
 Components provide two options for naming exports, symmetric to the first two
 options for naming imports:
-* a *naked kebab-name* that leaves it up to the developer to "read the docs"
+* a **plain name** that leaves it up to the developer to "read the docs"
   or otherwise figure out what the export does and how to use it; and
-* an *interface name* that is assumed to be a globally-unique identifier for
-  a higher-level semantic contract that component is claiming to implement
-  when the given exported definition.
-
-Export names include the same uniqueness requirements between exports as described
-above for import names.
+* an **interface name** that is assumed to uniquely identify a higher-level
+  semantic contract that the component is claiming to implement with the
+  given exported definition.
 
 As an example, the following component uses all 9 cases of imports and exports:
 ```wasm
 (component
   (import "custom-hook" (func (param string) (result string)))
-  (import (interface "wasi:http/handler") (instance
+  (import "wasi:http/handler" (instance
     (export "request" (type $request (sub resource)))
     (export "response" (type $response (sub resource)))
     (export "handle" (func (param (own $request)) (result (own $response))))
   ))
-  (import (url "https://mycdn.com/my-component.wasm") (component ...))
-  (import (relative-url "./other-component.wasm" (integrity "sha256-X9ArH3k...")) (component ...))
-  (import (integrity "sha256-Y3BsI4l...") (component ...))
-  (import (locked-dep "my-registry:sqlite@1.2.3" (integrity "sha256-H8BRh8j...")) (component ...))
-  (import (unlocked-dep "my-registry:imagemagick@{>=1.0.0}") (instance ...))
+  (import "url=<https://mycdn.com/my-component.wasm>" (component ...))
+  (import "relative-url=<./other-component.wasm>,integrity=<sha256-X9ArH3k...>" (component ...))
+  (import "locked-dep=<my-registry:sqlite@1.2.3>,integrity=<sha256-H8BRh8j...>" (component ...))
+  (import "unlocked-dep=<my-registry:imagemagick@{>=1.0.0}>" (instance ...))
+  (import "integrity=<sha256-Y3BsI4l...>" (component ...))
   ... impl
-  (export (interface "wasi:http/handler") (instance $http_handler_impl))
-  (export "configure" (func $configure_impl))
+  (export "wasi:http/handler" (instance $http_handler_impl))
+  (export "get-JSON" (func $get_json_impl (result string)))
 )
 ```
-Here, `custom-hook` and `configure` are imported/exported functions whose
-semantic contract is particular to this component, so naked kebab-names are
-used. In contrast, `wasi:http/handler` is the name of a separately-defined
-defined semantic contract, allowing the component to request the ability to
-make outgoing HTTP requests (through imports) and receive incoming HTTP
-requests (through exports) in a way that can be mechanically interpreted by
-hosts and tooling.
+Here, `custom-hook` and `get-JSON` are plain names for functions whose semantic
+contract is particular to this component and not defined elsewhere. In
+contrast, `wasi:http/handler` is the name of a separately-defined interface,
+allowing the component to request the ability to make outgoing HTTP requests
+(through imports) and receive incoming HTTP requests (through exports) in a way
+that can be mechanically interpreted by hosts and tooling.
 
 The remaining 4 imports show the different ways that a component can import
-external implementations. Here, the `url`, `relative-url` and `locked-dep`
-imports use `component` types, allowing this component to privately create
-and wire up instances using `instance` definitions. In contrast, the
-`unlocked-dep` import uses an `instance` type, anticipating a subsequent
-tooling step (likely the one that performs dependency resolution) to select,
-instantiate and provide the instance.
+external implementations. Here, the URL and locked dependency imports use
+`component` types, allowing this component to privately create and wire up
+instances using `instance` definitions. In contrast, the unlocked dependency
+import uses an `instance` type, anticipating a subsequent tooling step (likely
+the one that performs dependency resolution) to select, instantiate and provide
+the instance.
 
 Validation of `export` requires that all transitive uses of resource types in
 the types of exported functions or values refer to resources that were either
@@ -1618,20 +1616,11 @@ a 16-bit `layer` field with `0` for modules and `1` for components).
 Once compiled, a `WebAssembly.Component` could be instantiated using the
 existing JS API `WebAssembly.instantiate(Streaming)`. Since components have the
 same basic import/export structure as modules, this means extending the [*read
-the imports*] logic to support single-level imports (of kebab-case component
-import names converted to lowerCamelCase JavaScript identifiers) as well as
-imports of modules, components and instances. Since the results of
-instantiating a component is a record of JavaScript values, just like an
-instantiated module, `WebAssembly.instantiate` would always produce a
-`WebAssembly.Instance` object for both module and component arguments
-(again, with kebab-case component export names converted to lowerCamelCase).
-
-When `interface` imports or exports are used, the `iid` string is used in place
-of the kebab-name. Core WebAssembly modules allow arbitrary UTF-8 in
-import/export strings, so the union of kebab-names and interface identifiers
-(which is disjoint) allow components to express a subset of the possible Core
-WebAssembly import/export strings, which means that all component import/export
-names can be instantiated and called using the existing JS API.
+the imports*] logic to support single-level imports as well as imports of
+modules, components and instances. Since the results of instantiating a
+component is a record of JavaScript values, just like an instantiated module,
+`WebAssembly.instantiate` would always produce a `WebAssembly.Instance` object
+for both module and component arguments.
 
 Types are a new sort of definition that are not ([yet][type-imports]) present
 in Core WebAssembly and so the [*read the imports*] and [*create an exports
@@ -1775,14 +1764,13 @@ the same places where modules can be loaded today, branching on the `layer`
 field in the binary format to determine whether to decode as a module or a
 component.
 
-For `url` or `relative-url` import names, the `string` URL would be used as the
-[Module Specifier]. For naked kebab-`name` imports, the `name` would be
-used as the [Module Specifier]  (and an import map would be needed to map the
-`name` to a URL). For `locked-dep` and `unlocked-dep` import names,
-ESM-integration would likely simply fail loading the module, requiring a
-bundler to map these registry-relative names to URLs.
+For URL import names, the embedded URL would be used as the [Module Specifier].
+For plain names, the whole plain name would be used as the [Module Specifier]
+(and an import map would be needed to map the string to a URL). For locked and
+unlocked dependency names, ESM-integration would likely simply fail loading the
+module, requiring a bundler to map these registry-relative names to URLs.
 
-TODO: ESM-integration for `interface` imports and exports is still being
+TODO: ESM-integration for interface imports and exports is still being
 worked out in detail.
 
 The main remaining question is how to deal with component imports having a
@@ -1886,6 +1874,7 @@ and will be added over the coming months to complete the MVP proposal:
 [base URL]: https://developer.mozilla.org/en-US/docs/Web/API/URL/URL
 [`integrity-metadata`]: https://www.w3.org/TR/SRI/#the-integrity-attribute
 [Semantic Versioning 2.0]: https://semver.org/spec/v2.0.0.html
+[Delimit The URL]: https://www.rfc-editor.org/rfc/rfc3986#appendix-C
 
 [JS API]: https://webassembly.github.io/spec/js-api/index.html
 [*read the imports*]: https://webassembly.github.io/spec/js-api/index.html#read-the-imports
diff --git a/design/mvp/WIT.md b/design/mvp/WIT.md
index 0e7fe18c..2200b9a2 100644
--- a/design/mvp/WIT.md
+++ b/design/mvp/WIT.md
@@ -87,7 +87,7 @@ would correspond to:
 
 ```wasm
 (component
-  (import (interface "local:demo/host") (instance $host
+  (import "local:demo/host" (instance $host
     (export "log" (func (param "msg" string)))
   ))
   ;; ...
@@ -182,9 +182,8 @@ description of [`use`][use].
 
 An imported or exported interface corresponds to an imported or exported
 instance in the component model. Functions are equivalent to bare component
-functions.
-Additionally interfaces can be defined inline with an explicit kebab-name that
-avoids the need to have an out-of-line definition.
+functions. Additionally interfaces can be defined inline with an explicit
+[plain name] that avoids the need to have an out-of-line definition.
 
 ```wit
 package local:demo;
@@ -202,11 +201,11 @@ world your-world {
 }
 ```
 
-The kebab name of the `import` or `export` is the name of the corresponding item
-in the final component.
+The plain name of an `import` or `export` statement is used as the plain name
+of the final component `import` or `export` definition.
 
-In the component model imports to a component either use an ID or a
-kebab-name, and in WIT this is reflected in the syntax:
+In the component model imports to a component either use an plain or interface
+name, and in WIT this is reflected in the syntax:
 
 ```wit
 package local:demo;
@@ -222,10 +221,10 @@ world command {
   // generates an import of the ID `wasi:filesystem/types`
   import wasi:filesystem/types;
 
-  // generates an import of the kebab-name `foo`
+  // generates an import of the plain name `foo`
   import foo: func();
 
-  // generates an import of the kebab-name `bar`
+  // generates an import of the plain name `bar`
   import bar: interface {
     // ...
   }
@@ -236,6 +235,8 @@ Kebab names cannot overlap and must be unique, even between imports and exports.
 IDs, however, can be both imported and exported. The same interface cannot be
 explicitly imported or exported twice.
 
+[Plain Name]: Explainer.md#import-and-export-definitions
+
 ### Union of Worlds with `include`
 
 A World can be created by taking the union of two or more worlds. This operation allows world builders to form larger worlds from smaller worlds.
@@ -610,7 +611,7 @@ would generate this component:
 
 ```wasm
 (component
-  (import (interface "local:demo/shared") (instance $shared
+  (import "local:demo/shared" (instance $shared
     (type $metadata (record (; ... ;)))
     (export "metadata" (type (eq $metadata)))
   ))
@@ -744,11 +745,8 @@ defined within each language as well.
 ## WIT Identifiers
 [identifiers]: #wit-identifiers
 
-Identifiers in WIT documents are required to be valid component identifiers,
-meaning that they're "kebab cased". This currently is restricted to ascii
-characters and numbers that are `-` separated.
-
-For more information on this see the [binary format](./Binary.md).
+Identifiers in WIT documents are required to be valid plain or interface
+names, as defined by the [component model text format](Explainer.md#import-and-export-definitions).
 
 # Lexical structure
 [lexical-structure]: #lexical-structure
@@ -1308,8 +1306,8 @@ Component Model's definition of [`name`](Explainer.md).
 ## Identifiers
 
 Identifiers in `wit` can be defined with two different forms. The first is a
-[kebab-case] identifier defined by the [`name`](Explainer.md#instance-definitions)
-production in the Component Model text format.
+[kebab-case] [`label`](Explainer.md#import-and-export-names) production in the
+Component Model text format.
 
 ```wit
 foo: func(bar: u32);
@@ -1423,7 +1421,7 @@ can be packaged into a component as:
 ```wasm
 (component
   (type (export "types") (component
-    (export (interface "local:demo/types") (instance
+    (export "local:demo/types" (instance
       (export $file "file" (type (sub resource)))
       (export "[method]file.read" (func
         (param "self" (borrow $file)) (param "off" u32) (param "n" u32)
@@ -1436,11 +1434,11 @@ can be packaged into a component as:
     ))
   ))
   (type (export "namespace") (component
-    (import (interface "local:demo/types") (instance $types
+    (import "local:demo/types" (instance $types
       (export "file" (type (sub resource)))
     ))
     (alias export $types "file" (type $file))
-    (export (interface "local:demo/namespace") (instance
+    (export "local:demo/namespace" (instance
       (export "open" (func (param "name" string) (result (own $file))))
     ))
   ))
@@ -1489,16 +1487,15 @@ interface foo {
 is encoded as:
 ```wasm
 (component
-  (type $foo (component
-    (import (interface "wasi:http/types") (instance $types
+  (type (export "foo") (component
+    (import "wasi:http/types" (instance $types
       (export "request" (type (sub resource)))
     ))
     (alias export $types "request" (type $request))
-    (export (interface "local:demo/foo") (instance
+    (export "local:demo/foo" (instance
       (export "frob" (func (param "r" (own $request)) (result (own $request))))
     ))
   ))
-  (export "foo" (type $foo))
 )
 ```
 
@@ -1515,13 +1512,12 @@ world the-world {
 is encoded as:
 ```wasm
 (component
-  (type $the-world  (component
-    (export (interface "local:demo/the-world") (component
+  (type (export "the-world") (component
+    (export "local:demo/the-world" (component
       (export "test" (func))
       (export "run" (func))
     ))
   ))
-  (export "the-world" (type $the-world))
 )
 ```
 In the current version of WIT, the outer wrapping component-type will only ever
@@ -1546,20 +1542,18 @@ interface console {
 is encoded as:
 ```wasm
 (component
-  (type $the-world (component
-    (export (interface "local:demo/the-world") (component
-      (import (interface "local:demo/console") (instance
+  (type (export "the-world") (component
+    (export "local:demo/the-world" (component
+      (import "local:demo/console" (instance
         (export "log" (func (param "arg" string)))
       ))
     ))
   ))
-  (export "the-world" (type $the-world))
-  (type $console (component
-    (export (interface "local:demo/console") (instance
+  (type (export "console") (component
+    (export "local:demo/console" (instance
       (export "log" (func (param "arg" string)))
     ))
   ))
-  (export "console" (type $console))
 )
 ```
 This duplication is useful in the case of cross-package references or split
@@ -1594,47 +1588,44 @@ world proxy {
 are encoded as:
 ```wasm
 (component
-  (type $types (component
-    (export (interface "wasi:http/types") (instance
+  (type (export "types") (component
+    (export "wasi:http/types" (instance
       (export "request" (type (sub resource)))
       (export "response" (type (sub resource)))
       ...
     ))
   ))
-  (export "types" (type $types))
-  (type $handler (component
-    (import (interface "wasi:http/types") (instance $http-types
+  (type (export "handler") (component
+    (import "wasi:http/types" (instance $http-types
       (export "request" (type (sub resource)))
       (export "response" (type (sub resource)))
     ))
     (alias export $http-types "request" (type $request))
     (alias export $http-types "response" (type $response))
-    (export (interface "wasi:http/handler") (instance
+    (export "wasi:http/handler" (instance
       (export "handle" (func (param "r" (own $request)) (result (own $response))))
     ))
   ))
-  (export "handler" (type $handler))
-  (type $proxy (component
-    (export (interface "wasi:http/proxy") (component
-      (import (interface "wasi:logging/logger") (instance
+  (type (export "proxy") (component
+    (export "wasi:http/proxy" (component
+      (import "wasi:logging/logger" (instance
         ...
       ))
-      (import (interface "wasi:http/types") (instance $http-types
+      (import "wasi:http/types" (instance $http-types
         (export "request" (type (sub resource)))
         (export "response" (type (sub resource)))
         ...
       ))
       (alias export $http-types "request" (type $request))
       (alias export $http-types "response" (type $response))
-      (import (interface "wasi:http/handler") (instance
+      (import "wasi:http/handler" (instance
         (export "handle" (func (param "r" (own $request)) (result (own $response))))
       ))
-      (export (interface "wasi:http/handler") (instance
+      (export "wasi:http/handler" (instance
         (export "handle" (func (param "r" (own $request)) (result (own $response))))
       ))
     ))
   ))
-  (export "proxy" (type $proxy))
 )
 ```
 This examples shows how, in the context of concrete world (`wasi:http/proxy`),
diff --git a/design/mvp/examples/LinkTimeVirtualization.md b/design/mvp/examples/LinkTimeVirtualization.md
index 0e2d4b57..fbd25b56 100644
--- a/design/mvp/examples/LinkTimeVirtualization.md
+++ b/design/mvp/examples/LinkTimeVirtualization.md
@@ -17,7 +17,7 @@ without regard to `parent.wasm`:
 ```wasm
 ;; child.wat
 (component
-  (import (interface "wasi:filesystem/types") (instance
+  (import "wasi:filesystem/types" (instance
     (export "read" (func ...))
     (export "write" (func ...))
   ))
@@ -31,7 +31,7 @@ out and reused as a separate component:
 ```wasm
 ;; virtualize.wat
 (component
-  (import (interface "wasi:filesystem/types") (instance $fs
+  (import "wasi:filesystem/types" (instance $fs
     (export "read" (func ...))
     (export "write" (func ...))
   ))
@@ -49,7 +49,7 @@ We now write the parent component by composing `child.wasm` with
 ```wasm
 ;; parent.wat
 (component
-  (import (interface "wasi:filesystem/types") (instance $real-fs ...))
+  (import "wasi:filesystem/types" (instance $real-fs ...))
   (import "./virtualize.wasm" (component $Virtualize ...))
   (import "./child.wasm" (component $Child ...))
   (instance $virtual-fs (instantiate (component $Virtualize)
@@ -66,7 +66,7 @@ definitions in place of imports:
 ```wasm
 ;; parent.wat
 (component
-  (import (interface "wasi:filesystem/types") (instance $real-fs ...))
+  (import "wasi:filesystem/types" (instance $real-fs ...))
   (component $Virtualize ... copied inline ...)
   (component $Child ... copied inline ...)
   (instance $virtual-fs (instantiate (component $Virtualize)

From 12c00e8acb6589f9a41ff1ae1c8806e3981cc69c Mon Sep 17 00:00:00 2001
From: Luke Wagner <mail@lukewagner.name>
Date: Tue, 17 Oct 2023 11:26:02 -0500
Subject: [PATCH 2/2] Replace the junk byte with a fixed 0x00 byte

---
 design/mvp/Binary.md | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/design/mvp/Binary.md b/design/mvp/Binary.md
index 6f193931..5ed8dcc7 100644
--- a/design/mvp/Binary.md
+++ b/design/mvp/Binary.md
@@ -310,10 +310,8 @@ in the explainer.)
 ```ebnf
 import      ::= en:<importname'> ed:<externdesc>                     => (import in ed)
 export      ::= en:<exportname'> si:<sortidx> ed?:<externdesc>?      => (export en si ed?)
-importname' ::= <junk> len:<u32> in:<importname>                     => in  (if len = |in|)
-exportname' ::= <junk> len:<u32> en:<exportname>                     => en  (if len = |en|)
-junk        ::= 0x00
-              | 0x01
+importname' ::= 0x00 len:<u32> in:<importname>                       => in  (if len = |in|)
+exportname' ::= 0x00 len:<u32> en:<exportname>                       => en  (if len = |en|)
 ```
 
 Notes:
@@ -343,8 +341,6 @@ Notes:
 * `<valid semver>` is as defined by [https://semver.org](https://semver.org/)
 * `<integrity-metadata>` is as defined by the
   [SRI](https://www.w3.org/TR/SRI/#dfn-integrity-metadata) spec.
-* The `junk` byte is leftover from a previous iteration and will be removed at
-  the next breaking binary format change.
 
 ## Name Section