Review comments

Author: alexcrichton

design/mvp/Binary.md

@@ -310,22 +310,6 @@ Notes:
   independently unique among imports and exports, respectively.
 * URLs are compared for equality by plain byte identity.
 
-
-[`core:u32`]: https://webassembly.github.io/spec/core/binary/values.html#integers
-[`core:section`]: https://webassembly.github.io/spec/core/binary/modules.html#binary-section
-[`core:custom`]: https://webassembly.github.io/spec/core/binary/modules.html#custom-section
-[`core:module`]: https://webassembly.github.io/spec/core/binary/modules.html#binary-module
-[`core:version`]: https://webassembly.github.io/spec/core/binary/modules.html#binary-version
-[`core:name`]: https://webassembly.github.io/spec/core/binary/values.html#binary-name
-[`core:import`]: https://webassembly.github.io/spec/core/binary/modules.html#binary-import
-[`core:importdesc`]: https://webassembly.github.io/spec/core/binary/modules.html#binary-importdesc
-[`core:functype`]: https://webassembly.github.io/spec/core/binary/types.html#binary-functype
-
-[type-imports]: https://github.com/WebAssembly/proposal-type-imports/blob/master/proposals/type-imports/Overview.md
-[module-linking]: https://github.com/WebAssembly/module-linking/blob/main/proposals/module-linking/Explainer.md
-
-[Basic URL Parser]: https://url.spec.whatwg.org/#concept-basic-url-parser
-
 ## Name Section
 
 Like the core wasm [name
@@ -339,12 +323,12 @@ engines should not reject components which have an invalid `name` section.
 namesec    ::= section_0(namedata)
 namedata   ::= n:<name>                (if n = 'component-name')
                name:<componentnamesubsec>?
-               decls*:<declnamesubsec>*
+               sortnames*:<sortnamesubsec>*
 namesubsection_N(B) ::= N:<byte> size:<u32> B     (if size == |B|)
 
 componentnamesubsec ::= namesubsection_0(<name>)
-declnamesubsec ::= namesubsection_1(<declnames>)
-declnames ::= sort:<sort> names:<namemap>
+sortnamesubsec ::= namesubsection_1(<sortnames>)
+sortnames ::= sort:<sort> names:<namemap>
 
 namemap ::= names:vec(<nameassoc>)
 nameassoc ::= idx:<u32> name:<name>
@@ -353,3 +337,19 @@ nameassoc ::= idx:<u32> name:<name>
 where `namemap` is the same as for core wasm. A particular `sort` should only
 appear once within a `name` section, for example component instances can only be
 named once.
+
+
+[`core:u32`]: https://webassembly.github.io/spec/core/binary/values.html#integers
+[`core:section`]: https://webassembly.github.io/spec/core/binary/modules.html#binary-section
+[`core:custom`]: https://webassembly.github.io/spec/core/binary/modules.html#custom-section
+[`core:module`]: https://webassembly.github.io/spec/core/binary/modules.html#binary-module
+[`core:version`]: https://webassembly.github.io/spec/core/binary/modules.html#binary-version
+[`core:name`]: https://webassembly.github.io/spec/core/binary/values.html#binary-name
+[`core:import`]: https://webassembly.github.io/spec/core/binary/modules.html#binary-import
+[`core:importdesc`]: https://webassembly.github.io/spec/core/binary/modules.html#binary-importdesc
+[`core:functype`]: https://webassembly.github.io/spec/core/binary/types.html#binary-functype
+
+[type-imports]: https://github.com/WebAssembly/proposal-type-imports/blob/master/proposals/type-imports/Overview.md
+[module-linking]: https://github.com/WebAssembly/module-linking/blob/main/proposals/module-linking/Explainer.md
+
+[Basic URL Parser]: https://url.spec.whatwg.org/#concept-basic-url-parser