diff --git a/src/drivers/wayland/lv_wayland.h b/src/drivers/wayland/lv_wayland.h
index 18aff009d2..28ecd3727a 100644
--- a/src/drivers/wayland/lv_wayland.h
+++ b/src/drivers/wayland/lv_wayland.h
@@ -17,11 +17,11 @@ extern "C" {
 
 #if LV_USE_WAYLAND
 
-#include "lv_wl_keyboard.h"
-#include "lv_wl_pointer.h"
-#include "lv_wl_touch.h"
-#include "lv_wl_window.h"
-#include "lv_wl_pointer_axis.h"
+#include "lv_wayland_keyboard.h"
+#include "lv_wayland_pointer.h"
+#include "lv_wayland_touch.h"
+#include "lv_wayland_window.h"
+#include "lv_wayland_pointer_axis.h"
 
 /*********************
  *      DEFINES
diff --git a/src/drivers/wayland/lv_wl_egl_backend.c b/src/drivers/wayland/lv_wayland_backend_egl.c
similarity index 99%
rename from src/drivers/wayland/lv_wl_egl_backend.c
rename to src/drivers/wayland/lv_wayland_backend_egl.c
index cabc84d4a3..542577f3f4 100644
--- a/src/drivers/wayland/lv_wl_egl_backend.c
+++ b/src/drivers/wayland/lv_wayland_backend_egl.c
@@ -1,4 +1,4 @@
-/** @file lv_wl_egl_backend.c
+/** @file lv_wayland_backend_egl.c
  *
  */
 
diff --git a/src/drivers/wayland/lv_wl_g2d_backend.c b/src/drivers/wayland/lv_wayland_backend_g2d.c
similarity index 99%
rename from src/drivers/wayland/lv_wl_g2d_backend.c
rename to src/drivers/wayland/lv_wayland_backend_g2d.c
index 6ffc544c6c..69cc67c7c7 100644
--- a/src/drivers/wayland/lv_wl_g2d_backend.c
+++ b/src/drivers/wayland/lv_wayland_backend_g2d.c
@@ -1,6 +1,5 @@
-
 /**
- * @file lv_wl_g2d_backend.c
+ * @file lv_wayland_backend_g2d.c
  *
  */
 
diff --git a/src/drivers/wayland/lv_wl_backend_private.h b/src/drivers/wayland/lv_wayland_backend_private.h
similarity index 98%
rename from src/drivers/wayland/lv_wl_backend_private.h
rename to src/drivers/wayland/lv_wayland_backend_private.h
index f64ccdcff3..c9e617b79f 100644
--- a/src/drivers/wayland/lv_wl_backend_private.h
+++ b/src/drivers/wayland/lv_wayland_backend_private.h
@@ -1,10 +1,10 @@
 /**
- * @file lv_wl_backend_private.h
+ * @file lv_wayland_backend_private.h
  *
  */
 
-#ifndef LV_WL_BACKEND_PRIVATE_H
-#define LV_WL_BACKEND_PRIVATE_H
+#ifndef LV_WAYLAND_BACKEND_PRIVATE_H
+#define LV_WAYLAND_BACKEND_PRIVATE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -214,4 +214,4 @@ struct wl_surface * lv_wayland_get_window_surface(lv_display_t * display);
 } /*extern "C"*/
 #endif
 
-#endif /*LV_WL_BACKEND_PRIVATE_H*/
+#endif /*LV_WAYLAND_BACKEND_PRIVATE_H*/
diff --git a/src/drivers/wayland/lv_wl_shm_backend.c b/src/drivers/wayland/lv_wayland_backend_shm.c
similarity index 99%
rename from src/drivers/wayland/lv_wl_shm_backend.c
rename to src/drivers/wayland/lv_wayland_backend_shm.c
index 52b3d27865..ca657c4fc5 100644
--- a/src/drivers/wayland/lv_wl_shm_backend.c
+++ b/src/drivers/wayland/lv_wayland_backend_shm.c
@@ -1,5 +1,5 @@
 /**
- * @file lv_wl_shm_backend.c
+ * @file lv_wayland_backend_shm.c
  *
  */
 
diff --git a/src/drivers/wayland/lv_wl_keyboard.c b/src/drivers/wayland/lv_wayland_keyboard.c
similarity index 99%
rename from src/drivers/wayland/lv_wl_keyboard.c
rename to src/drivers/wayland/lv_wayland_keyboard.c
index 29e172eda2..2642bf2b72 100644
--- a/src/drivers/wayland/lv_wl_keyboard.c
+++ b/src/drivers/wayland/lv_wayland_keyboard.c
@@ -1,9 +1,9 @@
 /**
- * @file lv_wl_keyboard.c
+ * @file lv_wayland_keyboard.c
  *
  */
 
-#include "lv_wl_keyboard.h"
+#include "lv_wayland_keyboard.h"
 
 #if LV_USE_WAYLAND
 
