diff --git a/inc/gps.h b/inc/gps.h
--- a/inc/gps.h
+++ b/inc/gps.h
@@ -30,17 +30,21 @@
 #include <stdint.h>
 
 // Hardware config
-#define GPS_USART USART1
+/*#define GPS_USART USART1
 #define GPS_IRQ NVIC_USART1_IRQ
 
-#define GPS_TX_PIN GPIO_PIN_6
-#define GPS_RX_PIN GPIO_PIN_7
-#define GPS_RXTX_PORT GPIOB
+#define GPS_TX_PORT GPIOB
+#define GPS_TX_PIN GPIO6
+#define GPS_TX_AF GPIO_AF0
 
-#define GPS_ONOFF_PORT GPIOF
-#define GPS_ONOFF_PIN GPIO_PIN_1
+#define GPS_RX_PORT GPIOB
+#define GPS_RX_PIN GPIO7
+#define GPS_RX_AF GPIO_AF0
+
+#define GPS_ONOFF_PORT GPIOA
+#define GPS_ONOFF_PIN GPIO1
 #define GPS_ONOFF GPS_ONOFF_PORT, GPS_ONOFF_PIN
-
+*/
 // Messages (REMOVEME?)
 #define GGA_MESSAGE
 #define RMC_MESSAGE
@@ -62,7 +66,7 @@ char* get_hdop(void);
 char* get_sv(void);
 char* get_dayofmonth(void);
 uint8_t gps_hasfix(void);
-void gps_process(void);
+void parse_gps_transmission(void);
 void XORbyteWithChecksum(uint8_t byte);
 
 #endif /* GPS_H_ */