diff --git a/radio/src/gui/9X/lcd.cpp b/radio/src/gui/9X/lcd.cpp
index 1c6751f1a..ee9b09f60 100644
--- a/radio/src/gui/9X/lcd.cpp
+++ b/radio/src/gui/9X/lcd.cpp
@@ -40,7 +40,7 @@ display_t displayBuf[DISPLAY_BUF_SIZE];
 
 void lcd_clear()
 {
-  memset(displayBuf, 0, DISPLAY_BUFER_SIZE);
+  memset(displayBuf, 0, DISPLAY_BUFFER_SIZE);
 }
 
 coord_t lcdLastPos;
diff --git a/radio/src/gui/9X/lcd.h b/radio/src/gui/9X/lcd.h
index 1789429ab..a5b87b5e3 100644
--- a/radio/src/gui/9X/lcd.h
+++ b/radio/src/gui/9X/lcd.h
@@ -144,7 +144,7 @@ extern display_t displayBuf[DISPLAY_BUF_SIZE];
 extern coord_t lcdLastPos;
 extern coord_t lcdNextPos;
 
-#define DISPLAY_BUFER_SIZE     (sizeof(display_t)*DISPLAY_BUF_SIZE)
+#define DISPLAY_BUFFER_SIZE     (sizeof(display_t)*DISPLAY_BUF_SIZE)
 #define DISPLAY_END            (displayBuf + DISPLAY_BUF_SIZE)
 #define ASSERT_IN_DISPLAY(p)   assert((p) >= displayBuf && (p) < DISPLAY_END)
 
diff --git a/radio/src/gui/Taranis/lcd.cpp b/radio/src/gui/Taranis/lcd.cpp
index 93ccce20d..18f17e8cf 100644
--- a/radio/src/gui/Taranis/lcd.cpp
+++ b/radio/src/gui/Taranis/lcd.cpp
@@ -52,7 +52,7 @@ inline bool lcdIsPointOutside(coord_t x, coord_t y)
 
 void lcd_clear()
 {
-  memset(displayBuf, 0, DISPLAY_BUFER_SIZE);
+  memset(displayBuf, 0, DISPLAY_BUFFER_SIZE);
 }
 
 coord_t lcdLastPos;
diff --git a/radio/src/gui/Taranis/lcd.h b/radio/src/gui/Taranis/lcd.h
index a5342efb8..a0813c0ec 100644
--- a/radio/src/gui/Taranis/lcd.h
+++ b/radio/src/gui/Taranis/lcd.h
@@ -138,7 +138,7 @@
 extern coord_t lcdLastPos;
 extern coord_t lcdNextPos;
 
-#define DISPLAY_BUFER_SIZE     (sizeof(display_t)*DISPLAY_BUF_SIZE)
+#define DISPLAY_BUFFER_SIZE    (sizeof(display_t)*DISPLAY_BUF_SIZE)
 #define DISPLAY_END            (displayBuf + DISPLAY_BUF_SIZE)
 #define ASSERT_IN_DISPLAY(p)   assert((p) >= displayBuf && (p) < DISPLAY_END)
 
diff --git a/radio/src/targets/simu/simpgmspace.cpp b/radio/src/targets/simu/simpgmspace.cpp
index f41d475c2..27002ae39 100644
--- a/radio/src/targets/simu/simpgmspace.cpp
+++ b/radio/src/targets/simu/simpgmspace.cpp
@@ -348,7 +348,7 @@ void *main_thread(void *)
   try {
 #endif
 
-#if defined(COLORLCD)
+#if defined(PCBHORUS)
     lcdColorsInit();
 #endif
 
diff --git a/radio/src/tests/eeprom.cpp b/radio/src/tests/eeprom.cpp
index 0a032ae25..bf0a5536f 100644
--- a/radio/src/tests/eeprom.cpp
+++ b/radio/src/tests/eeprom.cpp
@@ -37,7 +37,7 @@
 #include "gtests.h"
 
 #if !defined(PCBSKY9X)
-TEST(EEPROM, 100_random_writes)
+TEST(Eeprom, 100_random_writes)
 {
   eepromFile = NULL; // in memory
   RlcFile f;
@@ -60,7 +60,7 @@ TEST(EEPROM, 100_random_writes)
   }
 }
 
-TEST(EEPROM, test2)
+TEST(Eeprom, test2)
 {
   eepromFile = NULL; // in memory
   RlcFile f;
@@ -83,7 +83,7 @@ TEST(EEPROM, test2)
   EXPECT_EQ(sz, 300);
 }
 
-TEST(EEPROM, eeCheckImmediately)
+TEST(Eeprom, eeCheckImmediately)
 {
   eepromFile = NULL; // in memory
   // RlcFile f;
@@ -108,7 +108,7 @@ TEST(EEPROM, eeCheckImmediately)
   EXPECT_EQ(sz, 300);
 }
 
-TEST(EEPROM, copy)
+TEST(Eeprom, copy)
 {
   eepromFile = NULL; // in memory
 
@@ -133,7 +133,7 @@ TEST(EEPROM, copy)
   EXPECT_EQ(sz, 300);
 }
 
