diff --git a/src/boards/addrlatch.c b/src/boards/addrlatch.c
index ee18af9..473559e 100644
--- a/src/boards/addrlatch.c
+++ b/src/boards/addrlatch.c
@@ -553,7 +553,7 @@ static void BMCTJ03Sync(void) {
 	setchr8(bank);
 
 	if (bank == 3) mirr ^= 1; /* Twin Bee has incorrect mirroring */
-	SetupCartMirroring(mirr, 1, NULL);
+	setmirror(mirr);
 }
 
 void BMCTJ03_Init(CartInfo *info) {
@@ -568,7 +568,7 @@ static void BMCSA005ASync(void) {
 	setprg16(0x8000, latche & 0x0F);
 	setprg16(0xC000, latche & 0x0F);
 	setchr8(latche & 0x0F);
-	SetupCartMirroring((latche >> 3) & 1, 1, NULL);
+	setmirror((latche >> 3) & 1);
 }
 
 void BMCSA005A_Init(CartInfo *info) {
diff --git a/src/boards/bmc60311c.c b/src/boards/bmc60311c.c
index 8f313ee..03eaf11 100644
--- a/src/boards/bmc60311c.c
+++ b/src/boards/bmc60311c.c
@@ -66,7 +66,7 @@ static void Sync(void) {
 	setchr8(0);
 	setprg16(0x8000, preg[0]);
 	setprg16(0xC000, preg[1]);
-	SetupCartMirroring(((mode & 8) >> 3) ^ 1, 1, NULL);
+	setmirror(((mode & 8) >> 3) ^ 1);
 }
 
 static DECLFW(Write0) {
diff --git a/src/boards/bmc80013b.c b/src/boards/bmc80013b.c
index 51fb150..82dc4cf 100644
--- a/src/boards/bmc80013b.c
+++ b/src/boards/bmc80013b.c
@@ -39,7 +39,7 @@ static void Sync(void) {
 	else
 		setprg16r(1, 0x8000, regs[0] & 0x03);
 	setprg16(0xC000, regs[1]);
-	SetupCartMirroring(((regs[0] >> 4) & 1) ^ 1, 1, NULL);
+	setmirror(((regs[0] >> 4) & 1) ^ 1);
 }
 
 static DECLFW(BMC80013BWrite) {
diff --git a/src/boards/bmcctc09.c b/src/boards/bmcctc09.c
index 185576c..8651ad9 100644
--- a/src/boards/bmcctc09.c
+++ b/src/boards/bmcctc09.c
@@ -43,7 +43,7 @@ static void Sync(void) {
 		setprg32(0x8000, regs[PRG] & 0x07);
 
 	setchr8(regs[CHR] & 0x0F);
-	SetupCartMirroring(((regs[PRG] >> 5) & 1) ^ 1, 1, NULL);
+	setmirror(((regs[PRG] >> 5) & 1) ^ 1);
 }
 
 static DECLFW(WritePRG) {
diff --git a/src/boards/bmck3036.c b/src/boards/bmck3036.c
index 2e716e0..c013579 100644
--- a/src/boards/bmck3036.c
+++ b/src/boards/bmck3036.c
@@ -43,7 +43,7 @@ static void Sync(void) {
 		setprg16(0xC000, regs[0] & 0x1F | 0x07);
 	}
 	setchr8(0);
-	SetupCartMirroring(((regs[0] & 0x25) == 0x25 ? MI_H : MI_V), 1, NULL);
+	setmirror(((regs[0] & 0x25) == 0x25) ? MI_H : MI_V);
 }
 
 static DECLFW(M340Write) {