diff --git a/opcodes-zicbo b/rv_zicbo
similarity index 57%
rename from opcodes-zicbo
rename to rv_zicbo
index 13e1668a..65a4567c 100644
--- a/opcodes-zicbo
+++ b/rv_zicbo
@@ -7,6 +7,6 @@ cbo.inval rs1 31..20=0 14..12=2 11..7=0 6..2=0x03 1..0=3
 cbo.zero  rs1 31..20=4 14..12=2 11..7=0 6..2=0x03 1..0=3
 
 # Zicbop: prefetch hint pseudoinstructions
-@prefetch.i rs1 imm12hi 24..20=0 14..12=6 11..7=0 6..2=0x04 1..0=3
-@prefetch.r rs1 imm12hi 24..20=1 14..12=6 11..7=0 6..2=0x04 1..0=3
-@prefetch.w rs1 imm12hi 24..20=3 14..12=6 11..7=0 6..2=0x04 1..0=3
+$pseudo_op rv_i::ori prefetch.i rs1 imm12hi 24..20=0 14..12=6 11..7=0 6..2=0x04 1..0=3
+$pseudo_op rv_i::ori prefetch.r rs1 imm12hi 24..20=1 14..12=6 11..7=0 6..2=0x04 1..0=3
+$pseudo_op rv_i::ori prefetch.w rs1 imm12hi 24..20=3 14..12=6 11..7=0 6..2=0x04 1..0=3