diff --git a/asm/instr.c b/asm/instr.c
index da38e83..48128e3 100644
--- a/asm/instr.c
+++ b/asm/instr.c
@@ -2,34 +2,34 @@
 #include <stddef.h>
 
 #define INSTR0(id, l, op)                                                      \
-	[IVY_OP_##op] = {                                                      \
+	[IVY_OPC_##op] = {                                                     \
 		.i_id = IVY_INSTR_##id,                                        \
 		.i_layout = IVY_INSTR_##l,                                     \
-		.i_opcode = IVY_OP_##op,                                       \
+		.i_opcode = IVY_OPC_##op,                                      \
 		.i_operand = {},                                               \
 	}
 
 #define INSTR1(id, l, op, a0)                                                  \
-	[IVY_OP_##op] = {                                                      \
+	[IVY_OPC_##op] = {                                                      \
 		.i_id = IVY_INSTR_##id,                                        \
 		.i_layout = IVY_INSTR_##l,                                     \
-		.i_opcode = IVY_OP_##op,                                       \
+		.i_opcode = IVY_OPC_##op,                                       \
 		.i_operand = {IVY_INSTR_OPERAND_##a0,},                        \
 	}
 
 #define INSTR2(id, l, op, a0, a1)                                              \
-	[IVY_OP_##op] = {                                                      \
+	[IVY_OPC_##op] = {                                                      \
 		.i_id = IVY_INSTR_##id,                                        \
 		.i_layout = IVY_INSTR_##l,                                     \
-		.i_opcode = IVY_OP_ ##op,                                      \
+		.i_opcode = IVY_OPC_ ##op,                                      \
 		.i_operand = {IVY_INSTR_OPERAND_##a0, IVY_INSTR_OPERAND_##a1,},\
 	}
 
 #define INSTR3(id, l, op, a0, a1, a2)                                          \
-	[IVY_OP_##op] = {                                                      \
+	[IVY_OPC_##op] = {                                                      \
 		.i_id = IVY_INSTR_##id,                                        \
 	        .i_layout = IVY_INSTR_##l,                                     \
-	        .i_opcode = IVY_OP_##op,                                       \
+	        .i_opcode = IVY_OPC_##op,                                       \
 	        .i_operand = {                                                 \
 			IVY_INSTR_OPERAND_##a0,                                \
 			IVY_INSTR_OPERAND_##a1,                                \