diff --git a/component/cm/const.go b/component/cm/const.go
new file mode 100644
index 00000000..daa7c30f
--- /dev/null
+++ b/component/cm/const.go
@@ -0,0 +1,10 @@
+package cm
+
+import bcm "go.bytecodealliance.org/cm"
+
+const (
+	ResultOK     = bcm.ResultOK
+	ResultErr    = bcm.ResultErr
+	MaxTuple     = bcm.MaxTuple
+	ResourceNone = bcm.ResourceNone
+)
diff --git a/component/cm/docs.go b/component/cm/docs.go
new file mode 100644
index 00000000..bf3b4d45
--- /dev/null
+++ b/component/cm/docs.go
@@ -0,0 +1,2 @@
+// Package cm re-exports the bytecodealliance cm package.
+package cm
diff --git a/component/cm/funcs.go b/component/cm/funcs.go
new file mode 100644
index 00000000..fd280bad
--- /dev/null
+++ b/component/cm/funcs.go
@@ -0,0 +1,89 @@
+package cm
+
+import (
+	"unsafe"
+
+	bcm "go.bytecodealliance.org/cm"
+)
+
+func BoolToU32[B ~bool](v B) uint32 { return bcm.BoolToU32(v) }
+
+func Case[T any, V AnyVariant[Tag, Shape, Align], Tag Discriminant, Shape, Align any](v *V, tag Tag) *T {
+	return bcm.Case[T](v, tag)
+}
+
+func Err[R AnyResult[Shape, OK, Err], Shape, OK, Err any](err Err) R {
+	return bcm.Err[R](err)
+}
+
+func F32ToU32(v float32) uint32 {
+	return bcm.F32ToU32(v)
+}
+
+func F32ToU64(v float32) uint64 {
+	return bcm.F32ToU64(v)
+}
+
+func F64ToU64(v float64) uint64 {
+	return bcm.F64ToU64(v)
+}
+
+func LiftList[L AnyList[T], T any, Data unsafe.Pointer | uintptr | *T, Len AnyInteger](data Data, datalen Len) L {
+	return bcm.LiftList[L](data, datalen)
+}
+
+func LiftString[T ~string, Data unsafe.Pointer | uintptr | *uint8, Len AnyInteger](data Data, datalen Len) T {
+	return bcm.LiftString[T](data, datalen)
+}
+
+func LowerList[L AnyList[T], T any](list L) (*T, uint32) {
+	return bcm.LowerList(list)
+}
+
+func LowerString[S ~string](s S) (*byte, uint32) {
+	return bcm.LowerString(s)
+}
+
+func New[V AnyVariant[Tag, Shape, Align], Tag Discriminant, Shape, Align any, T any](tag Tag, data T) V {
+	return bcm.New[V](tag, data)
+}
+
+func OK[R AnyResult[Shape, OK, Err], Shape, OK, Err any](ok OK) R {
+	return bcm.OK[R](ok)
+}
+
+func PointerToU32[T any](v *T) uint32 {
+	return bcm.PointerToU32(v)
+}
+
+func PointerToU64[T any](v *T) uint64 {
+	return bcm.PointerToU64(v)
+}
+
+func Reinterpret[T, From any](from From) (to T) {
+	return bcm.Reinterpret[T](from)
+}
+
+func U32ToBool(v uint32) bool {
+	return bcm.U32ToBool(v)
+}
+
+func U32ToF32(v uint32) float32 {
+	return bcm.U32ToF32(v)
+}
+
+func U32ToPointer[T any](v uint32) *T {
+	return bcm.U32ToPointer[T](v)
+}
+
+func U64ToF32(v uint64) float32 {
+	return bcm.U64ToF32(v)
+}
+
+func U64ToF64(v uint64) float64 {
+	return bcm.U64ToF64(v)
+}
+
+func U64ToPointer[T any](v uint64) *T {
+	return bcm.U64ToPointer[T](v)
+}
diff --git a/component/cm/types.go b/component/cm/types.go
new file mode 100644
index 00000000..5e22b91d
--- /dev/null
+++ b/component/cm/types.go
@@ -0,0 +1,34 @@
+package cm
+
+import bcm "go.bytecodealliance.org/cm"
+
+type (
+	AnyInteger                                                                        bcm.AnyInteger
+	AnyList[T any]                                                                    bcm.AnyList[T]
+	AnyResult[Shape, Ok, Err any]                                                     bcm.AnyResult[Shape, Ok, Err]
+	AnyVariant[Tag Discriminant, Shape, Align any]                                    bcm.AnyVariant[Tag, Shape, Align]
+	BoolResult                                                                        bcm.BoolResult
+	Discriminant                                                                      bcm.Discriminant
+	HostLayout                                                                        bcm.HostLayout
+	List[T any]                                                                       bcm.List[T]
+	Option[T any]                                                                     bcm.Option[T]
+	Rep                                                                               bcm.Rep
+	Resource                                                                          bcm.Resource
+	Result[Shape, Ok, Err any]                                                        bcm.Result[Shape, Ok, Err]
+	Tuple[T0, T1 any]                                                                 bcm.Tuple[T0, T1]
+	Tuple3[T0, T1, T2 any]                                                            bcm.Tuple3[T0, T1, T2]
+	Tuple4[T0, T1, T2, T3 any]                                                        bcm.Tuple4[T0, T1, T2, T3]
+	Tuple5[T0, T1, T2, T3, T4 any]                                                    bcm.Tuple5[T0, T1, T2, T3, T4]
+	Tuple6[T0, T1, T2, T3, T4, T5 any]                                                bcm.Tuple6[T0, T1, T2, T3, T4, T5]
+	Tuple7[T0, T1, T2, T3, T4, T5, T6 any]                                            bcm.Tuple7[T0, T1, T2, T3, T4, T5, T6]
+	Tuple8[T0, T1, T2, T3, T4, T5, T6, T7 any]                                        bcm.Tuple8[T0, T1, T2, T3, T4, T5, T6, T7]
+	Tuple9[T0, T1, T2, T3, T4, T5, T6, T7, T8 any]                                    bcm.Tuple9[T0, T1, T2, T3, T4, T5, T6, T7, T8]
+	Tuple10[T0, T1, T2, T3, T4, T5, T6, T7, T8, T9 any]                               bcm.Tuple10[T0, T1, T2, T3, T4, T5, T6, T7, T8, T9]
+	Tuple11[T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10 any]                          bcm.Tuple11[T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]
+	Tuple12[T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11 any]                     bcm.Tuple12[T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11]
+	Tuple13[T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12 any]                bcm.Tuple13[T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12]
+	Tuple14[T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13 any]           bcm.Tuple14[T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13]
+	Tuple15[T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14 any]      bcm.Tuple15[T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14]
+	Tuple16[T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15 any] bcm.Tuple16[T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15]
+	Variant[Tag Discriminant, Shape, Align any]                                       bcm.Variant[Tag, Shape, Align]
+)
diff --git a/component/component-bindgen-go/main.go b/component/component-bindgen-go/main.go
new file mode 100644
index 00000000..cef95562
--- /dev/null
+++ b/component/component-bindgen-go/main.go
@@ -0,0 +1,40 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"os"
+
+	"github.com/urfave/cli/v3"
+
+	"go.bytecodealliance.org/cmd/wit-bindgen-go/cmd/generate"
+)
+
+// wrapper around bytecodealliance wit-bindgen-go
+// Uses the component sdk 'cm' package if one is not provided
+// prevents cm package version mismatches at build time
+
+func main() {
+	cmd := generateCommand()
+	err := cmd.Run(context.Background(), os.Args)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "error: %v\n", err)
+		os.Exit(1)
+	}
+}
+
+func generateCommand() *cli.Command {
+	gen := generate.Command
+	gen.Name = "component-bindgen-go"
+	gen.Before = func(ctx context.Context, cmd *cli.Command) (context.Context, error) {
+		if cmd.String("cm") == "" {
+			if err := gen.Set("cm", "go.wasmcloud.dev/component/cm"); err != nil {
+				return ctx, err
+			}
+		}
+
+		return ctx, nil
+	}
+
+	return gen
+}
diff --git a/examples/component/http-server/gen/example/http-server/example/example.wit b/examples/component/http-server/gen/example/http-server/example/example.wit
deleted file mode 100755
index a41117b5..00000000
--- a/examples/component/http-server/gen/example/http-server/example/example.wit
+++ /dev/null
@@ -1,1132 +0,0 @@
-package example:http-server;
-
-world example {
-	import wasi:logging/logging@0.1.0-draft;
-	import wasi:config/runtime@0.2.0-draft;
-	import wasi:io/poll@0.2.0;
-	import wasi:clocks/monotonic-clock@0.2.0;
-	import wasi:io/error@0.2.0;
-	import wasi:io/streams@0.2.0;
-	import wasi:http/types@0.2.0;
-	import wasi:http/outgoing-handler@0.2.0;
-	import wasmcloud:bus/lattice@1.0.0;
-	import wasmcloud:secrets/store@0.1.0-draft;
-	import wasmcloud:secrets/reveal@0.1.0-draft;
-	import wasi:cli/environment@0.2.0;
-	import wasi:cli/exit@0.2.0;
-	import wasi:cli/stdin@0.2.0;
-	import wasi:cli/stdout@0.2.0;
-	import wasi:cli/stderr@0.2.0;
-	import wasi:cli/terminal-input@0.2.0;
-	import wasi:cli/terminal-output@0.2.0;
-	import wasi:cli/terminal-stdin@0.2.0;
-	import wasi:cli/terminal-stdout@0.2.0;
-	import wasi:cli/terminal-stderr@0.2.0;
-	import wasi:clocks/wall-clock@0.2.0;
-	import wasi:filesystem/types@0.2.0;
-	import wasi:filesystem/preopens@0.2.0;
-	import wasi:sockets/network@0.2.0;
-	import wasi:sockets/instance-network@0.2.0;
-	import wasi:sockets/udp@0.2.0;
-	import wasi:sockets/udp-create-socket@0.2.0;
-	import wasi:sockets/tcp@0.2.0;
-	import wasi:sockets/tcp-create-socket@0.2.0;
-	import wasi:sockets/ip-name-lookup@0.2.0;
-	import wasi:random/random@0.2.0;
-	import wasi:random/insecure@0.2.0;
-	import wasi:random/insecure-seed@0.2.0;
-	export wasi:http/incoming-handler@0.2.0;
-}
-
-package wasi:cli@0.2.0 {
-	interface stdout {
-		use wasi:io/streams@0.2.0.{output-stream};
-		get-stdout: func() -> output-stream;
-	}
-
-	interface stderr {
-		use wasi:io/streams@0.2.0.{output-stream};
-		get-stderr: func() -> output-stream;
-	}
-
-	interface stdin {
-		use wasi:io/streams@0.2.0.{input-stream};
-		get-stdin: func() -> input-stream;
-	}
-
-	interface environment {
-		get-environment: func() -> list<tuple<string, string>>;
-		get-arguments: func() -> list<string>;
-		initial-cwd: func() -> option<string>;
-	}
-
-	interface exit {
-		exit: func(status: result);
-	}
-
-	interface terminal-input {
-		resource terminal-input;
-	}
-
-	interface terminal-output {
-		resource terminal-output;
-	}
-
-	interface terminal-stdin {
-		use terminal-input.{terminal-input};
-		get-terminal-stdin: func() -> option<terminal-input>;
-	}
-
-	interface terminal-stdout {
-		use terminal-output.{terminal-output};
-		get-terminal-stdout: func() -> option<terminal-output>;
-	}
-
-	interface terminal-stderr {
-		use terminal-output.{terminal-output};
-		get-terminal-stderr: func() -> option<terminal-output>;
-	}
-}
-
-package wasi:clocks@0.2.0 {
-	interface monotonic-clock {
-		use wasi:io/poll@0.2.0.{pollable};
-		type instant = u64;
-		type duration = u64;
-		now: func() -> instant;
-		resolution: func() -> duration;
-		subscribe-instant: func(when: instant) -> pollable;
-		subscribe-duration: func(when: duration) -> pollable;
-	}
-
-	interface wall-clock {
-		record datetime {
-			seconds: u64,
-			nanoseconds: u32,
-		}
-		now: func() -> datetime;
-		resolution: func() -> datetime;
-	}
-}
-
-package wasi:config@0.2.0-draft {
-	interface runtime {
-		variant config-error {
-			upstream(string),
-			io(string),
-		}
-		get: func(key: string) -> result<option<string>, config-error>;
-		get-all: func() -> result<list<tuple<string, string>>, config-error>;
-	}
-}
-
-package wasi:filesystem@0.2.0 {
-	interface types {
-		use wasi:io/streams@0.2.0.{input-stream};
-		use wasi:io/streams@0.2.0.{output-stream};
-		use wasi:io/streams@0.2.0.{error};
-		use wasi:clocks/wall-clock@0.2.0.{datetime};
-		type filesize = u64;
-		enum descriptor-type {
-			unknown,
-			block-device,
-			character-device,
-			directory,
-			fifo,
-			symbolic-link,
-			regular-file,
-			socket
-		}
-		flags descriptor-flags {
-			read,
-			write,
-			file-integrity-sync,
-			data-integrity-sync,
-			requested-write-sync,
-			mutate-directory,
-		}
-		flags path-flags { symlink-follow }
-		flags open-flags {
-			create,
-			directory,
-			exclusive,
-			truncate,
-		}
-		type link-count = u64;
-		record descriptor-stat {
-			%type: descriptor-type,
-			link-count: link-count,
-			size: filesize,
-			data-access-timestamp: option<datetime>,
-			data-modification-timestamp: option<datetime>,
-			status-change-timestamp: option<datetime>,
-		}
-		variant new-timestamp {
-			no-change,
-			now,
-			timestamp(datetime),
-		}
-		record directory-entry {
-			%type: descriptor-type,
-			name: string,
-		}
-		enum error-code {
-			access,
-			would-block,
-			already,
-			bad-descriptor,
-			busy,
-			deadlock,
-			quota,
-			exist,
-			file-too-large,
-			illegal-byte-sequence,
-			in-progress,
-			interrupted,
-			invalid,
-			io,
-			is-directory,
-			loop,
-			too-many-links,
-			message-size,
-			name-too-long,
-			no-device,
-			no-entry,
-			no-lock,
-			insufficient-memory,
-			insufficient-space,
-			not-directory,
-			not-empty,
-			not-recoverable,
-			unsupported,
-			no-tty,
-			no-such-device,
-			overflow,
-			not-permitted,
-			pipe,
-			read-only,
-			invalid-seek,
-			text-file-busy,
-			cross-device
-		}
-		enum advice {
-			normal,
-			sequential,
-			random,
-			will-need,
-			dont-need,
-			no-reuse
-		}
-		record metadata-hash-value {
-			lower: u64,
-			upper: u64,
-		}
-		resource descriptor {
-			advise: func(offset: filesize, length: filesize, advice: advice) -> result<_, error-code>;
-			append-via-stream: func() -> result<output-stream, error-code>;
-			create-directory-at: func(path: string) -> result<_, error-code>;
-			get-flags: func() -> result<descriptor-flags, error-code>;
-			get-type: func() -> result<descriptor-type, error-code>;
-			is-same-object: func(other: borrow<descriptor>) -> bool;
-			link-at: func(old-path-flags: path-flags, old-path: string, new-descriptor: borrow<descriptor>, new-path: string) -> result<_, error-code>;
-			metadata-hash: func() -> result<metadata-hash-value, error-code>;
-			metadata-hash-at: func(path-flags: path-flags, path: string) -> result<metadata-hash-value, error-code>;
-			open-at: func(path-flags: path-flags, path: string, open-flags: open-flags, %flags: descriptor-flags) -> result<descriptor, error-code>;
-			read: func(length: filesize, offset: filesize) -> result<tuple<list<u8>, bool>, error-code>;
-			read-directory: func() -> result<directory-entry-stream, error-code>;
-			read-via-stream: func(offset: filesize) -> result<input-stream, error-code>;
-			readlink-at: func(path: string) -> result<string, error-code>;
-			remove-directory-at: func(path: string) -> result<_, error-code>;
-			rename-at: func(old-path: string, new-descriptor: borrow<descriptor>, new-path: string) -> result<_, error-code>;
-			set-size: func(size: filesize) -> result<_, error-code>;
-			set-times: func(data-access-timestamp: new-timestamp, data-modification-timestamp: new-timestamp) -> result<_, error-code>;
-			set-times-at: func(path-flags: path-flags, path: string, data-access-timestamp: new-timestamp, data-modification-timestamp: new-timestamp) -> result<_, error-code>;
-			stat: func() -> result<descriptor-stat, error-code>;
-			stat-at: func(path-flags: path-flags, path: string) -> result<descriptor-stat, error-code>;
-			symlink-at: func(old-path: string, new-path: string) -> result<_, error-code>;
-			sync: func() -> result<_, error-code>;
-			sync-data: func() -> result<_, error-code>;
-			unlink-file-at: func(path: string) -> result<_, error-code>;
-			write: func(buffer: list<u8>, offset: filesize) -> result<filesize, error-code>;
-			write-via-stream: func(offset: filesize) -> result<output-stream, error-code>;
-		}
-		resource directory-entry-stream {
-			read-directory-entry: func() -> result<option<directory-entry>, error-code>;
-		}
-		filesystem-error-code: func(err: borrow<error>) -> option<error-code>;
-	}
-
-	interface preopens {
-		use types.{descriptor};
-		get-directories: func() -> list<tuple<descriptor, string>>;
-	}
-}
-
-package wasi:http@0.2.0 {
-	/// This interface defines all of the types and methods for implementing
-	/// HTTP Requests and Responses, both incoming and outgoing, as well as
-	/// their headers, trailers, and bodies.
-	interface types {
-		use wasi:clocks/monotonic-clock@0.2.0.{duration};
-		use wasi:io/streams@0.2.0.{input-stream};
-		use wasi:io/streams@0.2.0.{output-stream};
-		use wasi:io/error@0.2.0.{error as io-error};
-		use wasi:io/poll@0.2.0.{pollable};
-
-		/// This type corresponds to HTTP standard Methods.
-		variant method {
-			get,
-			head,
-			post,
-			put,
-			delete,
-			connect,
-			options,
-			trace,
-			patch,
-			other(string),
-		}
-
-		/// This type corresponds to HTTP standard Related Schemes.
-		variant scheme { HTTP, HTTPS, other(string) }
-
-		/// Defines the case payload type for `DNS-error` above:
-		record DNS-error-payload {
-			rcode: option<string>,
-			info-code: option<u16>,
-		}
-
-		/// Defines the case payload type for `TLS-alert-received` above:
-		record TLS-alert-received-payload {
-			alert-id: option<u8>,
-			alert-message: option<string>,
-		}
-
-		/// Defines the case payload type for `HTTP-response-{header,trailer}-size` above:
-		record field-size-payload {
-			field-name: option<string>,
-			field-size: option<u32>,
-		}
-
-		/// These cases are inspired by the IANA HTTP Proxy Error Types:
-		/// https://www.iana.org/assignments/http-proxy-status/http-proxy-status.xhtml#table-http-proxy-error-types
-		variant error-code {
-			DNS-timeout,
-			DNS-error(DNS-error-payload),
-			destination-not-found,
-			destination-unavailable,
-			destination-IP-prohibited,
-			destination-IP-unroutable,
-			connection-refused,
-			connection-terminated,
-			connection-timeout,
-			connection-read-timeout,
-			connection-write-timeout,
-			connection-limit-reached,
-			TLS-protocol-error,
-			TLS-certificate-error,
-			TLS-alert-received(TLS-alert-received-payload),
-			HTTP-request-denied,
-			HTTP-request-length-required,
-			HTTP-request-body-size(option<u64>),
-			HTTP-request-method-invalid,
-			HTTP-request-URI-invalid,
-			HTTP-request-URI-too-long,
-			HTTP-request-header-section-size(option<u32>),
-			HTTP-request-header-size(option<field-size-payload>),
-			HTTP-request-trailer-section-size(option<u32>),
-			HTTP-request-trailer-size(field-size-payload),
-			HTTP-response-incomplete,
-			HTTP-response-header-section-size(option<u32>),
-			HTTP-response-header-size(field-size-payload),
-			HTTP-response-body-size(option<u64>),
-			HTTP-response-trailer-section-size(option<u32>),
-			HTTP-response-trailer-size(field-size-payload),
-			HTTP-response-transfer-coding(option<string>),
-			HTTP-response-content-coding(option<string>),
-			HTTP-response-timeout,
-			HTTP-upgrade-failed,
-			HTTP-protocol-error,
-			loop-detected,
-			configuration-error,
-			/// This is a catch-all error for anything that doesn't fit cleanly into a
-			/// more specific case. It also includes an optional string for an
-			/// unstructured description of the error. Users should not depend on the
-			/// string for diagnosing errors, as it's not required to be consistent
-			/// between implementations.
-			internal-error(option<string>),
-		}
-
-		/// This type enumerates the different kinds of errors that may occur when
-		/// setting or appending to a `fields` resource.
-		variant header-error {
-			/// This error indicates that a `field-key` or `field-value` was
-			/// syntactically invalid when used with an operation that sets headers in a
-			/// `fields`.
-			invalid-syntax,
-			/// This error indicates that a forbidden `field-key` was used when trying
-			/// to set a header in a `fields`.
-			forbidden,
-			/// This error indicates that the operation on the `fields` was not
-			/// permitted because the fields are immutable.
-			immutable,
-		}
-
-		/// Field keys are always strings.
-		type field-key = string;
-
-		/// Field values should always be ASCII strings. However, in
-		/// reality, HTTP implementations often have to interpret malformed values,
-		/// so they are provided as a list of bytes.
-		type field-value = list<u8>;
-
-		/// This following block defines the `fields` resource which corresponds to
-		/// HTTP standard Fields. Fields are a common representation used for both
-		/// Headers and Trailers.
-		///
-		/// A `fields` may be mutable or immutable. A `fields` created using the
-		/// constructor, `from-list`, or `clone` will be mutable, but a `fields`
-		/// resource given by other means (including, but not limited to,
-		/// `incoming-request.headers`, `outgoing-request.headers`) might be be
-		/// immutable. In an immutable fields, the `set`, `append`, and `delete`
-		/// operations will fail with `header-error.immutable`.
-		resource fields {
-			/// Construct an empty HTTP Fields.
-			///
-			/// The resulting `fields` is mutable.
-			constructor();
-
-			/// Append a value for a key. Does not change or delete any existing
-			/// values for that key.
-			///
-			/// Fails with `header-error.immutable` if the `fields` are immutable.
-			append: func(name: field-key, value: field-value) -> result<_, header-error>;
-
-			/// Make a deep copy of the Fields. Equivelant in behavior to calling the
-			/// `fields` constructor on the return value of `entries`. The resulting
-			/// `fields` is mutable.
-			clone: func() -> fields;
-
-			/// Delete all values for a key. Does nothing if no values for the key
-			/// exist.
-			///
-			/// Fails with `header-error.immutable` if the `fields` are immutable.
-			delete: func(name: field-key) -> result<_, header-error>;
-
-			/// Retrieve the full set of keys and values in the Fields. Like the
-			/// constructor, the list represents each key-value pair.
-			///
-			/// The outer list represents each key-value pair in the Fields. Keys
-			/// which have multiple values are represented by multiple entries in this
-			/// list with the same key.
-			entries: func() -> list<tuple<field-key, field-value>>;
-
-			/// Get all of the values corresponding to a key. If the key is not present
-			/// in this `fields`, an empty list is returned. However, if the key is
-			/// present but empty, this is represented by a list with one or more
-			/// empty field-values present.
-			get: func(name: field-key) -> list<field-value>;
-
-			/// Returns `true` when the key is present in this `fields`. If the key is
-			/// syntactically invalid, `false` is returned.
-			has: func(name: field-key) -> bool;
-
-			/// Set all of the values for a key. Clears any existing values for that
-			/// key, if they have been set.
-			///
-			/// Fails with `header-error.immutable` if the `fields` are immutable.
-			set: func(name: field-key, value: list<field-value>) -> result<_, header-error>;
-
-			/// Construct an HTTP Fields.
-			///
-			/// The resulting `fields` is mutable.
-			///
-			/// The list represents each key-value pair in the Fields. Keys
-			/// which have multiple values are represented by multiple entries in this
-			/// list with the same key.
-			///
-			/// The tuple is a pair of the field key, represented as a string, and
-			/// Value, represented as a list of bytes. In a valid Fields, all keys
-			/// and values are valid UTF-8 strings. However, values are not always
-			/// well-formed, so they are represented as a raw list of bytes.
-			///
-			/// An error result will be returned if any header or value was
-			/// syntactically invalid, or if a header was forbidden.
-			from-list: static func(entries: list<tuple<field-key, field-value>>) -> result<fields, header-error>;
-		}
-
-		/// Headers is an alias for Fields.
-		type headers = fields;
-
-		/// Trailers is an alias for Fields.
-		type trailers = fields;
-
-		/// Represents an incoming HTTP Request.
-		resource incoming-request {
-
-			/// Returns the authority from the request, if it was present.
-			authority: func() -> option<string>;
-
-			/// Gives the `incoming-body` associated with this request. Will only
-			/// return success at most once, and subsequent calls will return error.
-			consume: func() -> result<incoming-body>;
-
-			/// Get the `headers` associated with the request.
-			///
-			/// The returned `headers` resource is immutable: `set`, `append`, and
-			/// `delete` operations will fail with `header-error.immutable`.
-			///
-			/// The `headers` returned are a child resource: it must be dropped before
-			/// the parent `incoming-request` is dropped. Dropping this
-			/// `incoming-request` before all children are dropped will trap.
-			headers: func() -> headers;
-
-			/// Returns the method of the incoming request.
-			method: func() -> method;
-
-			/// Returns the path with query parameters from the request, as a string.
-			path-with-query: func() -> option<string>;
-
-			/// Returns the protocol scheme from the request.
-			scheme: func() -> option<scheme>;
-		}
-
-		/// Represents an outgoing HTTP Request.
-		resource outgoing-request {
-			/// Construct a new `outgoing-request` with a default `method` of `GET`, and
-			/// `none` values for `path-with-query`, `scheme`, and `authority`.
-			///
-			/// * `headers` is the HTTP Headers for the Request.
-			///
-			/// It is possible to construct, or manipulate with the accessor functions
-			/// below, an `outgoing-request` with an invalid combination of `scheme`
-			/// and `authority`, or `headers` which are not permitted to be sent.
-			/// It is the obligation of the `outgoing-handler.handle` implementation
-			/// to reject invalid constructions of `outgoing-request`.
-			constructor(headers: headers);
-
-			/// Get the HTTP Authority for the Request. A value of `none` may be used
-			/// with Related Schemes which do not require an Authority. The HTTP and
-			/// HTTPS schemes always require an authority.
-			authority: func() -> option<string>;
-
-			/// Returns the resource corresponding to the outgoing Body for this
-			/// Request.
-			///
-			/// Returns success on the first call: the `outgoing-body` resource for
-			/// this `outgoing-request` can be retrieved at most once. Subsequent
-			/// calls will return error.
-			body: func() -> result<outgoing-body>;
-
-			/// Get the headers associated with the Request.
-			///
-			/// The returned `headers` resource is immutable: `set`, `append`, and
-			/// `delete` operations will fail with `header-error.immutable`.
-			///
-			/// This headers resource is a child: it must be dropped before the parent
-			/// `outgoing-request` is dropped, or its ownership is transfered to
-			/// another component by e.g. `outgoing-handler.handle`.
-			headers: func() -> headers;
-
-			/// Get the Method for the Request.
-			method: func() -> method;
-
-			/// Get the combination of the HTTP Path and Query for the Request.
-			/// When `none`, this represents an empty Path and empty Query.
-			path-with-query: func() -> option<string>;
-
-			/// Get the HTTP Related Scheme for the Request. When `none`, the
-			/// implementation may choose an appropriate default scheme.
-			scheme: func() -> option<scheme>;
-
-			/// Set the HTTP Authority for the Request. A value of `none` may be used
-			/// with Related Schemes which do not require an Authority. The HTTP and
-			/// HTTPS schemes always require an authority. Fails if the string given is
-			/// not a syntactically valid uri authority.
-			set-authority: func(authority: option<string>) -> result;
-
-			/// Set the Method for the Request. Fails if the string present in a
-			/// `method.other` argument is not a syntactically valid method.
-			set-method: func(method: method) -> result;
-
-			/// Set the combination of the HTTP Path and Query for the Request.
-			/// When `none`, this represents an empty Path and empty Query. Fails is the
-			/// string given is not a syntactically valid path and query uri component.
-			set-path-with-query: func(path-with-query: option<string>) -> result;
-
-			/// Set the HTTP Related Scheme for the Request. When `none`, the
-			/// implementation may choose an appropriate default scheme. Fails if the
-			/// string given is not a syntactically valid uri scheme.
-			set-scheme: func(scheme: option<scheme>) -> result;
-		}
-
-		/// Parameters for making an HTTP Request. Each of these parameters is
-		/// currently an optional timeout applicable to the transport layer of the
-		/// HTTP protocol.
-		///
-		/// These timeouts are separate from any the user may use to bound a
-		/// blocking call to `wasi:io/poll.poll`.
-		resource request-options {
-			/// Construct a default `request-options` value.
-			constructor();
-
-			/// The timeout for receiving subsequent chunks of bytes in the Response
-			/// body stream.
-			between-bytes-timeout: func() -> option<duration>;
-
-			/// The timeout for the initial connect to the HTTP Server.
-			connect-timeout: func() -> option<duration>;
-
-			/// The timeout for receiving the first byte of the Response body.
-			first-byte-timeout: func() -> option<duration>;
-
-			/// Set the timeout for receiving subsequent chunks of bytes in the Response
-			/// body stream. An error return value indicates that this timeout is not
-			/// supported.
-			set-between-bytes-timeout: func(duration: option<duration>) -> result;
-
-			/// Set the timeout for the initial connect to the HTTP Server. An error
-			/// return value indicates that this timeout is not supported.
-			set-connect-timeout: func(duration: option<duration>) -> result;
-
-			/// Set the timeout for receiving the first byte of the Response body. An
-			/// error return value indicates that this timeout is not supported.
-			set-first-byte-timeout: func(duration: option<duration>) -> result;
-		}
-
-		/// Represents the ability to send an HTTP Response.
-		///
-		/// This resource is used by the `wasi:http/incoming-handler` interface to
-		/// allow a Response to be sent corresponding to the Request provided as the
-		/// other argument to `incoming-handler.handle`.
-		resource response-outparam {
-
-			/// Set the value of the `response-outparam` to either send a response,
-			/// or indicate an error.
-			///
-			/// This method consumes the `response-outparam` to ensure that it is
-			/// called at most once. If it is never called, the implementation
-			/// will respond with an error.
-			///
-			/// The user may provide an `error` to `response` to allow the
-			/// implementation determine how to respond with an HTTP error response.
-			set: static func(param: response-outparam, response: result<outgoing-response, error-code>);
-		}
-
-		/// This type corresponds to the HTTP standard Status Code.
-		type status-code = u16;
-
-		/// Represents an incoming HTTP Response.
-		resource incoming-response {
-
-			/// Returns the incoming body. May be called at most once. Returns error
-			/// if called additional times.
-			consume: func() -> result<incoming-body>;
-
-			/// Returns the headers from the incoming response.
-			///
-			/// The returned `headers` resource is immutable: `set`, `append`, and
-			/// `delete` operations will fail with `header-error.immutable`.
-			///
-			/// This headers resource is a child: it must be dropped before the parent
-			/// `incoming-response` is dropped.
-			headers: func() -> headers;
-
-			/// Returns the status code from the incoming response.
-			status: func() -> status-code;
-		}
-
-		/// Represents an incoming HTTP Request or Response's Body.
-		///
-		/// A body has both its contents - a stream of bytes - and a (possibly
-		/// empty) set of trailers, indicating that the full contents of the
-		/// body have been received. This resource represents the contents as
-		/// an `input-stream` and the delivery of trailers as a `future-trailers`,
-		/// and ensures that the user of this interface may only be consuming either
-		/// the body contents or waiting on trailers at any given time.
-		resource incoming-body {
-
-			/// Returns the contents of the body, as a stream of bytes.
-			///
-			/// Returns success on first call: the stream representing the contents
-			/// can be retrieved at most once. Subsequent calls will return error.
-			///
-			/// The returned `input-stream` resource is a child: it must be dropped
-			/// before the parent `incoming-body` is dropped, or consumed by
-			/// `incoming-body.finish`.
-			///
-			/// This invariant ensures that the implementation can determine whether
-			/// the user is consuming the contents of the body, waiting on the
-			/// `future-trailers` to be ready, or neither. This allows for network
-			/// backpressure is to be applied when the user is consuming the body,
-			/// and for that backpressure to not inhibit delivery of the trailers if
-			/// the user does not read the entire body.
-			%stream: func() -> result<input-stream>;
-
-			/// Takes ownership of `incoming-body`, and returns a `future-trailers`.
-			/// This function will trap if the `input-stream` child is still alive.
-			finish: static func(this: incoming-body) -> future-trailers;
-		}
-
-		/// Represents a future which may eventaully return trailers, or an error.
-		///
-		/// In the case that the incoming HTTP Request or Response did not have any
-		/// trailers, this future will resolve to the empty set of trailers once the
-		/// complete Request or Response body has been received.
-		resource future-trailers {
-
-			/// Returns the contents of the trailers, or an error which occured,
-			/// once the future is ready.
-			///
-			/// The outer `option` represents future readiness. Users can wait on this
-			/// `option` to become `some` using the `subscribe` method.
-			///
-			/// The outer `result` is used to retrieve the trailers or error at most
-			/// once. It will be success on the first call in which the outer option
-			/// is `some`, and error on subsequent calls.
-			///
-			/// The inner `result` represents that either the HTTP Request or Response
-			/// body, as well as any trailers, were received successfully, or that an
-			/// error occured receiving them. The optional `trailers` indicates whether
-			/// or not trailers were present in the body.
-			///
-			/// When some `trailers` are returned by this method, the `trailers`
-			/// resource is immutable, and a child. Use of the `set`, `append`, or
-			/// `delete` methods will return an error, and the resource must be
-			/// dropped before the parent `future-trailers` is dropped.
-			get: func() -> option<result<result<option<trailers>, error-code>>>;
-
-			/// Returns a pollable which becomes ready when either the trailers have
-			/// been received, or an error has occured. When this pollable is ready,
-			/// the `get` method will return `some`.
-			subscribe: func() -> pollable;
-		}
-
-		/// Represents an outgoing HTTP Response.
-		resource outgoing-response {
-			/// Construct an `outgoing-response`, with a default `status-code` of `200`.
-			/// If a different `status-code` is needed, it must be set via the
-			/// `set-status-code` method.
-			///
-			/// * `headers` is the HTTP Headers for the Response.
-			constructor(headers: headers);
-
-			/// Returns the resource corresponding to the outgoing Body for this Response.
-			///
-			/// Returns success on the first call: the `outgoing-body` resource for
-			/// this `outgoing-response` can be retrieved at most once. Subsequent
-			/// calls will return error.
-			body: func() -> result<outgoing-body>;
-
-			/// Get the headers associated with the Request.
-			///
-			/// The returned `headers` resource is immutable: `set`, `append`, and
-			/// `delete` operations will fail with `header-error.immutable`.
-			///
-			/// This headers resource is a child: it must be dropped before the parent
-			/// `outgoing-request` is dropped, or its ownership is transfered to
-			/// another component by e.g. `outgoing-handler.handle`.
-			headers: func() -> headers;
-
-			/// Set the HTTP Status Code for the Response. Fails if the status-code
-			/// given is not a valid http status code.
-			set-status-code: func(status-code: status-code) -> result;
-
-			/// Get the HTTP Status Code for the Response.
-			status-code: func() -> status-code;
-		}
-
-		/// Represents an outgoing HTTP Request or Response's Body.
-		///
-		/// A body has both its contents - a stream of bytes - and a (possibly
-		/// empty) set of trailers, inducating the full contents of the body
-		/// have been sent. This resource represents the contents as an
-		/// `output-stream` child resource, and the completion of the body (with
-		/// optional trailers) with a static function that consumes the
-		/// `outgoing-body` resource, and ensures that the user of this interface
-		/// may not write to the body contents after the body has been finished.
-		///
-		/// If the user code drops this resource, as opposed to calling the static
-		/// method `finish`, the implementation should treat the body as incomplete,
-		/// and that an error has occured. The implementation should propogate this
-		/// error to the HTTP protocol by whatever means it has available,
-		/// including: corrupting the body on the wire, aborting the associated
-		/// Request, or sending a late status code for the Response.
-		resource outgoing-body {
-
-			/// Returns a stream for writing the body contents.
-			///
-			/// The returned `output-stream` is a child resource: it must be dropped
-			/// before the parent `outgoing-body` resource is dropped (or finished),
-			/// otherwise the `outgoing-body` drop or `finish` will trap.
-			///
-			/// Returns success on the first call: the `output-stream` resource for
-			/// this `outgoing-body` may be retrieved at most once. Subsequent calls
-			/// will return error.
-			write: func() -> result<output-stream>;
-
-			/// Finalize an outgoing body, optionally providing trailers. This must be
-			/// called to signal that the response is complete. If the `outgoing-body`
-			/// is dropped without calling `outgoing-body.finalize`, the implementation
-			/// should treat the body as corrupted.
-			///
-			/// Fails if the body's `outgoing-request` or `outgoing-response` was
-			/// constructed with a Content-Length header, and the contents written
-			/// to the body (via `write`) does not match the value given in the
-			/// Content-Length.
-			finish: static func(this: outgoing-body, trailers: option<trailers>) -> result<_, error-code>;
-		}
-
-		/// Represents a future which may eventaully return an incoming HTTP
-		/// Response, or an error.
-		///
-		/// This resource is returned by the `wasi:http/outgoing-handler` interface to
-		/// provide the HTTP Response corresponding to the sent Request.
-		resource future-incoming-response {
-
-			/// Returns the incoming HTTP Response, or an error, once one is ready.
-			///
-			/// The outer `option` represents future readiness. Users can wait on this
-			/// `option` to become `some` using the `subscribe` method.
-			///
-			/// The outer `result` is used to retrieve the response or error at most
-			/// once. It will be success on the first call in which the outer option
-			/// is `some`, and error on subsequent calls.
-			///
-			/// The inner `result` represents that either the incoming HTTP Response
-			/// status and headers have recieved successfully, or that an error
-			/// occured. Errors may also occur while consuming the response body,
-			/// but those will be reported by the `incoming-body` and its
-			/// `output-stream` child.
-			get: func() -> option<result<result<incoming-response, error-code>>>;
-
-			/// Returns a pollable which becomes ready when either the Response has
-			/// been received, or an error has occured. When this pollable is ready,
-			/// the `get` method will return `some`.
-			subscribe: func() -> pollable;
-		}
-
-		/// Attempts to extract a http-related `error` from the wasi:io `error`
-		/// provided.
-		///
-		/// Stream operations which return
-		/// `wasi:io/stream/stream-error::last-operation-failed` have a payload of
-		/// type `wasi:io/error/error` with more information about the operation
-		/// that failed. This payload can be passed through to this function to see
-		/// if there's http-related information about the error to return.
-		///
-		/// Note that this function is fallible because not all io-errors are
-		/// http-related errors.
-		http-error-code: func(err: borrow<io-error>) -> option<error-code>;
-	}
-
-	/// This interface defines a handler of incoming HTTP Requests. It should
-	/// be exported by components which can respond to HTTP Requests.
-	interface incoming-handler {
-		use types.{incoming-request};
-		use types.{response-outparam};
-
-		/// This function is invoked with an incoming HTTP Request, and a resource
-		/// `response-outparam` which provides the capability to reply with an HTTP
-		/// Response. The response is sent by calling the `response-outparam.set`
-		/// method, which allows execution to continue after the response has been
-		/// sent. This enables both streaming to the response body, and performing other
-		/// work.
-		///
-		/// The implementor of this function must write a response to the
-		/// `response-outparam` before returning, or else the caller will respond
-		/// with an error on its behalf.
-		handle: func(request: incoming-request, response-out: response-outparam);
-	}
-
-	/// This interface defines a handler of outgoing HTTP Requests. It should be
-	/// imported by components which wish to make HTTP Requests.
-	interface outgoing-handler {
-		use types.{outgoing-request};
-		use types.{request-options};
-		use types.{future-incoming-response};
-		use types.{error-code};
-
-		/// This function is invoked with an outgoing HTTP Request, and it returns
-		/// a resource `future-incoming-response` which represents an HTTP Response
-		/// which may arrive in the future.
-		///
-		/// The `options` argument accepts optional parameters for the HTTP
-		/// protocol's transport layer.
-		///
-		/// This function may return an error if the `outgoing-request` is invalid
-		/// or not allowed to be made. Otherwise, protocol errors are reported
-		/// through the `future-incoming-response`.
-		handle: func(request: outgoing-request, options: option<request-options>) -> result<future-incoming-response, error-code>;
-	}
-}
-
-package wasi:io@0.2.0 {
-	interface poll {
-		resource pollable {
-			block: func();
-			ready: func() -> bool;
-		}
-		poll: func(in: list<borrow<pollable>>) -> list<u32>;
-	}
-
-	interface error {
-		resource error {
-			to-debug-string: func() -> string;
-		}
-	}
-
-	interface streams {
-		use error.{error};
-		use poll.{pollable};
-		variant stream-error {
-			last-operation-failed(error),
-			closed,
-		}
-		resource input-stream {
-			blocking-read: func(len: u64) -> result<list<u8>, stream-error>;
-			blocking-skip: func(len: u64) -> result<u64, stream-error>;
-			read: func(len: u64) -> result<list<u8>, stream-error>;
-			skip: func(len: u64) -> result<u64, stream-error>;
-			subscribe: func() -> pollable;
-		}
-		resource output-stream {
-			blocking-flush: func() -> result<_, stream-error>;
-			blocking-splice: func(src: borrow<input-stream>, len: u64) -> result<u64, stream-error>;
-			blocking-write-and-flush: func(contents: list<u8>) -> result<_, stream-error>;
-			blocking-write-zeroes-and-flush: func(len: u64) -> result<_, stream-error>;
-			check-write: func() -> result<u64, stream-error>;
-			flush: func() -> result<_, stream-error>;
-			splice: func(src: borrow<input-stream>, len: u64) -> result<u64, stream-error>;
-			subscribe: func() -> pollable;
-			write: func(contents: list<u8>) -> result<_, stream-error>;
-			write-zeroes: func(len: u64) -> result<_, stream-error>;
-		}
-	}
-}
-
-package wasi:logging@0.1.0-draft {
-	interface logging {
-		enum level {
-			trace,
-			debug,
-			info,
-			warn,
-			error,
-			critical
-		}
-		log: func(level: level, context: string, message: string);
-	}
-}
-
-package wasi:random@0.2.0 {
-	interface random {
-		get-random-bytes: func(len: u64) -> list<u8>;
-		get-random-u64: func() -> u64;
-	}
-
-	interface insecure {
-		get-insecure-random-bytes: func(len: u64) -> list<u8>;
-		get-insecure-random-u64: func() -> u64;
-	}
-
-	interface insecure-seed {
-		insecure-seed: func() -> tuple<u64, u64>;
-	}
-}
-
-package wasi:sockets@0.2.0 {
-	interface network {
-		resource network;
-		enum error-code {
-			unknown,
-			access-denied,
-			not-supported,
-			invalid-argument,
-			out-of-memory,
-			timeout,
-			concurrency-conflict,
-			not-in-progress,
-			would-block,
-			invalid-state,
-			new-socket-limit,
-			address-not-bindable,
-			address-in-use,
-			remote-unreachable,
-			connection-refused,
-			connection-reset,
-			connection-aborted,
-			datagram-too-large,
-			name-unresolvable,
-			temporary-resolver-failure,
-			permanent-resolver-failure
-		}
-		enum ip-address-family { ipv4, ipv6 }
-		type ipv4-address = tuple<u8, u8, u8, u8>;
-		type ipv6-address = tuple<u16, u16, u16, u16, u16, u16, u16, u16>;
-		variant ip-address {
-			ipv4(ipv4-address),
-			ipv6(ipv6-address),
-		}
-		record ipv4-socket-address {
-			port: u16,
-			address: ipv4-address,
-		}
-		record ipv6-socket-address {
-			port: u16,
-			flow-info: u32,
-			address: ipv6-address,
-			scope-id: u32,
-		}
-		variant ip-socket-address {
-			ipv4(ipv4-socket-address),
-			ipv6(ipv6-socket-address),
-		}
-	}
-
-	interface instance-network {
-		use network.{network};
-		instance-network: func() -> network;
-	}
-
-	interface udp {
-		use wasi:io/poll@0.2.0.{pollable};
-		use network.{network};
-		use network.{error-code};
-		use network.{ip-socket-address};
-		use network.{ip-address-family};
-		record incoming-datagram {
-			data: list<u8>,
-			remote-address: ip-socket-address,
-		}
-		record outgoing-datagram {
-			data: list<u8>,
-			remote-address: option<ip-socket-address>,
-		}
-		resource udp-socket {
-			address-family: func() -> ip-address-family;
-			finish-bind: func() -> result<_, error-code>;
-			local-address: func() -> result<ip-socket-address, error-code>;
-			receive-buffer-size: func() -> result<u64, error-code>;
-			remote-address: func() -> result<ip-socket-address, error-code>;
-			send-buffer-size: func() -> result<u64, error-code>;
-			set-receive-buffer-size: func(value: u64) -> result<_, error-code>;
-			set-send-buffer-size: func(value: u64) -> result<_, error-code>;
-			set-unicast-hop-limit: func(value: u8) -> result<_, error-code>;
-			start-bind: func(network: borrow<network>, local-address: ip-socket-address) -> result<_, error-code>;
-			%stream: func(remote-address: option<ip-socket-address>) -> result<tuple<incoming-datagram-stream, outgoing-datagram-stream>, error-code>;
-			subscribe: func() -> pollable;
-			unicast-hop-limit: func() -> result<u8, error-code>;
-		}
-		resource incoming-datagram-stream {
-			receive: func(max-results: u64) -> result<list<incoming-datagram>, error-code>;
-			subscribe: func() -> pollable;
-		}
-		resource outgoing-datagram-stream {
-			check-send: func() -> result<u64, error-code>;
-			send: func(datagrams: list<outgoing-datagram>) -> result<u64, error-code>;
-			subscribe: func() -> pollable;
-		}
-	}
-
-	interface udp-create-socket {
-		use network.{network};
-		use network.{error-code};
-		use network.{ip-address-family};
-		use udp.{udp-socket};
-		create-udp-socket: func(address-family: ip-address-family) -> result<udp-socket, error-code>;
-	}
-
-	interface tcp {
-		use wasi:io/streams@0.2.0.{input-stream};
-		use wasi:io/streams@0.2.0.{output-stream};
-		use wasi:io/poll@0.2.0.{pollable};
-		use wasi:clocks/monotonic-clock@0.2.0.{duration};
-		use network.{network};
-		use network.{error-code};
-		use network.{ip-socket-address};
-		use network.{ip-address-family};
-		enum shutdown-type { receive, send, both }
-		resource tcp-socket {
-			accept: func() -> result<tuple<tcp-socket, input-stream, output-stream>, error-code>;
-			address-family: func() -> ip-address-family;
-			finish-bind: func() -> result<_, error-code>;
-			finish-connect: func() -> result<tuple<input-stream, output-stream>, error-code>;
-			finish-listen: func() -> result<_, error-code>;
-			hop-limit: func() -> result<u8, error-code>;
-			is-listening: func() -> bool;
-			keep-alive-count: func() -> result<u32, error-code>;
-			keep-alive-enabled: func() -> result<bool, error-code>;
-			keep-alive-idle-time: func() -> result<duration, error-code>;
-			keep-alive-interval: func() -> result<duration, error-code>;
-			local-address: func() -> result<ip-socket-address, error-code>;
-			receive-buffer-size: func() -> result<u64, error-code>;
-			remote-address: func() -> result<ip-socket-address, error-code>;
-			send-buffer-size: func() -> result<u64, error-code>;
-			set-hop-limit: func(value: u8) -> result<_, error-code>;
-			set-keep-alive-count: func(value: u32) -> result<_, error-code>;
-			set-keep-alive-enabled: func(value: bool) -> result<_, error-code>;
-			set-keep-alive-idle-time: func(value: duration) -> result<_, error-code>;
-			set-keep-alive-interval: func(value: duration) -> result<_, error-code>;
-			set-listen-backlog-size: func(value: u64) -> result<_, error-code>;
-			set-receive-buffer-size: func(value: u64) -> result<_, error-code>;
-			set-send-buffer-size: func(value: u64) -> result<_, error-code>;
-			shutdown: func(shutdown-type: shutdown-type) -> result<_, error-code>;
-			start-bind: func(network: borrow<network>, local-address: ip-socket-address) -> result<_, error-code>;
-			start-connect: func(network: borrow<network>, remote-address: ip-socket-address) -> result<_, error-code>;
-			start-listen: func() -> result<_, error-code>;
-			subscribe: func() -> pollable;
-		}
-	}
-
-	interface tcp-create-socket {
-		use network.{network};
-		use network.{error-code};
-		use network.{ip-address-family};
-		use tcp.{tcp-socket};
-		create-tcp-socket: func(address-family: ip-address-family) -> result<tcp-socket, error-code>;
-	}
-
-	interface ip-name-lookup {
-		use wasi:io/poll@0.2.0.{pollable};
-		use network.{network};
-		use network.{error-code};
-		use network.{ip-address};
-		resource resolve-address-stream {
-			resolve-next-address: func() -> result<option<ip-address>, error-code>;
-			subscribe: func() -> pollable;
-		}
-		resolve-addresses: func(network: borrow<network>, name: string) -> result<resolve-address-stream, error-code>;
-	}
-}
-
-package wasmcloud:bus@1.0.0 {
-	interface lattice {
-		resource call-target-interface {
-			constructor(namespace: string, %package: string, %interface: string);
-		}
-		set-link-name: func(name: string, interfaces: list<call-target-interface>);
-	}
-}
-
-package wasmcloud:secrets@0.1.0-draft {
-	interface store {
-		variant secrets-error {
-			upstream(string),
-			io(string),
-			not-found,
-		}
-		variant secret-value {
-			%string(string),
-			bytes(list<u8>),
-		}
-		resource secret;
-		get: func(key: string) -> result<secret, secrets-error>;
-	}
-
-	interface reveal {
-		use store.{secret};
-		use store.{secret-value};
-		reveal: func(s: borrow<secret>) -> secret-value;
-	}
-}
diff --git a/examples/component/http-server/gen/example/http-server/example/example.wit.go b/examples/component/http-server/gen/example/http-server/example/example.wit.go
index 7368b9bd..af322d56 100755
--- a/examples/component/http-server/gen/example/http-server/example/example.wit.go
+++ b/examples/component/http-server/gen/example/http-server/example/example.wit.go
@@ -1,4 +1,4 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package example represents the world "example:http-server/example".
 package example
