diff --git a/common/include/ivy/opcode.h b/common/include/ivy/opcode.h
index db7d94b..ff6c6c5 100644
--- a/common/include/ivy/opcode.h
+++ b/common/include/ivy/opcode.h
@@ -12,7 +12,6 @@ enum ivy_instr_id {
 	IVY_INSTR_SUB,
 	IVY_INSTR_MUL,
 	IVY_INSTR_DIV,
-	IVY_INSTR_CMP,
 	IVY_INSTR_C_EQ,
 	IVY_INSTR_C_NE,
 	IVY_INSTR_C_LT,
@@ -20,14 +19,8 @@ enum ivy_instr_id {
 	IVY_INSTR_C_GT,
 	IVY_INSTR_C_GE,
 	IVY_INSTR_BR,
-	IVY_INSTR_B_Z,
-	IVY_INSTR_B_NZ,
-	IVY_INSTR_B_EQ,
-	IVY_INSTR_B_NE,
-	IVY_INSTR_B_LT,
-	IVY_INSTR_B_LE,
-	IVY_INSTR_B_GT,
-	IVY_INSTR_B_GE,
+	IVY_INSTR_BR_T,
+	IVY_INSTR_BR_F,
 	IVY_INSTR_OB_C,
 	IVY_INSTR_OB_E,
 	IVY_INSTR_LAM_C,
@@ -49,7 +42,7 @@ enum ivy_opcode {
 	IVY_OP_LDR_SELF_CONST,
 	IVY_OP_LDR_POOL_REG,
 	IVY_OP_LDR_POOL_CONST,
-	IVY_OP_LDR_IMM,
+	IVY_OP_LDR_CONST,
 
 	IVY_OP_STR_SP_REG,
 	IVY_OP_STR_SP_CONST,
@@ -70,8 +63,6 @@ enum ivy_opcode {
 	IVY_OP_MUL,
 	IVY_OP_DIV,
 
-	IVY_OP_CMP,
-
 	IVY_OP_C_EQ,
 	IVY_OP_C_NE,
 	IVY_OP_C_LT,
@@ -80,19 +71,15 @@ enum ivy_opcode {
 	IVY_OP_C_GE,
 
 	IVY_OP_BR,
-	IVY_OP_B_Z,
-	IVY_OP_B_NZ,
-	IVY_OP_B_EQ,
-	IVY_OP_B_NE,
-	IVY_OP_B_LT,
-	IVY_OP_B_LE,
-	IVY_OP_B_GT,
-	IVY_OP_B_GE,
+	IVY_OP_BR_T,
+	IVY_OP_BR_F,
 
-	IVY_OP_OB_C,
+	IVY_OP_OB_C_REG,
+	IVY_OP_OB_C_CONST,
 	IVY_OP_OB_E,
 
-	IVY_OP_LAM_C,
+	IVY_OP_LAM_C_REG,
+	IVY_OP_LAM_C_CONST,
 
 	IVY_OP_IT_G,
 	IVY_OP_IT_N,