diff --git a/include/console.h b/include/console.h
index e474951c..7b543013 100644
--- a/include/console.h
+++ b/include/console.h
@@ -39,9 +39,9 @@
 extern "C" {
 #endif
 
-msg_t lcdConsoleInit(GConsole_t *console, coord_t x0, coord_t y0, coord_t width, coord_t height, font_t font, pixel_t bkcolor, pixel_t color);
-msg_t lcdConsolePut(GConsole_t *console, char c);
-msg_t lcdConsoleWrite(GConsole_t *console, const uint8_t *bp, size_t n);
+msg_t lcdConsoleInit(GConsole *console, coord_t x0, coord_t y0, coord_t width, coord_t height, font_t font, pixel_t bkcolor, pixel_t color);
+msg_t lcdConsolePut(GConsole *console, char c);
+msg_t lcdConsoleWrite(GConsole *console, const uint8_t *bp, size_t n);
 
 #ifdef __cplusplus
 }
diff --git a/include/touchpad.h b/include/touchpad.h
index 469144b1..18f72ec5 100644
--- a/include/touchpad.h
+++ b/include/touchpad.h
@@ -70,7 +70,7 @@ typedef struct cal_t {
 extern "C" {
 #endif
 
-void tpInit(const TOUCHPADDriver_t *tp);
+void tpInit(const TOUCHPADDriver *tp);
 uint16_t tpReadX(void);
 uint16_t tpReadY(void);
 void tpCalibrate(void);
diff --git a/include/touchpad_lld.h b/include/touchpad_lld.h
index 77dd1578..d207eb6c 100644
--- a/include/touchpad_lld.h
+++ b/include/touchpad_lld.h
@@ -76,7 +76,7 @@
 /**
  * @brief	Structure representing a Touchpad driver.
  */
-typedef struct _TOUCHPADDriver_t {
+typedef struct _TOUCHPADDriver {
     /*
      * @brief   Pointer to SPI driver.
      * @note    SPI driver must be enabled in mcuconf.h and halconf.h
@@ -113,7 +113,7 @@ typedef struct _TOUCHPADDriver_t {
      *          bus with a fast flash memory chip.
      */
     bool_t          direct_init;
-} TOUCHPADDriver_t;
+} TOUCHPADDriver;
 
 
 /*===========================================================================*/
@@ -126,7 +126,7 @@ extern "C" {
 #endif
 
 	/* Core functions */
-	void tp_lld_init(const TOUCHPADDriver_t *tp);
+	void tp_lld_init(const TOUCHPADDriver *tp);
 
 	uint16_t tp_lld_read_value(uint8_t cmd);
 	uint16_t tp_lld_read_x(void);
diff --git a/src/console.c b/src/console.c
index 16b18114..4739c53c 100644
--- a/src/console.c
+++ b/src/console.c
@@ -41,7 +41,7 @@ struct GConsoleVMT {
  * @details This class extends @p BaseAsynchronousChannel by adding physical
  *          I/O queues.
  */
-typedef struct _GConsole_t {
+typedef struct _GConsole {
 	/** @brief Virtual Methods Table.*/
 	const struct GConsoleVMT *vmt;
 	_base_asynchronous_channel_data
@@ -60,7 +60,7 @@ typedef struct _GConsole_t {
 	uint8_t fy;
 	/* font inter-character padding in pixels */
 	uint8_t fp;
-} GConsole_t;
+} GConsole;
 
 /*
  * Interface implementation. The interface is write only
@@ -130,7 +130,7 @@ static const struct GConsoleVMT vmt = {
 };
 
 
-msg_t lcdConsoleInit(GConsole_t *console, coord_t x0, coord_t y0, coord_t width, coord_t height, font_t font, pixel_t bkcolor, pixel_t color) {
+msg_t lcdConsoleInit(GConsole *console, coord_t x0, coord_t y0, coord_t width, coord_t height, font_t font, pixel_t bkcolor, pixel_t color) {
 	console->vmt = &vmt;
 	/* read font, get height & padding */
 	console->fy = gdispGetFontMetric(font, fontHeight);
@@ -154,7 +154,7 @@ msg_t lcdConsoleInit(GConsole_t *console, coord_t x0, coord_t y0, coord_t width,
 	return RDY_OK;
 }
 
-msg_t lcdConsolePut(GLCDConsole_t *console, char c) {
+msg_t lcdConsolePut(GLCDConsole *console, char c) {
 	uint8_t width;
 
 	if(c == '\n') {
@@ -208,7 +208,7 @@ msg_t lcdConsolePut(GLCDConsole_t *console, char c) {
 	return RDY_OK;
 }
 
-msg_t lcdConsoleWrite(GLCDConsole_t *console, const uint8_t *bp, size_t n) {
+msg_t lcdConsoleWrite(GLCDConsole *console, const uint8_t *bp, size_t n) {
 	size_t i;
 	for(i = 0; i < n; i++)
 		lcdConsolePut(console, bp[i]);
diff --git a/src/touchpad.c b/src/touchpad.c
index b38283c2..0759134e 100644
--- a/src/touchpad.c
+++ b/src/touchpad.c
@@ -126,7 +126,7 @@ static void _tpDrawCross(uint16_t x, uint16_t y) {
  *
  * @api
  */
-void tpInit(const TOUCHPADDriver_t *tp) {
+void tpInit(const TOUCHPADDriver *tp) {
 	/* Initialise Mutex */
 	//MUTEX_INIT