diff --git a/crates/wasi-http/wit/deps/cli/imports.wit b/crates/wasi-http/wit/deps/cli/imports.wit
index a5f9a4623448..9386237c4018 100644
--- a/crates/wasi-http/wit/deps/cli/imports.wit
+++ b/crates/wasi-http/wit/deps/cli/imports.wit
@@ -1,7 +1,7 @@
 package wasi:cli@0.2.0;
 
 world imports {
-  include wasi:clocks/imports@0.2.1;
+  include wasi:clocks/imports@0.2.1-draft;
   include wasi:filesystem/imports@0.2.0;
   include wasi:sockets/imports@0.2.0;
   include wasi:random/imports@0.2.0;
diff --git a/crates/wasi-http/wit/deps/clocks/monotonic-clock.wit b/crates/wasi-http/wit/deps/clocks/monotonic-clock.wit
index 8903e45d6de9..86cd9fd5417e 100644
--- a/crates/wasi-http/wit/deps/clocks/monotonic-clock.wit
+++ b/crates/wasi-http/wit/deps/clocks/monotonic-clock.wit
@@ -1,4 +1,4 @@
-package wasi:clocks@0.2.1;
+package wasi:clocks@0.2.1-draft;
 /// WASI Monotonic Clock is a clock API intended to let users measure elapsed
 /// time.
 ///
diff --git a/crates/wasi-http/wit/deps/clocks/timezone.wit b/crates/wasi-http/wit/deps/clocks/timezone.wit
index 8353604402c2..3c79ed013516 100644
--- a/crates/wasi-http/wit/deps/clocks/timezone.wit
+++ b/crates/wasi-http/wit/deps/clocks/timezone.wit
@@ -1,4 +1,4 @@
-package wasi:clocks@0.2.1;
+package wasi:clocks@0.2.1-draft;
 
 interface timezone {
     use wall-clock.{datetime};
diff --git a/crates/wasi-http/wit/deps/clocks/wall-clock.wit b/crates/wasi-http/wit/deps/clocks/wall-clock.wit
index 0912486592e7..e68f774988f5 100644
--- a/crates/wasi-http/wit/deps/clocks/wall-clock.wit
+++ b/crates/wasi-http/wit/deps/clocks/wall-clock.wit
@@ -1,4 +1,4 @@
-package wasi:clocks@0.2.1;
+package wasi:clocks@0.2.1-draft;
 /// WASI Wall Clock is a clock API intended to let users query the current
 /// time. The name "wall" makes an analogy to a "clock on the wall", which
 /// is not necessarily monotonic as it may be reset.
diff --git a/crates/wasi-http/wit/deps/clocks/world.wit b/crates/wasi-http/wit/deps/clocks/world.wit
index 4d011df5aaca..6965fc9fa607 100644
--- a/crates/wasi-http/wit/deps/clocks/world.wit
+++ b/crates/wasi-http/wit/deps/clocks/world.wit
@@ -1,4 +1,4 @@
-package wasi:clocks@0.2.1;
+package wasi:clocks@0.2.1-draft;
 
 world imports {
     import monotonic-clock;
diff --git a/crates/wasi-http/wit/deps/filesystem/types.wit b/crates/wasi-http/wit/deps/filesystem/types.wit
index 7adcab3fe503..b86b807c2908 100644
--- a/crates/wasi-http/wit/deps/filesystem/types.wit
+++ b/crates/wasi-http/wit/deps/filesystem/types.wit
@@ -25,7 +25,7 @@ package wasi:filesystem@0.2.0;
 /// [WASI filesystem path resolution]: https://github.com/WebAssembly/wasi-filesystem/blob/main/path-resolution.md
 interface types {
     use wasi:io/streams@0.2.0.{input-stream, output-stream, error};
-    use wasi:clocks/wall-clock@0.2.1.{datetime};
+    use wasi:clocks/wall-clock@0.2.1-draft.{datetime};
 
     /// File size or length of a region within a file.
     type filesize = u64;
diff --git a/crates/wasi-http/wit/deps/http/proxy.wit b/crates/wasi-http/wit/deps/http/proxy.wit
index 038d4257259e..247895e22419 100644
--- a/crates/wasi-http/wit/deps/http/proxy.wit
+++ b/crates/wasi-http/wit/deps/http/proxy.wit
@@ -6,7 +6,7 @@ package wasi:http@0.2.0;
 /// outgoing HTTP requests.
 world proxy {
   /// HTTP proxies have access to time and randomness.
-  include wasi:clocks/imports@0.2.1;
+  include wasi:clocks/imports@0.2.1-draft;
   import wasi:random/random@0.2.0;
 
   /// Proxies have standard output and error streams which are expected to
diff --git a/crates/wasi-http/wit/deps/http/types.wit b/crates/wasi-http/wit/deps/http/types.wit
index 971847d19841..520deb1e59ff 100644
--- a/crates/wasi-http/wit/deps/http/types.wit
+++ b/crates/wasi-http/wit/deps/http/types.wit
@@ -2,7 +2,7 @@
 /// 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.1.{duration};
+  use wasi:clocks/monotonic-clock@0.2.1-draft.{duration};
   use wasi:io/streams@0.2.0.{input-stream, output-stream};
   use wasi:io/error@0.2.0.{error as io-error};
   use wasi:io/poll@0.2.0.{pollable};
diff --git a/crates/wasi-http/wit/deps/sockets/tcp.wit b/crates/wasi-http/wit/deps/sockets/tcp.wit
index 9c2cdfb4d97d..aeef4e5abeb4 100644
--- a/crates/wasi-http/wit/deps/sockets/tcp.wit
+++ b/crates/wasi-http/wit/deps/sockets/tcp.wit
@@ -2,7 +2,7 @@
 interface tcp {
     use wasi:io/streams@0.2.0.{input-stream, output-stream};
     use wasi:io/poll@0.2.0.{pollable};
-    use wasi:clocks/monotonic-clock@0.2.1.{duration};
+    use wasi:clocks/monotonic-clock@0.2.1-draft.{duration};
     use network.{network, error-code, ip-socket-address, ip-address-family};
 
     enum shutdown-type {
diff --git a/crates/wasi/wit/deps/cli/imports.wit b/crates/wasi/wit/deps/cli/imports.wit
index a5f9a4623448..9386237c4018 100644
--- a/crates/wasi/wit/deps/cli/imports.wit
+++ b/crates/wasi/wit/deps/cli/imports.wit
@@ -1,7 +1,7 @@
 package wasi:cli@0.2.0;
 
 world imports {
-  include wasi:clocks/imports@0.2.1;
+  include wasi:clocks/imports@0.2.1-draft;
   include wasi:filesystem/imports@0.2.0;
   include wasi:sockets/imports@0.2.0;
   include wasi:random/imports@0.2.0;
diff --git a/crates/wasi/wit/deps/clocks/monotonic-clock.wit b/crates/wasi/wit/deps/clocks/monotonic-clock.wit
index 8903e45d6de9..86cd9fd5417e 100644
--- a/crates/wasi/wit/deps/clocks/monotonic-clock.wit
+++ b/crates/wasi/wit/deps/clocks/monotonic-clock.wit
@@ -1,4 +1,4 @@
-package wasi:clocks@0.2.1;
+package wasi:clocks@0.2.1-draft;
 /// WASI Monotonic Clock is a clock API intended to let users measure elapsed
 /// time.
 ///
diff --git a/crates/wasi/wit/deps/clocks/timezone.wit b/crates/wasi/wit/deps/clocks/timezone.wit
index 8353604402c2..3c79ed013516 100644
--- a/crates/wasi/wit/deps/clocks/timezone.wit
+++ b/crates/wasi/wit/deps/clocks/timezone.wit
@@ -1,4 +1,4 @@
-package wasi:clocks@0.2.1;
+package wasi:clocks@0.2.1-draft;
 
 interface timezone {
     use wall-clock.{datetime};
diff --git a/crates/wasi/wit/deps/clocks/wall-clock.wit b/crates/wasi/wit/deps/clocks/wall-clock.wit
index 0912486592e7..e68f774988f5 100644
--- a/crates/wasi/wit/deps/clocks/wall-clock.wit
+++ b/crates/wasi/wit/deps/clocks/wall-clock.wit
@@ -1,4 +1,4 @@
-package wasi:clocks@0.2.1;
+package wasi:clocks@0.2.1-draft;
 /// WASI Wall Clock is a clock API intended to let users query the current
 /// time. The name "wall" makes an analogy to a "clock on the wall", which
 /// is not necessarily monotonic as it may be reset.
diff --git a/crates/wasi/wit/deps/clocks/world.wit b/crates/wasi/wit/deps/clocks/world.wit
index 4d011df5aaca..6965fc9fa607 100644
--- a/crates/wasi/wit/deps/clocks/world.wit
+++ b/crates/wasi/wit/deps/clocks/world.wit
@@ -1,4 +1,4 @@
-package wasi:clocks@0.2.1;
+package wasi:clocks@0.2.1-draft;
 
 world imports {
     import monotonic-clock;
diff --git a/crates/wasi/wit/deps/filesystem/types.wit b/crates/wasi/wit/deps/filesystem/types.wit
index 7adcab3fe503..b86b807c2908 100644
--- a/crates/wasi/wit/deps/filesystem/types.wit
+++ b/crates/wasi/wit/deps/filesystem/types.wit
@@ -25,7 +25,7 @@ package wasi:filesystem@0.2.0;
 /// [WASI filesystem path resolution]: https://github.com/WebAssembly/wasi-filesystem/blob/main/path-resolution.md
 interface types {
     use wasi:io/streams@0.2.0.{input-stream, output-stream, error};
-    use wasi:clocks/wall-clock@0.2.1.{datetime};
+    use wasi:clocks/wall-clock@0.2.1-draft.{datetime};
 
     /// File size or length of a region within a file.
     type filesize = u64;
diff --git a/crates/wasi/wit/deps/http/proxy.wit b/crates/wasi/wit/deps/http/proxy.wit
index 038d4257259e..247895e22419 100644
--- a/crates/wasi/wit/deps/http/proxy.wit
+++ b/crates/wasi/wit/deps/http/proxy.wit
@@ -6,7 +6,7 @@ package wasi:http@0.2.0;
 /// outgoing HTTP requests.
 world proxy {
   /// HTTP proxies have access to time and randomness.
-  include wasi:clocks/imports@0.2.1;
+  include wasi:clocks/imports@0.2.1-draft;
   import wasi:random/random@0.2.0;
 
   /// Proxies have standard output and error streams which are expected to
diff --git a/crates/wasi/wit/deps/http/types.wit b/crates/wasi/wit/deps/http/types.wit
index 971847d19841..520deb1e59ff 100644
--- a/crates/wasi/wit/deps/http/types.wit
+++ b/crates/wasi/wit/deps/http/types.wit
@@ -2,7 +2,7 @@
 /// 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.1.{duration};
+  use wasi:clocks/monotonic-clock@0.2.1-draft.{duration};
   use wasi:io/streams@0.2.0.{input-stream, output-stream};
   use wasi:io/error@0.2.0.{error as io-error};
   use wasi:io/poll@0.2.0.{pollable};
diff --git a/crates/wasi/wit/deps/sockets/tcp.wit b/crates/wasi/wit/deps/sockets/tcp.wit
index 9c2cdfb4d97d..aeef4e5abeb4 100644
--- a/crates/wasi/wit/deps/sockets/tcp.wit
+++ b/crates/wasi/wit/deps/sockets/tcp.wit
@@ -2,7 +2,7 @@
 interface tcp {
     use wasi:io/streams@0.2.0.{input-stream, output-stream};
     use wasi:io/poll@0.2.0.{pollable};
-    use wasi:clocks/monotonic-clock@0.2.1.{duration};
+    use wasi:clocks/monotonic-clock@0.2.1-draft.{duration};
     use network.{network, error-code, ip-socket-address, ip-address-family};
 
     enum shutdown-type {