diff --git a/frontend/cmd/disassemble.c b/frontend/cmd/disassemble.c
index 298ffff..7da9f3d 100644
--- a/frontend/cmd/disassemble.c
+++ b/frontend/cmd/disassemble.c
@@ -80,116 +80,116 @@ static void dump_instruction(b_i32 x)
 #undef PRINT_CASE
 
 	switch (op->i_opcode) {
-	case IVY_OP_LDR_SP_REG:
+	case IVY_OPC_LDR_SP_REG:
 		printf(" x%ld, [sp, x%ld]", instr.i_arg[0], instr.i_arg[1]);
 		break;
-	case IVY_OP_LDR_SP_CONST:
+	case IVY_OPC_LDR_SP_CONST:
 		printf(" x%ld, [sp, #%ld]", instr.i_arg[0], instr.i_arg[1]);
 		break;
-	case IVY_OP_LDR_BP_REG:
+	case IVY_OPC_LDR_BP_REG:
 		printf(" x%ld, [bp, x%ld]", instr.i_arg[0], instr.i_arg[1]);
 		break;
-	case IVY_OP_LDR_BP_CONST:
+	case IVY_OPC_LDR_BP_CONST:
 		printf(" x%ld, [bp, #%ld]", instr.i_arg[0], instr.i_arg[1]);
 		break;
-	case IVY_OP_LDR_SELF_REG:
+	case IVY_OPC_LDR_SELF_REG:
 		printf(" x%ld, [self, x%ld]", instr.i_arg[0], instr.i_arg[1]);
 		break;
-	case IVY_OP_LDR_SELF_CONST:
+	case IVY_OPC_LDR_SELF_CONST:
 		printf(" x%ld, [self, #%ld]", instr.i_arg[0], instr.i_arg[1]);
 		break;
-	case IVY_OP_LDR_POOL_REG:
+	case IVY_OPC_LDR_POOL_REG:
 		printf(" x%ld, [pool, x%ld]", instr.i_arg[0], instr.i_arg[1]);
 		break;
-	case IVY_OP_LDR_POOL_CONST:
+	case IVY_OPC_LDR_POOL_CONST:
 		printf(" x%ld, [pool, #%ld]", instr.i_arg[0], instr.i_arg[1]);
 		break;
-	case IVY_OP_LDR_CONST:
+	case IVY_OPC_LDR_CONST:
 		printf(" x%ld, #%ld", instr.i_arg[0], instr.i_arg[1]);
 		break;
 
-	case IVY_OP_STR_SP_REG:
+	case IVY_OPC_STR_SP_REG:
 		printf(" x%ld, [sp, x%ld]", instr.i_arg[0], instr.i_arg[1]);
 		break;
-	case IVY_OP_STR_SP_CONST:
+	case IVY_OPC_STR_SP_CONST:
 		printf(" x%ld, [sp, #%ld]", instr.i_arg[0], instr.i_arg[1]);
 		break;
-	case IVY_OP_STR_BP_REG:
+	case IVY_OPC_STR_BP_REG:
 		printf(" x%ld, [bp, x%ld]", instr.i_arg[0], instr.i_arg[1]);
 		break;
-	case IVY_OP_STR_BP_CONST:
+	case IVY_OPC_STR_BP_CONST:
 		printf(" x%ld, [bp, #%ld]", instr.i_arg[0], instr.i_arg[1]);
 		break;
-	case IVY_OP_STR_SELF_REG:
+	case IVY_OPC_STR_SELF_REG:
 		printf(" x%ld, [self, x%ld]", instr.i_arg[0], instr.i_arg[1]);
 		break;
-	case IVY_OP_STR_SELF_CONST:
+	case IVY_OPC_STR_SELF_CONST:
 		printf(" x%ld, [self, #%ld]", instr.i_arg[0], instr.i_arg[1]);
 		break;
 
-	case IVY_OP_PUSH_REG:
-	case IVY_OP_POP:
+	case IVY_OPC_PUSH_REG:
+	case IVY_OPC_POP:
 		printf(" x%ld", instr.i_arg[0]);
 		break;
-	case IVY_OP_PUSH_CONST:
+	case IVY_OPC_PUSH_CONST:
 		printf(" #%ld", instr.i_arg[0]);
 		break;
 
-	case IVY_OP_MSG_REG:
+	case IVY_OPC_MSG_REG:
 		printf(" x%ld, x%ld, x%lx", instr.i_arg[0], instr.i_arg[1],
 		       instr.i_arg[2]);
 		break;
-	case IVY_OP_MSG_CONST:
+	case IVY_OPC_MSG_CONST:
 		printf(" x%ld, x%ld, #%lx", instr.i_arg[0], instr.i_arg[1],
 		       instr.i_arg[2]);
 		break;
 
-	case IVY_OP_ADD:
-	case IVY_OP_SUB:
-	case IVY_OP_MUL:
-	case IVY_OP_DIV:
+	case IVY_OPC_ADD:
+	case IVY_OPC_SUB:
+	case IVY_OPC_MUL:
+	case IVY_OPC_DIV:
 		printf(" x%ld, x%ld, x%lx", instr.i_arg[0], instr.i_arg[1],
 		       instr.i_arg[2]);
 		break;
 
-	case IVY_OP_C_EQ:
-	case IVY_OP_C_NE:
-	case IVY_OP_C_LT:
-	case IVY_OP_C_LE:
-	case IVY_OP_C_GT:
-	case IVY_OP_C_GE:
+	case IVY_OPC_C_EQ:
+	case IVY_OPC_C_NE:
+	case IVY_OPC_C_LT:
+	case IVY_OPC_C_LE:
+	case IVY_OPC_C_GT:
+	case IVY_OPC_C_GE:
 		printf(" x%ld, x%ld, x%lx", instr.i_arg[0], instr.i_arg[1],
 		       instr.i_arg[2]);
 		break;
 
-	case IVY_OP_BR:
-	case IVY_OP_BR_T:
-	case IVY_OP_BR_F:
+	case IVY_OPC_BR:
+	case IVY_OPC_BR_T:
+	case IVY_OPC_BR_F:
 		printf(" $%04lXh", instr.i_arg[0]);
 		break;
 
-	case IVY_OP_OB_C_REG:
+	case IVY_OPC_OB_C_REG:
 		break;
-	case IVY_OP_OB_C_CONST:
+	case IVY_OPC_OB_C_CONST:
 		break;
-	case IVY_OP_OB_E:
+	case IVY_OPC_OB_E:
 		break;
 
-	case IVY_OP_LAM_C_REG:
+	case IVY_OPC_LAM_C_REG:
 		break;
-	case IVY_OP_LAM_C_CONST:
+	case IVY_OPC_LAM_C_CONST:
 		break;
 
-	case IVY_OP_IT_G:
+	case IVY_OPC_IT_G:
 		break;
-	case IVY_OP_IT_N:
+	case IVY_OPC_IT_N:
 		break;
-	case IVY_OP_IT_V:
+	case IVY_OPC_IT_V:
 		break;
 
-	case IVY_OP_RET:
+	case IVY_OPC_RET:
 		break;
-	case IVY_OP_RET_N:
+	case IVY_OPC_RET_N:
 		break;
 	default:
 		break;