diff --git a/examples/component/http-server/gen/wasi/cli/environment/environment.wasm.go b/examples/component/http-server/gen/wasi/cli/environment/environment.wasm.go
index 89bb596b..48122a20 100755
--- a/examples/component/http-server/gen/wasi/cli/environment/environment.wasm.go
+++ b/examples/component/http-server/gen/wasi/cli/environment/environment.wasm.go
@@ -1,9 +1,9 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package environment
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // This file contains wasmimport and wasmexport declarations for "wasi:cli@0.2.0".
diff --git a/examples/component/http-server/gen/wasi/cli/environment/environment.wit.go b/examples/component/http-server/gen/wasi/cli/environment/environment.wit.go
index 068bed33..bb061dab 100755
--- a/examples/component/http-server/gen/wasi/cli/environment/environment.wit.go
+++ b/examples/component/http-server/gen/wasi/cli/environment/environment.wit.go
@@ -1,10 +1,10 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package environment represents the imported interface "wasi:cli/environment@0.2.0".
 package environment
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // GetEnvironment represents the imported function "get-environment".
diff --git a/examples/component/http-server/gen/wasi/cli/exit/exit.wasm.go b/examples/component/http-server/gen/wasi/cli/exit/exit.wasm.go
index 849d5f50..b2b88d1e 100755
--- a/examples/component/http-server/gen/wasi/cli/exit/exit.wasm.go
+++ b/examples/component/http-server/gen/wasi/cli/exit/exit.wasm.go
@@ -1,4 +1,4 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package exit
 
