6 files changed, 12 insertions, 12 deletions
diff --git a/rv_zbkx b/rv_zbkx
index 12bc0b4..f6b64d9 100644
--- a/rv_zbkx
+++ b/rv_zbkx
@@ -1,2 +1,2 @@
-xperm4     rd rs1 rs2 31..25=20 14..12=2 6..2=0x0C 1..0=3
-xperm8     rd rs1 rs2 31..25=20 14..12=4 6..2=0x0C 1..0=3
+$import rv_zbp::xperm4
+$import rv_zbp::xperm8
diff --git a/rv_zk b/rv_zk
index bdd8514..c4dc854 100644
--- a/rv_zk
+++ b/rv_zk
@@ -13,8 +13,8 @@ $import rv_zbc::clmul
 $import rv_zbc::clmulh
 
 #import zbkx
-$import rv_zbkx::xperm4
-$import rv_zbkx::xperm8
+$import rv_zbp::xperm4
+$import rv_zbp::xperm8
 
 #import zknh
 # Scalar SHA256 - RV32/RV64
diff --git a/rv_zkn b/rv_zkn
index bdd8514..c4dc854 100644
--- a/rv_zkn
+++ b/rv_zkn
@@ -13,8 +13,8 @@ $import rv_zbc::clmul
 $import rv_zbc::clmulh
 
 #import zbkx
-$import rv_zbkx::xperm4
-$import rv_zbkx::xperm8
+$import rv_zbp::xperm4
+$import rv_zbp::xperm8
 
 #import zknh
 # Scalar SHA256 - RV32/RV64
diff --git a/rv_zks b/rv_zks
index 20516f3..f88a09b 100644
--- a/rv_zks
+++ b/rv_zks
@@ -13,8 +13,8 @@ $import rv_zbc::clmul
 $import rv_zbc::clmulh
 
 #import zbkx
-$import rv_zbkx::xperm4
-$import rv_zbkx::xperm8
+$import rv_zbp::xperm4
+$import rv_zbp::xperm8
 
 # Scalar SM4 - RV32, RV64
 $import rv_zksed::sm4ed
diff --git a/unratified/rv64_zbp b/unratified/rv64_zbp
index f4c0bca..f8c06bd 100644
--- a/unratified/rv64_zbp
+++ b/unratified/rv64_zbp
@@ -14,4 +14,4 @@ gorciw     rd rs1 31..26=10 25=0 shamtw 14..12=5 6..2=0x06 1..0=3
 greviw     rd rs1 31..26=26 25=0 shamtw 14..12=5 6..2=0x06 1..0=3
 shflw      rd rs1 rs2 31..25=4  14..12=1 6..2=0x0E 1..0=3
 unshflw    rd rs1 rs2 31..25=4  14..12=5 6..2=0x0E 1..0=3
-xperm.w    rd rs1 rs2 31..25=20 14..12=0 6..2=0x0C 1..0=3
+xperm32    rd rs1 rs2 31..25=20 14..12=0 6..2=0x0C 1..0=3
diff --git a/unratified/rv_zbp b/unratified/rv_zbp
index 810fe9d..b66d6b4 100644
--- a/unratified/rv_zbp
+++ b/unratified/rv_zbp
@@ -9,7 +9,7 @@ grev       rd rs1 rs2 31..25=52 14..12=5 6..2=0x0C 1..0=3
 gorc       rd rs1 rs2 31..25=20 14..12=5 6..2=0x0C 1..0=3
 shfl       rd rs1 rs2 31..25=4  14..12=1 6..2=0x0C 1..0=3
 unshfl     rd rs1 rs2 31..25=4  14..12=5 6..2=0x0C 1..0=3
-xperm.n     rd rs1 rs2 31..25=20 14..12=2 6..2=0x0C 1..0=3
-xperm.b     rd rs1 rs2 31..25=20 14..12=4 6..2=0x0C 1..0=3
-xperm.h    rd rs1 rs2 31..25=20 14..12=6 6..2=0x0C 1..0=3
+xperm4     rd rs1 rs2 31..25=20 14..12=2 6..2=0x0C 1..0=3
+xperm8     rd rs1 rs2 31..25=20 14..12=4 6..2=0x0C 1..0=3
+xperm16    rd rs1 rs2 31..25=20 14..12=6 6..2=0x0C 1..0=3
 packu      rd rs1 rs2 31..25=36 14..12=4 6..2=0x0C 1..0=3