diff --git a/radio/src/gui/colorlcd/layouts/layout1x1.cpp b/radio/src/gui/colorlcd/layouts/layout1x1.cpp
index 96296388f..3d469ecc7 100644
--- a/radio/src/gui/colorlcd/layouts/layout1x1.cpp
+++ b/radio/src/gui/colorlcd/layouts/layout1x1.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "layout.h"
-#include "layout_factory_implem.h"
+#include "layout_factory_impl.h"
 
 const uint8_t LBM_LAYOUT_1x1[] = {
 #include "mask_layout1x1.lbm"
diff --git a/radio/src/gui/colorlcd/layouts/layout2+1.cpp b/radio/src/gui/colorlcd/layouts/layout2+1.cpp
index 3977ecbdd..6f8d5eb6e 100644
--- a/radio/src/gui/colorlcd/layouts/layout2+1.cpp
+++ b/radio/src/gui/colorlcd/layouts/layout2+1.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "layout.h"
-#include "layout_factory_implem.h"
+#include "layout_factory_impl.h"
 
 const uint8_t LBM_LAYOUT_2P1[] = {
 #include "mask_layout2+1.lbm"
diff --git a/radio/src/gui/colorlcd/layouts/layout2x1.cpp b/radio/src/gui/colorlcd/layouts/layout2x1.cpp
index db38eaba3..b514662fc 100644
--- a/radio/src/gui/colorlcd/layouts/layout2x1.cpp
+++ b/radio/src/gui/colorlcd/layouts/layout2x1.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "layout.h"
-#include "layout_factory_implem.h"
+#include "layout_factory_impl.h"
 
 const uint8_t LBM_LAYOUT_2x1[] = {
 #include "mask_layout2x1.lbm"
diff --git a/radio/src/gui/colorlcd/layouts/layout2x2.cpp b/radio/src/gui/colorlcd/layouts/layout2x2.cpp
index 8b48adc46..174190cbf 100644
--- a/radio/src/gui/colorlcd/layouts/layout2x2.cpp
+++ b/radio/src/gui/colorlcd/layouts/layout2x2.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "layout.h"
-#include "layout_factory_implem.h"
+#include "layout_factory_impl.h"
 
 const uint8_t LBM_LAYOUT_2x2[] = {
 #include "mask_layout2x2.lbm"
diff --git a/radio/src/gui/colorlcd/layouts/layout2x4.cpp b/radio/src/gui/colorlcd/layouts/layout2x4.cpp
index 4b01e3ae2..b88c97095 100644
--- a/radio/src/gui/colorlcd/layouts/layout2x4.cpp
+++ b/radio/src/gui/colorlcd/layouts/layout2x4.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "layout.h"
-#include "layout_factory_implem.h"
+#include "layout_factory_impl.h"
 
 const uint8_t LBM_LAYOUT_2x4[] = {
 #include "mask_layout2x4.lbm"
diff --git a/radio/src/gui/colorlcd/layouts/layout_factory_implem.cpp b/radio/src/gui/colorlcd/layouts/layout_factory_impl.cpp
similarity index 98%
rename from radio/src/gui/colorlcd/layouts/layout_factory_implem.cpp
rename to radio/src/gui/colorlcd/layouts/layout_factory_impl.cpp
index c173f2524..f9440b443 100644
--- a/radio/src/gui/colorlcd/layouts/layout_factory_implem.cpp
+++ b/radio/src/gui/colorlcd/layouts/layout_factory_impl.cpp
@@ -18,7 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#include "layout_factory_implem.h"
+#include "layout_factory_impl.h"
 #include "layouts/trims.h"
 #include "layouts/sliders.h"
 #include "view_main_decoration.h"
diff --git a/radio/src/gui/colorlcd/layouts/layout_factory_implem.h b/radio/src/gui/colorlcd/layouts/layout_factory_impl.h
similarity index 97%
rename from radio/src/gui/colorlcd/layouts/layout_factory_implem.h
rename to radio/src/gui/colorlcd/layouts/layout_factory_impl.h
index 95a34c7f4..a70562804 100644
--- a/radio/src/gui/colorlcd/layouts/layout_factory_implem.h
+++ b/radio/src/gui/colorlcd/layouts/layout_factory_impl.h
@@ -22,14 +22,11 @@
 
 #include <list>
 
-//#include "lcd.h"
-//#include "topbar.h"
-
 #include "audio.h"
 #include "translations.h"
 
 #include "layout.h"
-#include "widgets/widgets_container_implem.h"
+#include "widgets/widgets_container_impl.h"
 
 #define LAYOUT_COMMON_OPTIONS \
   { STR_TOP_BAR, ZoneOption::Bool },         \
diff --git a/radio/src/gui/colorlcd/layouts/topbar_impl.h b/radio/src/gui/colorlcd/layouts/topbar_impl.h
index 2fb2af95e..8147aa151 100644
--- a/radio/src/gui/colorlcd/layouts/topbar_impl.h
+++ b/radio/src/gui/colorlcd/layouts/topbar_impl.h
@@ -21,7 +21,7 @@
 #pragma once
 
 #include "topbar.h"
-#include "widgets/widgets_container_implem.h"
+#include "layouts/layout_factory_impl.h"
 
 typedef WidgetsContainer<MAX_TOPBAR_ZONES, MAX_TOPBAR_OPTIONS> TopbarImplBase;
 
diff --git a/radio/src/gui/colorlcd/widgets/gauge.cpp b/radio/src/gui/colorlcd/widgets/gauge.cpp
index f5576bd8f..3f01aa6f3 100644
--- a/radio/src/gui/colorlcd/widgets/gauge.cpp
+++ b/radio/src/gui/colorlcd/widgets/gauge.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "opentx.h"
-#include "widgets_container_implem.h"
+#include "widgets_container_impl.h"
 
 class GaugeWidget: public Widget
 {
diff --git a/radio/src/gui/colorlcd/widgets/modelbmp.cpp b/radio/src/gui/colorlcd/widgets/modelbmp.cpp
index 39826b012..e6f67dbbd 100644
--- a/radio/src/gui/colorlcd/widgets/modelbmp.cpp
+++ b/radio/src/gui/colorlcd/widgets/modelbmp.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "opentx.h"
-#include "widgets_container_implem.h"
+#include "widgets_container_impl.h"
 
 #include <memory>
 
diff --git a/radio/src/gui/colorlcd/widgets/outputs.cpp b/radio/src/gui/colorlcd/widgets/outputs.cpp
index e665aecae..8f3f11e42 100644
--- a/radio/src/gui/colorlcd/widgets/outputs.cpp
+++ b/radio/src/gui/colorlcd/widgets/outputs.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "opentx.h"
-#include "widgets_container_implem.h"
+#include "widgets_container_impl.h"
 
 #define RECT_BORDER                    1
 #define ROW_HEIGHT                     17
diff --git a/radio/src/gui/colorlcd/widgets/text.cpp b/radio/src/gui/colorlcd/widgets/text.cpp
index a97eab9e9..9605d6035 100644
--- a/radio/src/gui/colorlcd/widgets/text.cpp
+++ b/radio/src/gui/colorlcd/widgets/text.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "opentx.h"
-#include "widgets_container_implem.h"
+#include "widgets_container_impl.h"
 
 #define TEXT_WIDGET_DEFAULT_LABEL  'M', 'y', ' ', 'L', 'a', 'b', 'e', 'l' // "My Label"
 
diff --git a/radio/src/gui/colorlcd/widgets/timer.cpp b/radio/src/gui/colorlcd/widgets/timer.cpp
index e7a4c5e0e..45336252d 100644
--- a/radio/src/gui/colorlcd/widgets/timer.cpp
+++ b/radio/src/gui/colorlcd/widgets/timer.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "opentx.h"
-#include "widgets_container_implem.h"
+#include "widgets_container_impl.h"
 
 class TimerWidget: public Widget
 {
diff --git a/radio/src/gui/colorlcd/widgets/value.cpp b/radio/src/gui/colorlcd/widgets/value.cpp
index 42921ac23..f36dde97f 100644
--- a/radio/src/gui/colorlcd/widgets/value.cpp
+++ b/radio/src/gui/colorlcd/widgets/value.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "opentx.h"
-#include "widgets_container_implem.h"
+#include "widgets_container_impl.h"
 
 const coord_t NUMBERS_PADDING = 4;
 
diff --git a/radio/src/gui/colorlcd/widgets/widgets_container_implem.h b/radio/src/gui/colorlcd/widgets/widgets_container_impl.h
similarity index 100%
rename from radio/src/gui/colorlcd/widgets/widgets_container_implem.h
rename to radio/src/gui/colorlcd/widgets/widgets_container_impl.h