diff --git a/examples/component/http-server/gen/wasi/cli/exit/exit.wit.go b/examples/component/http-server/gen/wasi/cli/exit/exit.wit.go
index 7a347b60..722346ce 100755
--- a/examples/component/http-server/gen/wasi/cli/exit/exit.wit.go
+++ b/examples/component/http-server/gen/wasi/cli/exit/exit.wit.go
@@ -1,10 +1,10 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package exit represents the imported interface "wasi:cli/exit@0.2.0".
 package exit
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // Exit represents the imported function "exit".
diff --git a/examples/component/http-server/gen/wasi/cli/stderr/stderr.wasm.go b/examples/component/http-server/gen/wasi/cli/stderr/stderr.wasm.go
index 462cf172..d6ec1d8c 100755
--- a/examples/component/http-server/gen/wasi/cli/stderr/stderr.wasm.go
+++ b/examples/component/http-server/gen/wasi/cli/stderr/stderr.wasm.go
@@ -1,4 +1,4 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package stderr
 
diff --git a/examples/component/http-server/gen/wasi/cli/stderr/stderr.wit.go b/examples/component/http-server/gen/wasi/cli/stderr/stderr.wit.go
index 3d53a114..0abc8824 100755
--- a/examples/component/http-server/gen/wasi/cli/stderr/stderr.wit.go
+++ b/examples/component/http-server/gen/wasi/cli/stderr/stderr.wit.go
@@ -1,11 +1,11 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package stderr represents the imported interface "wasi:cli/stderr@0.2.0".
 package stderr
 
 import (
 	"github.com/wasmCloud/go/examples/component/http-server/gen/wasi/io/streams"
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // OutputStream represents the imported type alias "wasi:cli/stderr@0.2.0#output-stream".
diff --git a/examples/component/http-server/gen/wasi/cli/stdin/stdin.wasm.go b/examples/component/http-server/gen/wasi/cli/stdin/stdin.wasm.go
index 374eb253..3f2c8e39 100755
--- a/examples/component/http-server/gen/wasi/cli/stdin/stdin.wasm.go
+++ b/examples/component/http-server/gen/wasi/cli/stdin/stdin.wasm.go
@@ -1,4 +1,4 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package stdin
 
diff --git a/examples/component/http-server/gen/wasi/cli/stdin/stdin.wit.go b/examples/component/http-server/gen/wasi/cli/stdin/stdin.wit.go
index 0469ced1..090e0759 100755
--- a/examples/component/http-server/gen/wasi/cli/stdin/stdin.wit.go
+++ b/examples/component/http-server/gen/wasi/cli/stdin/stdin.wit.go
@@ -1,11 +1,11 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package stdin represents the imported interface "wasi:cli/stdin@0.2.0".
 package stdin
 
 import (
 	"github.com/wasmCloud/go/examples/component/http-server/gen/wasi/io/streams"
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // InputStream represents the imported type alias "wasi:cli/stdin@0.2.0#input-stream".
diff --git a/examples/component/http-server/gen/wasi/cli/stdout/stdout.wasm.go b/examples/component/http-server/gen/wasi/cli/stdout/stdout.wasm.go
index 68e4a3da..243508e7 100755
--- a/examples/component/http-server/gen/wasi/cli/stdout/stdout.wasm.go
+++ b/examples/component/http-server/gen/wasi/cli/stdout/stdout.wasm.go
@@ -1,4 +1,4 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package stdout
 
diff --git a/examples/component/http-server/gen/wasi/cli/stdout/stdout.wit.go b/examples/component/http-server/gen/wasi/cli/stdout/stdout.wit.go
index 8d9d7fda..77eefcf4 100755
--- a/examples/component/http-server/gen/wasi/cli/stdout/stdout.wit.go
+++ b/examples/component/http-server/gen/wasi/cli/stdout/stdout.wit.go
@@ -1,11 +1,11 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package stdout represents the imported interface "wasi:cli/stdout@0.2.0".
 package stdout
 
 import (
 	"github.com/wasmCloud/go/examples/component/http-server/gen/wasi/io/streams"
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // OutputStream represents the imported type alias "wasi:cli/stdout@0.2.0#output-stream".
diff --git a/examples/component/http-server/gen/wasi/cli/terminal-input/terminal-input.wit.go b/examples/component/http-server/gen/wasi/cli/terminal-input/terminal-input.wit.go
index 18b9a9d7..958851bd 100755
--- a/examples/component/http-server/gen/wasi/cli/terminal-input/terminal-input.wit.go
+++ b/examples/component/http-server/gen/wasi/cli/terminal-input/terminal-input.wit.go
@@ -1,10 +1,10 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package terminalinput represents the imported interface "wasi:cli/terminal-input@0.2.0".
 package terminalinput
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // TerminalInput represents the imported resource "wasi:cli/terminal-input@0.2.0#terminal-input".
diff --git a/examples/component/http-server/gen/wasi/cli/terminal-input/terminalinput.wasm.go b/examples/component/http-server/gen/wasi/cli/terminal-input/terminalinput.wasm.go
index 1df3794f..a411b7c2 100755
--- a/examples/component/http-server/gen/wasi/cli/terminal-input/terminalinput.wasm.go
+++ b/examples/component/http-server/gen/wasi/cli/terminal-input/terminalinput.wasm.go
@@ -1,4 +1,4 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package terminalinput
 
diff --git a/examples/component/http-server/gen/wasi/cli/terminal-output/terminal-output.wit.go b/examples/component/http-server/gen/wasi/cli/terminal-output/terminal-output.wit.go
index 823aaf52..123a33db 100755
--- a/examples/component/http-server/gen/wasi/cli/terminal-output/terminal-output.wit.go
+++ b/examples/component/http-server/gen/wasi/cli/terminal-output/terminal-output.wit.go
@@ -1,10 +1,10 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package terminaloutput represents the imported interface "wasi:cli/terminal-output@0.2.0".
 package terminaloutput
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // TerminalOutput represents the imported resource "wasi:cli/terminal-output@0.2.0#terminal-output".
diff --git a/examples/component/http-server/gen/wasi/cli/terminal-output/terminaloutput.wasm.go b/examples/component/http-server/gen/wasi/cli/terminal-output/terminaloutput.wasm.go
index fb35fc41..76ebe672 100755
--- a/examples/component/http-server/gen/wasi/cli/terminal-output/terminaloutput.wasm.go
+++ b/examples/component/http-server/gen/wasi/cli/terminal-output/terminaloutput.wasm.go
@@ -1,4 +1,4 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package terminaloutput
 
diff --git a/examples/component/http-server/gen/wasi/cli/terminal-stderr/terminal-stderr.wit.go b/examples/component/http-server/gen/wasi/cli/terminal-stderr/terminal-stderr.wit.go
index d6a1585a..c0f0d3ff 100755
--- a/examples/component/http-server/gen/wasi/cli/terminal-stderr/terminal-stderr.wit.go
+++ b/examples/component/http-server/gen/wasi/cli/terminal-stderr/terminal-stderr.wit.go
@@ -1,11 +1,11 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package terminalstderr represents the imported interface "wasi:cli/terminal-stderr@0.2.0".
 package terminalstderr
 
 import (
 	terminaloutput "github.com/wasmCloud/go/examples/component/http-server/gen/wasi/cli/terminal-output"
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // TerminalOutput represents the imported type alias "wasi:cli/terminal-stderr@0.2.0#terminal-output".
diff --git a/examples/component/http-server/gen/wasi/cli/terminal-stderr/terminalstderr.wasm.go b/examples/component/http-server/gen/wasi/cli/terminal-stderr/terminalstderr.wasm.go
index be9af72f..da11e43b 100755
--- a/examples/component/http-server/gen/wasi/cli/terminal-stderr/terminalstderr.wasm.go
+++ b/examples/component/http-server/gen/wasi/cli/terminal-stderr/terminalstderr.wasm.go
@@ -1,9 +1,9 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package terminalstderr
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // This file contains wasmimport and wasmexport declarations for "wasi:cli@0.2.0".
diff --git a/examples/component/http-server/gen/wasi/cli/terminal-stdin/terminal-stdin.wit.go b/examples/component/http-server/gen/wasi/cli/terminal-stdin/terminal-stdin.wit.go
index 1d37efee..a65ae232 100755
--- a/examples/component/http-server/gen/wasi/cli/terminal-stdin/terminal-stdin.wit.go
+++ b/examples/component/http-server/gen/wasi/cli/terminal-stdin/terminal-stdin.wit.go
@@ -1,11 +1,11 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package terminalstdin represents the imported interface "wasi:cli/terminal-stdin@0.2.0".
 package terminalstdin
 
 import (
 	terminalinput "github.com/wasmCloud/go/examples/component/http-server/gen/wasi/cli/terminal-input"
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // TerminalInput represents the imported type alias "wasi:cli/terminal-stdin@0.2.0#terminal-input".
diff --git a/examples/component/http-server/gen/wasi/cli/terminal-stdin/terminalstdin.wasm.go b/examples/component/http-server/gen/wasi/cli/terminal-stdin/terminalstdin.wasm.go
index e3b3ac61..dcbcdac4 100755
--- a/examples/component/http-server/gen/wasi/cli/terminal-stdin/terminalstdin.wasm.go
+++ b/examples/component/http-server/gen/wasi/cli/terminal-stdin/terminalstdin.wasm.go
@@ -1,9 +1,9 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package terminalstdin
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // This file contains wasmimport and wasmexport declarations for "wasi:cli@0.2.0".
diff --git a/examples/component/http-server/gen/wasi/cli/terminal-stdout/terminal-stdout.wit.go b/examples/component/http-server/gen/wasi/cli/terminal-stdout/terminal-stdout.wit.go
index a45762ea..42346e98 100755
--- a/examples/component/http-server/gen/wasi/cli/terminal-stdout/terminal-stdout.wit.go
+++ b/examples/component/http-server/gen/wasi/cli/terminal-stdout/terminal-stdout.wit.go
@@ -1,11 +1,11 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package terminalstdout represents the imported interface "wasi:cli/terminal-stdout@0.2.0".
 package terminalstdout
 
 import (
 	terminaloutput "github.com/wasmCloud/go/examples/component/http-server/gen/wasi/cli/terminal-output"
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // TerminalOutput represents the imported type alias "wasi:cli/terminal-stdout@0.2.0#terminal-output".
diff --git a/examples/component/http-server/gen/wasi/cli/terminal-stdout/terminalstdout.wasm.go b/examples/component/http-server/gen/wasi/cli/terminal-stdout/terminalstdout.wasm.go
index fa750ad9..0f8d7a26 100755
--- a/examples/component/http-server/gen/wasi/cli/terminal-stdout/terminalstdout.wasm.go
+++ b/examples/component/http-server/gen/wasi/cli/terminal-stdout/terminalstdout.wasm.go
@@ -1,9 +1,9 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package terminalstdout
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // This file contains wasmimport and wasmexport declarations for "wasi:cli@0.2.0".
diff --git a/examples/component/http-server/gen/wasi/clocks/monotonic-clock/monotonic-clock.wit.go b/examples/component/http-server/gen/wasi/clocks/monotonic-clock/monotonic-clock.wit.go
index 1dffa9d9..2288044d 100755
--- a/examples/component/http-server/gen/wasi/clocks/monotonic-clock/monotonic-clock.wit.go
+++ b/examples/component/http-server/gen/wasi/clocks/monotonic-clock/monotonic-clock.wit.go
@@ -1,11 +1,11 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package monotonicclock represents the imported interface "wasi:clocks/monotonic-clock@0.2.0".
 package monotonicclock
 
 import (
 	"github.com/wasmCloud/go/examples/component/http-server/gen/wasi/io/poll"
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // Pollable represents the imported type alias "wasi:clocks/monotonic-clock@0.2.0#pollable".
diff --git a/examples/component/http-server/gen/wasi/clocks/monotonic-clock/monotonicclock.wasm.go b/examples/component/http-server/gen/wasi/clocks/monotonic-clock/monotonicclock.wasm.go
index 36a1720a..eb1910e1 100755
--- a/examples/component/http-server/gen/wasi/clocks/monotonic-clock/monotonicclock.wasm.go
+++ b/examples/component/http-server/gen/wasi/clocks/monotonic-clock/monotonicclock.wasm.go
@@ -1,4 +1,4 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package monotonicclock
 
diff --git a/examples/component/http-server/gen/wasi/clocks/wall-clock/wall-clock.wit.go b/examples/component/http-server/gen/wasi/clocks/wall-clock/wall-clock.wit.go
index e3f35395..c6bcfad9 100755
--- a/examples/component/http-server/gen/wasi/clocks/wall-clock/wall-clock.wit.go
+++ b/examples/component/http-server/gen/wasi/clocks/wall-clock/wall-clock.wit.go
@@ -1,10 +1,10 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package wallclock represents the imported interface "wasi:clocks/wall-clock@0.2.0".
 package wallclock
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // DateTime represents the record "wasi:clocks/wall-clock@0.2.0#datetime".
diff --git a/examples/component/http-server/gen/wasi/clocks/wall-clock/wallclock.wasm.go b/examples/component/http-server/gen/wasi/clocks/wall-clock/wallclock.wasm.go
index 321ff3f1..841e9b93 100755
--- a/examples/component/http-server/gen/wasi/clocks/wall-clock/wallclock.wasm.go
+++ b/examples/component/http-server/gen/wasi/clocks/wall-clock/wallclock.wasm.go
@@ -1,4 +1,4 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package wallclock
 
diff --git a/examples/component/http-server/gen/wasi/config/runtime/abi.go b/examples/component/http-server/gen/wasi/config/runtime/abi.go
index 61412cbe..bb63e065 100755
--- a/examples/component/http-server/gen/wasi/config/runtime/abi.go
+++ b/examples/component/http-server/gen/wasi/config/runtime/abi.go
@@ -1,9 +1,9 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package runtime
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 	"unsafe"
 )
 
diff --git a/examples/component/http-server/gen/wasi/config/runtime/runtime.wasm.go b/examples/component/http-server/gen/wasi/config/runtime/runtime.wasm.go
index 8ce17d5e..da0a40c7 100755
--- a/examples/component/http-server/gen/wasi/config/runtime/runtime.wasm.go
+++ b/examples/component/http-server/gen/wasi/config/runtime/runtime.wasm.go
@@ -1,9 +1,9 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package runtime
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // This file contains wasmimport and wasmexport declarations for "wasi:config@0.2.0-draft".
diff --git a/examples/component/http-server/gen/wasi/config/runtime/runtime.wit.go b/examples/component/http-server/gen/wasi/config/runtime/runtime.wit.go
index 99a739d1..1188e211 100755
--- a/examples/component/http-server/gen/wasi/config/runtime/runtime.wit.go
+++ b/examples/component/http-server/gen/wasi/config/runtime/runtime.wit.go
@@ -1,10 +1,10 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package runtime represents the imported interface "wasi:config/runtime@0.2.0-draft".
 package runtime
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // ConfigError represents the variant "wasi:config/runtime@0.2.0-draft#config-error".
diff --git a/examples/component/http-server/gen/wasi/filesystem/preopens/preopens.wasm.go b/examples/component/http-server/gen/wasi/filesystem/preopens/preopens.wasm.go
index 1bcd416a..e6f08122 100755
--- a/examples/component/http-server/gen/wasi/filesystem/preopens/preopens.wasm.go
+++ b/examples/component/http-server/gen/wasi/filesystem/preopens/preopens.wasm.go
@@ -1,9 +1,9 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package preopens
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // This file contains wasmimport and wasmexport declarations for "wasi:filesystem@0.2.0".
diff --git a/examples/component/http-server/gen/wasi/filesystem/preopens/preopens.wit.go b/examples/component/http-server/gen/wasi/filesystem/preopens/preopens.wit.go
index e287b2b3..3087d9ad 100755
--- a/examples/component/http-server/gen/wasi/filesystem/preopens/preopens.wit.go
+++ b/examples/component/http-server/gen/wasi/filesystem/preopens/preopens.wit.go
@@ -1,11 +1,11 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package preopens represents the imported interface "wasi:filesystem/preopens@0.2.0".
 package preopens
 
 import (
 	"github.com/wasmCloud/go/examples/component/http-server/gen/wasi/filesystem/types"
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // Descriptor represents the imported type alias "wasi:filesystem/preopens@0.2.0#descriptor".
diff --git a/examples/component/http-server/gen/wasi/filesystem/types/abi.go b/examples/component/http-server/gen/wasi/filesystem/types/abi.go
index f5ed743a..9d32a640 100755
--- a/examples/component/http-server/gen/wasi/filesystem/types/abi.go
+++ b/examples/component/http-server/gen/wasi/filesystem/types/abi.go
@@ -1,10 +1,10 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package types
 
 import (
 	wallclock "github.com/wasmCloud/go/examples/component/http-server/gen/wasi/clocks/wall-clock"
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 	"unsafe"
 )
 
diff --git a/examples/component/http-server/gen/wasi/filesystem/types/types.wasm.go b/examples/component/http-server/gen/wasi/filesystem/types/types.wasm.go
index b97dad84..ed3a428f 100755
--- a/examples/component/http-server/gen/wasi/filesystem/types/types.wasm.go
+++ b/examples/component/http-server/gen/wasi/filesystem/types/types.wasm.go
@@ -1,9 +1,9 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package types
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // This file contains wasmimport and wasmexport declarations for "wasi:filesystem@0.2.0".
diff --git a/examples/component/http-server/gen/wasi/filesystem/types/types.wit.go b/examples/component/http-server/gen/wasi/filesystem/types/types.wit.go
index d55c5790..1b3c0084 100755
--- a/examples/component/http-server/gen/wasi/filesystem/types/types.wit.go
+++ b/examples/component/http-server/gen/wasi/filesystem/types/types.wit.go
@@ -1,4 +1,4 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package types represents the imported interface "wasi:filesystem/types@0.2.0".
 package types
@@ -6,7 +6,7 @@ package types
 import (
 	wallclock "github.com/wasmCloud/go/examples/component/http-server/gen/wasi/clocks/wall-clock"
 	"github.com/wasmCloud/go/examples/component/http-server/gen/wasi/io/streams"
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // InputStream represents the imported type alias "wasi:filesystem/types@0.2.0#input-stream".
diff --git a/examples/component/http-server/gen/wasi/http/incoming-handler/incoming-handler.exports.go b/examples/component/http-server/gen/wasi/http/incoming-handler/incoming-handler.exports.go
index 673ccb48..2bd9f3cb 100755
--- a/examples/component/http-server/gen/wasi/http/incoming-handler/incoming-handler.exports.go
+++ b/examples/component/http-server/gen/wasi/http/incoming-handler/incoming-handler.exports.go
@@ -1,4 +1,4 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package incominghandler
 
diff --git a/examples/component/http-server/gen/wasi/http/incoming-handler/incoming-handler.wit.go b/examples/component/http-server/gen/wasi/http/incoming-handler/incoming-handler.wit.go
index 0c114e19..31e4a943 100755
--- a/examples/component/http-server/gen/wasi/http/incoming-handler/incoming-handler.wit.go
+++ b/examples/component/http-server/gen/wasi/http/incoming-handler/incoming-handler.wit.go
@@ -1,4 +1,4 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package incominghandler represents the exported interface "wasi:http/incoming-handler@0.2.0".
 //
diff --git a/examples/component/http-server/gen/wasi/http/incoming-handler/incominghandler.wasm.go b/examples/component/http-server/gen/wasi/http/incoming-handler/incominghandler.wasm.go
index eae429f3..57a0475a 100755
--- a/examples/component/http-server/gen/wasi/http/incoming-handler/incominghandler.wasm.go
+++ b/examples/component/http-server/gen/wasi/http/incoming-handler/incominghandler.wasm.go
@@ -1,9 +1,9 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package incominghandler
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // This file contains wasmimport and wasmexport declarations for "wasi:http@0.2.0".
diff --git a/examples/component/http-server/gen/wasi/http/outgoing-handler/abi.go b/examples/component/http-server/gen/wasi/http/outgoing-handler/abi.go
index 334f455c..172589fe 100755
--- a/examples/component/http-server/gen/wasi/http/outgoing-handler/abi.go
+++ b/examples/component/http-server/gen/wasi/http/outgoing-handler/abi.go
@@ -1,10 +1,10 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package outgoinghandler
 
 import (
 	"github.com/wasmCloud/go/examples/component/http-server/gen/wasi/http/types"
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 	"unsafe"
 )
 
diff --git a/examples/component/http-server/gen/wasi/http/outgoing-handler/outgoing-handler.wit.go b/examples/component/http-server/gen/wasi/http/outgoing-handler/outgoing-handler.wit.go
index 48d756fb..5a7c2747 100755
--- a/examples/component/http-server/gen/wasi/http/outgoing-handler/outgoing-handler.wit.go
+++ b/examples/component/http-server/gen/wasi/http/outgoing-handler/outgoing-handler.wit.go
@@ -1,4 +1,4 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package outgoinghandler represents the imported interface "wasi:http/outgoing-handler@0.2.0".
 //
@@ -8,7 +8,7 @@ package outgoinghandler
 
 import (
 	"github.com/wasmCloud/go/examples/component/http-server/gen/wasi/http/types"
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // OutgoingRequest represents the imported type alias "wasi:http/outgoing-handler@0.2.0#outgoing-request".
diff --git a/examples/component/http-server/gen/wasi/http/outgoing-handler/outgoinghandler.wasm.go b/examples/component/http-server/gen/wasi/http/outgoing-handler/outgoinghandler.wasm.go
index 6b3f3828..bd1bf89d 100755
--- a/examples/component/http-server/gen/wasi/http/outgoing-handler/outgoinghandler.wasm.go
+++ b/examples/component/http-server/gen/wasi/http/outgoing-handler/outgoinghandler.wasm.go
@@ -1,9 +1,9 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package outgoinghandler
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // This file contains wasmimport and wasmexport declarations for "wasi:http@0.2.0".
diff --git a/examples/component/http-server/gen/wasi/http/types/abi.go b/examples/component/http-server/gen/wasi/http/types/abi.go
index 6ffb1fdd..5adab377 100755
--- a/examples/component/http-server/gen/wasi/http/types/abi.go
+++ b/examples/component/http-server/gen/wasi/http/types/abi.go
@@ -1,9 +1,9 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package types
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 	"unsafe"
 )
 
diff --git a/examples/component/http-server/gen/wasi/http/types/types.wasm.go b/examples/component/http-server/gen/wasi/http/types/types.wasm.go
index b025b2af..d79126f0 100755
--- a/examples/component/http-server/gen/wasi/http/types/types.wasm.go
+++ b/examples/component/http-server/gen/wasi/http/types/types.wasm.go
@@ -1,9 +1,9 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package types
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // This file contains wasmimport and wasmexport declarations for "wasi:http@0.2.0".
diff --git a/examples/component/http-server/gen/wasi/http/types/types.wit.go b/examples/component/http-server/gen/wasi/http/types/types.wit.go
index a1b516dc..7e533bb7 100755
--- a/examples/component/http-server/gen/wasi/http/types/types.wit.go
+++ b/examples/component/http-server/gen/wasi/http/types/types.wit.go
@@ -1,4 +1,4 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package types represents the imported interface "wasi:http/types@0.2.0".
 //
@@ -12,7 +12,7 @@ import (
 	ioerror "github.com/wasmCloud/go/examples/component/http-server/gen/wasi/io/error"
 	"github.com/wasmCloud/go/examples/component/http-server/gen/wasi/io/poll"
 	"github.com/wasmCloud/go/examples/component/http-server/gen/wasi/io/streams"
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // Duration represents the type alias "wasi:http/types@0.2.0#duration".
diff --git a/examples/component/http-server/gen/wasi/io/error/error.wit.go b/examples/component/http-server/gen/wasi/io/error/error.wit.go
index 828e977e..7bb5d7d1 100755
--- a/examples/component/http-server/gen/wasi/io/error/error.wit.go
+++ b/examples/component/http-server/gen/wasi/io/error/error.wit.go
@@ -1,10 +1,10 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package ioerror represents the imported interface "wasi:io/error@0.2.0".
 package ioerror
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // Error represents the imported resource "wasi:io/error@0.2.0#error".
diff --git a/examples/component/http-server/gen/wasi/io/error/ioerror.wasm.go b/examples/component/http-server/gen/wasi/io/error/ioerror.wasm.go
index e254b5d8..6e8e0380 100755
--- a/examples/component/http-server/gen/wasi/io/error/ioerror.wasm.go
+++ b/examples/component/http-server/gen/wasi/io/error/ioerror.wasm.go
@@ -1,4 +1,4 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package ioerror
 
diff --git a/examples/component/http-server/gen/wasi/io/poll/poll.wasm.go b/examples/component/http-server/gen/wasi/io/poll/poll.wasm.go
index f7c55c3d..49f50145 100755
--- a/examples/component/http-server/gen/wasi/io/poll/poll.wasm.go
+++ b/examples/component/http-server/gen/wasi/io/poll/poll.wasm.go
@@ -1,9 +1,9 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package poll
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // This file contains wasmimport and wasmexport declarations for "wasi:io@0.2.0".
diff --git a/examples/component/http-server/gen/wasi/io/poll/poll.wit.go b/examples/component/http-server/gen/wasi/io/poll/poll.wit.go
index ad9e9564..3ad7089c 100755
--- a/examples/component/http-server/gen/wasi/io/poll/poll.wit.go
+++ b/examples/component/http-server/gen/wasi/io/poll/poll.wit.go
@@ -1,10 +1,10 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package poll represents the imported interface "wasi:io/poll@0.2.0".
 package poll
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // Pollable represents the imported resource "wasi:io/poll@0.2.0#pollable".
diff --git a/examples/component/http-server/gen/wasi/io/streams/streams.wasm.go b/examples/component/http-server/gen/wasi/io/streams/streams.wasm.go
index eec56645..6b83cff1 100755
--- a/examples/component/http-server/gen/wasi/io/streams/streams.wasm.go
+++ b/examples/component/http-server/gen/wasi/io/streams/streams.wasm.go
@@ -1,9 +1,9 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package streams
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // This file contains wasmimport and wasmexport declarations for "wasi:io@0.2.0".
diff --git a/examples/component/http-server/gen/wasi/io/streams/streams.wit.go b/examples/component/http-server/gen/wasi/io/streams/streams.wit.go
index 59250d81..af20301a 100755
--- a/examples/component/http-server/gen/wasi/io/streams/streams.wit.go
+++ b/examples/component/http-server/gen/wasi/io/streams/streams.wit.go
@@ -1,4 +1,4 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package streams represents the imported interface "wasi:io/streams@0.2.0".
 package streams
@@ -6,7 +6,7 @@ package streams
 import (
 	ioerror "github.com/wasmCloud/go/examples/component/http-server/gen/wasi/io/error"
 	"github.com/wasmCloud/go/examples/component/http-server/gen/wasi/io/poll"
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // Error represents the imported type alias "wasi:io/streams@0.2.0#error".
diff --git a/examples/component/http-server/gen/wasi/logging/logging/logging.wasm.go b/examples/component/http-server/gen/wasi/logging/logging/logging.wasm.go
index d2d27098..5f8b298f 100755
--- a/examples/component/http-server/gen/wasi/logging/logging/logging.wasm.go
+++ b/examples/component/http-server/gen/wasi/logging/logging/logging.wasm.go
@@ -1,4 +1,4 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package logging
 
diff --git a/examples/component/http-server/gen/wasi/logging/logging/logging.wit.go b/examples/component/http-server/gen/wasi/logging/logging/logging.wit.go
index 96e406ed..0762e642 100755
--- a/examples/component/http-server/gen/wasi/logging/logging/logging.wit.go
+++ b/examples/component/http-server/gen/wasi/logging/logging/logging.wit.go
@@ -1,10 +1,10 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package logging represents the imported interface "wasi:logging/logging@0.1.0-draft".
 package logging
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // Level represents the enum "wasi:logging/logging@0.1.0-draft#level".
diff --git a/examples/component/http-server/gen/wasi/random/insecure-seed/insecure-seed.wit.go b/examples/component/http-server/gen/wasi/random/insecure-seed/insecure-seed.wit.go
index e701d1b4..d58309a6 100755
--- a/examples/component/http-server/gen/wasi/random/insecure-seed/insecure-seed.wit.go
+++ b/examples/component/http-server/gen/wasi/random/insecure-seed/insecure-seed.wit.go
@@ -1,4 +1,4 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package insecureseed represents the imported interface "wasi:random/insecure-seed@0.2.0".
 package insecureseed
diff --git a/examples/component/http-server/gen/wasi/random/insecure-seed/insecureseed.wasm.go b/examples/component/http-server/gen/wasi/random/insecure-seed/insecureseed.wasm.go
index e94356df..a323d11f 100755
--- a/examples/component/http-server/gen/wasi/random/insecure-seed/insecureseed.wasm.go
+++ b/examples/component/http-server/gen/wasi/random/insecure-seed/insecureseed.wasm.go
@@ -1,4 +1,4 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package insecureseed
 
diff --git a/examples/component/http-server/gen/wasi/random/insecure/insecure.wasm.go b/examples/component/http-server/gen/wasi/random/insecure/insecure.wasm.go
index 498bfe4a..bbfc0e15 100755
--- a/examples/component/http-server/gen/wasi/random/insecure/insecure.wasm.go
+++ b/examples/component/http-server/gen/wasi/random/insecure/insecure.wasm.go
@@ -1,9 +1,9 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package insecure
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // This file contains wasmimport and wasmexport declarations for "wasi:random@0.2.0".
diff --git a/examples/component/http-server/gen/wasi/random/insecure/insecure.wit.go b/examples/component/http-server/gen/wasi/random/insecure/insecure.wit.go
index f32282c6..3c4c56be 100755
--- a/examples/component/http-server/gen/wasi/random/insecure/insecure.wit.go
+++ b/examples/component/http-server/gen/wasi/random/insecure/insecure.wit.go
@@ -1,10 +1,10 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package insecure represents the imported interface "wasi:random/insecure@0.2.0".
 package insecure
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // GetInsecureRandomBytes represents the imported function "get-insecure-random-bytes".
diff --git a/examples/component/http-server/gen/wasi/random/random/random.wasm.go b/examples/component/http-server/gen/wasi/random/random/random.wasm.go
index 9096457b..7fad8fee 100755
--- a/examples/component/http-server/gen/wasi/random/random/random.wasm.go
+++ b/examples/component/http-server/gen/wasi/random/random/random.wasm.go
@@ -1,9 +1,9 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package random
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // This file contains wasmimport and wasmexport declarations for "wasi:random@0.2.0".
diff --git a/examples/component/http-server/gen/wasi/random/random/random.wit.go b/examples/component/http-server/gen/wasi/random/random/random.wit.go
index 98bb7779..76b30760 100755
--- a/examples/component/http-server/gen/wasi/random/random/random.wit.go
+++ b/examples/component/http-server/gen/wasi/random/random/random.wit.go
@@ -1,10 +1,10 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package random represents the imported interface "wasi:random/random@0.2.0".
 package random
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // GetRandomBytes represents the imported function "get-random-bytes".
diff --git a/examples/component/http-server/gen/wasi/sockets/instance-network/instance-network.wit.go b/examples/component/http-server/gen/wasi/sockets/instance-network/instance-network.wit.go
index 3c126a50..820df490 100755
--- a/examples/component/http-server/gen/wasi/sockets/instance-network/instance-network.wit.go
+++ b/examples/component/http-server/gen/wasi/sockets/instance-network/instance-network.wit.go
@@ -1,11 +1,11 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package instancenetwork represents the imported interface "wasi:sockets/instance-network@0.2.0".
 package instancenetwork
 
 import (
 	"github.com/wasmCloud/go/examples/component/http-server/gen/wasi/sockets/network"
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // Network represents the imported type alias "wasi:sockets/instance-network@0.2.0#network".
diff --git a/examples/component/http-server/gen/wasi/sockets/instance-network/instancenetwork.wasm.go b/examples/component/http-server/gen/wasi/sockets/instance-network/instancenetwork.wasm.go
index eb113e21..4a3682c2 100755
--- a/examples/component/http-server/gen/wasi/sockets/instance-network/instancenetwork.wasm.go
+++ b/examples/component/http-server/gen/wasi/sockets/instance-network/instancenetwork.wasm.go
@@ -1,4 +1,4 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package instancenetwork
 
diff --git a/examples/component/http-server/gen/wasi/sockets/ip-name-lookup/abi.go b/examples/component/http-server/gen/wasi/sockets/ip-name-lookup/abi.go
index a63f0d01..f550a0e7 100755
--- a/examples/component/http-server/gen/wasi/sockets/ip-name-lookup/abi.go
+++ b/examples/component/http-server/gen/wasi/sockets/ip-name-lookup/abi.go
@@ -1,9 +1,9 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package ipnamelookup
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 	"unsafe"
 )
 
diff --git a/examples/component/http-server/gen/wasi/sockets/ip-name-lookup/ip-name-lookup.wit.go b/examples/component/http-server/gen/wasi/sockets/ip-name-lookup/ip-name-lookup.wit.go
index e446da73..4d194c6b 100755
--- a/examples/component/http-server/gen/wasi/sockets/ip-name-lookup/ip-name-lookup.wit.go
+++ b/examples/component/http-server/gen/wasi/sockets/ip-name-lookup/ip-name-lookup.wit.go
@@ -1,4 +1,4 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package ipnamelookup represents the imported interface "wasi:sockets/ip-name-lookup@0.2.0".
 package ipnamelookup
@@ -6,7 +6,7 @@ package ipnamelookup
 import (
 	"github.com/wasmCloud/go/examples/component/http-server/gen/wasi/io/poll"
 	"github.com/wasmCloud/go/examples/component/http-server/gen/wasi/sockets/network"
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // Pollable represents the imported type alias "wasi:sockets/ip-name-lookup@0.2.0#pollable".
diff --git a/examples/component/http-server/gen/wasi/sockets/ip-name-lookup/ipnamelookup.wasm.go b/examples/component/http-server/gen/wasi/sockets/ip-name-lookup/ipnamelookup.wasm.go
index da5fb000..009a6f9b 100755
--- a/examples/component/http-server/gen/wasi/sockets/ip-name-lookup/ipnamelookup.wasm.go
+++ b/examples/component/http-server/gen/wasi/sockets/ip-name-lookup/ipnamelookup.wasm.go
@@ -1,9 +1,9 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package ipnamelookup
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // This file contains wasmimport and wasmexport declarations for "wasi:sockets@0.2.0".
diff --git a/examples/component/http-server/gen/wasi/sockets/network/abi.go b/examples/component/http-server/gen/wasi/sockets/network/abi.go
index a088bd1d..d58814a4 100755
--- a/examples/component/http-server/gen/wasi/sockets/network/abi.go
+++ b/examples/component/http-server/gen/wasi/sockets/network/abi.go
@@ -1,9 +1,9 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package network
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 	"unsafe"
 )
 
diff --git a/examples/component/http-server/gen/wasi/sockets/network/network.wasm.go b/examples/component/http-server/gen/wasi/sockets/network/network.wasm.go
index 012a79ff..7c436401 100755
--- a/examples/component/http-server/gen/wasi/sockets/network/network.wasm.go
+++ b/examples/component/http-server/gen/wasi/sockets/network/network.wasm.go
@@ -1,4 +1,4 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package network
 
diff --git a/examples/component/http-server/gen/wasi/sockets/network/network.wit.go b/examples/component/http-server/gen/wasi/sockets/network/network.wit.go
index f0fb7eef..dd2b5179 100755
--- a/examples/component/http-server/gen/wasi/sockets/network/network.wit.go
+++ b/examples/component/http-server/gen/wasi/sockets/network/network.wit.go
@@ -1,10 +1,10 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package network represents the imported interface "wasi:sockets/network@0.2.0".
 package network
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // Network represents the imported resource "wasi:sockets/network@0.2.0#network".
diff --git a/examples/component/http-server/gen/wasi/sockets/tcp-create-socket/tcp-create-socket.wit.go b/examples/component/http-server/gen/wasi/sockets/tcp-create-socket/tcp-create-socket.wit.go
index fd65d0f0..e5c40de4 100755
--- a/examples/component/http-server/gen/wasi/sockets/tcp-create-socket/tcp-create-socket.wit.go
+++ b/examples/component/http-server/gen/wasi/sockets/tcp-create-socket/tcp-create-socket.wit.go
@@ -1,4 +1,4 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package tcpcreatesocket represents the imported interface "wasi:sockets/tcp-create-socket@0.2.0".
 package tcpcreatesocket
@@ -6,7 +6,7 @@ package tcpcreatesocket
 import (
 	"github.com/wasmCloud/go/examples/component/http-server/gen/wasi/sockets/network"
 	"github.com/wasmCloud/go/examples/component/http-server/gen/wasi/sockets/tcp"
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // Network represents the imported type alias "wasi:sockets/tcp-create-socket@0.2.0#network".
diff --git a/examples/component/http-server/gen/wasi/sockets/tcp-create-socket/tcpcreatesocket.wasm.go b/examples/component/http-server/gen/wasi/sockets/tcp-create-socket/tcpcreatesocket.wasm.go
index b7b43155..78f13e94 100755
--- a/examples/component/http-server/gen/wasi/sockets/tcp-create-socket/tcpcreatesocket.wasm.go
+++ b/examples/component/http-server/gen/wasi/sockets/tcp-create-socket/tcpcreatesocket.wasm.go
@@ -1,9 +1,9 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package tcpcreatesocket
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // This file contains wasmimport and wasmexport declarations for "wasi:sockets@0.2.0".
diff --git a/examples/component/http-server/gen/wasi/sockets/tcp/abi.go b/examples/component/http-server/gen/wasi/sockets/tcp/abi.go
index 16eda7fd..11b193af 100755
--- a/examples/component/http-server/gen/wasi/sockets/tcp/abi.go
+++ b/examples/component/http-server/gen/wasi/sockets/tcp/abi.go
@@ -1,10 +1,10 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package tcp
 
 import (
 	"github.com/wasmCloud/go/examples/component/http-server/gen/wasi/sockets/network"
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 	"unsafe"
 )
 
diff --git a/examples/component/http-server/gen/wasi/sockets/tcp/tcp.wasm.go b/examples/component/http-server/gen/wasi/sockets/tcp/tcp.wasm.go
index 56247525..e91d648e 100755
--- a/examples/component/http-server/gen/wasi/sockets/tcp/tcp.wasm.go
+++ b/examples/component/http-server/gen/wasi/sockets/tcp/tcp.wasm.go
@@ -1,9 +1,9 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package tcp
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // This file contains wasmimport and wasmexport declarations for "wasi:sockets@0.2.0".
diff --git a/examples/component/http-server/gen/wasi/sockets/tcp/tcp.wit.go b/examples/component/http-server/gen/wasi/sockets/tcp/tcp.wit.go
index 9b3ef629..382c426a 100755
--- a/examples/component/http-server/gen/wasi/sockets/tcp/tcp.wit.go
+++ b/examples/component/http-server/gen/wasi/sockets/tcp/tcp.wit.go
@@ -1,4 +1,4 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package tcp represents the imported interface "wasi:sockets/tcp@0.2.0".
 package tcp
@@ -8,7 +8,7 @@ import (
 	"github.com/wasmCloud/go/examples/component/http-server/gen/wasi/io/poll"
 	"github.com/wasmCloud/go/examples/component/http-server/gen/wasi/io/streams"
 	"github.com/wasmCloud/go/examples/component/http-server/gen/wasi/sockets/network"
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // InputStream represents the imported type alias "wasi:sockets/tcp@0.2.0#input-stream".
diff --git a/examples/component/http-server/gen/wasi/sockets/udp-create-socket/udp-create-socket.wit.go b/examples/component/http-server/gen/wasi/sockets/udp-create-socket/udp-create-socket.wit.go
index fc351ff3..c73b7265 100755
--- a/examples/component/http-server/gen/wasi/sockets/udp-create-socket/udp-create-socket.wit.go
+++ b/examples/component/http-server/gen/wasi/sockets/udp-create-socket/udp-create-socket.wit.go
@@ -1,4 +1,4 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package udpcreatesocket represents the imported interface "wasi:sockets/udp-create-socket@0.2.0".
 package udpcreatesocket
@@ -6,7 +6,7 @@ package udpcreatesocket
 import (
 	"github.com/wasmCloud/go/examples/component/http-server/gen/wasi/sockets/network"
 	"github.com/wasmCloud/go/examples/component/http-server/gen/wasi/sockets/udp"
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // Network represents the imported type alias "wasi:sockets/udp-create-socket@0.2.0#network".
diff --git a/examples/component/http-server/gen/wasi/sockets/udp-create-socket/udpcreatesocket.wasm.go b/examples/component/http-server/gen/wasi/sockets/udp-create-socket/udpcreatesocket.wasm.go
index 94b1ab67..c75b7771 100755
--- a/examples/component/http-server/gen/wasi/sockets/udp-create-socket/udpcreatesocket.wasm.go
+++ b/examples/component/http-server/gen/wasi/sockets/udp-create-socket/udpcreatesocket.wasm.go
@@ -1,9 +1,9 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package udpcreatesocket
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // This file contains wasmimport and wasmexport declarations for "wasi:sockets@0.2.0".
diff --git a/examples/component/http-server/gen/wasi/sockets/udp/abi.go b/examples/component/http-server/gen/wasi/sockets/udp/abi.go
index e340f347..c88a64aa 100755
--- a/examples/component/http-server/gen/wasi/sockets/udp/abi.go
+++ b/examples/component/http-server/gen/wasi/sockets/udp/abi.go
@@ -1,10 +1,10 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package udp
 
 import (
 	"github.com/wasmCloud/go/examples/component/http-server/gen/wasi/sockets/network"
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 	"unsafe"
 )
 
diff --git a/examples/component/http-server/gen/wasi/sockets/udp/udp.wasm.go b/examples/component/http-server/gen/wasi/sockets/udp/udp.wasm.go
index 83ce8ca7..22fbc5b5 100755
--- a/examples/component/http-server/gen/wasi/sockets/udp/udp.wasm.go
+++ b/examples/component/http-server/gen/wasi/sockets/udp/udp.wasm.go
@@ -1,9 +1,9 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package udp
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // This file contains wasmimport and wasmexport declarations for "wasi:sockets@0.2.0".
diff --git a/examples/component/http-server/gen/wasi/sockets/udp/udp.wit.go b/examples/component/http-server/gen/wasi/sockets/udp/udp.wit.go
index ecb44be0..8c81ad88 100755
--- a/examples/component/http-server/gen/wasi/sockets/udp/udp.wit.go
+++ b/examples/component/http-server/gen/wasi/sockets/udp/udp.wit.go
@@ -1,4 +1,4 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package udp represents the imported interface "wasi:sockets/udp@0.2.0".
 package udp
@@ -6,7 +6,7 @@ package udp
 import (
 	"github.com/wasmCloud/go/examples/component/http-server/gen/wasi/io/poll"
 	"github.com/wasmCloud/go/examples/component/http-server/gen/wasi/sockets/network"
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // Pollable represents the imported type alias "wasi:sockets/udp@0.2.0#pollable".
diff --git a/examples/component/http-server/gen/wasmcloud/bus/lattice/lattice.wasm.go b/examples/component/http-server/gen/wasmcloud/bus/lattice/lattice.wasm.go
index 7c7b9094..bb45c79d 100755
--- a/examples/component/http-server/gen/wasmcloud/bus/lattice/lattice.wasm.go
+++ b/examples/component/http-server/gen/wasmcloud/bus/lattice/lattice.wasm.go
@@ -1,4 +1,4 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package lattice
 
diff --git a/examples/component/http-server/gen/wasmcloud/bus/lattice/lattice.wit.go b/examples/component/http-server/gen/wasmcloud/bus/lattice/lattice.wit.go
index ba34d30c..75dd0dc0 100755
--- a/examples/component/http-server/gen/wasmcloud/bus/lattice/lattice.wit.go
+++ b/examples/component/http-server/gen/wasmcloud/bus/lattice/lattice.wit.go
@@ -1,10 +1,10 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package lattice represents the imported interface "wasmcloud:bus/lattice@1.0.0".
 package lattice
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // CallTargetInterface represents the imported resource "wasmcloud:bus/lattice@1.0.0#call-target-interface".
diff --git a/examples/component/http-server/gen/wasmcloud/secrets/reveal/reveal.wasm.go b/examples/component/http-server/gen/wasmcloud/secrets/reveal/reveal.wasm.go
index 65404eb3..267634d8 100755
--- a/examples/component/http-server/gen/wasmcloud/secrets/reveal/reveal.wasm.go
+++ b/examples/component/http-server/gen/wasmcloud/secrets/reveal/reveal.wasm.go
@@ -1,4 +1,4 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package reveal
 
diff --git a/examples/component/http-server/gen/wasmcloud/secrets/reveal/reveal.wit.go b/examples/component/http-server/gen/wasmcloud/secrets/reveal/reveal.wit.go
index a588f52d..cc0b74b6 100755
--- a/examples/component/http-server/gen/wasmcloud/secrets/reveal/reveal.wit.go
+++ b/examples/component/http-server/gen/wasmcloud/secrets/reveal/reveal.wit.go
@@ -1,11 +1,11 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package reveal represents the imported interface "wasmcloud:secrets/reveal@0.1.0-draft".
 package reveal
 
 import (
 	"github.com/wasmCloud/go/examples/component/http-server/gen/wasmcloud/secrets/store"
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // Secret represents the imported type alias "wasmcloud:secrets/reveal@0.1.0-draft#secret".
diff --git a/examples/component/http-server/gen/wasmcloud/secrets/store/abi.go b/examples/component/http-server/gen/wasmcloud/secrets/store/abi.go
index 20affd6c..51b9cf3c 100755
--- a/examples/component/http-server/gen/wasmcloud/secrets/store/abi.go
+++ b/examples/component/http-server/gen/wasmcloud/secrets/store/abi.go
@@ -1,9 +1,9 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package store
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 	"unsafe"
 )
 
diff --git a/examples/component/http-server/gen/wasmcloud/secrets/store/store.wasm.go b/examples/component/http-server/gen/wasmcloud/secrets/store/store.wasm.go
index cc94c517..0ea2a67f 100755
--- a/examples/component/http-server/gen/wasmcloud/secrets/store/store.wasm.go
+++ b/examples/component/http-server/gen/wasmcloud/secrets/store/store.wasm.go
@@ -1,9 +1,9 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 package store
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // This file contains wasmimport and wasmexport declarations for "wasmcloud:secrets@0.1.0-draft".
diff --git a/examples/component/http-server/gen/wasmcloud/secrets/store/store.wit.go b/examples/component/http-server/gen/wasmcloud/secrets/store/store.wit.go
index d3465e4f..c902f8b3 100755
--- a/examples/component/http-server/gen/wasmcloud/secrets/store/store.wit.go
+++ b/examples/component/http-server/gen/wasmcloud/secrets/store/store.wit.go
@@ -1,10 +1,10 @@
-// Code generated by wit-bindgen-go. DO NOT EDIT.
+// Code generated by component-bindgen-go. DO NOT EDIT.
 
 // Package store represents the imported interface "wasmcloud:secrets/store@0.1.0-draft".
 package store
 
 import (
-	"go.bytecodealliance.org/cm"
+	"go.wasmcloud.dev/component/cm"
 )
 
 // SecretsError represents the variant "wasmcloud:secrets/store@0.1.0-draft#secrets-error".
diff --git a/examples/component/http-server/go.mod b/examples/component/http-server/go.mod
index c500d0cf..685064ee 100644
--- a/examples/component/http-server/go.mod
+++ b/examples/component/http-server/go.mod
@@ -4,12 +4,13 @@ go 1.24
 
 require (
 	github.com/stretchr/testify v1.10.0
-	go.bytecodealliance.org v0.5.0
 	go.bytecodealliance.org/cm v0.1.0
 	go.wasmcloud.dev/component v0.0.5
 	go.wasmcloud.dev/wadge v0.7.0
 )
 
+require go.bytecodealliance.org v0.5.0 // indirect
+
 require (
 	github.com/bytecodealliance/wasm-tools-go v0.3.2 // indirect
 	github.com/coreos/go-semver v0.3.1 // indirect
@@ -37,6 +38,6 @@ require (
 replace go.wasmcloud.dev/component => ../../../component
 
 tool (
-	go.bytecodealliance.org/cmd/wit-bindgen-go
+	go.wasmcloud.dev/component/component-bindgen-go
 	go.wasmcloud.dev/wadge/cmd/wadge-bindgen-go
 )
diff --git a/examples/component/http-server/main.go b/examples/component/http-server/main.go
index df9b5b12..15b595aa 100644
--- a/examples/component/http-server/main.go
+++ b/examples/component/http-server/main.go
@@ -1,4 +1,4 @@
-//go:generate go tool wit-bindgen-go generate --world example --out gen ./wit
+//go:generate go tool component-bindgen-go --world example --out gen ./wit
 
 package main