-#define LED_CONFIG() (P1DIR |= BIT6)
-#define LED_ON() (P1OUT |= BIT6)
-#define LED_OFF() (P1OUT &= ~BIT6)
-#define LED_READ() (P1OUT & BIT6)
-#define LED_TOGGLE() (P1OUT ^= BIT6)
-
-#define CONNECTED_LED_CONFIG() (P1DIR |= BIT0)
-#define CONNECTED_LED_ON() (P1OUT |= BIT0)
-#define CONNECTED_LED_OFF() (P1OUT &= ~BIT0)
-
-#define BUTTON_CONFIG() (P1DIR &= ~BIT3, P1REN |= BIT3, P1OUT |= BIT3, P1IES |= BIT3);
-#define BUTTON_ENABLE() (P1IFG &= ~BIT3, P1IE |= BIT3)
-#define BUTTON_PRESSED() (!(P1IN & BIT3))
-#define BUTTON_DEBOUNCE_MSECS 100
+#define GREEN_LED_CONFIG() (P1DIR |= BIT6)
+#define GREEN_LED_ON() (P1OUT |= BIT6)
+#define GREEN_LED_OFF() (P1OUT &= ~BIT6)
+#define GREEN_LED_READ() (P1OUT & BIT6)
+#define GREEN_LED_TOGGLE() (P1OUT ^= BIT6)
+
+#define RED_LED_CONFIG() (P1DIR |= BIT0)
+#define RED_LED_ON() (P1OUT |= BIT0)
+#define RED_LED_OFF() (P1OUT &= ~BIT0)
+#define RED_LED_READ() (P1OUT & BIT0)
+#define RED_LED_TOGGLE() (P1OUT ^= BIT0)
+
+#define GPIO_CONFIG(mask) (P1DIR &= ~mask, P1REN |= mask, P1OUT |= mask, P1IES |= mask);
+#define GPIO_ENABLE(mask) (P1IFG &= ~mask, P1IE |= mask)
+#define GPIO_DISABLE(mask) (P1IE &= ~mask, P1IFG &= ~mask)
+#define GPIO_FIRED(mask) (P1IFG & mask)
+#define GPIO_LOW(mask) (!(P1IN & mask))
+#define GPIO_DEBOUNCE_MSECS 100