diff --git a/src/drivers/wayland/lv_wl_keyboard.h b/src/drivers/wayland/lv_wayland_keyboard.h
similarity index 86%
rename from src/drivers/wayland/lv_wl_keyboard.h
rename to src/drivers/wayland/lv_wayland_keyboard.h
index 86296d4484..c568497f6d 100644
--- a/src/drivers/wayland/lv_wl_keyboard.h
+++ b/src/drivers/wayland/lv_wayland_keyboard.h
@@ -1,10 +1,10 @@
 /**
- * @file lv_wl_keyboard.h
+ * @file lv_wayland_keyboard.h
  *
  */
 
-#ifndef LV_WL_KEYBOARD_H
-#define LV_WL_KEYBOARD_H
+#ifndef LV_WAYLAND_KEYBOARD_H
+#define LV_WAYLAND_KEYBOARD_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -49,4 +49,4 @@ lv_indev_t * lv_wayland_get_keyboard(lv_display_t * display);
 } /*extern "C"*/
 #endif
 
-#endif /*LV_WL_KEYBOARD_H*/
+#endif /*LV_WAYLAND_KEYBOARD_H*/
diff --git a/src/drivers/wayland/lv_wl_pointer.c b/src/drivers/wayland/lv_wayland_pointer.c
similarity index 99%
rename from src/drivers/wayland/lv_wl_pointer.c
rename to src/drivers/wayland/lv_wayland_pointer.c
index ddfdb34ee3..91a17cc1f0 100644
--- a/src/drivers/wayland/lv_wl_pointer.c
+++ b/src/drivers/wayland/lv_wayland_pointer.c
@@ -1,9 +1,9 @@
 /**
- * @file lv_wl_pointer.c
+ * @file lv_wayland_pointer.c
  *
  */
 
-#include "lv_wl_pointer.h"
+#include "lv_wayland_pointer.h"
 
 #if LV_USE_WAYLAND
 
diff --git a/src/drivers/wayland/lv_wl_pointer.h b/src/drivers/wayland/lv_wayland_pointer.h
similarity index 88%
rename from src/drivers/wayland/lv_wl_pointer.h
rename to src/drivers/wayland/lv_wayland_pointer.h
index 265394c775..dc02773a5e 100644
--- a/src/drivers/wayland/lv_wl_pointer.h
+++ b/src/drivers/wayland/lv_wayland_pointer.h
@@ -1,11 +1,11 @@
 
 /**
- * @file lv_wl_pointer.h
+ * @file lv_wayland_pointer.h
  *
  */
 
-#ifndef LV_WL_POINTER_H
-#define LV_WL_POINTER_H
+#ifndef LV_WAYLAND_POINTER_H
+#define LV_WAYLAND_POINTER_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -51,4 +51,4 @@ lv_indev_t * lv_wayland_get_pointer(lv_display_t * disp);
 } /*extern "C"*/
 #endif
 
-#endif /*LV_WL_POINTER_H*/
+#endif /*LV_WAYLAND_POINTER_H*/
diff --git a/src/drivers/wayland/lv_wl_pointer_axis.h b/src/drivers/wayland/lv_wayland_pointer_axis.h
similarity index 86%
rename from src/drivers/wayland/lv_wl_pointer_axis.h
rename to src/drivers/wayland/lv_wayland_pointer_axis.h
index d3564a5047..8299bfa736 100644
--- a/src/drivers/wayland/lv_wl_pointer_axis.h
+++ b/src/drivers/wayland/lv_wayland_pointer_axis.h
@@ -1,10 +1,10 @@
 /**
- * @file lv_wl_pointer_axis.h
+ * @file lv_wayland_pointer_axis.h
  *
  */
 
-#ifndef LV_WL_POINTER_AXIS_H
-#define LV_WL_POINTER_AXIS_H
+#ifndef LV_WAYLAND_POINTER_AXIS_H
+#define LV_WAYLAND_POINTER_AXIS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -51,4 +51,4 @@ lv_indev_t * lv_wayland_get_pointeraxis(lv_display_t * display);
 } /*extern "C"*/
 #endif
 
