diff --git a/components/collections/codepointtrie_builder/cpp/Makefile b/components/collections/codepointtrie_builder/cpp/Makefile
index aaa91c6779e..1f87f5738f0 100644
--- a/components/collections/codepointtrie_builder/cpp/Makefile
+++ b/components/collections/codepointtrie_builder/cpp/Makefile
@@ -30,7 +30,7 @@ wasm_obj/icu4c/%.o: $(ICU4C_SOURCE)/%.cpp
 wasm_obj/ucptrie_wrap.o: ucptrie_wrap.cpp
 	mkdir -p wasm_obj
 	$(CXX) --target=wasm32-unknown-wasi \
-		-I/usr/include/wasm32-wasi \
+		-I/usr/include/wasm32-wasip1 \
 		--compile \
 		-flto \
 		-I$(ICU4C_SOURCE)/common \
diff --git a/tutorials/gn/build/rust_wasi/BUILD.gn b/tutorials/gn/build/rust_wasi/BUILD.gn
index aaef2fd91cf..8223a57d854 100644
--- a/tutorials/gn/build/rust_wasi/BUILD.gn
+++ b/tutorials/gn/build/rust_wasi/BUILD.gn
@@ -5,5 +5,5 @@
 import("//tutorials/gn/build/rust_toolchain.gni")
 
 rust_toolchain("rust_wasi") {
-  rust_target = "wasm32-wasi"
+  rust_target = "wasm32-wasip1"
 }
diff --git a/tutorials/gn/gn.toml b/tutorials/gn/gn.toml
index c93d1ba0332..597be9a205e 100644
--- a/tutorials/gn/gn.toml
+++ b/tutorials/gn/gn.toml
@@ -161,7 +161,7 @@ assert ${third_party_tools} "The GN third-party tools are not installed.\n*** Pl
 
 cd tutorials/gn
 
-exec --fail-on-error rustup target add wasm32-wasi --toolchain ${PINNED_CI_NIGHTLY}
+exec --fail-on-error rustup target add wasm32-wasip1 --toolchain ${PINNED_CI_NIGHTLY}
 
 exec --fail-on-error ./third_party_tools/bin/gn gen --root=../.. --args=target_os="wasi" out/wasi
 exec --fail-on-error rustup run ${PINNED_CI_NIGHTLY} ./third_party_tools/depot_tools/ninja -C out/wasi