diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift
index 6e5c17141..50bebb907 100644
--- a/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift
+++ b/Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift
@@ -389,9 +389,9 @@ public class ExportSwift {
             case .enumStatic(let enumDef):
                 return enumDef.name
             case .classStatic(let klass), .classInstance(let klass):
-                return klass.name
+                return klass.abiName
             case .structStatic(let structDef):
-                return structDef.name
+                return structDef.abiName
             }
         }
 
@@ -653,7 +653,7 @@ public class ExportSwift {
 
         do {
             let funcDecl = SwiftCodePattern.buildExposedFunctionDecl(
-                abiName: "bjs_\(klass.name)_deinit",
+                abiName: "bjs_\(klass.abiName)_deinit",
                 signature: SwiftSignatureBuilder.buildABIFunctionSignature(
                     abiParameters: [("pointer", .pointer)],
                     returnType: nil
@@ -686,8 +686,8 @@ public class ExportSwift {
     /// fileprivate func _bjs_Greeter_wrap(_: UnsafeMutableRawPointer) -> Int32
     /// ```
     func renderConvertibleToJSValueExtension(klass: ExportedClass) -> [DeclSyntax] {
-        let wrapFunctionName = "_bjs_\(klass.name)_wrap"
-        let externFunctionName = "bjs_\(klass.name)_wrap"
+        let wrapFunctionName = "_bjs_\(klass.abiName)_wrap"
+        let externFunctionName = "bjs_\(klass.abiName)_wrap"
 
         // If the class has an explicit access control, we need to add it to the extension declaration.
         let accessControl = klass.explicitAccessControl.map { "\($0) " } ?? ""
@@ -1087,10 +1087,10 @@ struct StructCodegen {
     func renderStructHelpers(_ structDef: ExportedStruct) -> [DeclSyntax] {
         let typeName = structDef.swiftCallName
 
-        let lowerExternName = "swift_js_struct_lower_\(structDef.name)"
-        let liftExternName = "swift_js_struct_lift_\(structDef.name)"
-        let lowerFunctionName = "_bjs_struct_lower_\(structDef.name)"
-        let liftFunctionName = "_bjs_struct_lift_\(structDef.name)"
+        let lowerExternName = "swift_js_struct_lower_\(structDef.abiName)"
+        let liftExternName = "swift_js_struct_lift_\(structDef.abiName)"
+        let lowerFunctionName = "_bjs_struct_lower_\(structDef.abiName)"
+        let liftFunctionName = "_bjs_struct_lift_\(structDef.abiName)"
 
         let printer = CodeFragmentPrinter()
         printer.write("extension \(typeName): _BridgedSwiftStruct {")
diff --git a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift
index 0cf5a567f..8f1b3fa35 100644
--- a/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift
+++ b/Plugins/BridgeJS/Sources/BridgeJSCore/SwiftToSkeleton.swift
@@ -1060,9 +1060,10 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
         switch state {
         case .topLevel:
             staticContext = nil
-        case .classBody(let className, _):
+        case .classBody(_, let classKey):
             if isStatic {
-                staticContext = .className(className)
+                let classAbiName = exportedClassByName[classKey]?.abiName ?? "unknown"
+                staticContext = .className(classAbiName)
             } else {
                 staticContext = nil
             }
@@ -1077,9 +1078,10 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
             staticContext = isNamespaceEnum ? .namespaceEnum(swiftCallName) : .enumName(enumName)
         case .protocolBody(_, _):
             return nil
-        case .structBody(let structName, _):
+        case .structBody(_, let structKey):
             if isStatic {
-                staticContext = .structName(structName)
+                let structAbiName = exportedStructByName[structKey]?.abiName ?? "unknown"
+                staticContext = .structName(structAbiName)
             } else {
                 staticContext = nil
             }
@@ -1087,10 +1089,10 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
 
         let classNameForABI: String?
         switch state {
-        case .classBody(let className, _):
-            classNameForABI = className
-        case .structBody(let structName, _):
-            classNameForABI = structName
+        case .classBody(_, let classKey):
+            classNameForABI = exportedClassByName[classKey]?.abiName
+        case .structBody(_, let structKey):
+            classNameForABI = exportedStructByName[structKey]?.abiName
         default:
             classNameForABI = nil
         }
@@ -1179,7 +1181,7 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
         guard let jsAttribute = node.attributes.firstJSAttribute else { return .skipChildren }
 
         switch state {
-        case .classBody(let className, let classKey):
+        case .classBody(_, let classKey):
             if extractNamespace(from: jsAttribute) != nil {
                 diagnose(
                     node: jsAttribute,
@@ -1194,14 +1196,15 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
                 return .skipChildren
             }
 
+            let classAbiName = exportedClassByName[classKey]?.abiName ?? "unknown"
             let constructor = ExportedConstructor(
-                abiName: "bjs_\(className)_init",
+                abiName: "bjs_\(classAbiName)_init",
                 parameters: parameters,
                 effects: effects
             )
             exportedClassByName[classKey]?.constructor = constructor
 
-        case .structBody(let structName, let structKey):
+        case .structBody(_, let structKey):
             if extractNamespace(from: jsAttribute) != nil {
                 diagnose(
                     node: jsAttribute,
@@ -1216,8 +1219,9 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
                 return .skipChildren
             }
 
+            let structAbiName = exportedStructByName[structKey]?.abiName ?? "unknown"
             let constructor = ExportedConstructor(
-                abiName: "bjs_\(structName)_init",
+                abiName: "bjs_\(structAbiName)_init",
                 parameters: parameters,
                 effects: effects
             )
@@ -1263,8 +1267,13 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
         let staticContext: StaticContext?
 
         switch state {
-        case .classBody(let className, _):
-            staticContext = isStatic ? .className(className) : nil
+        case .classBody(_, let classKey):
+            if isStatic {
+                let classAbiName = exportedClassByName[classKey]?.abiName ?? "unknown"
+                staticContext = .className(classAbiName)
+            } else {
+                staticContext = nil
+            }
         case .enumBody(let enumName, let enumKey):
             if !isStatic {
                 diagnose(node: node, message: "Only static properties are supported in enums")
@@ -1280,9 +1289,10 @@ private final class ExportSwiftAPICollector: SyntaxAnyVisitor {
             return .skipChildren
         case .protocolBody(let protocolName, let protocolKey):
             return visitProtocolProperty(node: node, protocolName: protocolName, protocolKey: protocolKey)
-        case .structBody(let structName, _):
+        case .structBody(_, let structKey):
             if isStatic {
-                staticContext = .structName(structName)
+                let structAbiName = exportedStructByName[structKey]?.abiName ?? "unknown"
+                staticContext = .structName(structAbiName)
             } else {
                 diagnose(node: node, message: "@JS var must be static in structs (instance fields don't need @JS)")
                 return .skipChildren
diff --git a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift
index 499d6f60b..af2456f81 100644
--- a/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift
+++ b/Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift
@@ -447,7 +447,7 @@ public struct BridgeJSLink {
                 printer.write("}")
                 if !allStructs.isEmpty {
                     for structDef in allStructs {
-                        printer.write("bjs[\"swift_js_struct_lower_\(structDef.name)\"] = function(objectId) {")
+                        printer.write("bjs[\"swift_js_struct_lower_\(structDef.abiName)\"] = function(objectId) {")
                         printer.indent {
                             printer.write(
                                 "\(JSGlueVariableScope.reservedStructHelpers).\(structDef.name).lower(\(JSGlueVariableScope.reservedSwift).memory.getObject(objectId));"
@@ -455,7 +455,7 @@ public struct BridgeJSLink {
                         }
                         printer.write("}")
 
-                        printer.write("bjs[\"swift_js_struct_lift_\(structDef.name)\"] = function() {")
+                        printer.write("bjs[\"swift_js_struct_lift_\(structDef.abiName)\"] = function() {")
                         printer.indent {
                             printer.write(
                                 "const value = \(JSGlueVariableScope.reservedStructHelpers).\(structDef.name).lift();"
@@ -1155,7 +1155,7 @@ public struct BridgeJSLink {
             wrapperLines.append("}")
 
             for klass in classes.sorted(by: { $0.name < $1.name }) {
-                let wrapperFunctionName = "bjs_\(klass.name)_wrap"
+                let wrapperFunctionName = "bjs_\(klass.abiName)_wrap"
                 let namespacePath = (klass.namespace ?? []).map { ".\($0)" }.joined()
                 let exportsPath =
                     namespacePath.isEmpty ? "_exports['\(klass.name)']" : "_exports\(namespacePath).\(klass.name)"
@@ -1967,7 +1967,7 @@ extension BridgeJSLink {
             jsPrinter.write("static __construct(ptr) {")
             jsPrinter.indent {
                 jsPrinter.write(
-                    "return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_\(klass.name)_deinit, \(klass.name).prototype);"
+                    "return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_\(klass.abiName)_deinit, \(klass.name).prototype);"
                 )
             }
             jsPrinter.write("}")
@@ -2069,7 +2069,7 @@ extension BridgeJSLink {
         for property in klass.properties {
             try renderClassProperty(
                 property: property,
-                className: klass.name,
+                className: klass.abiName,
                 isStatic: property.isStatic,
                 jsPrinter: jsPrinter,
                 dtsPrinter: property.isStatic ? dtsExportEntryPrinter : dtsTypePrinter
diff --git a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift
index dab5fae33..967215f6c 100644
--- a/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift
+++ b/Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift
@@ -1,5 +1,21 @@
 // This file is shared between BridgeTool and BridgeJSLink
 
+// MARK: - Namespaced Type Protocol
+
+public protocol NamespacedExportedType {
+    var name: String { get }
+    var namespace: [String]? { get }
+}
+
+extension NamespacedExportedType {
+    public var abiName: String {
+        if let namespace = namespace, !namespace.isEmpty {
+            return (namespace + [name]).joined(separator: "_")
+        }
+        return name
+    }
+}
+
 // MARK: - ABI Name Generation
 
 /// Utility for generating consistent ABI names across all exported and imported types
@@ -412,7 +428,7 @@ public struct StructField: Codable, Equatable, Sendable {
     }
 }
 
-public struct ExportedStruct: Codable, Equatable, Sendable {
+public struct ExportedStruct: Codable, Equatable, Sendable, NamespacedExportedType {
     public let name: String
     public let swiftCallName: String
     public let explicitAccessControl: String?
@@ -490,7 +506,7 @@ public enum EnumEmitStyle: String, Codable, Sendable {
     case tsEnum
 }
 
-public struct ExportedEnum: Codable, Equatable, Sendable {
+public struct ExportedEnum: Codable, Equatable, Sendable, NamespacedExportedType {
     public static let valuesSuffix = "Values"
     public static let objectSuffix = "Object"
 
@@ -619,7 +635,7 @@ public struct ExportedFunction: Codable, Equatable, Sendable {
     }
 }
 
-public struct ExportedClass: Codable {
+public struct ExportedClass: Codable, NamespacedExportedType {
     public var name: String
     public var swiftCallName: String
     public var explicitAccessControl: String?
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/EnumNamespace.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/EnumNamespace.swift
index 218cd4ca3..e46d74423 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/EnumNamespace.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/EnumNamespace.swift
@@ -57,6 +57,16 @@ enum Internal {
     }
 }
 
+@JS enum Formatting {
+    @JS class Converter {
+        @JS init() {}
+
+        @JS func format(value: Int) -> String {
+            return "formatted_\(value)"
+        }
+    }
+}
+
 @JS(namespace: "Services.Graph")
 enum GraphOperations {
     @JS static func createGraph(rootId: Int) -> Int {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.json
index f26bd3041..b519748d4 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.json
@@ -3,7 +3,7 @@
     "classes" : [
       {
         "constructor" : {
-          "abiName" : "bjs_Converter_init",
+          "abiName" : "bjs_Utils_Converter_init",
           "effects" : {
             "isAsync" : false,
             "isStatic" : false,
@@ -15,7 +15,7 @@
         },
         "methods" : [
           {
-            "abiName" : "bjs_Converter_toString",
+            "abiName" : "bjs_Utils_Converter_toString",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
@@ -66,7 +66,7 @@
       },
       {
         "constructor" : {
-          "abiName" : "bjs_HTTPServer_init",
+          "abiName" : "bjs_Networking_API_HTTPServer_init",
           "effects" : {
             "isAsync" : false,
             "isStatic" : false,
@@ -78,7 +78,7 @@
         },
         "methods" : [
           {
-            "abiName" : "bjs_HTTPServer_call",
+            "abiName" : "bjs_Networking_API_HTTPServer_call",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
@@ -119,7 +119,7 @@
       },
       {
         "constructor" : {
-          "abiName" : "bjs_TestServer_init",
+          "abiName" : "bjs_Networking_APIV2_Internal_TestServer_init",
           "effects" : {
             "isAsync" : false,
             "isStatic" : false,
@@ -131,7 +131,7 @@
         },
         "methods" : [
           {
-            "abiName" : "bjs_TestServer_call",
+            "abiName" : "bjs_Networking_APIV2_Internal_TestServer_call",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
@@ -171,6 +171,57 @@
 
         ],
         "swiftCallName" : "Internal.TestServer"
+      },
+      {
+        "constructor" : {
+          "abiName" : "bjs_Formatting_Converter_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+
+          ]
+        },
+        "methods" : [
+          {
+            "abiName" : "bjs_Formatting_Converter_format",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "format",
+            "namespace" : [
+              "Formatting"
+            ],
+            "parameters" : [
+              {
+                "label" : "value",
+                "name" : "value",
+                "type" : {
+                  "int" : {
+
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "name" : "Converter",
+        "namespace" : [
+          "Formatting"
+        ],
+        "properties" : [
+
+        ],
+        "swiftCallName" : "Formatting.Converter"
       }
     ],
     "enums" : [
@@ -417,6 +468,21 @@
       {
         "cases" : [
 
+        ],
+        "emitStyle" : "const",
+        "name" : "Formatting",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "Formatting",
+        "tsFullPath" : "Formatting"
+      },
+      {
+        "cases" : [
+
         ],
         "emitStyle" : "const",
         "name" : "GraphOperations",
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.swift
index f3d673a03..d4dfa57a9 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.Global.swift
@@ -129,9 +129,9 @@ public func _bjs_Services_Graph_GraphOperations_static_validate(_ graphId: Int32
     #endif
 }
 
-@_expose(wasm, "bjs_Converter_init")
-@_cdecl("bjs_Converter_init")
-public func _bjs_Converter_init() -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_Utils_Converter_init")
+@_cdecl("bjs_Utils_Converter_init")
+public func _bjs_Utils_Converter_init() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
     let ret = Utils.Converter()
     return ret.bridgeJSLowerReturn()
@@ -140,9 +140,9 @@ public func _bjs_Converter_init() -> UnsafeMutableRawPointer {
     #endif
 }
 
-@_expose(wasm, "bjs_Converter_toString")
-@_cdecl("bjs_Converter_toString")
-public func _bjs_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+@_expose(wasm, "bjs_Utils_Converter_toString")
+@_cdecl("bjs_Utils_Converter_toString")
+public func _bjs_Utils_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
     #if arch(wasm32)
     let ret = Utils.Converter.bridgeJSLiftParameter(_self).toString(value: Int.bridgeJSLiftParameter(value))
     return ret.bridgeJSLowerReturn()
@@ -151,9 +151,9 @@ public func _bjs_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: I
     #endif
 }
 
-@_expose(wasm, "bjs_Converter_precision_get")
-@_cdecl("bjs_Converter_precision_get")
-public func _bjs_Converter_precision_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
+@_expose(wasm, "bjs_Utils_Converter_precision_get")
+@_cdecl("bjs_Utils_Converter_precision_get")
+public func _bjs_Utils_Converter_precision_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
     let ret = Utils.Converter.bridgeJSLiftParameter(_self).precision
     return ret.bridgeJSLowerReturn()
@@ -162,9 +162,9 @@ public func _bjs_Converter_precision_get(_ _self: UnsafeMutableRawPointer) -> In
     #endif
 }
 
-@_expose(wasm, "bjs_Converter_precision_set")
-@_cdecl("bjs_Converter_precision_set")
-public func _bjs_Converter_precision_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+@_expose(wasm, "bjs_Utils_Converter_precision_set")
+@_cdecl("bjs_Utils_Converter_precision_set")
+public func _bjs_Utils_Converter_precision_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
     #if arch(wasm32)
     Utils.Converter.bridgeJSLiftParameter(_self).precision = Int.bridgeJSLiftParameter(value)
     #else
@@ -172,9 +172,9 @@ public func _bjs_Converter_precision_set(_ _self: UnsafeMutableRawPointer, _ val
     #endif
 }
 
-@_expose(wasm, "bjs_Converter_deinit")
-@_cdecl("bjs_Converter_deinit")
-public func _bjs_Converter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_Utils_Converter_deinit")
+@_cdecl("bjs_Utils_Converter_deinit")
+public func _bjs_Utils_Converter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     Unmanaged<Utils.Converter>.fromOpaque(pointer).release()
     #else
@@ -184,25 +184,25 @@ public func _bjs_Converter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
 
 extension Utils.Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject {
     var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_Converter_wrap(Unmanaged.passRetained(self).toOpaque()))))
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Utils_Converter_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "TestModule", name: "bjs_Converter_wrap")
-fileprivate func _bjs_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "TestModule", name: "bjs_Utils_Converter_wrap")
+fileprivate func _bjs_Utils_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func _bjs_Utils_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_Converter_wrap_extern(pointer)
+@inline(never) fileprivate func _bjs_Utils_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Utils_Converter_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_HTTPServer_init")
-@_cdecl("bjs_HTTPServer_init")
-public func _bjs_HTTPServer_init() -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_Networking_API_HTTPServer_init")
+@_cdecl("bjs_Networking_API_HTTPServer_init")
+public func _bjs_Networking_API_HTTPServer_init() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
     let ret = Networking.API.HTTPServer()
     return ret.bridgeJSLowerReturn()
@@ -211,9 +211,9 @@ public func _bjs_HTTPServer_init() -> UnsafeMutableRawPointer {
     #endif
 }
 
-@_expose(wasm, "bjs_HTTPServer_call")
-@_cdecl("bjs_HTTPServer_call")
-public func _bjs_HTTPServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void {
+@_expose(wasm, "bjs_Networking_API_HTTPServer_call")
+@_cdecl("bjs_Networking_API_HTTPServer_call")
+public func _bjs_Networking_API_HTTPServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void {
     #if arch(wasm32)
     Networking.API.HTTPServer.bridgeJSLiftParameter(_self).call(_: Networking.API.Method.bridgeJSLiftParameter(method))
     #else
@@ -221,9 +221,9 @@ public func _bjs_HTTPServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int
     #endif
 }
 
-@_expose(wasm, "bjs_HTTPServer_deinit")
-@_cdecl("bjs_HTTPServer_deinit")
-public func _bjs_HTTPServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_Networking_API_HTTPServer_deinit")
+@_cdecl("bjs_Networking_API_HTTPServer_deinit")
+public func _bjs_Networking_API_HTTPServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     Unmanaged<Networking.API.HTTPServer>.fromOpaque(pointer).release()
     #else
@@ -233,25 +233,25 @@ public func _bjs_HTTPServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
 
 extension Networking.API.HTTPServer: ConvertibleToJSValue, _BridgedSwiftHeapObject {
     var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_HTTPServer_wrap(Unmanaged.passRetained(self).toOpaque()))))
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Networking_API_HTTPServer_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "TestModule", name: "bjs_HTTPServer_wrap")
-fileprivate func _bjs_HTTPServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "TestModule", name: "bjs_Networking_API_HTTPServer_wrap")
+fileprivate func _bjs_Networking_API_HTTPServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_HTTPServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func _bjs_Networking_API_HTTPServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_HTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_HTTPServer_wrap_extern(pointer)
+@inline(never) fileprivate func _bjs_Networking_API_HTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Networking_API_HTTPServer_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_TestServer_init")
-@_cdecl("bjs_TestServer_init")
-public func _bjs_TestServer_init() -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_Networking_APIV2_Internal_TestServer_init")
+@_cdecl("bjs_Networking_APIV2_Internal_TestServer_init")
+public func _bjs_Networking_APIV2_Internal_TestServer_init() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
     let ret = Internal.TestServer()
     return ret.bridgeJSLowerReturn()
@@ -260,9 +260,9 @@ public func _bjs_TestServer_init() -> UnsafeMutableRawPointer {
     #endif
 }
 
-@_expose(wasm, "bjs_TestServer_call")
-@_cdecl("bjs_TestServer_call")
-public func _bjs_TestServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void {
+@_expose(wasm, "bjs_Networking_APIV2_Internal_TestServer_call")
+@_cdecl("bjs_Networking_APIV2_Internal_TestServer_call")
+public func _bjs_Networking_APIV2_Internal_TestServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void {
     #if arch(wasm32)
     Internal.TestServer.bridgeJSLiftParameter(_self).call(_: Internal.SupportedMethod.bridgeJSLiftParameter(method))
     #else
@@ -270,9 +270,9 @@ public func _bjs_TestServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int
     #endif
 }
 
-@_expose(wasm, "bjs_TestServer_deinit")
-@_cdecl("bjs_TestServer_deinit")
-public func _bjs_TestServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_Networking_APIV2_Internal_TestServer_deinit")
+@_cdecl("bjs_Networking_APIV2_Internal_TestServer_deinit")
+public func _bjs_Networking_APIV2_Internal_TestServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     Unmanaged<Internal.TestServer>.fromOpaque(pointer).release()
     #else
@@ -282,18 +282,68 @@ public func _bjs_TestServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
 
 extension Internal.TestServer: ConvertibleToJSValue, _BridgedSwiftHeapObject {
     var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_TestServer_wrap(Unmanaged.passRetained(self).toOpaque()))))
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Networking_APIV2_Internal_TestServer_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "TestModule", name: "bjs_TestServer_wrap")
-fileprivate func _bjs_TestServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "TestModule", name: "bjs_Networking_APIV2_Internal_TestServer_wrap")
+fileprivate func _bjs_Networking_APIV2_Internal_TestServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_TestServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func _bjs_Networking_APIV2_Internal_TestServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_TestServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_TestServer_wrap_extern(pointer)
+@inline(never) fileprivate func _bjs_Networking_APIV2_Internal_TestServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Networking_APIV2_Internal_TestServer_wrap_extern(pointer)
+}
+
+@_expose(wasm, "bjs_Formatting_Converter_init")
+@_cdecl("bjs_Formatting_Converter_init")
+public func _bjs_Formatting_Converter_init() -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = Formatting.Converter()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Formatting_Converter_format")
+@_cdecl("bjs_Formatting_Converter_format")
+public func _bjs_Formatting_Converter_format(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = Formatting.Converter.bridgeJSLiftParameter(_self).format(value: Int.bridgeJSLiftParameter(value))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Formatting_Converter_deinit")
+@_cdecl("bjs_Formatting_Converter_deinit")
+public func _bjs_Formatting_Converter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    Unmanaged<Formatting.Converter>.fromOpaque(pointer).release()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Formatting.Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Formatting_Converter_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_Formatting_Converter_wrap")
+fileprivate func _bjs_Formatting_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_Formatting_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_Formatting_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Formatting_Converter_wrap_extern(pointer)
 }
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.json
index a4ba27b8c..a468b2e2c 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.json
@@ -3,7 +3,7 @@
     "classes" : [
       {
         "constructor" : {
-          "abiName" : "bjs_Converter_init",
+          "abiName" : "bjs_Utils_Converter_init",
           "effects" : {
             "isAsync" : false,
             "isStatic" : false,
@@ -15,7 +15,7 @@
         },
         "methods" : [
           {
-            "abiName" : "bjs_Converter_toString",
+            "abiName" : "bjs_Utils_Converter_toString",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
@@ -66,7 +66,7 @@
       },
       {
         "constructor" : {
-          "abiName" : "bjs_HTTPServer_init",
+          "abiName" : "bjs_Networking_API_HTTPServer_init",
           "effects" : {
             "isAsync" : false,
             "isStatic" : false,
@@ -78,7 +78,7 @@
         },
         "methods" : [
           {
-            "abiName" : "bjs_HTTPServer_call",
+            "abiName" : "bjs_Networking_API_HTTPServer_call",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
@@ -119,7 +119,7 @@
       },
       {
         "constructor" : {
-          "abiName" : "bjs_TestServer_init",
+          "abiName" : "bjs_Networking_APIV2_Internal_TestServer_init",
           "effects" : {
             "isAsync" : false,
             "isStatic" : false,
@@ -131,7 +131,7 @@
         },
         "methods" : [
           {
-            "abiName" : "bjs_TestServer_call",
+            "abiName" : "bjs_Networking_APIV2_Internal_TestServer_call",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
@@ -171,6 +171,57 @@
 
         ],
         "swiftCallName" : "Internal.TestServer"
+      },
+      {
+        "constructor" : {
+          "abiName" : "bjs_Formatting_Converter_init",
+          "effects" : {
+            "isAsync" : false,
+            "isStatic" : false,
+            "isThrows" : false
+          },
+          "parameters" : [
+
+          ]
+        },
+        "methods" : [
+          {
+            "abiName" : "bjs_Formatting_Converter_format",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "format",
+            "namespace" : [
+              "Formatting"
+            ],
+            "parameters" : [
+              {
+                "label" : "value",
+                "name" : "value",
+                "type" : {
+                  "int" : {
+
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "string" : {
+
+              }
+            }
+          }
+        ],
+        "name" : "Converter",
+        "namespace" : [
+          "Formatting"
+        ],
+        "properties" : [
+
+        ],
+        "swiftCallName" : "Formatting.Converter"
       }
     ],
     "enums" : [
@@ -417,6 +468,21 @@
       {
         "cases" : [
 
+        ],
+        "emitStyle" : "const",
+        "name" : "Formatting",
+        "staticMethods" : [
+
+        ],
+        "staticProperties" : [
+
+        ],
+        "swiftCallName" : "Formatting",
+        "tsFullPath" : "Formatting"
+      },
+      {
+        "cases" : [
+
         ],
         "emitStyle" : "const",
         "name" : "GraphOperations",
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.swift
index f3d673a03..d4dfa57a9 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/EnumNamespace.swift
@@ -129,9 +129,9 @@ public func _bjs_Services_Graph_GraphOperations_static_validate(_ graphId: Int32
     #endif
 }
 
-@_expose(wasm, "bjs_Converter_init")
-@_cdecl("bjs_Converter_init")
-public func _bjs_Converter_init() -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_Utils_Converter_init")
+@_cdecl("bjs_Utils_Converter_init")
+public func _bjs_Utils_Converter_init() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
     let ret = Utils.Converter()
     return ret.bridgeJSLowerReturn()
@@ -140,9 +140,9 @@ public func _bjs_Converter_init() -> UnsafeMutableRawPointer {
     #endif
 }
 
-@_expose(wasm, "bjs_Converter_toString")
-@_cdecl("bjs_Converter_toString")
-public func _bjs_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+@_expose(wasm, "bjs_Utils_Converter_toString")
+@_cdecl("bjs_Utils_Converter_toString")
+public func _bjs_Utils_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
     #if arch(wasm32)
     let ret = Utils.Converter.bridgeJSLiftParameter(_self).toString(value: Int.bridgeJSLiftParameter(value))
     return ret.bridgeJSLowerReturn()
@@ -151,9 +151,9 @@ public func _bjs_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: I
     #endif
 }
 
-@_expose(wasm, "bjs_Converter_precision_get")
-@_cdecl("bjs_Converter_precision_get")
-public func _bjs_Converter_precision_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
+@_expose(wasm, "bjs_Utils_Converter_precision_get")
+@_cdecl("bjs_Utils_Converter_precision_get")
+public func _bjs_Utils_Converter_precision_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
     let ret = Utils.Converter.bridgeJSLiftParameter(_self).precision
     return ret.bridgeJSLowerReturn()
@@ -162,9 +162,9 @@ public func _bjs_Converter_precision_get(_ _self: UnsafeMutableRawPointer) -> In
     #endif
 }
 
-@_expose(wasm, "bjs_Converter_precision_set")
-@_cdecl("bjs_Converter_precision_set")
-public func _bjs_Converter_precision_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+@_expose(wasm, "bjs_Utils_Converter_precision_set")
+@_cdecl("bjs_Utils_Converter_precision_set")
+public func _bjs_Utils_Converter_precision_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
     #if arch(wasm32)
     Utils.Converter.bridgeJSLiftParameter(_self).precision = Int.bridgeJSLiftParameter(value)
     #else
@@ -172,9 +172,9 @@ public func _bjs_Converter_precision_set(_ _self: UnsafeMutableRawPointer, _ val
     #endif
 }
 
-@_expose(wasm, "bjs_Converter_deinit")
-@_cdecl("bjs_Converter_deinit")
-public func _bjs_Converter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_Utils_Converter_deinit")
+@_cdecl("bjs_Utils_Converter_deinit")
+public func _bjs_Utils_Converter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     Unmanaged<Utils.Converter>.fromOpaque(pointer).release()
     #else
@@ -184,25 +184,25 @@ public func _bjs_Converter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
 
 extension Utils.Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject {
     var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_Converter_wrap(Unmanaged.passRetained(self).toOpaque()))))
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Utils_Converter_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "TestModule", name: "bjs_Converter_wrap")
-fileprivate func _bjs_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "TestModule", name: "bjs_Utils_Converter_wrap")
+fileprivate func _bjs_Utils_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func _bjs_Utils_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_Converter_wrap_extern(pointer)
+@inline(never) fileprivate func _bjs_Utils_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Utils_Converter_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_HTTPServer_init")
-@_cdecl("bjs_HTTPServer_init")
-public func _bjs_HTTPServer_init() -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_Networking_API_HTTPServer_init")
+@_cdecl("bjs_Networking_API_HTTPServer_init")
+public func _bjs_Networking_API_HTTPServer_init() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
     let ret = Networking.API.HTTPServer()
     return ret.bridgeJSLowerReturn()
@@ -211,9 +211,9 @@ public func _bjs_HTTPServer_init() -> UnsafeMutableRawPointer {
     #endif
 }
 
-@_expose(wasm, "bjs_HTTPServer_call")
-@_cdecl("bjs_HTTPServer_call")
-public func _bjs_HTTPServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void {
+@_expose(wasm, "bjs_Networking_API_HTTPServer_call")
+@_cdecl("bjs_Networking_API_HTTPServer_call")
+public func _bjs_Networking_API_HTTPServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void {
     #if arch(wasm32)
     Networking.API.HTTPServer.bridgeJSLiftParameter(_self).call(_: Networking.API.Method.bridgeJSLiftParameter(method))
     #else
@@ -221,9 +221,9 @@ public func _bjs_HTTPServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int
     #endif
 }
 
-@_expose(wasm, "bjs_HTTPServer_deinit")
-@_cdecl("bjs_HTTPServer_deinit")
-public func _bjs_HTTPServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_Networking_API_HTTPServer_deinit")
+@_cdecl("bjs_Networking_API_HTTPServer_deinit")
+public func _bjs_Networking_API_HTTPServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     Unmanaged<Networking.API.HTTPServer>.fromOpaque(pointer).release()
     #else
@@ -233,25 +233,25 @@ public func _bjs_HTTPServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
 
 extension Networking.API.HTTPServer: ConvertibleToJSValue, _BridgedSwiftHeapObject {
     var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_HTTPServer_wrap(Unmanaged.passRetained(self).toOpaque()))))
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Networking_API_HTTPServer_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "TestModule", name: "bjs_HTTPServer_wrap")
-fileprivate func _bjs_HTTPServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "TestModule", name: "bjs_Networking_API_HTTPServer_wrap")
+fileprivate func _bjs_Networking_API_HTTPServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_HTTPServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func _bjs_Networking_API_HTTPServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_HTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_HTTPServer_wrap_extern(pointer)
+@inline(never) fileprivate func _bjs_Networking_API_HTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Networking_API_HTTPServer_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_TestServer_init")
-@_cdecl("bjs_TestServer_init")
-public func _bjs_TestServer_init() -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_Networking_APIV2_Internal_TestServer_init")
+@_cdecl("bjs_Networking_APIV2_Internal_TestServer_init")
+public func _bjs_Networking_APIV2_Internal_TestServer_init() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
     let ret = Internal.TestServer()
     return ret.bridgeJSLowerReturn()
@@ -260,9 +260,9 @@ public func _bjs_TestServer_init() -> UnsafeMutableRawPointer {
     #endif
 }
 
-@_expose(wasm, "bjs_TestServer_call")
-@_cdecl("bjs_TestServer_call")
-public func _bjs_TestServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void {
+@_expose(wasm, "bjs_Networking_APIV2_Internal_TestServer_call")
+@_cdecl("bjs_Networking_APIV2_Internal_TestServer_call")
+public func _bjs_Networking_APIV2_Internal_TestServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void {
     #if arch(wasm32)
     Internal.TestServer.bridgeJSLiftParameter(_self).call(_: Internal.SupportedMethod.bridgeJSLiftParameter(method))
     #else
@@ -270,9 +270,9 @@ public func _bjs_TestServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int
     #endif
 }
 
-@_expose(wasm, "bjs_TestServer_deinit")
-@_cdecl("bjs_TestServer_deinit")
-public func _bjs_TestServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_Networking_APIV2_Internal_TestServer_deinit")
+@_cdecl("bjs_Networking_APIV2_Internal_TestServer_deinit")
+public func _bjs_Networking_APIV2_Internal_TestServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     Unmanaged<Internal.TestServer>.fromOpaque(pointer).release()
     #else
@@ -282,18 +282,68 @@ public func _bjs_TestServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
 
 extension Internal.TestServer: ConvertibleToJSValue, _BridgedSwiftHeapObject {
     var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_TestServer_wrap(Unmanaged.passRetained(self).toOpaque()))))
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Networking_APIV2_Internal_TestServer_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "TestModule", name: "bjs_TestServer_wrap")
-fileprivate func _bjs_TestServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "TestModule", name: "bjs_Networking_APIV2_Internal_TestServer_wrap")
+fileprivate func _bjs_Networking_APIV2_Internal_TestServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_TestServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func _bjs_Networking_APIV2_Internal_TestServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_TestServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_TestServer_wrap_extern(pointer)
+@inline(never) fileprivate func _bjs_Networking_APIV2_Internal_TestServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Networking_APIV2_Internal_TestServer_wrap_extern(pointer)
+}
+
+@_expose(wasm, "bjs_Formatting_Converter_init")
+@_cdecl("bjs_Formatting_Converter_init")
+public func _bjs_Formatting_Converter_init() -> UnsafeMutableRawPointer {
+    #if arch(wasm32)
+    let ret = Formatting.Converter()
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Formatting_Converter_format")
+@_cdecl("bjs_Formatting_Converter_format")
+public func _bjs_Formatting_Converter_format(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = Formatting.Converter.bridgeJSLiftParameter(_self).format(value: Int.bridgeJSLiftParameter(value))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_Formatting_Converter_deinit")
+@_cdecl("bjs_Formatting_Converter_deinit")
+public func _bjs_Formatting_Converter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    Unmanaged<Formatting.Converter>.fromOpaque(pointer).release()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+extension Formatting.Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject {
+    var jsValue: JSValue {
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Formatting_Converter_wrap(Unmanaged.passRetained(self).toOpaque()))))
+    }
+}
+
+#if arch(wasm32)
+@_extern(wasm, module: "TestModule", name: "bjs_Formatting_Converter_wrap")
+fileprivate func _bjs_Formatting_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+#else
+fileprivate func _bjs_Formatting_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    fatalError("Only available on WebAssembly")
+}
+#endif
+@inline(never) fileprivate func _bjs_Formatting_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Formatting_Converter_wrap_extern(pointer)
 }
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedGlobal.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedGlobal.json
index 1241c232d..f140fd007 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedGlobal.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedGlobal.json
@@ -3,7 +3,7 @@
     "classes" : [
       {
         "constructor" : {
-          "abiName" : "bjs_GlobalClass_init",
+          "abiName" : "bjs_GlobalAPI_GlobalClass_init",
           "effects" : {
             "isAsync" : false,
             "isStatic" : false,
@@ -15,7 +15,7 @@
         },
         "methods" : [
           {
-            "abiName" : "bjs_GlobalClass_greet",
+            "abiName" : "bjs_GlobalAPI_GlobalClass_greet",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedGlobal.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedGlobal.swift
index 195a00fa1..802a09638 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedGlobal.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedGlobal.swift
@@ -9,9 +9,9 @@ public func _bjs_GlobalAPI_globalFunction() -> Void {
     #endif
 }
 
-@_expose(wasm, "bjs_GlobalClass_init")
-@_cdecl("bjs_GlobalClass_init")
-public func _bjs_GlobalClass_init() -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_GlobalAPI_GlobalClass_init")
+@_cdecl("bjs_GlobalAPI_GlobalClass_init")
+public func _bjs_GlobalAPI_GlobalClass_init() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
     let ret = GlobalClass()
     return ret.bridgeJSLowerReturn()
@@ -20,9 +20,9 @@ public func _bjs_GlobalClass_init() -> UnsafeMutableRawPointer {
     #endif
 }
 
-@_expose(wasm, "bjs_GlobalClass_greet")
-@_cdecl("bjs_GlobalClass_greet")
-public func _bjs_GlobalClass_greet(_ _self: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_GlobalAPI_GlobalClass_greet")
+@_cdecl("bjs_GlobalAPI_GlobalClass_greet")
+public func _bjs_GlobalAPI_GlobalClass_greet(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     let ret = GlobalClass.bridgeJSLiftParameter(_self).greet()
     return ret.bridgeJSLowerReturn()
@@ -31,9 +31,9 @@ public func _bjs_GlobalClass_greet(_ _self: UnsafeMutableRawPointer) -> Void {
     #endif
 }
 
-@_expose(wasm, "bjs_GlobalClass_deinit")
-@_cdecl("bjs_GlobalClass_deinit")
-public func _bjs_GlobalClass_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_GlobalAPI_GlobalClass_deinit")
+@_cdecl("bjs_GlobalAPI_GlobalClass_deinit")
+public func _bjs_GlobalAPI_GlobalClass_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     Unmanaged<GlobalClass>.fromOpaque(pointer).release()
     #else
@@ -43,18 +43,18 @@ public func _bjs_GlobalClass_deinit(_ pointer: UnsafeMutableRawPointer) -> Void
 
 extension GlobalClass: ConvertibleToJSValue, _BridgedSwiftHeapObject {
     var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_GlobalClass_wrap(Unmanaged.passRetained(self).toOpaque()))))
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_GlobalAPI_GlobalClass_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "TestModule", name: "bjs_GlobalClass_wrap")
-fileprivate func _bjs_GlobalClass_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "TestModule", name: "bjs_GlobalAPI_GlobalClass_wrap")
+fileprivate func _bjs_GlobalAPI_GlobalClass_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_GlobalClass_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func _bjs_GlobalAPI_GlobalClass_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_GlobalClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_GlobalClass_wrap_extern(pointer)
+@inline(never) fileprivate func _bjs_GlobalAPI_GlobalClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_GlobalAPI_GlobalClass_wrap_extern(pointer)
 }
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedPrivate.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedPrivate.json
index 96e188fd2..9e9dc445e 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedPrivate.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedPrivate.json
@@ -3,7 +3,7 @@
     "classes" : [
       {
         "constructor" : {
-          "abiName" : "bjs_PrivateClass_init",
+          "abiName" : "bjs_PrivateAPI_PrivateClass_init",
           "effects" : {
             "isAsync" : false,
             "isStatic" : false,
@@ -15,7 +15,7 @@
         },
         "methods" : [
           {
-            "abiName" : "bjs_PrivateClass_greet",
+            "abiName" : "bjs_PrivateAPI_PrivateClass_greet",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedPrivate.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedPrivate.swift
index 6112dd3e4..50dc9e778 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedPrivate.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/MixedPrivate.swift
@@ -9,9 +9,9 @@ public func _bjs_PrivateAPI_privateFunction() -> Void {
     #endif
 }
 
-@_expose(wasm, "bjs_PrivateClass_init")
-@_cdecl("bjs_PrivateClass_init")
-public func _bjs_PrivateClass_init() -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_PrivateAPI_PrivateClass_init")
+@_cdecl("bjs_PrivateAPI_PrivateClass_init")
+public func _bjs_PrivateAPI_PrivateClass_init() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
     let ret = PrivateClass()
     return ret.bridgeJSLowerReturn()
@@ -20,9 +20,9 @@ public func _bjs_PrivateClass_init() -> UnsafeMutableRawPointer {
     #endif
 }
 
-@_expose(wasm, "bjs_PrivateClass_greet")
-@_cdecl("bjs_PrivateClass_greet")
-public func _bjs_PrivateClass_greet(_ _self: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_PrivateAPI_PrivateClass_greet")
+@_cdecl("bjs_PrivateAPI_PrivateClass_greet")
+public func _bjs_PrivateAPI_PrivateClass_greet(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     let ret = PrivateClass.bridgeJSLiftParameter(_self).greet()
     return ret.bridgeJSLowerReturn()
@@ -31,9 +31,9 @@ public func _bjs_PrivateClass_greet(_ _self: UnsafeMutableRawPointer) -> Void {
     #endif
 }
 
-@_expose(wasm, "bjs_PrivateClass_deinit")
-@_cdecl("bjs_PrivateClass_deinit")
-public func _bjs_PrivateClass_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_PrivateAPI_PrivateClass_deinit")
+@_cdecl("bjs_PrivateAPI_PrivateClass_deinit")
+public func _bjs_PrivateAPI_PrivateClass_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     Unmanaged<PrivateClass>.fromOpaque(pointer).release()
     #else
@@ -43,18 +43,18 @@ public func _bjs_PrivateClass_deinit(_ pointer: UnsafeMutableRawPointer) -> Void
 
 extension PrivateClass: ConvertibleToJSValue, _BridgedSwiftHeapObject {
     var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_PrivateClass_wrap(Unmanaged.passRetained(self).toOpaque()))))
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_PrivateAPI_PrivateClass_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "TestModule", name: "bjs_PrivateClass_wrap")
-fileprivate func _bjs_PrivateClass_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "TestModule", name: "bjs_PrivateAPI_PrivateClass_wrap")
+fileprivate func _bjs_PrivateAPI_PrivateClass_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_PrivateClass_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func _bjs_PrivateAPI_PrivateClass_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_PrivateClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_PrivateClass_wrap_extern(pointer)
+@inline(never) fileprivate func _bjs_PrivateAPI_PrivateClass_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_PrivateAPI_PrivateClass_wrap_extern(pointer)
 }
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.json
index 0ef46ac72..29cbddeb7 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.json
@@ -3,7 +3,7 @@
     "classes" : [
       {
         "constructor" : {
-          "abiName" : "bjs_Greeter_init",
+          "abiName" : "bjs___Swift_Foundation_Greeter_init",
           "effects" : {
             "isAsync" : false,
             "isStatic" : false,
@@ -23,7 +23,7 @@
         },
         "methods" : [
           {
-            "abiName" : "bjs_Greeter_greet",
+            "abiName" : "bjs___Swift_Foundation_Greeter_greet",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
@@ -52,7 +52,7 @@
       },
       {
         "constructor" : {
-          "abiName" : "bjs_Converter_init",
+          "abiName" : "bjs_Utils_Converters_Converter_init",
           "effects" : {
             "isAsync" : false,
             "isStatic" : false,
@@ -64,7 +64,7 @@
         },
         "methods" : [
           {
-            "abiName" : "bjs_Converter_toString",
+            "abiName" : "bjs_Utils_Converters_Converter_toString",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
@@ -102,7 +102,7 @@
       {
         "methods" : [
           {
-            "abiName" : "bjs_UUID_uuidString",
+            "abiName" : "bjs___Swift_Foundation_UUID_uuidString",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
@@ -131,7 +131,7 @@
       },
       {
         "constructor" : {
-          "abiName" : "bjs_Container_init",
+          "abiName" : "bjs_Collections_Container_init",
           "effects" : {
             "isAsync" : false,
             "isStatic" : false,
@@ -143,7 +143,7 @@
         },
         "methods" : [
           {
-            "abiName" : "bjs_Container_getItems",
+            "abiName" : "bjs_Collections_Container_getItems",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
@@ -164,7 +164,7 @@
             }
           },
           {
-            "abiName" : "bjs_Container_addItem",
+            "abiName" : "bjs_Collections_Container_addItem",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.swift
index 4b9ecd10a..d376a2a54 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.Global.swift
@@ -20,9 +20,9 @@ public func _bjs_MyModule_Utils_namespacedFunction() -> Void {
     #endif
 }
 
-@_expose(wasm, "bjs_Greeter_init")
-@_cdecl("bjs_Greeter_init")
-public func _bjs_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs___Swift_Foundation_Greeter_init")
+@_cdecl("bjs___Swift_Foundation_Greeter_init")
+public func _bjs___Swift_Foundation_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer {
     #if arch(wasm32)
     let ret = Greeter(name: String.bridgeJSLiftParameter(nameBytes, nameLength))
     return ret.bridgeJSLowerReturn()
@@ -31,9 +31,9 @@ public func _bjs_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> Unsafe
     #endif
 }
 
-@_expose(wasm, "bjs_Greeter_greet")
-@_cdecl("bjs_Greeter_greet")
-public func _bjs_Greeter_greet(_ _self: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs___Swift_Foundation_Greeter_greet")
+@_cdecl("bjs___Swift_Foundation_Greeter_greet")
+public func _bjs___Swift_Foundation_Greeter_greet(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     let ret = Greeter.bridgeJSLiftParameter(_self).greet()
     return ret.bridgeJSLowerReturn()
@@ -42,9 +42,9 @@ public func _bjs_Greeter_greet(_ _self: UnsafeMutableRawPointer) -> Void {
     #endif
 }
 
-@_expose(wasm, "bjs_Greeter_deinit")
-@_cdecl("bjs_Greeter_deinit")
-public func _bjs_Greeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs___Swift_Foundation_Greeter_deinit")
+@_cdecl("bjs___Swift_Foundation_Greeter_deinit")
+public func _bjs___Swift_Foundation_Greeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     Unmanaged<Greeter>.fromOpaque(pointer).release()
     #else
@@ -54,25 +54,25 @@ public func _bjs_Greeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
 
 extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject {
     var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_Greeter_wrap(Unmanaged.passRetained(self).toOpaque()))))
+        return .object(JSObject(id: UInt32(bitPattern: _bjs___Swift_Foundation_Greeter_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "TestModule", name: "bjs_Greeter_wrap")
-fileprivate func _bjs_Greeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "TestModule", name: "bjs___Swift_Foundation_Greeter_wrap")
+fileprivate func _bjs___Swift_Foundation_Greeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_Greeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func _bjs___Swift_Foundation_Greeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_Greeter_wrap_extern(pointer)
+@inline(never) fileprivate func _bjs___Swift_Foundation_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs___Swift_Foundation_Greeter_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_Converter_init")
-@_cdecl("bjs_Converter_init")
-public func _bjs_Converter_init() -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_Utils_Converters_Converter_init")
+@_cdecl("bjs_Utils_Converters_Converter_init")
+public func _bjs_Utils_Converters_Converter_init() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
     let ret = Converter()
     return ret.bridgeJSLowerReturn()
@@ -81,9 +81,9 @@ public func _bjs_Converter_init() -> UnsafeMutableRawPointer {
     #endif
 }
 
-@_expose(wasm, "bjs_Converter_toString")
-@_cdecl("bjs_Converter_toString")
-public func _bjs_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+@_expose(wasm, "bjs_Utils_Converters_Converter_toString")
+@_cdecl("bjs_Utils_Converters_Converter_toString")
+public func _bjs_Utils_Converters_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
     #if arch(wasm32)
     let ret = Converter.bridgeJSLiftParameter(_self).toString(value: Int.bridgeJSLiftParameter(value))
     return ret.bridgeJSLowerReturn()
@@ -92,9 +92,9 @@ public func _bjs_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: I
     #endif
 }
 
-@_expose(wasm, "bjs_Converter_deinit")
-@_cdecl("bjs_Converter_deinit")
-public func _bjs_Converter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_Utils_Converters_Converter_deinit")
+@_cdecl("bjs_Utils_Converters_Converter_deinit")
+public func _bjs_Utils_Converters_Converter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     Unmanaged<Converter>.fromOpaque(pointer).release()
     #else
@@ -104,25 +104,25 @@ public func _bjs_Converter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
 
 extension Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject {
     var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_Converter_wrap(Unmanaged.passRetained(self).toOpaque()))))
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Utils_Converters_Converter_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "TestModule", name: "bjs_Converter_wrap")
-fileprivate func _bjs_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "TestModule", name: "bjs_Utils_Converters_Converter_wrap")
+fileprivate func _bjs_Utils_Converters_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func _bjs_Utils_Converters_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_Converter_wrap_extern(pointer)
+@inline(never) fileprivate func _bjs_Utils_Converters_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Utils_Converters_Converter_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_UUID_uuidString")
-@_cdecl("bjs_UUID_uuidString")
-public func _bjs_UUID_uuidString(_ _self: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs___Swift_Foundation_UUID_uuidString")
+@_cdecl("bjs___Swift_Foundation_UUID_uuidString")
+public func _bjs___Swift_Foundation_UUID_uuidString(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     let ret = UUID.bridgeJSLiftParameter(_self).uuidString()
     return ret.bridgeJSLowerReturn()
@@ -131,9 +131,9 @@ public func _bjs_UUID_uuidString(_ _self: UnsafeMutableRawPointer) -> Void {
     #endif
 }
 
-@_expose(wasm, "bjs_UUID_deinit")
-@_cdecl("bjs_UUID_deinit")
-public func _bjs_UUID_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs___Swift_Foundation_UUID_deinit")
+@_cdecl("bjs___Swift_Foundation_UUID_deinit")
+public func _bjs___Swift_Foundation_UUID_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     Unmanaged<UUID>.fromOpaque(pointer).release()
     #else
@@ -143,25 +143,25 @@ public func _bjs_UUID_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
 
 extension UUID: ConvertibleToJSValue, _BridgedSwiftHeapObject {
     var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_UUID_wrap(Unmanaged.passRetained(self).toOpaque()))))
+        return .object(JSObject(id: UInt32(bitPattern: _bjs___Swift_Foundation_UUID_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "TestModule", name: "bjs_UUID_wrap")
-fileprivate func _bjs_UUID_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "TestModule", name: "bjs___Swift_Foundation_UUID_wrap")
+fileprivate func _bjs___Swift_Foundation_UUID_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_UUID_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func _bjs___Swift_Foundation_UUID_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_UUID_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_UUID_wrap_extern(pointer)
+@inline(never) fileprivate func _bjs___Swift_Foundation_UUID_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs___Swift_Foundation_UUID_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_Container_init")
-@_cdecl("bjs_Container_init")
-public func _bjs_Container_init() -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_Collections_Container_init")
+@_cdecl("bjs_Collections_Container_init")
+public func _bjs_Collections_Container_init() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
     let ret = Container()
     return ret.bridgeJSLowerReturn()
@@ -170,9 +170,9 @@ public func _bjs_Container_init() -> UnsafeMutableRawPointer {
     #endif
 }
 
-@_expose(wasm, "bjs_Container_getItems")
-@_cdecl("bjs_Container_getItems")
-public func _bjs_Container_getItems(_ _self: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_Collections_Container_getItems")
+@_cdecl("bjs_Collections_Container_getItems")
+public func _bjs_Collections_Container_getItems(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     let ret = Container.bridgeJSLiftParameter(_self).getItems()
     ret.bridgeJSStackPush()
@@ -181,9 +181,9 @@ public func _bjs_Container_getItems(_ _self: UnsafeMutableRawPointer) -> Void {
     #endif
 }
 
-@_expose(wasm, "bjs_Container_addItem")
-@_cdecl("bjs_Container_addItem")
-public func _bjs_Container_addItem(_ _self: UnsafeMutableRawPointer, _ item: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_Collections_Container_addItem")
+@_cdecl("bjs_Collections_Container_addItem")
+public func _bjs_Collections_Container_addItem(_ _self: UnsafeMutableRawPointer, _ item: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     Container.bridgeJSLiftParameter(_self).addItem(_: Greeter.bridgeJSLiftParameter(item))
     #else
@@ -191,9 +191,9 @@ public func _bjs_Container_addItem(_ _self: UnsafeMutableRawPointer, _ item: Uns
     #endif
 }
 
-@_expose(wasm, "bjs_Container_deinit")
-@_cdecl("bjs_Container_deinit")
-public func _bjs_Container_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_Collections_Container_deinit")
+@_cdecl("bjs_Collections_Container_deinit")
+public func _bjs_Collections_Container_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     Unmanaged<Container>.fromOpaque(pointer).release()
     #else
@@ -203,18 +203,18 @@ public func _bjs_Container_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
 
 extension Container: ConvertibleToJSValue, _BridgedSwiftHeapObject {
     var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_Container_wrap(Unmanaged.passRetained(self).toOpaque()))))
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Collections_Container_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "TestModule", name: "bjs_Container_wrap")
-fileprivate func _bjs_Container_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "TestModule", name: "bjs_Collections_Container_wrap")
+fileprivate func _bjs_Collections_Container_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_Container_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func _bjs_Collections_Container_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_Container_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_Container_wrap_extern(pointer)
+@inline(never) fileprivate func _bjs_Collections_Container_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Collections_Container_wrap_extern(pointer)
 }
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.json b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.json
index 1bca1dc5d..619fe0689 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.json
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.json
@@ -3,7 +3,7 @@
     "classes" : [
       {
         "constructor" : {
-          "abiName" : "bjs_Greeter_init",
+          "abiName" : "bjs___Swift_Foundation_Greeter_init",
           "effects" : {
             "isAsync" : false,
             "isStatic" : false,
@@ -23,7 +23,7 @@
         },
         "methods" : [
           {
-            "abiName" : "bjs_Greeter_greet",
+            "abiName" : "bjs___Swift_Foundation_Greeter_greet",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
@@ -52,7 +52,7 @@
       },
       {
         "constructor" : {
-          "abiName" : "bjs_Converter_init",
+          "abiName" : "bjs_Utils_Converters_Converter_init",
           "effects" : {
             "isAsync" : false,
             "isStatic" : false,
@@ -64,7 +64,7 @@
         },
         "methods" : [
           {
-            "abiName" : "bjs_Converter_toString",
+            "abiName" : "bjs_Utils_Converters_Converter_toString",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
@@ -102,7 +102,7 @@
       {
         "methods" : [
           {
-            "abiName" : "bjs_UUID_uuidString",
+            "abiName" : "bjs___Swift_Foundation_UUID_uuidString",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
@@ -131,7 +131,7 @@
       },
       {
         "constructor" : {
-          "abiName" : "bjs_Container_init",
+          "abiName" : "bjs_Collections_Container_init",
           "effects" : {
             "isAsync" : false,
             "isStatic" : false,
@@ -143,7 +143,7 @@
         },
         "methods" : [
           {
-            "abiName" : "bjs_Container_getItems",
+            "abiName" : "bjs_Collections_Container_getItems",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
@@ -164,7 +164,7 @@
             }
           },
           {
-            "abiName" : "bjs_Container_addItem",
+            "abiName" : "bjs_Collections_Container_addItem",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.swift b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.swift
index 4b9ecd10a..d376a2a54 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.swift
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/Namespaces.swift
@@ -20,9 +20,9 @@ public func _bjs_MyModule_Utils_namespacedFunction() -> Void {
     #endif
 }
 
-@_expose(wasm, "bjs_Greeter_init")
-@_cdecl("bjs_Greeter_init")
-public func _bjs_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs___Swift_Foundation_Greeter_init")
+@_cdecl("bjs___Swift_Foundation_Greeter_init")
+public func _bjs___Swift_Foundation_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> UnsafeMutableRawPointer {
     #if arch(wasm32)
     let ret = Greeter(name: String.bridgeJSLiftParameter(nameBytes, nameLength))
     return ret.bridgeJSLowerReturn()
@@ -31,9 +31,9 @@ public func _bjs_Greeter_init(_ nameBytes: Int32, _ nameLength: Int32) -> Unsafe
     #endif
 }
 
-@_expose(wasm, "bjs_Greeter_greet")
-@_cdecl("bjs_Greeter_greet")
-public func _bjs_Greeter_greet(_ _self: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs___Swift_Foundation_Greeter_greet")
+@_cdecl("bjs___Swift_Foundation_Greeter_greet")
+public func _bjs___Swift_Foundation_Greeter_greet(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     let ret = Greeter.bridgeJSLiftParameter(_self).greet()
     return ret.bridgeJSLowerReturn()
@@ -42,9 +42,9 @@ public func _bjs_Greeter_greet(_ _self: UnsafeMutableRawPointer) -> Void {
     #endif
 }
 
-@_expose(wasm, "bjs_Greeter_deinit")
-@_cdecl("bjs_Greeter_deinit")
-public func _bjs_Greeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs___Swift_Foundation_Greeter_deinit")
+@_cdecl("bjs___Swift_Foundation_Greeter_deinit")
+public func _bjs___Swift_Foundation_Greeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     Unmanaged<Greeter>.fromOpaque(pointer).release()
     #else
@@ -54,25 +54,25 @@ public func _bjs_Greeter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
 
 extension Greeter: ConvertibleToJSValue, _BridgedSwiftHeapObject {
     var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_Greeter_wrap(Unmanaged.passRetained(self).toOpaque()))))
+        return .object(JSObject(id: UInt32(bitPattern: _bjs___Swift_Foundation_Greeter_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "TestModule", name: "bjs_Greeter_wrap")
-fileprivate func _bjs_Greeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "TestModule", name: "bjs___Swift_Foundation_Greeter_wrap")
+fileprivate func _bjs___Swift_Foundation_Greeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_Greeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func _bjs___Swift_Foundation_Greeter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_Greeter_wrap_extern(pointer)
+@inline(never) fileprivate func _bjs___Swift_Foundation_Greeter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs___Swift_Foundation_Greeter_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_Converter_init")
-@_cdecl("bjs_Converter_init")
-public func _bjs_Converter_init() -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_Utils_Converters_Converter_init")
+@_cdecl("bjs_Utils_Converters_Converter_init")
+public func _bjs_Utils_Converters_Converter_init() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
     let ret = Converter()
     return ret.bridgeJSLowerReturn()
@@ -81,9 +81,9 @@ public func _bjs_Converter_init() -> UnsafeMutableRawPointer {
     #endif
 }
 
-@_expose(wasm, "bjs_Converter_toString")
-@_cdecl("bjs_Converter_toString")
-public func _bjs_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+@_expose(wasm, "bjs_Utils_Converters_Converter_toString")
+@_cdecl("bjs_Utils_Converters_Converter_toString")
+public func _bjs_Utils_Converters_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
     #if arch(wasm32)
     let ret = Converter.bridgeJSLiftParameter(_self).toString(value: Int.bridgeJSLiftParameter(value))
     return ret.bridgeJSLowerReturn()
@@ -92,9 +92,9 @@ public func _bjs_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: I
     #endif
 }
 
-@_expose(wasm, "bjs_Converter_deinit")
-@_cdecl("bjs_Converter_deinit")
-public func _bjs_Converter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_Utils_Converters_Converter_deinit")
+@_cdecl("bjs_Utils_Converters_Converter_deinit")
+public func _bjs_Utils_Converters_Converter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     Unmanaged<Converter>.fromOpaque(pointer).release()
     #else
@@ -104,25 +104,25 @@ public func _bjs_Converter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
 
 extension Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject {
     var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_Converter_wrap(Unmanaged.passRetained(self).toOpaque()))))
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Utils_Converters_Converter_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "TestModule", name: "bjs_Converter_wrap")
-fileprivate func _bjs_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "TestModule", name: "bjs_Utils_Converters_Converter_wrap")
+fileprivate func _bjs_Utils_Converters_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func _bjs_Utils_Converters_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_Converter_wrap_extern(pointer)
+@inline(never) fileprivate func _bjs_Utils_Converters_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Utils_Converters_Converter_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_UUID_uuidString")
-@_cdecl("bjs_UUID_uuidString")
-public func _bjs_UUID_uuidString(_ _self: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs___Swift_Foundation_UUID_uuidString")
+@_cdecl("bjs___Swift_Foundation_UUID_uuidString")
+public func _bjs___Swift_Foundation_UUID_uuidString(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     let ret = UUID.bridgeJSLiftParameter(_self).uuidString()
     return ret.bridgeJSLowerReturn()
@@ -131,9 +131,9 @@ public func _bjs_UUID_uuidString(_ _self: UnsafeMutableRawPointer) -> Void {
     #endif
 }
 
-@_expose(wasm, "bjs_UUID_deinit")
-@_cdecl("bjs_UUID_deinit")
-public func _bjs_UUID_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs___Swift_Foundation_UUID_deinit")
+@_cdecl("bjs___Swift_Foundation_UUID_deinit")
+public func _bjs___Swift_Foundation_UUID_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     Unmanaged<UUID>.fromOpaque(pointer).release()
     #else
@@ -143,25 +143,25 @@ public func _bjs_UUID_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
 
 extension UUID: ConvertibleToJSValue, _BridgedSwiftHeapObject {
     var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_UUID_wrap(Unmanaged.passRetained(self).toOpaque()))))
+        return .object(JSObject(id: UInt32(bitPattern: _bjs___Swift_Foundation_UUID_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "TestModule", name: "bjs_UUID_wrap")
-fileprivate func _bjs_UUID_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "TestModule", name: "bjs___Swift_Foundation_UUID_wrap")
+fileprivate func _bjs___Swift_Foundation_UUID_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_UUID_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func _bjs___Swift_Foundation_UUID_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_UUID_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_UUID_wrap_extern(pointer)
+@inline(never) fileprivate func _bjs___Swift_Foundation_UUID_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs___Swift_Foundation_UUID_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_Container_init")
-@_cdecl("bjs_Container_init")
-public func _bjs_Container_init() -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_Collections_Container_init")
+@_cdecl("bjs_Collections_Container_init")
+public func _bjs_Collections_Container_init() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
     let ret = Container()
     return ret.bridgeJSLowerReturn()
@@ -170,9 +170,9 @@ public func _bjs_Container_init() -> UnsafeMutableRawPointer {
     #endif
 }
 
-@_expose(wasm, "bjs_Container_getItems")
-@_cdecl("bjs_Container_getItems")
-public func _bjs_Container_getItems(_ _self: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_Collections_Container_getItems")
+@_cdecl("bjs_Collections_Container_getItems")
+public func _bjs_Collections_Container_getItems(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     let ret = Container.bridgeJSLiftParameter(_self).getItems()
     ret.bridgeJSStackPush()
@@ -181,9 +181,9 @@ public func _bjs_Container_getItems(_ _self: UnsafeMutableRawPointer) -> Void {
     #endif
 }
 
-@_expose(wasm, "bjs_Container_addItem")
-@_cdecl("bjs_Container_addItem")
-public func _bjs_Container_addItem(_ _self: UnsafeMutableRawPointer, _ item: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_Collections_Container_addItem")
+@_cdecl("bjs_Collections_Container_addItem")
+public func _bjs_Collections_Container_addItem(_ _self: UnsafeMutableRawPointer, _ item: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     Container.bridgeJSLiftParameter(_self).addItem(_: Greeter.bridgeJSLiftParameter(item))
     #else
@@ -191,9 +191,9 @@ public func _bjs_Container_addItem(_ _self: UnsafeMutableRawPointer, _ item: Uns
     #endif
 }
 
-@_expose(wasm, "bjs_Container_deinit")
-@_cdecl("bjs_Container_deinit")
-public func _bjs_Container_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_Collections_Container_deinit")
+@_cdecl("bjs_Collections_Container_deinit")
+public func _bjs_Collections_Container_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     Unmanaged<Container>.fromOpaque(pointer).release()
     #else
@@ -203,18 +203,18 @@ public func _bjs_Container_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
 
 extension Container: ConvertibleToJSValue, _BridgedSwiftHeapObject {
     var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_Container_wrap(Unmanaged.passRetained(self).toOpaque()))))
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Collections_Container_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "TestModule", name: "bjs_Container_wrap")
-fileprivate func _bjs_Container_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "TestModule", name: "bjs_Collections_Container_wrap")
+fileprivate func _bjs_Collections_Container_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_Container_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func _bjs_Collections_Container_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_Container_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_Container_wrap_extern(pointer)
+@inline(never) fileprivate func _bjs_Collections_Container_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Collections_Container_wrap_extern(pointer)
 }
\ No newline at end of file
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.d.ts
index 17ac74a82..936ae6b3a 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.d.ts
@@ -30,6 +30,12 @@ declare global {
         };
         type PortTag = typeof PortValues[keyof typeof PortValues];
     }
+    namespace Formatting {
+        class Converter {
+            constructor();
+            format(value: number): string;
+        }
+    }
     namespace Networking {
         namespace API {
             class HTTPServer {
@@ -92,11 +98,19 @@ export interface HTTPServer extends SwiftHeapObject {
 export interface TestServer extends SwiftHeapObject {
     call(method: Networking.APIV2.Internal.SupportedMethodTag): void;
 }
+export interface Converter extends SwiftHeapObject {
+    format(value: number): string;
+}
 export type Exports = {
     Configuration: {
         LogLevel: LogLevelObject
         Port: PortObject
     },
+    Formatting: {
+        Converter: {
+            new(): Converter;
+        }
+    },
     Networking: {
         API: {
             HTTPServer: {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js
index f39031341..7c3166d36 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.js
@@ -232,15 +232,19 @@ export async function createInstantiator(options, swift) {
             if (!importObject["TestModule"]) {
                 importObject["TestModule"] = {};
             }
-            importObject["TestModule"]["bjs_Converter_wrap"] = function(pointer) {
+            importObject["TestModule"]["bjs_Utils_Converter_wrap"] = function(pointer) {
                 const obj = _exports.Utils.Converter.__construct(pointer);
                 return swift.memory.retain(obj);
             };
-            importObject["TestModule"]["bjs_HTTPServer_wrap"] = function(pointer) {
+            importObject["TestModule"]["bjs_Formatting_Converter_wrap"] = function(pointer) {
+                const obj = _exports.Formatting.Converter.__construct(pointer);
+                return swift.memory.retain(obj);
+            };
+            importObject["TestModule"]["bjs_Networking_API_HTTPServer_wrap"] = function(pointer) {
                 const obj = _exports.Networking.API.HTTPServer.__construct(pointer);
                 return swift.memory.retain(obj);
             };
-            importObject["TestModule"]["bjs_TestServer_wrap"] = function(pointer) {
+            importObject["TestModule"]["bjs_Networking_APIV2_Internal_TestServer_wrap"] = function(pointer) {
                 const obj = _exports.Networking.APIV2.Internal.TestServer.__construct(pointer);
                 return swift.memory.retain(obj);
             };
@@ -287,56 +291,75 @@ export async function createInstantiator(options, swift) {
             }
             class Converter extends SwiftHeapObject {
                 static __construct(ptr) {
-                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Converter_deinit, Converter.prototype);
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Utils_Converter_deinit, Converter.prototype);
                 }
 
                 constructor() {
-                    const ret = instance.exports.bjs_Converter_init();
+                    const ret = instance.exports.bjs_Utils_Converter_init();
                     return Converter.__construct(ret);
                 }
                 toString(value) {
-                    instance.exports.bjs_Converter_toString(this.pointer, value);
+                    instance.exports.bjs_Utils_Converter_toString(this.pointer, value);
                     const ret = tmpRetString;
                     tmpRetString = undefined;
                     return ret;
                 }
                 get precision() {
-                    const ret = instance.exports.bjs_Converter_precision_get(this.pointer);
+                    const ret = instance.exports.bjs_Utils_Converter_precision_get(this.pointer);
                     return ret;
                 }
                 set precision(value) {
-                    instance.exports.bjs_Converter_precision_set(this.pointer, value);
+                    instance.exports.bjs_Utils_Converter_precision_set(this.pointer, value);
                 }
             }
             class HTTPServer extends SwiftHeapObject {
                 static __construct(ptr) {
-                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_HTTPServer_deinit, HTTPServer.prototype);
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Networking_API_HTTPServer_deinit, HTTPServer.prototype);
                 }
 
                 constructor() {
-                    const ret = instance.exports.bjs_HTTPServer_init();
+                    const ret = instance.exports.bjs_Networking_API_HTTPServer_init();
                     return HTTPServer.__construct(ret);
                 }
                 call(method) {
-                    instance.exports.bjs_HTTPServer_call(this.pointer, method);
+                    instance.exports.bjs_Networking_API_HTTPServer_call(this.pointer, method);
                 }
             }
             class TestServer extends SwiftHeapObject {
                 static __construct(ptr) {
-                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_TestServer_deinit, TestServer.prototype);
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Networking_APIV2_Internal_TestServer_deinit, TestServer.prototype);
                 }
 
                 constructor() {
-                    const ret = instance.exports.bjs_TestServer_init();
+                    const ret = instance.exports.bjs_Networking_APIV2_Internal_TestServer_init();
                     return TestServer.__construct(ret);
                 }
                 call(method) {
-                    instance.exports.bjs_TestServer_call(this.pointer, method);
+                    instance.exports.bjs_Networking_APIV2_Internal_TestServer_call(this.pointer, method);
+                }
+            }
+            class Converter extends SwiftHeapObject {
+                static __construct(ptr) {
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Formatting_Converter_deinit, Converter.prototype);
+                }
+
+                constructor() {
+                    const ret = instance.exports.bjs_Formatting_Converter_init();
+                    return Converter.__construct(ret);
+                }
+                format(value) {
+                    instance.exports.bjs_Formatting_Converter_format(this.pointer, value);
+                    const ret = tmpRetString;
+                    tmpRetString = undefined;
+                    return ret;
                 }
             }
             if (typeof globalThis.Configuration === 'undefined') {
                 globalThis.Configuration = {};
             }
+            if (typeof globalThis.Formatting === 'undefined') {
+                globalThis.Formatting = {};
+            }
             if (typeof globalThis.Networking === 'undefined') {
                 globalThis.Networking = {};
             }
@@ -366,6 +389,9 @@ export async function createInstantiator(options, swift) {
                     LogLevel: LogLevelValues,
                     Port: PortValues,
                 },
+                Formatting: {
+                    Converter,
+                },
                 Networking: {
                     API: {
                         HTTPServer,
@@ -410,6 +436,7 @@ export async function createInstantiator(options, swift) {
             globalThis.Utils.Converter = exports.Utils.Converter;
             globalThis.Networking.API.HTTPServer = exports.Networking.API.HTTPServer;
             globalThis.Networking.APIV2.Internal.TestServer = exports.Networking.APIV2.Internal.TestServer;
+            globalThis.Formatting.Converter = exports.Formatting.Converter;
             globalThis.Services.Graph.GraphOperations.createGraph = exports.Services.Graph.GraphOperations.createGraph;
             globalThis.Services.Graph.GraphOperations.nodeCount = exports.Services.Graph.GraphOperations.nodeCount;
             globalThis.Services.Graph.GraphOperations.validate = exports.Services.Graph.GraphOperations.validate;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.d.ts b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.d.ts
index bc8e1601d..23d872d27 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.d.ts
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.d.ts
@@ -64,11 +64,19 @@ export interface HTTPServer extends SwiftHeapObject {
 export interface TestServer extends SwiftHeapObject {
     call(method: Networking.APIV2.Internal.SupportedMethodTag): void;
 }
+export interface Converter extends SwiftHeapObject {
+    format(value: number): string;
+}
 export type Exports = {
     Configuration: {
         LogLevel: LogLevelObject
         Port: PortObject
     },
+    Formatting: {
+        Converter: {
+            new(): Converter;
+        }
+    },
     Networking: {
         API: {
             HTTPServer: {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js
index effa7feec..6eea84ffa 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.js
@@ -213,15 +213,19 @@ export async function createInstantiator(options, swift) {
             if (!importObject["TestModule"]) {
                 importObject["TestModule"] = {};
             }
-            importObject["TestModule"]["bjs_Converter_wrap"] = function(pointer) {
+            importObject["TestModule"]["bjs_Utils_Converter_wrap"] = function(pointer) {
                 const obj = _exports.Utils.Converter.__construct(pointer);
                 return swift.memory.retain(obj);
             };
-            importObject["TestModule"]["bjs_HTTPServer_wrap"] = function(pointer) {
+            importObject["TestModule"]["bjs_Formatting_Converter_wrap"] = function(pointer) {
+                const obj = _exports.Formatting.Converter.__construct(pointer);
+                return swift.memory.retain(obj);
+            };
+            importObject["TestModule"]["bjs_Networking_API_HTTPServer_wrap"] = function(pointer) {
                 const obj = _exports.Networking.API.HTTPServer.__construct(pointer);
                 return swift.memory.retain(obj);
             };
-            importObject["TestModule"]["bjs_TestServer_wrap"] = function(pointer) {
+            importObject["TestModule"]["bjs_Networking_APIV2_Internal_TestServer_wrap"] = function(pointer) {
                 const obj = _exports.Networking.APIV2.Internal.TestServer.__construct(pointer);
                 return swift.memory.retain(obj);
             };
@@ -268,51 +272,67 @@ export async function createInstantiator(options, swift) {
             }
             class Converter extends SwiftHeapObject {
                 static __construct(ptr) {
-                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Converter_deinit, Converter.prototype);
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Utils_Converter_deinit, Converter.prototype);
                 }
 
                 constructor() {
-                    const ret = instance.exports.bjs_Converter_init();
+                    const ret = instance.exports.bjs_Utils_Converter_init();
                     return Converter.__construct(ret);
                 }
                 toString(value) {
-                    instance.exports.bjs_Converter_toString(this.pointer, value);
+                    instance.exports.bjs_Utils_Converter_toString(this.pointer, value);
                     const ret = tmpRetString;
                     tmpRetString = undefined;
                     return ret;
                 }
                 get precision() {
-                    const ret = instance.exports.bjs_Converter_precision_get(this.pointer);
+                    const ret = instance.exports.bjs_Utils_Converter_precision_get(this.pointer);
                     return ret;
                 }
                 set precision(value) {
-                    instance.exports.bjs_Converter_precision_set(this.pointer, value);
+                    instance.exports.bjs_Utils_Converter_precision_set(this.pointer, value);
                 }
             }
             class HTTPServer extends SwiftHeapObject {
                 static __construct(ptr) {
-                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_HTTPServer_deinit, HTTPServer.prototype);
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Networking_API_HTTPServer_deinit, HTTPServer.prototype);
                 }
 
                 constructor() {
-                    const ret = instance.exports.bjs_HTTPServer_init();
+                    const ret = instance.exports.bjs_Networking_API_HTTPServer_init();
                     return HTTPServer.__construct(ret);
                 }
                 call(method) {
-                    instance.exports.bjs_HTTPServer_call(this.pointer, method);
+                    instance.exports.bjs_Networking_API_HTTPServer_call(this.pointer, method);
                 }
             }
             class TestServer extends SwiftHeapObject {
                 static __construct(ptr) {
-                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_TestServer_deinit, TestServer.prototype);
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Networking_APIV2_Internal_TestServer_deinit, TestServer.prototype);
                 }
 
                 constructor() {
-                    const ret = instance.exports.bjs_TestServer_init();
+                    const ret = instance.exports.bjs_Networking_APIV2_Internal_TestServer_init();
                     return TestServer.__construct(ret);
                 }
                 call(method) {
-                    instance.exports.bjs_TestServer_call(this.pointer, method);
+                    instance.exports.bjs_Networking_APIV2_Internal_TestServer_call(this.pointer, method);
+                }
+            }
+            class Converter extends SwiftHeapObject {
+                static __construct(ptr) {
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Formatting_Converter_deinit, Converter.prototype);
+                }
+
+                constructor() {
+                    const ret = instance.exports.bjs_Formatting_Converter_init();
+                    return Converter.__construct(ret);
+                }
+                format(value) {
+                    instance.exports.bjs_Formatting_Converter_format(this.pointer, value);
+                    const ret = tmpRetString;
+                    tmpRetString = undefined;
+                    return ret;
                 }
             }
             const exports = {
@@ -320,6 +340,9 @@ export async function createInstantiator(options, swift) {
                     LogLevel: LogLevelValues,
                     Port: PortValues,
                 },
+                Formatting: {
+                    Converter,
+                },
                 Networking: {
                     API: {
                         HTTPServer,
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js
index 9460ed45e..dd0e0c55e 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedGlobal.js
@@ -188,7 +188,7 @@ export async function createInstantiator(options, swift) {
             if (!importObject["TestModule"]) {
                 importObject["TestModule"] = {};
             }
-            importObject["TestModule"]["bjs_GlobalClass_wrap"] = function(pointer) {
+            importObject["TestModule"]["bjs_GlobalAPI_GlobalClass_wrap"] = function(pointer) {
                 const obj = _exports.GlobalAPI.GlobalClass.__construct(pointer);
                 return swift.memory.retain(obj);
             };
@@ -235,15 +235,15 @@ export async function createInstantiator(options, swift) {
             }
             class GlobalClass extends SwiftHeapObject {
                 static __construct(ptr) {
-                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_GlobalClass_deinit, GlobalClass.prototype);
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_GlobalAPI_GlobalClass_deinit, GlobalClass.prototype);
                 }
 
                 constructor() {
-                    const ret = instance.exports.bjs_GlobalClass_init();
+                    const ret = instance.exports.bjs_GlobalAPI_GlobalClass_init();
                     return GlobalClass.__construct(ret);
                 }
                 greet() {
-                    instance.exports.bjs_GlobalClass_greet(this.pointer);
+                    instance.exports.bjs_GlobalAPI_GlobalClass_greet(this.pointer);
                     const ret = tmpRetString;
                     tmpRetString = undefined;
                     return ret;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js
index 5b99112ab..523df73cd 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedModules.js
@@ -188,7 +188,7 @@ export async function createInstantiator(options, swift) {
             if (!importObject["GlobalModule"]) {
                 importObject["GlobalModule"] = {};
             }
-            importObject["GlobalModule"]["bjs_GlobalClass_wrap"] = function(pointer) {
+            importObject["GlobalModule"]["bjs_GlobalAPI_GlobalClass_wrap"] = function(pointer) {
                 const obj = _exports.GlobalAPI.GlobalClass.__construct(pointer);
                 return swift.memory.retain(obj);
             };
@@ -196,7 +196,7 @@ export async function createInstantiator(options, swift) {
             if (!importObject["PrivateModule"]) {
                 importObject["PrivateModule"] = {};
             }
-            importObject["PrivateModule"]["bjs_PrivateClass_wrap"] = function(pointer) {
+            importObject["PrivateModule"]["bjs_PrivateAPI_PrivateClass_wrap"] = function(pointer) {
                 const obj = _exports.PrivateAPI.PrivateClass.__construct(pointer);
                 return swift.memory.retain(obj);
             };
@@ -243,15 +243,15 @@ export async function createInstantiator(options, swift) {
             }
             class GlobalClass extends SwiftHeapObject {
                 static __construct(ptr) {
-                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_GlobalClass_deinit, GlobalClass.prototype);
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_GlobalAPI_GlobalClass_deinit, GlobalClass.prototype);
                 }
 
                 constructor() {
-                    const ret = instance.exports.bjs_GlobalClass_init();
+                    const ret = instance.exports.bjs_GlobalAPI_GlobalClass_init();
                     return GlobalClass.__construct(ret);
                 }
                 greet() {
-                    instance.exports.bjs_GlobalClass_greet(this.pointer);
+                    instance.exports.bjs_GlobalAPI_GlobalClass_greet(this.pointer);
                     const ret = tmpRetString;
                     tmpRetString = undefined;
                     return ret;
@@ -259,15 +259,15 @@ export async function createInstantiator(options, swift) {
             }
             class PrivateClass extends SwiftHeapObject {
                 static __construct(ptr) {
-                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_PrivateClass_deinit, PrivateClass.prototype);
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_PrivateAPI_PrivateClass_deinit, PrivateClass.prototype);
                 }
 
                 constructor() {
-                    const ret = instance.exports.bjs_PrivateClass_init();
+                    const ret = instance.exports.bjs_PrivateAPI_PrivateClass_init();
                     return PrivateClass.__construct(ret);
                 }
                 greet() {
-                    instance.exports.bjs_PrivateClass_greet(this.pointer);
+                    instance.exports.bjs_PrivateAPI_PrivateClass_greet(this.pointer);
                     const ret = tmpRetString;
                     tmpRetString = undefined;
                     return ret;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js
index e600c1eb9..4d08957d0 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/MixedPrivate.js
@@ -188,7 +188,7 @@ export async function createInstantiator(options, swift) {
             if (!importObject["TestModule"]) {
                 importObject["TestModule"] = {};
             }
-            importObject["TestModule"]["bjs_PrivateClass_wrap"] = function(pointer) {
+            importObject["TestModule"]["bjs_PrivateAPI_PrivateClass_wrap"] = function(pointer) {
                 const obj = _exports.PrivateAPI.PrivateClass.__construct(pointer);
                 return swift.memory.retain(obj);
             };
@@ -235,15 +235,15 @@ export async function createInstantiator(options, swift) {
             }
             class PrivateClass extends SwiftHeapObject {
                 static __construct(ptr) {
-                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_PrivateClass_deinit, PrivateClass.prototype);
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_PrivateAPI_PrivateClass_deinit, PrivateClass.prototype);
                 }
 
                 constructor() {
-                    const ret = instance.exports.bjs_PrivateClass_init();
+                    const ret = instance.exports.bjs_PrivateAPI_PrivateClass_init();
                     return PrivateClass.__construct(ret);
                 }
                 greet() {
-                    instance.exports.bjs_PrivateClass_greet(this.pointer);
+                    instance.exports.bjs_PrivateAPI_PrivateClass_greet(this.pointer);
                     const ret = tmpRetString;
                     tmpRetString = undefined;
                     return ret;
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js
index 303dd5274..ac55ae750 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.js
@@ -188,19 +188,19 @@ export async function createInstantiator(options, swift) {
             if (!importObject["TestModule"]) {
                 importObject["TestModule"] = {};
             }
-            importObject["TestModule"]["bjs_Container_wrap"] = function(pointer) {
+            importObject["TestModule"]["bjs_Collections_Container_wrap"] = function(pointer) {
                 const obj = _exports.Collections.Container.__construct(pointer);
                 return swift.memory.retain(obj);
             };
-            importObject["TestModule"]["bjs_Converter_wrap"] = function(pointer) {
+            importObject["TestModule"]["bjs_Utils_Converters_Converter_wrap"] = function(pointer) {
                 const obj = _exports.Utils.Converters.Converter.__construct(pointer);
                 return swift.memory.retain(obj);
             };
-            importObject["TestModule"]["bjs_Greeter_wrap"] = function(pointer) {
+            importObject["TestModule"]["bjs___Swift_Foundation_Greeter_wrap"] = function(pointer) {
                 const obj = _exports.__Swift.Foundation.Greeter.__construct(pointer);
                 return swift.memory.retain(obj);
             };
-            importObject["TestModule"]["bjs_UUID_wrap"] = function(pointer) {
+            importObject["TestModule"]["bjs___Swift_Foundation_UUID_wrap"] = function(pointer) {
                 const obj = _exports.__Swift.Foundation.UUID.__construct(pointer);
                 return swift.memory.retain(obj);
             };
@@ -247,17 +247,17 @@ export async function createInstantiator(options, swift) {
             }
             class Greeter extends SwiftHeapObject {
                 static __construct(ptr) {
-                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Greeter_deinit, Greeter.prototype);
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs___Swift_Foundation_Greeter_deinit, Greeter.prototype);
                 }
 
                 constructor(name) {
                     const nameBytes = textEncoder.encode(name);
                     const nameId = swift.memory.retain(nameBytes);
-                    const ret = instance.exports.bjs_Greeter_init(nameId, nameBytes.length);
+                    const ret = instance.exports.bjs___Swift_Foundation_Greeter_init(nameId, nameBytes.length);
                     return Greeter.__construct(ret);
                 }
                 greet() {
-                    instance.exports.bjs_Greeter_greet(this.pointer);
+                    instance.exports.bjs___Swift_Foundation_Greeter_greet(this.pointer);
                     const ret = tmpRetString;
                     tmpRetString = undefined;
                     return ret;
@@ -265,15 +265,15 @@ export async function createInstantiator(options, swift) {
             }
             class Converter extends SwiftHeapObject {
                 static __construct(ptr) {
-                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Converter_deinit, Converter.prototype);
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Utils_Converters_Converter_deinit, Converter.prototype);
                 }
 
                 constructor() {
-                    const ret = instance.exports.bjs_Converter_init();
+                    const ret = instance.exports.bjs_Utils_Converters_Converter_init();
                     return Converter.__construct(ret);
                 }
                 toString(value) {
-                    instance.exports.bjs_Converter_toString(this.pointer, value);
+                    instance.exports.bjs_Utils_Converters_Converter_toString(this.pointer, value);
                     const ret = tmpRetString;
                     tmpRetString = undefined;
                     return ret;
@@ -281,11 +281,11 @@ export async function createInstantiator(options, swift) {
             }
             class UUID extends SwiftHeapObject {
                 static __construct(ptr) {
-                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_UUID_deinit, UUID.prototype);
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs___Swift_Foundation_UUID_deinit, UUID.prototype);
                 }
 
                 uuidString() {
-                    instance.exports.bjs_UUID_uuidString(this.pointer);
+                    instance.exports.bjs___Swift_Foundation_UUID_uuidString(this.pointer);
                     const ret = tmpRetString;
                     tmpRetString = undefined;
                     return ret;
@@ -293,15 +293,15 @@ export async function createInstantiator(options, swift) {
             }
             class Container extends SwiftHeapObject {
                 static __construct(ptr) {
-                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Container_deinit, Container.prototype);
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Collections_Container_deinit, Container.prototype);
                 }
 
                 constructor() {
-                    const ret = instance.exports.bjs_Container_init();
+                    const ret = instance.exports.bjs_Collections_Container_init();
                     return Container.__construct(ret);
                 }
                 getItems() {
-                    instance.exports.bjs_Container_getItems(this.pointer);
+                    instance.exports.bjs_Collections_Container_getItems(this.pointer);
                     const arrayLen = i32Stack.pop();
                     const arrayResult = [];
                     for (let i = 0; i < arrayLen; i++) {
@@ -313,7 +313,7 @@ export async function createInstantiator(options, swift) {
                     return arrayResult;
                 }
                 addItem(item) {
-                    instance.exports.bjs_Container_addItem(this.pointer, item.pointer);
+                    instance.exports.bjs_Collections_Container_addItem(this.pointer, item.pointer);
                 }
             }
             if (typeof globalThis.Collections === 'undefined') {
diff --git a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js
index 85c45665d..1fb247cbe 100644
--- a/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js
+++ b/Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.js
@@ -188,19 +188,19 @@ export async function createInstantiator(options, swift) {
             if (!importObject["TestModule"]) {
                 importObject["TestModule"] = {};
             }
-            importObject["TestModule"]["bjs_Container_wrap"] = function(pointer) {
+            importObject["TestModule"]["bjs_Collections_Container_wrap"] = function(pointer) {
                 const obj = _exports.Collections.Container.__construct(pointer);
                 return swift.memory.retain(obj);
             };
-            importObject["TestModule"]["bjs_Converter_wrap"] = function(pointer) {
+            importObject["TestModule"]["bjs_Utils_Converters_Converter_wrap"] = function(pointer) {
                 const obj = _exports.Utils.Converters.Converter.__construct(pointer);
                 return swift.memory.retain(obj);
             };
-            importObject["TestModule"]["bjs_Greeter_wrap"] = function(pointer) {
+            importObject["TestModule"]["bjs___Swift_Foundation_Greeter_wrap"] = function(pointer) {
                 const obj = _exports.__Swift.Foundation.Greeter.__construct(pointer);
                 return swift.memory.retain(obj);
             };
-            importObject["TestModule"]["bjs_UUID_wrap"] = function(pointer) {
+            importObject["TestModule"]["bjs___Swift_Foundation_UUID_wrap"] = function(pointer) {
                 const obj = _exports.__Swift.Foundation.UUID.__construct(pointer);
                 return swift.memory.retain(obj);
             };
@@ -247,17 +247,17 @@ export async function createInstantiator(options, swift) {
             }
             class Greeter extends SwiftHeapObject {
                 static __construct(ptr) {
-                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Greeter_deinit, Greeter.prototype);
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs___Swift_Foundation_Greeter_deinit, Greeter.prototype);
                 }
 
                 constructor(name) {
                     const nameBytes = textEncoder.encode(name);
                     const nameId = swift.memory.retain(nameBytes);
-                    const ret = instance.exports.bjs_Greeter_init(nameId, nameBytes.length);
+                    const ret = instance.exports.bjs___Swift_Foundation_Greeter_init(nameId, nameBytes.length);
                     return Greeter.__construct(ret);
                 }
                 greet() {
-                    instance.exports.bjs_Greeter_greet(this.pointer);
+                    instance.exports.bjs___Swift_Foundation_Greeter_greet(this.pointer);
                     const ret = tmpRetString;
                     tmpRetString = undefined;
                     return ret;
@@ -265,15 +265,15 @@ export async function createInstantiator(options, swift) {
             }
             class Converter extends SwiftHeapObject {
                 static __construct(ptr) {
-                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Converter_deinit, Converter.prototype);
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Utils_Converters_Converter_deinit, Converter.prototype);
                 }
 
                 constructor() {
-                    const ret = instance.exports.bjs_Converter_init();
+                    const ret = instance.exports.bjs_Utils_Converters_Converter_init();
                     return Converter.__construct(ret);
                 }
                 toString(value) {
-                    instance.exports.bjs_Converter_toString(this.pointer, value);
+                    instance.exports.bjs_Utils_Converters_Converter_toString(this.pointer, value);
                     const ret = tmpRetString;
                     tmpRetString = undefined;
                     return ret;
@@ -281,11 +281,11 @@ export async function createInstantiator(options, swift) {
             }
             class UUID extends SwiftHeapObject {
                 static __construct(ptr) {
-                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_UUID_deinit, UUID.prototype);
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs___Swift_Foundation_UUID_deinit, UUID.prototype);
                 }
 
                 uuidString() {
-                    instance.exports.bjs_UUID_uuidString(this.pointer);
+                    instance.exports.bjs___Swift_Foundation_UUID_uuidString(this.pointer);
                     const ret = tmpRetString;
                     tmpRetString = undefined;
                     return ret;
@@ -293,15 +293,15 @@ export async function createInstantiator(options, swift) {
             }
             class Container extends SwiftHeapObject {
                 static __construct(ptr) {
-                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Container_deinit, Container.prototype);
+                    return SwiftHeapObject.__wrap(ptr, instance.exports.bjs_Collections_Container_deinit, Container.prototype);
                 }
 
                 constructor() {
-                    const ret = instance.exports.bjs_Container_init();
+                    const ret = instance.exports.bjs_Collections_Container_init();
                     return Container.__construct(ret);
                 }
                 getItems() {
-                    instance.exports.bjs_Container_getItems(this.pointer);
+                    instance.exports.bjs_Collections_Container_getItems(this.pointer);
                     const arrayLen = i32Stack.pop();
                     const arrayResult = [];
                     for (let i = 0; i < arrayLen; i++) {
@@ -313,7 +313,7 @@ export async function createInstantiator(options, swift) {
                     return arrayResult;
                 }
                 addItem(item) {
-                    instance.exports.bjs_Container_addItem(this.pointer, item.pointer);
+                    instance.exports.bjs_Collections_Container_addItem(this.pointer, item.pointer);
                 }
             }
             const exports = {
diff --git a/Tests/BridgeJSGlobalTests/Generated/BridgeJS.swift b/Tests/BridgeJSGlobalTests/Generated/BridgeJS.swift
index b34b78bb0..ca9968838 100644
--- a/Tests/BridgeJSGlobalTests/Generated/BridgeJS.swift
+++ b/Tests/BridgeJSGlobalTests/Generated/BridgeJS.swift
@@ -176,9 +176,9 @@ public func _bjs_GlobalStaticPropertyNamespace_NestedProperties_static_nestedDou
     #endif
 }
 
-@_expose(wasm, "bjs_TestHTTPServer_init")
-@_cdecl("bjs_TestHTTPServer_init")
-public func _bjs_TestHTTPServer_init() -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_GlobalNetworking_API_TestHTTPServer_init")
+@_cdecl("bjs_GlobalNetworking_API_TestHTTPServer_init")
+public func _bjs_GlobalNetworking_API_TestHTTPServer_init() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
     let ret = GlobalNetworking.API.TestHTTPServer()
     return ret.bridgeJSLowerReturn()
@@ -187,9 +187,9 @@ public func _bjs_TestHTTPServer_init() -> UnsafeMutableRawPointer {
     #endif
 }
 
-@_expose(wasm, "bjs_TestHTTPServer_call")
-@_cdecl("bjs_TestHTTPServer_call")
-public func _bjs_TestHTTPServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void {
+@_expose(wasm, "bjs_GlobalNetworking_API_TestHTTPServer_call")
+@_cdecl("bjs_GlobalNetworking_API_TestHTTPServer_call")
+public func _bjs_GlobalNetworking_API_TestHTTPServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void {
     #if arch(wasm32)
     GlobalNetworking.API.TestHTTPServer.bridgeJSLiftParameter(_self).call(_: GlobalNetworking.API.CallMethod.bridgeJSLiftParameter(method))
     #else
@@ -197,9 +197,9 @@ public func _bjs_TestHTTPServer_call(_ _self: UnsafeMutableRawPointer, _ method:
     #endif
 }
 
-@_expose(wasm, "bjs_TestHTTPServer_deinit")
-@_cdecl("bjs_TestHTTPServer_deinit")
-public func _bjs_TestHTTPServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_GlobalNetworking_API_TestHTTPServer_deinit")
+@_cdecl("bjs_GlobalNetworking_API_TestHTTPServer_deinit")
+public func _bjs_GlobalNetworking_API_TestHTTPServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     Unmanaged<GlobalNetworking.API.TestHTTPServer>.fromOpaque(pointer).release()
     #else
@@ -209,25 +209,25 @@ public func _bjs_TestHTTPServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Vo
 
 extension GlobalNetworking.API.TestHTTPServer: ConvertibleToJSValue, _BridgedSwiftHeapObject {
     var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_TestHTTPServer_wrap(Unmanaged.passRetained(self).toOpaque()))))
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_GlobalNetworking_API_TestHTTPServer_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSGlobalTests", name: "bjs_TestHTTPServer_wrap")
-fileprivate func _bjs_TestHTTPServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "BridgeJSGlobalTests", name: "bjs_GlobalNetworking_API_TestHTTPServer_wrap")
+fileprivate func _bjs_GlobalNetworking_API_TestHTTPServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_TestHTTPServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func _bjs_GlobalNetworking_API_TestHTTPServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_TestHTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_TestHTTPServer_wrap_extern(pointer)
+@inline(never) fileprivate func _bjs_GlobalNetworking_API_TestHTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_GlobalNetworking_API_TestHTTPServer_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_TestInternalServer_init")
-@_cdecl("bjs_TestInternalServer_init")
-public func _bjs_TestInternalServer_init() -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_GlobalNetworking_APIV2_Internal_TestInternalServer_init")
+@_cdecl("bjs_GlobalNetworking_APIV2_Internal_TestInternalServer_init")
+public func _bjs_GlobalNetworking_APIV2_Internal_TestInternalServer_init() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
     let ret = Internal.TestInternalServer()
     return ret.bridgeJSLowerReturn()
@@ -236,9 +236,9 @@ public func _bjs_TestInternalServer_init() -> UnsafeMutableRawPointer {
     #endif
 }
 
-@_expose(wasm, "bjs_TestInternalServer_call")
-@_cdecl("bjs_TestInternalServer_call")
-public func _bjs_TestInternalServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void {
+@_expose(wasm, "bjs_GlobalNetworking_APIV2_Internal_TestInternalServer_call")
+@_cdecl("bjs_GlobalNetworking_APIV2_Internal_TestInternalServer_call")
+public func _bjs_GlobalNetworking_APIV2_Internal_TestInternalServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void {
     #if arch(wasm32)
     Internal.TestInternalServer.bridgeJSLiftParameter(_self).call(_: Internal.SupportedServerMethod.bridgeJSLiftParameter(method))
     #else
@@ -246,9 +246,9 @@ public func _bjs_TestInternalServer_call(_ _self: UnsafeMutableRawPointer, _ met
     #endif
 }
 
-@_expose(wasm, "bjs_TestInternalServer_deinit")
-@_cdecl("bjs_TestInternalServer_deinit")
-public func _bjs_TestInternalServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_GlobalNetworking_APIV2_Internal_TestInternalServer_deinit")
+@_cdecl("bjs_GlobalNetworking_APIV2_Internal_TestInternalServer_deinit")
+public func _bjs_GlobalNetworking_APIV2_Internal_TestInternalServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     Unmanaged<Internal.TestInternalServer>.fromOpaque(pointer).release()
     #else
@@ -258,25 +258,25 @@ public func _bjs_TestInternalServer_deinit(_ pointer: UnsafeMutableRawPointer) -
 
 extension Internal.TestInternalServer: ConvertibleToJSValue, _BridgedSwiftHeapObject {
     var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_TestInternalServer_wrap(Unmanaged.passRetained(self).toOpaque()))))
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_GlobalNetworking_APIV2_Internal_TestInternalServer_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSGlobalTests", name: "bjs_TestInternalServer_wrap")
-fileprivate func _bjs_TestInternalServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "BridgeJSGlobalTests", name: "bjs_GlobalNetworking_APIV2_Internal_TestInternalServer_wrap")
+fileprivate func _bjs_GlobalNetworking_APIV2_Internal_TestInternalServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_TestInternalServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func _bjs_GlobalNetworking_APIV2_Internal_TestInternalServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_TestInternalServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_TestInternalServer_wrap_extern(pointer)
+@inline(never) fileprivate func _bjs_GlobalNetworking_APIV2_Internal_TestInternalServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_GlobalNetworking_APIV2_Internal_TestInternalServer_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_PublicConverter_init")
-@_cdecl("bjs_PublicConverter_init")
-public func _bjs_PublicConverter_init() -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_GlobalUtils_PublicConverter_init")
+@_cdecl("bjs_GlobalUtils_PublicConverter_init")
+public func _bjs_GlobalUtils_PublicConverter_init() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
     let ret = GlobalUtils.PublicConverter()
     return ret.bridgeJSLowerReturn()
@@ -285,9 +285,9 @@ public func _bjs_PublicConverter_init() -> UnsafeMutableRawPointer {
     #endif
 }
 
-@_expose(wasm, "bjs_PublicConverter_toString")
-@_cdecl("bjs_PublicConverter_toString")
-public func _bjs_PublicConverter_toString(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+@_expose(wasm, "bjs_GlobalUtils_PublicConverter_toString")
+@_cdecl("bjs_GlobalUtils_PublicConverter_toString")
+public func _bjs_GlobalUtils_PublicConverter_toString(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
     #if arch(wasm32)
     let ret = GlobalUtils.PublicConverter.bridgeJSLiftParameter(_self).toString(value: Int.bridgeJSLiftParameter(value))
     return ret.bridgeJSLowerReturn()
@@ -296,9 +296,9 @@ public func _bjs_PublicConverter_toString(_ _self: UnsafeMutableRawPointer, _ va
     #endif
 }
 
-@_expose(wasm, "bjs_PublicConverter_deinit")
-@_cdecl("bjs_PublicConverter_deinit")
-public func _bjs_PublicConverter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_GlobalUtils_PublicConverter_deinit")
+@_cdecl("bjs_GlobalUtils_PublicConverter_deinit")
+public func _bjs_GlobalUtils_PublicConverter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     Unmanaged<GlobalUtils.PublicConverter>.fromOpaque(pointer).release()
     #else
@@ -308,18 +308,18 @@ public func _bjs_PublicConverter_deinit(_ pointer: UnsafeMutableRawPointer) -> V
 
 extension GlobalUtils.PublicConverter: ConvertibleToJSValue, _BridgedSwiftHeapObject {
     var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_PublicConverter_wrap(Unmanaged.passRetained(self).toOpaque()))))
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_GlobalUtils_PublicConverter_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSGlobalTests", name: "bjs_PublicConverter_wrap")
-fileprivate func _bjs_PublicConverter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "BridgeJSGlobalTests", name: "bjs_GlobalUtils_PublicConverter_wrap")
+fileprivate func _bjs_GlobalUtils_PublicConverter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_PublicConverter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func _bjs_GlobalUtils_PublicConverter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_PublicConverter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_PublicConverter_wrap_extern(pointer)
+@inline(never) fileprivate func _bjs_GlobalUtils_PublicConverter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_GlobalUtils_PublicConverter_wrap_extern(pointer)
 }
\ No newline at end of file
diff --git a/Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.json
index e7bcf59b6..2eeb8ed2d 100644
--- a/Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.json
+++ b/Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.json
@@ -3,7 +3,7 @@
     "classes" : [
       {
         "constructor" : {
-          "abiName" : "bjs_TestHTTPServer_init",
+          "abiName" : "bjs_GlobalNetworking_API_TestHTTPServer_init",
           "effects" : {
             "isAsync" : false,
             "isStatic" : false,
@@ -15,7 +15,7 @@
         },
         "methods" : [
           {
-            "abiName" : "bjs_TestHTTPServer_call",
+            "abiName" : "bjs_GlobalNetworking_API_TestHTTPServer_call",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
@@ -56,7 +56,7 @@
       },
       {
         "constructor" : {
-          "abiName" : "bjs_TestInternalServer_init",
+          "abiName" : "bjs_GlobalNetworking_APIV2_Internal_TestInternalServer_init",
           "effects" : {
             "isAsync" : false,
             "isStatic" : false,
@@ -68,7 +68,7 @@
         },
         "methods" : [
           {
-            "abiName" : "bjs_TestInternalServer_call",
+            "abiName" : "bjs_GlobalNetworking_APIV2_Internal_TestInternalServer_call",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
@@ -111,7 +111,7 @@
       },
       {
         "constructor" : {
-          "abiName" : "bjs_PublicConverter_init",
+          "abiName" : "bjs_GlobalUtils_PublicConverter_init",
           "effects" : {
             "isAsync" : false,
             "isStatic" : false,
@@ -123,7 +123,7 @@
         },
         "methods" : [
           {
-            "abiName" : "bjs_PublicConverter_toString",
+            "abiName" : "bjs_GlobalUtils_PublicConverter_toString",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
diff --git a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift
index e8a0b9476..00d1b47e3 100644
--- a/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift
+++ b/Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift
@@ -7103,9 +7103,9 @@ fileprivate func _bjs_PackageGreeter_wrap_extern(_ pointer: UnsafeMutableRawPoin
     return _bjs_PackageGreeter_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_Converter_init")
-@_cdecl("bjs_Converter_init")
-public func _bjs_Converter_init() -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_Utils_Converter_init")
+@_cdecl("bjs_Utils_Converter_init")
+public func _bjs_Utils_Converter_init() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
     let ret = Utils.Converter()
     return ret.bridgeJSLowerReturn()
@@ -7114,9 +7114,9 @@ public func _bjs_Converter_init() -> UnsafeMutableRawPointer {
     #endif
 }
 
-@_expose(wasm, "bjs_Converter_toString")
-@_cdecl("bjs_Converter_toString")
-public func _bjs_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+@_expose(wasm, "bjs_Utils_Converter_toString")
+@_cdecl("bjs_Utils_Converter_toString")
+public func _bjs_Utils_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
     #if arch(wasm32)
     let ret = Utils.Converter.bridgeJSLiftParameter(_self).toString(value: Int.bridgeJSLiftParameter(value))
     return ret.bridgeJSLowerReturn()
@@ -7125,9 +7125,9 @@ public func _bjs_Converter_toString(_ _self: UnsafeMutableRawPointer, _ value: I
     #endif
 }
 
-@_expose(wasm, "bjs_Converter_precision_get")
-@_cdecl("bjs_Converter_precision_get")
-public func _bjs_Converter_precision_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
+@_expose(wasm, "bjs_Utils_Converter_precision_get")
+@_cdecl("bjs_Utils_Converter_precision_get")
+public func _bjs_Utils_Converter_precision_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
     #if arch(wasm32)
     let ret = Utils.Converter.bridgeJSLiftParameter(_self).precision
     return ret.bridgeJSLowerReturn()
@@ -7136,9 +7136,9 @@ public func _bjs_Converter_precision_get(_ _self: UnsafeMutableRawPointer) -> In
     #endif
 }
 
-@_expose(wasm, "bjs_Converter_precision_set")
-@_cdecl("bjs_Converter_precision_set")
-public func _bjs_Converter_precision_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+@_expose(wasm, "bjs_Utils_Converter_precision_set")
+@_cdecl("bjs_Utils_Converter_precision_set")
+public func _bjs_Utils_Converter_precision_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
     #if arch(wasm32)
     Utils.Converter.bridgeJSLiftParameter(_self).precision = Int.bridgeJSLiftParameter(value)
     #else
@@ -7146,9 +7146,9 @@ public func _bjs_Converter_precision_set(_ _self: UnsafeMutableRawPointer, _ val
     #endif
 }
 
-@_expose(wasm, "bjs_Converter_deinit")
-@_cdecl("bjs_Converter_deinit")
-public func _bjs_Converter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_Utils_Converter_deinit")
+@_cdecl("bjs_Utils_Converter_deinit")
+public func _bjs_Utils_Converter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     Unmanaged<Utils.Converter>.fromOpaque(pointer).release()
     #else
@@ -7158,25 +7158,25 @@ public func _bjs_Converter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
 
 extension Utils.Converter: ConvertibleToJSValue, _BridgedSwiftHeapObject {
     var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_Converter_wrap(Unmanaged.passRetained(self).toOpaque()))))
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Utils_Converter_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Converter_wrap")
-fileprivate func _bjs_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Utils_Converter_wrap")
+fileprivate func _bjs_Utils_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func _bjs_Utils_Converter_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_Converter_wrap_extern(pointer)
+@inline(never) fileprivate func _bjs_Utils_Converter_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Utils_Converter_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_HTTPServer_init")
-@_cdecl("bjs_HTTPServer_init")
-public func _bjs_HTTPServer_init() -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_Networking_API_HTTPServer_init")
+@_cdecl("bjs_Networking_API_HTTPServer_init")
+public func _bjs_Networking_API_HTTPServer_init() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
     let ret = Networking.API.HTTPServer()
     return ret.bridgeJSLowerReturn()
@@ -7185,9 +7185,9 @@ public func _bjs_HTTPServer_init() -> UnsafeMutableRawPointer {
     #endif
 }
 
-@_expose(wasm, "bjs_HTTPServer_call")
-@_cdecl("bjs_HTTPServer_call")
-public func _bjs_HTTPServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void {
+@_expose(wasm, "bjs_Networking_API_HTTPServer_call")
+@_cdecl("bjs_Networking_API_HTTPServer_call")
+public func _bjs_Networking_API_HTTPServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void {
     #if arch(wasm32)
     Networking.API.HTTPServer.bridgeJSLiftParameter(_self).call(_: Networking.API.Method.bridgeJSLiftParameter(method))
     #else
@@ -7195,9 +7195,9 @@ public func _bjs_HTTPServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int
     #endif
 }
 
-@_expose(wasm, "bjs_HTTPServer_deinit")
-@_cdecl("bjs_HTTPServer_deinit")
-public func _bjs_HTTPServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_Networking_API_HTTPServer_deinit")
+@_cdecl("bjs_Networking_API_HTTPServer_deinit")
+public func _bjs_Networking_API_HTTPServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     Unmanaged<Networking.API.HTTPServer>.fromOpaque(pointer).release()
     #else
@@ -7207,25 +7207,25 @@ public func _bjs_HTTPServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
 
 extension Networking.API.HTTPServer: ConvertibleToJSValue, _BridgedSwiftHeapObject {
     var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_HTTPServer_wrap(Unmanaged.passRetained(self).toOpaque()))))
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Networking_API_HTTPServer_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_HTTPServer_wrap")
-fileprivate func _bjs_HTTPServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Networking_API_HTTPServer_wrap")
+fileprivate func _bjs_Networking_API_HTTPServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_HTTPServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func _bjs_Networking_API_HTTPServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_HTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_HTTPServer_wrap_extern(pointer)
+@inline(never) fileprivate func _bjs_Networking_API_HTTPServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Networking_API_HTTPServer_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_UUID_init")
-@_cdecl("bjs_UUID_init")
-public func _bjs_UUID_init(_ valueBytes: Int32, _ valueLength: Int32) -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs___Swift_Foundation_UUID_init")
+@_cdecl("bjs___Swift_Foundation_UUID_init")
+public func _bjs___Swift_Foundation_UUID_init(_ valueBytes: Int32, _ valueLength: Int32) -> UnsafeMutableRawPointer {
     #if arch(wasm32)
     let ret = UUID(value: String.bridgeJSLiftParameter(valueBytes, valueLength))
     return ret.bridgeJSLowerReturn()
@@ -7234,9 +7234,9 @@ public func _bjs_UUID_init(_ valueBytes: Int32, _ valueLength: Int32) -> UnsafeM
     #endif
 }
 
-@_expose(wasm, "bjs_UUID_uuidString")
-@_cdecl("bjs_UUID_uuidString")
-public func _bjs_UUID_uuidString(_ _self: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs___Swift_Foundation_UUID_uuidString")
+@_cdecl("bjs___Swift_Foundation_UUID_uuidString")
+public func _bjs___Swift_Foundation_UUID_uuidString(_ _self: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     let ret = UUID.bridgeJSLiftParameter(_self).uuidString()
     return ret.bridgeJSLowerReturn()
@@ -7245,9 +7245,9 @@ public func _bjs_UUID_uuidString(_ _self: UnsafeMutableRawPointer) -> Void {
     #endif
 }
 
-@_expose(wasm, "bjs_UUID_deinit")
-@_cdecl("bjs_UUID_deinit")
-public func _bjs_UUID_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs___Swift_Foundation_UUID_deinit")
+@_cdecl("bjs___Swift_Foundation_UUID_deinit")
+public func _bjs___Swift_Foundation_UUID_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     Unmanaged<UUID>.fromOpaque(pointer).release()
     #else
@@ -7257,25 +7257,25 @@ public func _bjs_UUID_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
 
 extension UUID: ConvertibleToJSValue, _BridgedSwiftHeapObject {
     var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_UUID_wrap(Unmanaged.passRetained(self).toOpaque()))))
+        return .object(JSObject(id: UInt32(bitPattern: _bjs___Swift_Foundation_UUID_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_UUID_wrap")
-fileprivate func _bjs_UUID_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs___Swift_Foundation_UUID_wrap")
+fileprivate func _bjs___Swift_Foundation_UUID_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_UUID_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func _bjs___Swift_Foundation_UUID_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_UUID_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_UUID_wrap_extern(pointer)
+@inline(never) fileprivate func _bjs___Swift_Foundation_UUID_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs___Swift_Foundation_UUID_wrap_extern(pointer)
 }
 
-@_expose(wasm, "bjs_TestServer_init")
-@_cdecl("bjs_TestServer_init")
-public func _bjs_TestServer_init() -> UnsafeMutableRawPointer {
+@_expose(wasm, "bjs_Networking_APIV2_Internal_TestServer_init")
+@_cdecl("bjs_Networking_APIV2_Internal_TestServer_init")
+public func _bjs_Networking_APIV2_Internal_TestServer_init() -> UnsafeMutableRawPointer {
     #if arch(wasm32)
     let ret = Internal.TestServer()
     return ret.bridgeJSLowerReturn()
@@ -7284,9 +7284,9 @@ public func _bjs_TestServer_init() -> UnsafeMutableRawPointer {
     #endif
 }
 
-@_expose(wasm, "bjs_TestServer_call")
-@_cdecl("bjs_TestServer_call")
-public func _bjs_TestServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void {
+@_expose(wasm, "bjs_Networking_APIV2_Internal_TestServer_call")
+@_cdecl("bjs_Networking_APIV2_Internal_TestServer_call")
+public func _bjs_Networking_APIV2_Internal_TestServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int32) -> Void {
     #if arch(wasm32)
     Internal.TestServer.bridgeJSLiftParameter(_self).call(_: Internal.SupportedMethod.bridgeJSLiftParameter(method))
     #else
@@ -7294,9 +7294,9 @@ public func _bjs_TestServer_call(_ _self: UnsafeMutableRawPointer, _ method: Int
     #endif
 }
 
-@_expose(wasm, "bjs_TestServer_deinit")
-@_cdecl("bjs_TestServer_deinit")
-public func _bjs_TestServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
+@_expose(wasm, "bjs_Networking_APIV2_Internal_TestServer_deinit")
+@_cdecl("bjs_Networking_APIV2_Internal_TestServer_deinit")
+public func _bjs_Networking_APIV2_Internal_TestServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
     #if arch(wasm32)
     Unmanaged<Internal.TestServer>.fromOpaque(pointer).release()
     #else
@@ -7306,20 +7306,20 @@ public func _bjs_TestServer_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {
 
 extension Internal.TestServer: ConvertibleToJSValue, _BridgedSwiftHeapObject {
     var jsValue: JSValue {
-        return .object(JSObject(id: UInt32(bitPattern: _bjs_TestServer_wrap(Unmanaged.passRetained(self).toOpaque()))))
+        return .object(JSObject(id: UInt32(bitPattern: _bjs_Networking_APIV2_Internal_TestServer_wrap(Unmanaged.passRetained(self).toOpaque()))))
     }
 }
 
 #if arch(wasm32)
-@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_TestServer_wrap")
-fileprivate func _bjs_TestServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
+@_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_Networking_APIV2_Internal_TestServer_wrap")
+fileprivate func _bjs_Networking_APIV2_Internal_TestServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32
 #else
-fileprivate func _bjs_TestServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+fileprivate func _bjs_Networking_APIV2_Internal_TestServer_wrap_extern(_ pointer: UnsafeMutableRawPointer) -> Int32 {
     fatalError("Only available on WebAssembly")
 }
 #endif
-@inline(never) fileprivate func _bjs_TestServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
-    return _bjs_TestServer_wrap_extern(pointer)
+@inline(never) fileprivate func _bjs_Networking_APIV2_Internal_TestServer_wrap(_ pointer: UnsafeMutableRawPointer) -> Int32 {
+    return _bjs_Networking_APIV2_Internal_TestServer_wrap_extern(pointer)
 }
 
 @_expose(wasm, "bjs_SimplePropertyHolder_init")
diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json
index 66027d719..e635af160 100644
--- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json
+++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json
@@ -835,7 +835,7 @@
       },
       {
         "constructor" : {
-          "abiName" : "bjs_Converter_init",
+          "abiName" : "bjs_Utils_Converter_init",
           "effects" : {
             "isAsync" : false,
             "isStatic" : false,
@@ -847,7 +847,7 @@
         },
         "methods" : [
           {
-            "abiName" : "bjs_Converter_toString",
+            "abiName" : "bjs_Utils_Converter_toString",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
@@ -898,7 +898,7 @@
       },
       {
         "constructor" : {
-          "abiName" : "bjs_HTTPServer_init",
+          "abiName" : "bjs_Networking_API_HTTPServer_init",
           "effects" : {
             "isAsync" : false,
             "isStatic" : false,
@@ -910,7 +910,7 @@
         },
         "methods" : [
           {
-            "abiName" : "bjs_HTTPServer_call",
+            "abiName" : "bjs_Networking_API_HTTPServer_call",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
@@ -951,7 +951,7 @@
       },
       {
         "constructor" : {
-          "abiName" : "bjs_UUID_init",
+          "abiName" : "bjs___Swift_Foundation_UUID_init",
           "effects" : {
             "isAsync" : false,
             "isStatic" : false,
@@ -971,7 +971,7 @@
         },
         "methods" : [
           {
-            "abiName" : "bjs_UUID_uuidString",
+            "abiName" : "bjs___Swift_Foundation_UUID_uuidString",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,
@@ -1000,7 +1000,7 @@
       },
       {
         "constructor" : {
-          "abiName" : "bjs_TestServer_init",
+          "abiName" : "bjs_Networking_APIV2_Internal_TestServer_init",
           "effects" : {
             "isAsync" : false,
             "isStatic" : false,
@@ -1012,7 +1012,7 @@
         },
         "methods" : [
           {
-            "abiName" : "bjs_TestServer_call",
+            "abiName" : "bjs_Networking_APIV2_Internal_TestServer_call",
             "effects" : {
               "isAsync" : false,
               "isStatic" : false,