diff --git a/wasi-common-cbindgen/src/lib.rs b/wasi-common-cbindgen/src/lib.rs
index c8d780b285..31bd115b23 100644
--- a/wasi-common-cbindgen/src/lib.rs
+++ b/wasi-common-cbindgen/src/lib.rs
@@ -15,7 +15,7 @@ pub fn wasi_common_cbindgen(attr: TokenStream, function: TokenStream) -> TokenSt
 
     // generate C fn name prefixed with __wasi_
     let fn_ident = &function.ident;
-    let concatenated = format!("__wasi_{}", fn_ident);
+    let concatenated = format!("wasi_common_{}", fn_ident);
     let c_fn_ident = syn::Ident::new(&concatenated, fn_ident.span());
 
     // capture input args
diff --git a/wasi-common-cbindgen/tests/array_args.rs b/wasi-common-cbindgen/tests/array_args.rs
index fa93d1b91f..1aee2a702a 100644
--- a/wasi-common-cbindgen/tests/array_args.rs
+++ b/wasi-common-cbindgen/tests/array_args.rs
@@ -13,7 +13,7 @@ fn main() {
 
     let given: &mut [u8] = &mut [0, 0];
     unsafe {
-        __wasi_array_args(given.as_mut_ptr(), given.len());
+        wasi_common_array_args(given.as_mut_ptr(), given.len());
     }
 
     assert_eq!(given, expected);
diff --git a/wasi-common-cbindgen/tests/mut_args.rs b/wasi-common-cbindgen/tests/mut_args.rs
index 7bce5ccbc6..5ddaa2da19 100644
--- a/wasi-common-cbindgen/tests/mut_args.rs
+++ b/wasi-common-cbindgen/tests/mut_args.rs
@@ -13,7 +13,7 @@ fn main() {
     let given = unsafe {
         let given = Box::new(2);
         let raw = Box::into_raw(given);
-        __wasi_mut_args(raw);
+        wasi_common_mut_args(raw);
         Box::from_raw(raw)
     };
     assert_eq!(*given, *expected);
diff --git a/wasi-common-cbindgen/tests/no_args.rs b/wasi-common-cbindgen/tests/no_args.rs
index af17e04123..60204ecb31 100644
--- a/wasi-common-cbindgen/tests/no_args.rs
+++ b/wasi-common-cbindgen/tests/no_args.rs
@@ -8,5 +8,5 @@ fn no_args() -> u32 {
 }
 
 fn main() {
-    assert_eq!(unsafe { __wasi_no_args() }, no_args());
+    assert_eq!(unsafe { wasi_common_no_args() }, no_args());
 }
diff --git a/wasi-common-cbindgen/tests/ref_args.rs b/wasi-common-cbindgen/tests/ref_args.rs
index 57c988241f..3a234b1128 100644
--- a/wasi-common-cbindgen/tests/ref_args.rs
+++ b/wasi-common-cbindgen/tests/ref_args.rs
@@ -12,7 +12,7 @@ fn main() {
     let expected = ref_args(a.as_ref());
     let given = unsafe {
         let raw = Box::into_raw(a);
-        let res = __wasi_ref_args(raw);
+        let res = wasi_common_ref_args(raw);
         Box::from_raw(raw);
         res
     };
diff --git a/wasi-common-cbindgen/tests/val_args.rs b/wasi-common-cbindgen/tests/val_args.rs
index 68b6d27eef..47313be032 100644
--- a/wasi-common-cbindgen/tests/val_args.rs
+++ b/wasi-common-cbindgen/tests/val_args.rs
@@ -8,5 +8,5 @@ fn val_args(a: usize, b: usize) -> usize {
 }
 
 fn main() {
-    assert_eq!(unsafe { __wasi_val_args(1, 2) }, val_args(1, 2));
+    assert_eq!(unsafe { wasi_common_val_args(1, 2) }, val_args(1, 2));
 }