diff --git a/Cargo.lock b/Cargo.lock
index 1ea0206..8a0867a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1545,9 +1545,9 @@ dependencies = [
 
 [[package]]
 name = "id-arena"
-version = "2.2.1"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005"
+checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
 
 [[package]]
 name = "ident_case"
@@ -4075,7 +4075,7 @@ dependencies = [
  "warg-client",
  "warg-protocol",
  "wasmprinter 0.244.0",
- "wat",
+ "wat 1.244.0 (git+https://github.com/bytecodealliance/wasm-tools.git)",
  "wit-component",
  "wit-parser",
 ]
@@ -4095,11 +4095,11 @@ dependencies = [
  "serde_json",
  "thiserror",
  "wac-types",
- "wasm-encoder 0.244.0",
+ "wasm-encoder 0.244.0 (git+https://github.com/bytecodealliance/wasm-tools.git)",
  "wasm-metadata",
- "wasmparser 0.244.0",
+ "wasmparser 0.244.0 (git+https://github.com/bytecodealliance/wasm-tools.git)",
  "wasmprinter 0.244.0",
- "wat",
+ "wat 1.244.0 (git+https://github.com/bytecodealliance/wasm-tools.git)",
  "wit-component",
  "wit-parser",
 ]
@@ -4125,9 +4125,9 @@ dependencies = [
  "tokio",
  "wac-graph",
  "wac-resolver",
- "wasm-encoder 0.244.0",
+ "wasm-encoder 0.244.0 (git+https://github.com/bytecodealliance/wasm-tools.git)",
  "wasm-metadata",
- "wasmparser 0.244.0",
+ "wasmparser 0.244.0 (git+https://github.com/bytecodealliance/wasm-tools.git)",
  "wasmprinter 0.244.0",
 ]
 
@@ -4155,7 +4155,7 @@ dependencies = [
  "warg-protocol",
  "warg-server",
  "wasmprinter 0.244.0",
- "wat",
+ "wat 1.244.0 (git+https://github.com/bytecodealliance/wasm-tools.git)",
  "wit-component",
  "wit-parser",
 ]
@@ -4169,8 +4169,8 @@ dependencies = [
  "indexmap 2.12.0",
  "semver",
  "serde 1.0.228",
- "wasm-encoder 0.244.0",
- "wasmparser 0.244.0",
+ "wasm-encoder 0.244.0 (git+https://github.com/bytecodealliance/wasm-tools.git)",
+ "wasmparser 0.244.0 (git+https://github.com/bytecodealliance/wasm-tools.git)",
 ]
 
 [[package]]
@@ -4457,7 +4457,7 @@ dependencies = [
  "smallvec",
  "wasm-encoder 0.41.2",
  "wasmparser 0.121.2",
- "wat",
+ "wat 1.244.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -4477,14 +4477,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
 dependencies = [
  "leb128fmt",
- "wasmparser 0.244.0",
+ "wasmparser 0.244.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wasm-encoder"
+version = "0.244.0"
+source = "git+https://github.com/bytecodealliance/wasm-tools.git#037cce497699bdc178906a3eedd6c63a31a44523"
+dependencies = [
+ "leb128fmt",
+ "wasmparser 0.244.0 (git+https://github.com/bytecodealliance/wasm-tools.git)",
 ]
 
 [[package]]
 name = "wasm-metadata"
 version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
+source = "git+https://github.com/bytecodealliance/wasm-tools.git#037cce497699bdc178906a3eedd6c63a31a44523"
 dependencies = [
  "anyhow",
  "auditable-serde",
@@ -4495,8 +4503,8 @@ dependencies = [
  "serde_json",
  "spdx",
  "url",
- "wasm-encoder 0.244.0",
- "wasmparser 0.244.0",
+ "wasm-encoder 0.244.0 (git+https://github.com/bytecodealliance/wasm-tools.git)",
+ "wasmparser 0.244.0 (git+https://github.com/bytecodealliance/wasm-tools.git)",
 ]
 
 [[package]]
@@ -4528,6 +4536,16 @@ name = "wasmparser"
 version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
+dependencies = [
+ "bitflags 2.5.0",
+ "indexmap 2.12.0",
+ "semver",
+]
+
+[[package]]
+name = "wasmparser"
+version = "0.244.0"
+source = "git+https://github.com/bytecodealliance/wasm-tools.git#037cce497699bdc178906a3eedd6c63a31a44523"
 dependencies = [
  "bitflags 2.5.0",
  "hashbrown 0.15.2",
@@ -4549,12 +4567,11 @@ dependencies = [
 [[package]]
 name = "wasmprinter"
 version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09390d7b2bd7b938e563e4bff10aa345ef2e27a3bc99135697514ef54495e68f"
+source = "git+https://github.com/bytecodealliance/wasm-tools.git#037cce497699bdc178906a3eedd6c63a31a44523"
 dependencies = [
  "anyhow",
  "termcolor",
- "wasmparser 0.244.0",
+ "wasmparser 0.244.0 (git+https://github.com/bytecodealliance/wasm-tools.git)",
 ]
 
 [[package]]
@@ -4567,7 +4584,19 @@ dependencies = [
  "leb128fmt",
  "memchr",
  "unicode-width 0.2.0",
- "wasm-encoder 0.244.0",
+ "wasm-encoder 0.244.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wast"
+version = "244.0.0"
+source = "git+https://github.com/bytecodealliance/wasm-tools.git#037cce497699bdc178906a3eedd6c63a31a44523"
+dependencies = [
+ "bumpalo",
+ "leb128fmt",
+ "memchr",
+ "unicode-width 0.2.0",
+ "wasm-encoder 0.244.0 (git+https://github.com/bytecodealliance/wasm-tools.git)",
 ]
 
 [[package]]
@@ -4576,7 +4605,15 @@ version = "1.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbf35b87ed352f9ab6cd0732abde5a67dd6153dfd02c493e61459218b19456fa"
 dependencies = [
- "wast",
+ "wast 244.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "wat"
+version = "1.244.0"
+source = "git+https://github.com/bytecodealliance/wasm-tools.git#037cce497699bdc178906a3eedd6c63a31a44523"
+dependencies = [
+ "wast 244.0.0 (git+https://github.com/bytecodealliance/wasm-tools.git)",
 ]
 
 [[package]]
@@ -4849,8 +4886,7 @@ dependencies = [
 [[package]]
 name = "wit-component"
 version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
+source = "git+https://github.com/bytecodealliance/wasm-tools.git#037cce497699bdc178906a3eedd6c63a31a44523"
 dependencies = [
  "anyhow",
  "bitflags 2.5.0",
@@ -4859,20 +4895,20 @@ dependencies = [
  "serde 1.0.228",
  "serde_derive",
  "serde_json",
- "wasm-encoder 0.244.0",
+ "wasm-encoder 0.244.0 (git+https://github.com/bytecodealliance/wasm-tools.git)",
  "wasm-metadata",
- "wasmparser 0.244.0",
- "wat",
+ "wasmparser 0.244.0 (git+https://github.com/bytecodealliance/wasm-tools.git)",
+ "wat 1.244.0 (git+https://github.com/bytecodealliance/wasm-tools.git)",
  "wit-parser",
 ]
 
 [[package]]
 name = "wit-parser"
 version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
+source = "git+https://github.com/bytecodealliance/wasm-tools.git#037cce497699bdc178906a3eedd6c63a31a44523"
 dependencies = [
  "anyhow",
+ "hashbrown 0.15.2",
  "id-arena",
  "indexmap 2.12.0",
  "log",
@@ -4881,7 +4917,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "unicode-xid",
- "wasmparser 0.244.0",
+ "wasmparser 0.244.0 (git+https://github.com/bytecodealliance/wasm-tools.git)",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 7b48a51..99cfd25 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -63,13 +63,13 @@ wac-parser = { path = "crates/wac-parser", version = "0.9.0-dev", default-featur
 wac-resolver = { path = "crates/wac-resolver", version = "0.9.0-dev", default-features = false }
 wac-graph = { path = "crates/wac-graph", version = "0.9.0-dev" }
 wac-types = { path = "crates/wac-types", version = "0.9.0-dev" }
-wit-parser = "0.244.0"
-wasmparser = "0.244.0"
-wit-component = "0.244.0"
-wasm-encoder = "0.244.0"
-wasmprinter = "0.244.0"
-wasm-metadata = "0.244.0"
-wat = "1.244.0"
+wit-parser = { git = 'https://github.com/bytecodealliance/wasm-tools.git' }
+wasmparser = { git = 'https://github.com/bytecodealliance/wasm-tools.git' }
+wit-component = { git = 'https://github.com/bytecodealliance/wasm-tools.git' }
+wasm-encoder = { git = 'https://github.com/bytecodealliance/wasm-tools.git' }
+wasmprinter = { git = 'https://github.com/bytecodealliance/wasm-tools.git' }
+wasm-metadata = { git = 'https://github.com/bytecodealliance/wasm-tools.git' }
+wat = { git = 'https://github.com/bytecodealliance/wasm-tools.git' }
 anyhow = "1.0.81"
 clap = { version = "4.5.4", features = ["derive"] }
 semver = { version = "1.0.22", features = ["serde"] }
@@ -81,7 +81,7 @@ tokio = { version = "1.45.1", default-features = false, features = [
 ] }
 owo-colors = { version = "4.0.0", features = ["supports-colors"] }
 indexmap = { version = "2.2.6", features = ["serde"] }
-id-arena = "2.2.1"
+id-arena = "2.3.0"
 serde = { version = "1.0.197", features = ["derive"] }
 serde_json = "1.0.115"
 logos = "0.14.0"
diff --git a/crates/wac-graph/src/encoding.rs b/crates/wac-graph/src/encoding.rs
index 55b3c3b..7772a95 100644
--- a/crates/wac-graph/src/encoding.rs
+++ b/crates/wac-graph/src/encoding.rs
@@ -561,7 +561,7 @@ impl<'a> TypeEncoder<'a> {
             .encodable
             .ty()
             .defined_type()
-            .fixed_size_list(ty, elements);
+            .fixed_length_list(ty, elements);
         index
     }
 
diff --git a/crates/wac-types/src/package.rs b/crates/wac-types/src/package.rs
index af6a923..bb6829e 100644
--- a/crates/wac-types/src/package.rs
+++ b/crates/wac-types/src/package.rs
@@ -754,7 +754,7 @@ impl<'a> TypeConverter<'a> {
                 let option = ty.map(|ty| self.component_val_type(ty)).transpose()?;
                 ValueType::Defined(self.types.add_defined_type(DefinedType::Future(option)))
             }
-            wasm::ComponentDefinedType::FixedSizeList(ty, _) => {
+            wasm::ComponentDefinedType::FixedLengthList(ty, _) => {
                 let ty = self.component_val_type(*ty)?;
                 ValueType::Defined(self.types.add_defined_type(DefinedType::List(ty)))
             }