diff --git a/rpcs3/Emu/SysCalls/Modules.h b/rpcs3/Emu/SysCalls/Modules.h
index f49d189ca4..fdf579ec0b 100644
--- a/rpcs3/Emu/SysCalls/Modules.h
+++ b/rpcs3/Emu/SysCalls/Modules.h
@@ -165,9 +165,9 @@ void hook_ppu_funcs(vm::ptr<u32> base, u32 size);
 
 #define se_op_all(type, op, sup) []() { s32 XXX = 0; SearchPatternEntry res = { (type), (op), 0, (sup) }; XXX = -1; res.mask = (op) ^ ~res.data; return res; }()
 #define se_op(op) se_op_all(SPET_MASKED_OPCODE, op, 0)
-#define se_opt(op) se_op_all(SPET_OPTIONAL_MASKED_OPCODE, op, 0)
+#define se_opt_op(op) se_op_all(SPET_OPTIONAL_MASKED_OPCODE, op, 0)
 #define se_label(label) { SPET_LABEL, (label) }
-#define se_lbr(op, label) se_op_all(SPET_BRANCH_TO_LABEL, op, label)
-#define se_call(op, name) se_op_all(SPET_BRANCH_TO_FUNC, op, get_function_id(#name))
+#define se_br_label(op, label) se_op_all(SPET_BRANCH_TO_LABEL, op, label)
+#define se_func_call(op, name) se_op_all(SPET_BRANCH_TO_FUNC, op, get_function_id(#name))
 
 #define UNIMPLEMENTED_FUNC(module) module.Error("%s", __FUNCTION__)
diff --git a/rpcs3/Emu/SysCalls/Modules/libmixer.cpp b/rpcs3/Emu/SysCalls/Modules/libmixer.cpp
index 18ae4578c2..f8c6545cf5 100644
--- a/rpcs3/Emu/SysCalls/Modules/libmixer.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/libmixer.cpp
@@ -677,7 +677,7 @@ Module libmixer("libmixer", []()
 		{ SPET_MASKED_OPCODE, 0x7c691b78, 0xffffffff },
 		{ SPET_MASKED_OPCODE, 0x7c8a2378, 0xffffffff },
 		{ SPET_MASKED_OPCODE, 0x60000003, 0xffffffff },
-		se_lbr(BNE(cr7, XXX), 0x24),
+		se_br_label(BNE(cr7, XXX), 0x24),
 		se_label(0x24),
 		{ SPET_MASKED_OPCODE, 0x7c0307b4, 0xffffffff },
 		{ SPET_MASKED_OPCODE, 0xe80100a0, 0xffffffff },
@@ -688,7 +688,7 @@ Module libmixer("libmixer", []()
 		{ SPET_MASKED_OPCODE, 0x2f850000, 0xffffffff },
 		{ SPET_MASKED_OPCODE, 0x78630020, 0xffffffff },
 		{ SPET_MASKED_OPCODE, 0x38810070, 0xffffffff },
-		se_lbr(BEQ(cr7, XXX), 0x38),
+		se_br_label(BEQ(cr7, XXX), 0x38),
 		{ SPET_MASKED_OPCODE, 0x81690000, 0xffffffff },
 		{ SPET_MASKED_OPCODE, 0x38000001, 0xffffffff },
 		{ SPET_MASKED_OPCODE, 0x91210074, 0xffffffff },
@@ -720,7 +720,7 @@ Module libmixer("libmixer", []()
 		{ SPET_MASKED_OPCODE, 0x7c691b78, 0xffffffff },
 		{ SPET_MASKED_OPCODE, 0x7c8a2378, 0xffffffff },
 		{ SPET_MASKED_OPCODE, 0x60000003, 0xffffffff },
-		se_lbr(BNE(cr7, XXX), 0x24),
+		se_br_label(BNE(cr7, XXX), 0x24),
 		se_label(0x24),
 		{ SPET_MASKED_OPCODE, 0x7c0307b4, 0xffffffff },
 		{ SPET_MASKED_OPCODE, 0xe80100a0, 0xffffffff },
@@ -731,7 +731,7 @@ Module libmixer("libmixer", []()
 		{ SPET_MASKED_OPCODE, 0x2f850000, 0xffffffff },
 		{ SPET_MASKED_OPCODE, 0x78630020, 0xffffffff },
 		{ SPET_MASKED_OPCODE, 0x38810070, 0xffffffff },
-		se_lbr(BEQ(cr7, XXX), 0x38),
+		se_br_label(BEQ(cr7, XXX), 0x38),
 		{ SPET_MASKED_OPCODE, 0x81690000, 0xffffffff },
 		{ SPET_MASKED_OPCODE, 0x38000001, 0xffffffff },
 		{ SPET_MASKED_OPCODE, 0x91210074, 0xffffffff },
@@ -767,7 +767,7 @@ Module libmixer("libmixer", []()
 		{ SPET_MASKED_OPCODE, 0xfbe100a8, 0xffffffff },
 		{ SPET_MASKED_OPCODE, 0xf80100c0, 0xffffffff },
 		{ SPET_MASKED_OPCODE, 0x7c7e1b78, 0xffffffff },
-		se_lbr(BNE(cr7, XXX), 0x6c),
+		se_br_label(BNE(cr7, XXX), 0x6c),
 		{ SPET_MASKED_OPCODE, 0x3fe08031, 0xffffffff },
 		{ SPET_MASKED_OPCODE, 0x63ff0003, 0xffffffff },
 		{ SPET_MASKED_OPCODE, 0xe80100c0, 0xffffffff },
diff --git a/rpcs3/Emu/SysCalls/Modules/sys_libc.cpp b/rpcs3/Emu/SysCalls/Modules/sys_libc.cpp
index 918c15ffc4..4d658ab79f 100644
--- a/rpcs3/Emu/SysCalls/Modules/sys_libc.cpp
+++ b/rpcs3/Emu/SysCalls/Modules/sys_libc.cpp
@@ -27,7 +27,7 @@ Module sys_libc("sys_libc", []()
 		se_op(MR(r11, r3)),
 		se_op(BGT(cr7, XXX & 0xff)),
 		se_op(CMPDI(r5, 0)),
-		se_opt(MR(r9, r3)),
+		se_opt_op(MR(r9, r3)),
 		{ SPET_MASKED_OPCODE, 0x4d820020, 0xffffffff },
 	);
 });