diff --git a/compiler/systems.inc b/compiler/systems.inc
index 7741e5187d..581a2151e3 100644
--- a/compiler/systems.inc
+++ b/compiler/systems.inc
@@ -254,7 +254,7 @@
              ,as_solaris_as
              ,as_m68k_vasm
              ,as_m68k_as_aout
-             ,as_wasm_binaryen
+             ,as_wasm32_binaryen
              ,as_powerpc_gas_legacy    { for systems with very old GAS versions only, which don't support eg. named sections }
              ,as_clang_llvm
              ,as_clang_gas             { machine code assembler in gas style assembled by clang }
@@ -262,7 +262,7 @@
              ,as_sdcc_sdasz80
              ,as_z80_vasm
              ,as_z80_rel
-             ,as_wasm_wabt
+             ,as_wasm32_wabt
        );
 
        tlink = (ld_none,
diff --git a/compiler/systems/i_wasi.pas b/compiler/systems/i_wasi.pas
index e3d31fe004..c902a11323 100644
--- a/compiler/systems/i_wasi.pas
+++ b/compiler/systems/i_wasi.pas
@@ -75,8 +75,8 @@ unit i_wasi;
             Cprefix      : '';
             newline      : #10;
             dirsep       : '/';
-            assem        : as_wasm_wabt;
-            assemextern  : as_wasm_binaryen;
+            assem        : as_wasm32_wabt;
+            assemextern  : as_wasm32_binaryen;
             link         : ld_wasi;
             linkextern   : ld_wasi; // there's no linker, only object files for WASM
             ar           : ar_none;
diff --git a/compiler/systems/i_wasm.pas b/compiler/systems/i_wasm.pas
index 8250c07262..fdd4573235 100644
--- a/compiler/systems/i_wasm.pas
+++ b/compiler/systems/i_wasm.pas
@@ -75,8 +75,8 @@ unit i_wasm;
             Cprefix      : '';
             newline      : #10;
             dirsep       : '/';
-            assem        : as_wasm_wabt;
-            assemextern  : as_wasm_binaryen;
+            assem        : as_wasm32_wabt;
+            assemextern  : as_wasm32_binaryen;
             link         : ld_wasm;
             linkextern   : ld_wasm; // there's no linker, only object files for WASM
             ar           : ar_none;
diff --git a/compiler/wasm32/agbinaryen.pas b/compiler/wasm32/agbinaryen.pas
index 9529e3e5cc..9e8110fb64 100644
--- a/compiler/wasm32/agbinaryen.pas
+++ b/compiler/wasm32/agbinaryen.pas
@@ -586,7 +586,7 @@ implementation
   const
     as_wasm_binaryen_info : tasminfo =
        (
-         id     : as_wasm_binaryen;
+         id     : as_wasm32_binaryen;
          idtxt  : 'Binaryen';
          asmbin : 'wasm-as';
          asmcmd : '$ASM $EXTRAOPT';
diff --git a/compiler/wasm32/agwat.pas b/compiler/wasm32/agwat.pas
index 18edcf5e9f..bd9725a1fb 100644
--- a/compiler/wasm32/agwat.pas
+++ b/compiler/wasm32/agwat.pas
@@ -1078,7 +1078,7 @@ implementation
   const
     as_wasm_wabt_info : tasminfo =
        (
-         id     : as_wasm_wabt;
+         id     : as_wasm32_wabt;
          idtxt  : 'Wabt';
          asmbin : 'wasa';
          asmcmd : '-r --no-canonicalize-leb128s -o $OBJ $EXTRAOPT $ASM';