diff --git a/compiler-rs/clients_schema_to_openapi/src/paths.rs b/compiler-rs/clients_schema_to_openapi/src/paths.rs
index db80c202fc..8184b711b6 100644
--- a/compiler-rs/clients_schema_to_openapi/src/paths.rs
+++ b/compiler-rs/clients_schema_to_openapi/src/paths.rs
@@ -47,10 +47,10 @@ pub fn add_endpoint(
     }
 
     // Namespace
-    // let namespace = match endpoint.name.split_once('.') {
-    //    Some((ns, _)) => ns,
-    //    None => "core",
-    //};
+    let namespace = match endpoint.name.split_once('.') {
+       Some((ns, _)) => ns,
+       None => &endpoint.name,
+    };
 
     // Will we produce multiple paths? If true, we will register components for reuse across paths
     let is_multipath = endpoint.urls.len() > 1 || endpoint.urls.iter().any(|u| u.methods.len() > 1);
@@ -196,7 +196,7 @@ pub fn add_endpoint(
 
         // Create the operation, it will be repeated if we have several methods
         let operation = openapiv3::Operation {
-            tags: vec![endpoint.name.splitn(1, '.')],
+            tags: vec![namespace.to_string()],
             summary: sum_desc.summary,
             description: sum_desc.description,
             external_docs: tac.convert_external_docs(endpoint),
diff --git a/compiler-rs/compiler-wasm-lib/pkg/compiler_wasm_lib_bg.wasm b/compiler-rs/compiler-wasm-lib/pkg/compiler_wasm_lib_bg.wasm
index 4e11b1c40c..0b00772127 100644
Binary files a/compiler-rs/compiler-wasm-lib/pkg/compiler_wasm_lib_bg.wasm and b/compiler-rs/compiler-wasm-lib/pkg/compiler_wasm_lib_bg.wasm differ