-#endif /*LV_WL_POINTER_AXIS_H*/
+#endif /*LV_WAYLAND_POINTER_AXIS_H*/
diff --git a/src/drivers/wayland/lv_wayland_private.h b/src/drivers/wayland/lv_wayland_private.h
index a84950c6de..c51ae7e3a1 100644
--- a/src/drivers/wayland/lv_wayland_private.h
+++ b/src/drivers/wayland/lv_wayland_private.h
@@ -23,7 +23,7 @@ extern "C" {
 #include <wayland-client-protocol.h>
 #include <wayland_xdg_shell.h>
 #include "../../misc/lv_types.h"
-#include "lv_wl_backend_private.h"
+#include "lv_wayland_backend_private.h"
 
 /*********************
  *      DEFINES
diff --git a/src/drivers/wayland/lv_wl_seat.c b/src/drivers/wayland/lv_wayland_seat.c
similarity index 99%
rename from src/drivers/wayland/lv_wl_seat.c
rename to src/drivers/wayland/lv_wayland_seat.c
index f547a8ec10..354cfc432f 100644
--- a/src/drivers/wayland/lv_wl_seat.c
+++ b/src/drivers/wayland/lv_wayland_seat.c
@@ -1,5 +1,5 @@
 /**
- * @file lv_wl_seat.c
+ * @file lv_wayland_seat.c
  *
  */
 
diff --git a/src/drivers/wayland/lv_wl_touch.c b/src/drivers/wayland/lv_wayland_touch.c
similarity index 99%
rename from src/drivers/wayland/lv_wl_touch.c
rename to src/drivers/wayland/lv_wayland_touch.c
index 490bcf27ee..88e196d0e1 100644
--- a/src/drivers/wayland/lv_wl_touch.c
+++ b/src/drivers/wayland/lv_wayland_touch.c
@@ -1,9 +1,9 @@
 /**
- * @file lv_wl_touch.c
+ * @file lv_wayland_touch.c
  *
  */
 
-#include "lv_wl_touch.h"
+#include "lv_wayland_touch.h"
 
 #if LV_USE_WAYLAND
 
diff --git a/src/drivers/wayland/lv_wl_touch.h b/src/drivers/wayland/lv_wayland_touch.h
similarity index 88%
rename from src/drivers/wayland/lv_wl_touch.h
rename to src/drivers/wayland/lv_wayland_touch.h
index 2c4a742ee0..132f1e6eeb 100644
--- a/src/drivers/wayland/lv_wl_touch.h
+++ b/src/drivers/wayland/lv_wayland_touch.h
@@ -1,12 +1,10 @@
-
-
 /**
- * @file lv_wl_touch.h
+ * @file lv_wayland_touch.h
  *
  */
 
-#ifndef LV_WL_TOUCH_H
-#define LV_WL_TOUCH_H
+#ifndef LV_WAYLAND_TOUCH_H
+#define LV_WAYLAND_TOUCH_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -51,4 +49,4 @@ lv_indev_t * lv_wayland_get_touchscreen(lv_display_t * display);
 } /*extern "C"*/
 #endif
 
-#endif /*LV_WL_TOUCH_H*/
+#endif /*LV_WAYLAND_TOUCH_H*/
diff --git a/src/drivers/wayland/lv_wl_window.c b/src/drivers/wayland/lv_wayland_window.c
similarity index 97%
rename from src/drivers/wayland/lv_wl_window.c
rename to src/drivers/wayland/lv_wayland_window.c
index fcd204bdf2..1799354444 100644
--- a/src/drivers/wayland/lv_wl_window.c
+++ b/src/drivers/wayland/lv_wayland_window.c
@@ -1,12 +1,12 @@
 /**
- * @file lv_wl_window.c
+ * @file lv_wayland_window.c
  *
  */
 
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_wl_window.h"
+#include "lv_wayland_window.h"
 
 #if LV_USE_WAYLAND
 
@@ -16,10 +16,10 @@
 #include <string.h>
 #include "lv_wayland_private.h"
 #include "lv_wayland_private.h"
-#include "lv_wl_pointer.h"
-#include "lv_wl_pointer_axis.h"
-#include "lv_wl_touch.h"
-#include "lv_wl_keyboard.h"
+#include "lv_wayland_pointer.h"
+#include "lv_wayland_pointer_axis.h"
+#include "lv_wayland_touch.h"
+#include "lv_wayland_keyboard.h"
 
 /*********************
  *      DEFINES
diff --git a/src/drivers/wayland/lv_wl_window.h b/src/drivers/wayland/lv_wayland_window.h
similarity index 95%
rename from src/drivers/wayland/lv_wl_window.h
rename to src/drivers/wayland/lv_wayland_window.h
index d41ead16be..336b50a898 100644
--- a/src/drivers/wayland/lv_wl_window.h
+++ b/src/drivers/wayland/lv_wayland_window.h
@@ -1,11 +1,11 @@
 
 /**
- * @file lv_wl_window.h
+ * @file lv_wayland_window.h
  *
  */
 
-#ifndef LV_WL_WINDOW_H
-#define LV_WL_WINDOW_H
+#ifndef LV_WAYLAND_WINDOW_H
+#define LV_WAYLAND_WINDOW_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -101,4 +101,4 @@ void lv_wayland_window_set_minimized(lv_display_t * disp);
 } /*extern "C"*/
 #endif
 
-#endif /*LV_WL_WINDOW_H*/
+#endif /*LV_WAYLAND_WINDOW_H*/
diff --git a/src/drivers/wayland/lv_wl_xdg_shell.c b/src/drivers/wayland/lv_wayland_xdg_shell.c
similarity index 99%
rename from src/drivers/wayland/lv_wl_xdg_shell.c
rename to src/drivers/wayland/lv_wayland_xdg_shell.c
index c395a7acb3..1e53b6bb71 100644
--- a/src/drivers/wayland/lv_wl_xdg_shell.c
+++ b/src/drivers/wayland/lv_wayland_xdg_shell.c
@@ -1,5 +1,5 @@
 /**
- * @file lv_wl_xdg_shell.c
+ * @file lv_wayland_xdg_shell.c
  *
  */