-TEST(EEPROM, rm)
+TEST(Eeprom, rm)
 {
   eepromFile = NULL; // in memory
 
diff --git a/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/audio/inc/usbd_audio_core.h b/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/audio/inc/usbd_audio_core.h
index 0a0e6f884..914f70218 100644
--- a/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/audio/inc/usbd_audio_core.h
+++ b/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/audio/inc/usbd_audio_core.h
@@ -30,7 +30,7 @@
 #ifndef __USB_AUDIO_CORE_H_
 #define __USB_AUDIO_CORE_H_
 
-#include "../../../../../../../targets/Flamenco/usbd_desc.h"
+#include "usbd_desc.h"
 #include "usbd_ioreq.h"
 #include "usbd_req.h"
 
diff --git a/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/cdc/inc/usbd_cdc_if_template.h b/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/cdc/inc/usbd_cdc_if_template.h
index f3f1af32f..1b0c3f048 100644
--- a/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/cdc/inc/usbd_cdc_if_template.h
+++ b/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/cdc/inc/usbd_cdc_if_template.h
@@ -30,8 +30,8 @@
 #define __USBD_CDC_IF_TEMPLATE_H
 
 /* Includes ------------------------------------------------------------------*/
-#include "../../../../../../../targets/Flamenco/usb_conf.h"
-#include "../../../../../../../targets/Flamenco/usbd_conf.h"
+#include "usb_conf.h"
+#include "usbd_conf.h"
 #include "usbd_cdc_core.h"
 
 /* Exported types ------------------------------------------------------------*/
diff --git a/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_dfu_mal.h b/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_dfu_mal.h
index 740d3b22e..2711dfc0e 100644
--- a/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_dfu_mal.h
+++ b/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_dfu_mal.h
@@ -30,8 +30,7 @@
 #define __DFU_MAL_H
 
 /* Includes ------------------------------------------------------------------*/
-#include "../../../../../../../targets/Flamenco/usb_conf.h"
-#include "../../../../../../../targets/Flamenco/usbd_conf.h"
+#include "usb_conf.h"
 #include "usbd_conf.h"
 #include "usbd_dfu_core.h"
 
diff --git a/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_mem_if_template.h b/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_mem_if_template.h
index 777649e0a..d4542f515 100644
--- a/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_mem_if_template.h
+++ b/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/dfu/inc/usbd_mem_if_template.h
@@ -30,7 +30,7 @@
 #define __MEM_IF_MAL_H
 
 /* Includes ------------------------------------------------------------------*/
-#include "../../../../../../../targets/Flamenco/usb_conf.h"
+#include "usb_conf.h"
 #include "usbd_dfu_mal.h"
 
 /* Exported types ------------------------------------------------------------*/
diff --git a/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_dfu_core.c b/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_dfu_core.c
index 56ef1e662..0cfa47897 100644
--- a/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_dfu_core.c
+++ b/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/dfu/src/usbd_dfu_core.c
@@ -64,7 +64,7 @@
 /* Includes ------------------------------------------------------------------*/
 #include "usbd_dfu_core.h"
 
-#include "../../../../../../../targets/Flamenco/usbd_desc.h"
+#include "usbd_desc.h"
 #include "usbd_req.h"
 #include "usb_bsp.h"
 
diff --git a/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/hid/src/usbd_hid_core.c b/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/hid/src/usbd_hid_core.c
index 99eb14a05..3dcfd918c 100644
--- a/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/hid/src/usbd_hid_core.c
+++ b/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/hid/src/usbd_hid_core.c
@@ -49,7 +49,7 @@
 /* Includes ------------------------------------------------------------------*/
 #include "usbd_hid_core.h"
 
-#include "../../../../../../../targets/Flamenco/usbd_desc.h"
+#include "usbd_desc.h"
 #include "usbd_req.h"
 
 
diff --git a/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_data.h b/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_data.h
index ef440fbc4..c8f3a2adf 100644
--- a/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_data.h
+++ b/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/msc/inc/usbd_msc_data.h
@@ -31,7 +31,7 @@
 #define _USBD_MSC_DATA_H_
 
 /* Includes ------------------------------------------------------------------*/
-#include "../../../../../../../targets/Flamenco/usbd_conf.h"
+#include "usbd_conf.h"
 
 /** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY
   * @{
diff --git a/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Core/inc/usbd_conf_template.h b/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Core/inc/usbd_conf_template.h
index ab10fa7a1..b1a20f947 100644
--- a/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Core/inc/usbd_conf_template.h
+++ b/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Core/inc/usbd_conf_template.h
@@ -30,7 +30,7 @@
 #define __USBD_CONF__H__
 
 /* Includes ------------------------------------------------------------------*/
-#include "../../../../../../targets/Flamenco/usb_conf.h"
+#include "usb_conf.h"
 
 /** @defgroup USB_CONF_Exported_Defines
   * @{
diff --git a/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_conf_template.h b/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_conf_template.h
index 5de0d5143..2e415e126 100644
--- a/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_conf_template.h
+++ b/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_conf_template.h
@@ -30,7 +30,7 @@
 #define __USB_CONF__H__
 
 /* Includes ------------------------------------------------------------------*/
-#include "../../../../../targets/Flamenco/usb_conf.h"
+#include "usb_conf.h"
 
 /** @addtogroup USB_OTG_DRIVER
   * @{
diff --git a/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/src/usb_hcd.c b/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/src/usb_hcd.c
index 5ba595dfd..115b1ad5d 100644
--- a/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/src/usb_hcd.c
+++ b/radio/src/thirdparty/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/src/usb_hcd.c
@@ -29,7 +29,7 @@
 #include "usb_core.h"
 #include "usb_hcd.h"
 
-#include "../../../../../targets/Flamenco/usb_conf.h"
+#include "usb_conf.h"
 #include "usb_bsp.h"