scala-js
diff --git a/‎linker/shared/src/main/scala/org/scalajs/linker/backend/wasmemitter/ClassEmitter.scala
Lines changed: 6 additions & 6 deletions b/‎linker/shared/src/main/scala/org/scalajs/linker/backend/wasmemitter/ClassEmitter.scala
Lines changed: 6 additions & 6 deletions
@@ -212,8 +212,7 @@ class ClassEmitter(coreSpec: CoreSpec) {
       coreSpec.semantics.runtimeClassNameMapper,
       className.nameString
     )
-    val nameDataValue: List[wa.Instr] =
-      ctx.stringPool.getConstantStringDataInstr(nameStr)
+    val nameValue = ctx.stringPool.getConstantStringInstr(nameStr)
 
     val kind = className match {
       case ObjectClass         => KindObject
@@ -299,8 +298,10 @@ class ClassEmitter(coreSpec: CoreSpec) {
       elemsInstrs :+ wa.ArrayNewFixed(genTypeID.reflectiveProxies, reflectiveProxies.size)
     }
 
-    nameDataValue :::
+    (
       List(
+        // name
+        nameValue,
         // kind
         wa.I32Const(kind),
         // specialInstanceTypes
@@ -312,8 +313,6 @@ class ClassEmitter(coreSpec: CoreSpec) {
       List(
         // componentType - always `null` since this method is not used for array types
         wa.RefNull(watpe.HeapType(genTypeID.typeData)),
-        // name - initially `null`; filled in by the `typeDataName` helper
-        wa.RefNull(watpe.HeapType.NoExtern),
         // the classOf instance - initially `null`; filled in by the `createClassOf` helper
         wa.RefNull(watpe.HeapType(genTypeID.ClassStruct)),
         // arrayOf, the typeData of an array of this type - initially `null`; filled in by the `arrayTypeData` helper
@@ -327,6 +326,7 @@ class ClassEmitter(coreSpec: CoreSpec) {
       // Generated instructions create an array of reflective proxy structs, where each struct
       // contains the ID of the reflective proxy and a reference to the actual method implementation.
       reflectiveProxiesInstrs
+    )
   }
 
   private def genTypeDataGlobal(className: ClassName, typeDataTypeID: wanme.TypeID,
@@ -1366,7 +1366,7 @@ class ClassEmitter(coreSpec: CoreSpec) {
 
     ctx.moduleBuilder.addImport(
       wamod.Import(
-        "__scalaJSExportSetters",
+        ExportSettersModule,
         exportedName,
         wamod.ImportDesc.Func(
           functionID,