-#define BTN_UP GP2X_UP
-#define BTN_DOWN GP2X_DOWN
-#define BTN_LEFT GP2X_LEFT
-#define BTN_RIGHT GP2X_RIGHT
-
-#define BTN_NORTH GP2X_Y
-#define BTN_SOUTH GP2X_X
-#define BTN_WEST GP2X_A
-#define BTN_EAST GP2X_B
-#define BTN_L GP2X_L
-#define BTN_R GP2X_R
+#define PBTN_UP GP2X_UP
+#define PBTN_DOWN GP2X_DOWN
+#define PBTN_LEFT GP2X_LEFT
+#define PBTN_RIGHT GP2X_RIGHT
+
+#define PBTN_NORTH GP2X_Y
+#define PBTN_SOUTH GP2X_X
+#define PBTN_WEST GP2X_A
+#define PBTN_EAST GP2X_B
+#define PBTN_L GP2X_L
+#define PBTN_R GP2X_R