diff --git a/gba/cartest/src/cartest.cpp b/gba/cartest/src/cartest.cpp
index 504221e..7e4b3e5 100644
--- a/gba/cartest/src/cartest.cpp
+++ b/gba/cartest/src/cartest.cpp
@@ -38,7 +38,7 @@ unsigned int frame;
 void VblankInterrupt()
 {
 	frame += 1;
-	ScanKeys();
+	scanKeys();
 }
 
 class Smoke {
@@ -168,10 +168,10 @@ int main(void)
 	OBJAFFINE *const oa_buffer = (OBJAFFINE*)oe_buffer;
 
 	// Set up the interrupt handlers
-	InitInterrupt();
-	SetInterrupt( IE_VBL, VblankInterrupt);
+	irqInit();
+	irqSet( IRQ_VBLANK, VblankInterrupt);
 	// Enable Vblank Interrupt to allow VblankIntrWait
-	EnableInterrupt(IE_VBL);
+	irqEnable(IRQ_VBLANK);
 	// Allow Interrupts
 	REG_IME = 1;
 	// screen mode, background and objects to display
@@ -194,29 +194,29 @@ int main(void)
 	Smoke smoke(NUMSMOKES, &oe_buffer[2], smoke_index);
 
 	while (1) {
-		if (KeysHeld() & KEY_RIGHT) {
+		if (keysHeld() & KEY_RIGHT) {
 		  red.rotate(-8);
-		} else if (KeysHeld() & KEY_LEFT) {
+		} else if (keysHeld() & KEY_LEFT) {
 		  red.rotate(8);
 		}
-		if (KeysHeld() & KEY_A) {
+		if (keysHeld() & KEY_A) {
 		  blue.rotate(-8);
-		} else if (KeysHeld() & KEY_B) {
+		} else if (keysHeld() & KEY_B) {
 		  blue.rotate(8);
 		}
 		
-		if (KeysHeld() & KEY_L) {
+		if (keysHeld() & KEY_L) {
 		  red.speedup();
 		}
 
-		if (KeysHeld() & KEY_R) {
+		if (keysHeld() & KEY_R) {
 		  blue.speedup();
 		}
 
-		if (!(KeysHeld() & KEY_L)) {
+		if (!(keysHeld() & KEY_L)) {
 		  red.slowdown();
 		}
-		if (!(KeysHeld() & KEY_R)) {
+		if (!(keysHeld() & KEY_R)) {
 		  blue.slowdown();
 		}