diff --git a/model/riscv_insts_cext.sail b/model/riscv_insts_cext.sail
index f9f49d39b..8b9fa8f0e 100644
--- a/model/riscv_insts_cext.sail
+++ b/model/riscv_insts_cext.sail
@@ -529,8 +529,8 @@ function clause execute (C_SWSP(uimm, rs2)) = {
   execute(STORE(imm, rs2, sp, WORD, false, false))
 }
 
-mapping clause assembly = C_SWSP(uimm, rd)
-  <-> "c.swsp" ^ spc() ^ reg_name(rd) ^ sep() ^ hex_bits_6(uimm)
+mapping clause assembly = C_SWSP(uimm, rs2)
+  <-> "c.swsp" ^ spc() ^ reg_name(rs2) ^ sep() ^ hex_bits_6(uimm)
 
 /* ****************************************************************** */
 union clause ast = C_SDSP : (bits(6), regidx)
diff --git a/model/riscv_insts_cfext.sail b/model/riscv_insts_cfext.sail
index 632495ee4..5380aa261 100644
--- a/model/riscv_insts_cfext.sail
+++ b/model/riscv_insts_cfext.sail
@@ -106,9 +106,9 @@ function clause execute (C_FSWSP(uimm, rs2)) = {
   execute(STORE_FP(imm, rs2, sp, WORD))
 }
 
-mapping clause assembly = C_FSWSP(uimm, rd)
+mapping clause assembly = C_FSWSP(uimm, rs2)
       if sizeof(xlen) == 32
-  <-> "c.fswsp" ^ spc() ^ reg_name(rd) ^ sep() ^ hex_bits_6(uimm)
+  <-> "c.fswsp" ^ spc() ^ reg_name(rs2) ^ sep() ^ hex_bits_6(uimm)
       if sizeof(xlen) == 32
 
 /* ****************************************************************** */
diff --git a/model/riscv_insts_zkn.sail b/model/riscv_insts_zkn.sail
index 43256ed3a..7cbbf2594 100644
--- a/model/riscv_insts_zkn.sail
+++ b/model/riscv_insts_zkn.sail
@@ -328,8 +328,8 @@ mapping clause encdec = AES64DSM (rs2, rs1, rd) if haveZknd() & sizeof(xlen) ==
 mapping clause encdec = AES64DS (rs2, rs1, rd) if haveZknd() & sizeof(xlen) == 64
   <-> 0b00 @ 0b11101 @ rs2 @ rs1 @ 0b000 @ rd @ 0b0110011
 
-mapping clause assembly = AES64KS1I (rcon, rs1, rd)
-  <-> "aes64ks1i" ^ spc() ^ reg_name(rd) ^ sep() ^ reg_name(rs1) ^ sep() ^ hex_bits_4(rcon)
+mapping clause assembly = AES64KS1I (rnum, rs1, rd)
+  <-> "aes64ks1i" ^ spc() ^ reg_name(rd) ^ sep() ^ reg_name(rs1) ^ sep() ^ hex_bits_4(rnum)
 
 mapping clause assembly = AES64KS2 (rs2, rs1, rd)
   <-> "aes64ks2" ^ spc() ^ reg_name(rd) ^ sep() ^ reg_name(rs1) ^ sep() ^ reg_name(rs2)