diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
index 6610e90ab7..6d672e3b8c 100644
--- a/Marlin/src/MarlinCore.cpp
+++ b/Marlin/src/MarlinCore.cpp
@@ -74,11 +74,11 @@
 #endif
 
 #if HAS_DWIN_E3V2
-  #include "lcd/e3v2/common/encoder.h"
+  #include "lcd/dwin/common/encoder.h"
   #if ENABLED(DWIN_CREALITY_LCD)
-    #include "lcd/e3v2/creality/dwin.h"
+    #include "lcd/dwin/creality/dwin.h"
   #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-    #include "lcd/e3v2/jyersui/dwin.h"
+    #include "lcd/dwin/jyersui/dwin.h"
   #elif ENABLED(SOVOL_SV06_RTS)
     #include "lcd/sovol_rts/sovol_rts.h"
   #endif
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 058d4ea4ab..800d51dac6 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -51,7 +51,7 @@
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../../lcd/extui/ui_api.h"
 #elif ENABLED(DWIN_CREALITY_LCD)
-  #include "../../../lcd/e3v2/creality/dwin.h"
+  #include "../../../lcd/dwin/creality/dwin.h"
 #elif ENABLED(SOVOL_SV06_RTS)
   #include "../../../lcd/sovol_rts/sovol_rts.h"
 #endif
diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp
index 4d3d7841e7..4a0ecffc4b 100644
--- a/Marlin/src/gcode/calibrate/G28.cpp
+++ b/Marlin/src/gcode/calibrate/G28.cpp
@@ -61,7 +61,7 @@
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../lcd/extui/ui_api.h"
 #elif ENABLED(DWIN_CREALITY_LCD)
-  #include "../../lcd/e3v2/creality/dwin.h"
+  #include "../../lcd/dwin/creality/dwin.h"
 #elif ENABLED(SOVOL_SV06_RTS)
   #include "../../lcd/sovol_rts/sovol_rts.h"
 #endif
diff --git a/Marlin/src/gcode/feature/powerloss/M1000.cpp b/Marlin/src/gcode/feature/powerloss/M1000.cpp
index c85817cd3e..15597eac59 100644
--- a/Marlin/src/gcode/feature/powerloss/M1000.cpp
+++ b/Marlin/src/gcode/feature/powerloss/M1000.cpp
@@ -36,9 +36,9 @@
 #if ENABLED(EXTENSIBLE_UI)
   #include "../../../lcd/extui/ui_api.h"
 #elif ENABLED(DWIN_CREALITY_LCD)
-  #include "../../../lcd/e3v2/creality/dwin.h"
+  #include "../../../lcd/dwin/creality/dwin.h"
 #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-  #include "../../../lcd/e3v2/jyersui/dwin.h" // Temporary fix until it can be better implemented
+  #include "../../../lcd/dwin/jyersui/dwin.h" // Temporary fix until it can be better implemented
 #endif
 
 #define DEBUG_OUT ENABLED(DEBUG_POWER_LOSS_RECOVERY)
diff --git a/Marlin/src/gcode/stats/M75-M78.cpp b/Marlin/src/gcode/stats/M75-M78.cpp
index 8c7378c977..b539bf30dc 100644
--- a/Marlin/src/gcode/stats/M75-M78.cpp
+++ b/Marlin/src/gcode/stats/M75-M78.cpp
@@ -30,7 +30,7 @@
 #include "../../MarlinCore.h" // for startOrResumeJob
 
 #if ENABLED(DWIN_LCD_PROUI)
-  #include "../../lcd/e3v2/proui/dwin.h"
+  #include "../../lcd/dwin/proui/dwin.h"
 #endif
 
 /**
diff --git a/Marlin/src/inc/Conditionals-2-LCD.h b/Marlin/src/inc/Conditionals-2-LCD.h
index 49d8121f0c..72bad45c89 100644
--- a/Marlin/src/inc/Conditionals-2-LCD.h
+++ b/Marlin/src/inc/Conditionals-2-LCD.h
@@ -570,7 +570,7 @@
   #define EXTENSIBLE_UI
 #endif
 
-// E3V2 extras
+// DWIN extras
 #if ANY(HAS_DWIN_E3V2, IS_DWIN_MARLINUI, SOVOL_SV06_RTS)
   #define SERIAL_CATCHALL 0
   #define HAS_LCD_BRIGHTNESS 1
diff --git a/Marlin/src/lcd/e3v2/README.md b/Marlin/src/lcd/dwin/README.md
similarity index 100%
rename from Marlin/src/lcd/e3v2/README.md
rename to Marlin/src/lcd/dwin/README.md
diff --git a/Marlin/src/lcd/e3v2/common/dwin_api.cpp b/Marlin/src/lcd/dwin/common/dwin_api.cpp
similarity index 100%
rename from Marlin/src/lcd/e3v2/common/dwin_api.cpp
rename to Marlin/src/lcd/dwin/common/dwin_api.cpp
diff --git a/Marlin/src/lcd/e3v2/common/dwin_api.h b/Marlin/src/lcd/dwin/common/dwin_api.h
similarity index 99%
rename from Marlin/src/lcd/e3v2/common/dwin_api.h
rename to Marlin/src/lcd/dwin/common/dwin_api.h
index bf50a78e2f..15c7ba3c94 100644
--- a/Marlin/src/lcd/e3v2/common/dwin_api.h
+++ b/Marlin/src/lcd/dwin/common/dwin_api.h
@@ -24,9 +24,9 @@
 #include "../../../inc/MarlinConfig.h"
 
 //
-// e3v2/common/dwin_api.h
+// dwin/common/dwin_api.h
 //
-// Included by: e3v2/*/dwin_lcd.h
+// Included by: dwin/*/dwin_lcd.h
 //
 
 #if ENABLED(DWIN_MARLINUI_LANDSCAPE)
diff --git a/Marlin/src/lcd/e3v2/common/dwin_color.h b/Marlin/src/lcd/dwin/common/dwin_color.h
similarity index 100%
rename from Marlin/src/lcd/e3v2/common/dwin_color.h
rename to Marlin/src/lcd/dwin/common/dwin_color.h
diff --git a/Marlin/src/lcd/e3v2/common/dwin_font.h b/Marlin/src/lcd/dwin/common/dwin_font.h
similarity index 100%
rename from Marlin/src/lcd/e3v2/common/dwin_font.h
rename to Marlin/src/lcd/dwin/common/dwin_font.h
diff --git a/Marlin/src/lcd/e3v2/common/dwin_set.h b/Marlin/src/lcd/dwin/common/dwin_set.h
similarity index 100%
rename from Marlin/src/lcd/e3v2/common/dwin_set.h
rename to Marlin/src/lcd/dwin/common/dwin_set.h
diff --git a/Marlin/src/lcd/e3v2/common/encoder.cpp b/Marlin/src/lcd/dwin/common/encoder.cpp
similarity index 99%
rename from Marlin/src/lcd/e3v2/common/encoder.cpp
rename to Marlin/src/lcd/dwin/common/encoder.cpp
index 2f050e92fd..8eea288d12 100644
--- a/Marlin/src/lcd/e3v2/common/encoder.cpp
+++ b/Marlin/src/lcd/dwin/common/encoder.cpp
@@ -21,7 +21,7 @@
  */
 
 /*****************************************************************************
- * @file     lcd/e3v2/common/encoder.cpp
+ * @file     lcd/dwin/common/encoder.cpp
  * @brief    Rotary encoder functions
  *****************************************************************************/
 
diff --git a/Marlin/src/lcd/e3v2/common/encoder.h b/Marlin/src/lcd/dwin/common/encoder.h
similarity index 98%
rename from Marlin/src/lcd/e3v2/common/encoder.h
rename to Marlin/src/lcd/dwin/common/encoder.h
index 428193ca65..8a8f2fcaa3 100644
--- a/Marlin/src/lcd/e3v2/common/encoder.h
+++ b/Marlin/src/lcd/dwin/common/encoder.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /*****************************************************************************
-  * @file     lcd/e3v2/common/encoder.h
+  * @file     lcd/dwin/common/encoder.h
   * @brief    Rotary encoder functions
   ****************************************************************************/
 
diff --git a/Marlin/src/lcd/e3v2/common/limits.h b/Marlin/src/lcd/dwin/common/limits.h
similarity index 99%
rename from Marlin/src/lcd/e3v2/common/limits.h
rename to Marlin/src/lcd/dwin/common/limits.h
index c773240b28..1e2a77980c 100644
--- a/Marlin/src/lcd/e3v2/common/limits.h
+++ b/Marlin/src/lcd/dwin/common/limits.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /*****************************************************************************
- * @file     lcd/e3v2/common/limits.h
+ * @file     lcd/dwin/common/limits.h
  * @brief    Limits for UI values
  ****************************************************************************/
 
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.cpp b/Marlin/src/lcd/dwin/creality/dwin.cpp
similarity index 100%
rename from Marlin/src/lcd/e3v2/creality/dwin.cpp
rename to Marlin/src/lcd/dwin/creality/dwin.cpp
diff --git a/Marlin/src/lcd/e3v2/creality/dwin.h b/Marlin/src/lcd/dwin/creality/dwin.h
similarity index 100%
rename from Marlin/src/lcd/e3v2/creality/dwin.h
rename to Marlin/src/lcd/dwin/creality/dwin.h
diff --git a/Marlin/src/lcd/e3v2/creality/dwin_lcd.cpp b/Marlin/src/lcd/dwin/creality/dwin_lcd.cpp
similarity index 98%
rename from Marlin/src/lcd/e3v2/creality/dwin_lcd.cpp
rename to Marlin/src/lcd/dwin/creality/dwin_lcd.cpp
index 649e1b4771..60c49e8d96 100644
--- a/Marlin/src/lcd/e3v2/creality/dwin_lcd.cpp
+++ b/Marlin/src/lcd/dwin/creality/dwin_lcd.cpp
@@ -21,7 +21,7 @@
  */
 
 /********************************************************************************
- * @file     lcd/e3v2/creality/dwin_lcd.cpp
+ * @file     lcd/dwin/creality/dwin_lcd.cpp
  * @author   LEO / Creality3D
  * @date     2019/07/18
  * @version  2.0.1
diff --git a/Marlin/src/lcd/e3v2/creality/dwin_lcd.h b/Marlin/src/lcd/dwin/creality/dwin_lcd.h
similarity index 100%
rename from Marlin/src/lcd/e3v2/creality/dwin_lcd.h
rename to Marlin/src/lcd/dwin/creality/dwin_lcd.h
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp b/Marlin/src/lcd/dwin/jyersui/dwin.cpp
similarity index 99%
rename from Marlin/src/lcd/e3v2/jyersui/dwin.cpp
rename to Marlin/src/lcd/dwin/jyersui/dwin.cpp
index 2cede088ec..1e8cdb1a55 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.cpp
+++ b/Marlin/src/lcd/dwin/jyersui/dwin.cpp
@@ -21,7 +21,7 @@
  */
 
 /**
- * lcd/e3v2/jyersui/dwin.cpp
+ * lcd/dwin/jyersui/dwin.cpp
  */
 
 #include "../../../inc/MarlinConfigPre.h"
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin.h b/Marlin/src/lcd/dwin/jyersui/dwin.h
similarity index 99%
rename from Marlin/src/lcd/e3v2/jyersui/dwin.h
rename to Marlin/src/lcd/dwin/jyersui/dwin.h
index 890cc79999..22a56b190c 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin.h
+++ b/Marlin/src/lcd/dwin/jyersui/dwin.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * lcd/e3v2/jyersui/dwin.h
+ * lcd/dwin/jyersui/dwin.h
  */
 
 #include "dwin_lcd.h"
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp b/Marlin/src/lcd/dwin/jyersui/dwin_lcd.cpp
similarity index 98%
rename from Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp
rename to Marlin/src/lcd/dwin/jyersui/dwin_lcd.cpp
index 96518b8c21..717e17868d 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.cpp
+++ b/Marlin/src/lcd/dwin/jyersui/dwin_lcd.cpp
@@ -21,7 +21,7 @@
  */
 
 /********************************************************************************
- * @file     lcd/e3v2/jyersui/dwin_lcd.cpp
+ * @file     lcd/dwin/jyersui/dwin_lcd.cpp
  * @brief    DWIN screen control functions
  ********************************************************************************/
 
diff --git a/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h b/Marlin/src/lcd/dwin/jyersui/dwin_lcd.h
similarity index 96%
rename from Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h
rename to Marlin/src/lcd/dwin/jyersui/dwin_lcd.h
index a9335a4f23..124062535a 100644
--- a/Marlin/src/lcd/e3v2/jyersui/dwin_lcd.h
+++ b/Marlin/src/lcd/dwin/jyersui/dwin_lcd.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /********************************************************************************
- * @file     lcd/e3v2/jyersui/dwin_lcd.h
+ * @file     lcd/dwin/jyersui/dwin_lcd.h
  * @brief    DWIN screen control functions
  ********************************************************************************/
 
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.cpp b/Marlin/src/lcd/dwin/marlinui/dwin_lcd.cpp
similarity index 98%
rename from Marlin/src/lcd/e3v2/marlinui/dwin_lcd.cpp
rename to Marlin/src/lcd/dwin/marlinui/dwin_lcd.cpp
index 13c6de5480..49d660d843 100644
--- a/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.cpp
+++ b/Marlin/src/lcd/dwin/marlinui/dwin_lcd.cpp
@@ -21,7 +21,7 @@
  */
 
 /********************************************************************************
- * @file     lcd/e3v2/marlinui/dwin_lcd.cpp
+ * @file     lcd/dwin/marlinui/dwin_lcd.cpp
  * @brief    DWIN screen control functions
  ********************************************************************************/
 
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h b/Marlin/src/lcd/dwin/marlinui/dwin_lcd.h
similarity index 98%
rename from Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h
rename to Marlin/src/lcd/dwin/marlinui/dwin_lcd.h
index ef81a7df77..3b308a7020 100644
--- a/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.h
+++ b/Marlin/src/lcd/dwin/marlinui/dwin_lcd.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /********************************************************************************
- * @file     lcd/e3v2/marlinui/dwin_lcd.h
+ * @file     lcd/dwin/marlinui/dwin_lcd.h
  * @brief    DWIN screen control functions
  ********************************************************************************/
 
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp b/Marlin/src/lcd/dwin/marlinui/dwin_string.cpp
similarity index 100%
rename from Marlin/src/lcd/e3v2/marlinui/dwin_string.cpp
rename to Marlin/src/lcd/dwin/marlinui/dwin_string.cpp
diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_string.h b/Marlin/src/lcd/dwin/marlinui/dwin_string.h
similarity index 100%
rename from Marlin/src/lcd/e3v2/marlinui/dwin_string.h
rename to Marlin/src/lcd/dwin/marlinui/dwin_string.h
diff --git a/Marlin/src/lcd/e3v2/marlinui/game.cpp b/Marlin/src/lcd/dwin/marlinui/game.cpp
similarity index 99%
rename from Marlin/src/lcd/e3v2/marlinui/game.cpp
rename to Marlin/src/lcd/dwin/marlinui/game.cpp
index eb15bd8108..b77c72664f 100644
--- a/Marlin/src/lcd/e3v2/marlinui/game.cpp
+++ b/Marlin/src/lcd/dwin/marlinui/game.cpp
@@ -26,7 +26,7 @@
 // Enable performance counters (draw call count, frame timing) for debugging
 //#define GAME_PERFORMANCE_COUNTERS
 
-#include "../../menu/game/types.h" // includes e3v2/marlinui/game.h
+#include "../../menu/game/types.h" // includes dwin/marlinui/game.h
 #include "../../lcdprint.h"
 #include "lcdprint_dwin.h"
 #include "marlinui_dwin.h"
diff --git a/Marlin/src/lcd/e3v2/marlinui/game.h b/Marlin/src/lcd/dwin/marlinui/game.h
similarity index 100%
rename from Marlin/src/lcd/e3v2/marlinui/game.h
rename to Marlin/src/lcd/dwin/marlinui/game.h
diff --git a/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp b/Marlin/src/lcd/dwin/marlinui/lcdprint_dwin.cpp
similarity index 99%
rename from Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp
rename to Marlin/src/lcd/dwin/marlinui/lcdprint_dwin.cpp
index d13ec2e779..a1c7ba2094 100644
--- a/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.cpp
+++ b/Marlin/src/lcd/dwin/marlinui/lcdprint_dwin.cpp
@@ -21,7 +21,7 @@
  */
 
 /**
- * lcd/e3v2/marlinui/lcdprint_dwin.cpp
+ * lcd/dwin/marlinui/lcdprint_dwin.cpp
  *
  * Due to DWIN hardware limitations simplified characters are used
  */
diff --git a/Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.h b/Marlin/src/lcd/dwin/marlinui/lcdprint_dwin.h
similarity index 100%
rename from Marlin/src/lcd/e3v2/marlinui/lcdprint_dwin.h
rename to Marlin/src/lcd/dwin/marlinui/lcdprint_dwin.h
diff --git a/Marlin/src/lcd/e3v2/marlinui/marlinui_dwin.h b/Marlin/src/lcd/dwin/marlinui/marlinui_dwin.h
similarity index 99%
rename from Marlin/src/lcd/e3v2/marlinui/marlinui_dwin.h
rename to Marlin/src/lcd/dwin/marlinui/marlinui_dwin.h
index b8913914dd..eb25ecd362 100644
--- a/Marlin/src/lcd/e3v2/marlinui/marlinui_dwin.h
+++ b/Marlin/src/lcd/dwin/marlinui/marlinui_dwin.h
@@ -22,7 +22,7 @@
 #pragma once
 
 /**
- * lcd/e3v2/marlinui/lcdprint_dwin.h
+ * lcd/dwin/marlinui/lcdprint_dwin.h
  */
 
 #include "../../../inc/MarlinConfigPre.h"
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp b/Marlin/src/lcd/dwin/marlinui/ui_common.cpp
similarity index 100%
rename from Marlin/src/lcd/e3v2/marlinui/ui_common.cpp
rename to Marlin/src/lcd/dwin/marlinui/ui_common.cpp
diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp b/Marlin/src/lcd/dwin/marlinui/ui_status_480x272.cpp
similarity index 100%
rename from Marlin/src/lcd/e3v2/marlinui/ui_status_480x272.cpp
rename to Marlin/src/lcd/dwin/marlinui/ui_status_480x272.cpp
diff --git a/Marlin/src/lcd/e3v2/proui/base64.h b/Marlin/src/lcd/dwin/proui/base64.h
similarity index 100%
rename from Marlin/src/lcd/e3v2/proui/base64.h
rename to Marlin/src/lcd/dwin/proui/base64.h
diff --git a/Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp b/Marlin/src/lcd/dwin/proui/bedlevel_tools.cpp
similarity index 100%
rename from Marlin/src/lcd/e3v2/proui/bedlevel_tools.cpp
rename to Marlin/src/lcd/dwin/proui/bedlevel_tools.cpp
diff --git a/Marlin/src/lcd/e3v2/proui/bedlevel_tools.h b/Marlin/src/lcd/dwin/proui/bedlevel_tools.h
similarity index 100%
rename from Marlin/src/lcd/e3v2/proui/bedlevel_tools.h
rename to Marlin/src/lcd/dwin/proui/bedlevel_tools.h
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.cpp b/Marlin/src/lcd/dwin/proui/dwin.cpp
similarity index 100%
rename from Marlin/src/lcd/e3v2/proui/dwin.cpp
rename to Marlin/src/lcd/dwin/proui/dwin.cpp
diff --git a/Marlin/src/lcd/e3v2/proui/dwin.h b/Marlin/src/lcd/dwin/proui/dwin.h
similarity index 100%
rename from Marlin/src/lcd/e3v2/proui/dwin.h
rename to Marlin/src/lcd/dwin/proui/dwin.h
diff --git a/Marlin/src/lcd/e3v2/proui/dwin_defines.h b/Marlin/src/lcd/dwin/proui/dwin_defines.h
similarity index 100%
rename from Marlin/src/lcd/e3v2/proui/dwin_defines.h
rename to Marlin/src/lcd/dwin/proui/dwin_defines.h
diff --git a/Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp b/Marlin/src/lcd/dwin/proui/dwin_lcd.cpp
similarity index 100%
rename from Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp
rename to Marlin/src/lcd/dwin/proui/dwin_lcd.cpp
diff --git a/Marlin/src/lcd/e3v2/proui/dwin_lcd.h b/Marlin/src/lcd/dwin/proui/dwin_lcd.h
similarity index 100%
rename from Marlin/src/lcd/e3v2/proui/dwin_lcd.h
rename to Marlin/src/lcd/dwin/proui/dwin_lcd.h
diff --git a/Marlin/src/lcd/e3v2/proui/dwin_popup.cpp b/Marlin/src/lcd/dwin/proui/dwin_popup.cpp
similarity index 100%
rename from Marlin/src/lcd/e3v2/proui/dwin_popup.cpp
rename to Marlin/src/lcd/dwin/proui/dwin_popup.cpp
diff --git a/Marlin/src/lcd/e3v2/proui/dwin_popup.h b/Marlin/src/lcd/dwin/proui/dwin_popup.h
similarity index 100%
rename from Marlin/src/lcd/e3v2/proui/dwin_popup.h
rename to Marlin/src/lcd/dwin/proui/dwin_popup.h
diff --git a/Marlin/src/lcd/e3v2/proui/dwinui.cpp b/Marlin/src/lcd/dwin/proui/dwinui.cpp
similarity index 100%
rename from Marlin/src/lcd/e3v2/proui/dwinui.cpp
rename to Marlin/src/lcd/dwin/proui/dwinui.cpp
diff --git a/Marlin/src/lcd/e3v2/proui/dwinui.h b/Marlin/src/lcd/dwin/proui/dwinui.h
similarity index 100%
rename from Marlin/src/lcd/e3v2/proui/dwinui.h
rename to Marlin/src/lcd/dwin/proui/dwinui.h
diff --git a/Marlin/src/lcd/e3v2/proui/endstop_diag.cpp b/Marlin/src/lcd/dwin/proui/endstop_diag.cpp
similarity index 100%
rename from Marlin/src/lcd/e3v2/proui/endstop_diag.cpp
rename to Marlin/src/lcd/dwin/proui/endstop_diag.cpp
diff --git a/Marlin/src/lcd/e3v2/proui/endstop_diag.h b/Marlin/src/lcd/dwin/proui/endstop_diag.h
similarity index 100%
rename from Marlin/src/lcd/e3v2/proui/endstop_diag.h
rename to Marlin/src/lcd/dwin/proui/endstop_diag.h
diff --git a/Marlin/src/lcd/e3v2/proui/gcode_preview.cpp b/Marlin/src/lcd/dwin/proui/gcode_preview.cpp
similarity index 100%
rename from Marlin/src/lcd/e3v2/proui/gcode_preview.cpp
rename to Marlin/src/lcd/dwin/proui/gcode_preview.cpp
diff --git a/Marlin/src/lcd/e3v2/proui/gcode_preview.h b/Marlin/src/lcd/dwin/proui/gcode_preview.h
similarity index 100%
rename from Marlin/src/lcd/e3v2/proui/gcode_preview.h
rename to Marlin/src/lcd/dwin/proui/gcode_preview.h
diff --git a/Marlin/src/lcd/e3v2/proui/lockscreen.cpp b/Marlin/src/lcd/dwin/proui/lockscreen.cpp
similarity index 100%
rename from Marlin/src/lcd/e3v2/proui/lockscreen.cpp
rename to Marlin/src/lcd/dwin/proui/lockscreen.cpp
diff --git a/Marlin/src/lcd/e3v2/proui/lockscreen.h b/Marlin/src/lcd/dwin/proui/lockscreen.h
similarity index 100%
rename from Marlin/src/lcd/e3v2/proui/lockscreen.h
rename to Marlin/src/lcd/dwin/proui/lockscreen.h
diff --git a/Marlin/src/lcd/e3v2/proui/menus.cpp b/Marlin/src/lcd/dwin/proui/menus.cpp
similarity index 100%
rename from Marlin/src/lcd/e3v2/proui/menus.cpp
rename to Marlin/src/lcd/dwin/proui/menus.cpp
diff --git a/Marlin/src/lcd/e3v2/proui/menus.h b/Marlin/src/lcd/dwin/proui/menus.h
similarity index 100%
rename from Marlin/src/lcd/e3v2/proui/menus.h
rename to Marlin/src/lcd/dwin/proui/menus.h
diff --git a/Marlin/src/lcd/e3v2/proui/meshviewer.cpp b/Marlin/src/lcd/dwin/proui/meshviewer.cpp
similarity index 100%
rename from Marlin/src/lcd/e3v2/proui/meshviewer.cpp
rename to Marlin/src/lcd/dwin/proui/meshviewer.cpp
diff --git a/Marlin/src/lcd/e3v2/proui/meshviewer.h b/Marlin/src/lcd/dwin/proui/meshviewer.h
similarity index 100%
rename from Marlin/src/lcd/e3v2/proui/meshviewer.h
rename to Marlin/src/lcd/dwin/proui/meshviewer.h
diff --git a/Marlin/src/lcd/e3v2/proui/plot.cpp b/Marlin/src/lcd/dwin/proui/plot.cpp
similarity index 100%
rename from Marlin/src/lcd/e3v2/proui/plot.cpp
rename to Marlin/src/lcd/dwin/proui/plot.cpp
diff --git a/Marlin/src/lcd/e3v2/proui/plot.h b/Marlin/src/lcd/dwin/proui/plot.h
similarity index 100%
rename from Marlin/src/lcd/e3v2/proui/plot.h
rename to Marlin/src/lcd/dwin/proui/plot.h
diff --git a/Marlin/src/lcd/e3v2/proui/printstats.cpp b/Marlin/src/lcd/dwin/proui/printstats.cpp
similarity index 100%
rename from Marlin/src/lcd/e3v2/proui/printstats.cpp
rename to Marlin/src/lcd/dwin/proui/printstats.cpp
diff --git a/Marlin/src/lcd/e3v2/proui/printstats.h b/Marlin/src/lcd/dwin/proui/printstats.h
similarity index 100%
rename from Marlin/src/lcd/e3v2/proui/printstats.h
rename to Marlin/src/lcd/dwin/proui/printstats.h
diff --git a/Marlin/src/lcd/e3v2/proui/proui_extui.cpp b/Marlin/src/lcd/dwin/proui/proui_extui.cpp
similarity index 100%
rename from Marlin/src/lcd/e3v2/proui/proui_extui.cpp
rename to Marlin/src/lcd/dwin/proui/proui_extui.cpp
diff --git a/Marlin/src/lcd/lcdprint.h b/Marlin/src/lcd/lcdprint.h
index ef50fb823e..50f1074655 100644
--- a/Marlin/src/lcd/lcdprint.h
+++ b/Marlin/src/lcd/lcdprint.h
@@ -36,7 +36,7 @@
 
 #if IS_DWIN_MARLINUI
 
-  #include "e3v2/marlinui/marlinui_dwin.h"
+  #include "dwin/marlinui/marlinui_dwin.h"
 
   // The DWIN lcd_moveto function uses row / column, not pixels
   #define LCD_COL_X(col)    (col)
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
index b9f7749c97..b22023a056 100644
--- a/Marlin/src/lcd/marlinui.cpp
+++ b/Marlin/src/lcd/marlinui.cpp
@@ -46,9 +46,9 @@ MarlinUI ui;
 #endif
 
 #if ENABLED(DWIN_CREALITY_LCD)
-  #include "e3v2/creality/dwin.h"
+  #include "dwin/creality/dwin.h"
 #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-  #include "e3v2/jyersui/dwin.h"
+  #include "dwin/jyersui/dwin.h"
 #elif ENABLED(SOVOL_SV06_RTS)
   #include "sovol_rts/sovol_rts.h"
 #endif
diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
index 94a333629a..a3a3ae28f0 100644
--- a/Marlin/src/lcd/marlinui.h
+++ b/Marlin/src/lcd/marlinui.h
@@ -48,13 +48,13 @@
 #endif
 
 #if ENABLED(DWIN_CREALITY_LCD)
-  #include "e3v2/creality/dwin.h"
+  #include "dwin/creality/dwin.h"
 #elif ENABLED(DWIN_LCD_PROUI)
-  #include "e3v2/proui/dwin.h"
+  #include "dwin/proui/dwin.h"
 #endif
 
 #if ALL(HAS_STATUS_MESSAGE, IS_DWIN_MARLINUI)
-  #include "e3v2/marlinui/marlinui_dwin.h" // for LCD_WIDTH
+  #include "dwin/marlinui/marlinui_dwin.h" // for LCD_WIDTH
 #endif
 
 typedef bool (*statusResetFunc_t)();
diff --git a/Marlin/src/lcd/menu/game/types.h b/Marlin/src/lcd/menu/game/types.h
index a12d134d38..c19c60dd69 100644
--- a/Marlin/src/lcd/menu/game/types.h
+++ b/Marlin/src/lcd/menu/game/types.h
@@ -27,7 +27,7 @@
 #if HAS_MARLINUI_U8GLIB
   #include "../../dogm/game.h"
 #elif IS_DWIN_MARLINUI
-  #include "../../e3v2/marlinui/game.h"
+  #include "../../dwin/marlinui/game.h"
 #endif
 
 typedef struct { int8_t x, y; } pos_t;
diff --git a/Marlin/src/module/motion.h b/Marlin/src/module/motion.h
index fbce0166a9..8050e66448 100644
--- a/Marlin/src/module/motion.h
+++ b/Marlin/src/module/motion.h
@@ -31,7 +31,7 @@
 #include "../inc/MarlinConfig.h"
 
 #if ALL(DWIN_LCD_PROUI, INDIVIDUAL_AXIS_HOMING_SUBMENU, MESH_BED_LEVELING)
-  #include "../lcd/e3v2/proui/dwin.h" // for Z_POST_CLEARANCE
+  #include "../lcd/dwin/proui/dwin.h" // for Z_POST_CLEARANCE
 #endif
 
 #if IS_SCARA
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index e7ce0204c7..e48b215b77 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -79,14 +79,14 @@
 #endif
 
 #if ENABLED(DWIN_LCD_PROUI)
-  #include "../lcd/e3v2/proui/dwin.h"
-  #include "../lcd/e3v2/proui/bedlevel_tools.h"
+  #include "../lcd/dwin/proui/dwin.h"
+  #include "../lcd/dwin/proui/bedlevel_tools.h"
 #endif
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../lcd/extui/ui_api.h"
 #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
-  #include "../lcd/e3v2/jyersui/dwin.h"
+  #include "../lcd/dwin/jyersui/dwin.h"
 #endif
 
 #if ENABLED(HOST_PROMPT_SUPPORT)
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
index 819133f30d..f0ca49ef66 100644
--- a/Marlin/src/module/temperature.cpp
+++ b/Marlin/src/module/temperature.cpp
@@ -51,7 +51,7 @@
 #endif
 
 #if ENABLED(DWIN_CREALITY_LCD)
-  #include "../lcd/e3v2/creality/dwin.h"
+  #include "../lcd/dwin/creality/dwin.h"
 #elif ENABLED(SOVOL_SV06_RTS)
   #include "../lcd/sovol_rts/sovol_rts.h"
 #endif
diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp
index 1fb12f44a2..98b44e5d14 100644
--- a/Marlin/src/sd/cardreader.cpp
+++ b/Marlin/src/sd/cardreader.cpp
@@ -36,7 +36,7 @@
 #include "../lcd/marlinui.h"
 
 #if ENABLED(DWIN_CREALITY_LCD)
-  #include "../lcd/e3v2/creality/dwin.h"
+  #include "../lcd/dwin/creality/dwin.h"
 #elif ENABLED(SOVOL_SV06_RTS)
   #include "../lcd/sovol_rts/sovol_rts.h"
 #endif
diff --git a/ini/features.ini b/ini/features.ini
index d9b0928237..03a9bdbba8 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -47,11 +47,11 @@ HAS_(FSMC|SPI|LTDC)_TFT                = build_src_filter=+<src/lcd/tft_io>
 I2C_EEPROM                             = build_src_filter=+<src/HAL/shared/eeprom_if_i2c.cpp>
 SOFT_I2C_EEPROM|U8G_USES_SW_I2C        = SlowSoftI2CMaster, SlowSoftWire=https://github.com/felias-fogg/SlowSoftWire/archive/f34d777f39.zip
 SPI_EEPROM                             = build_src_filter=+<src/HAL/shared/eeprom_if_spi.cpp>
-HAS_DWIN_E3V2|IS_DWIN_MARLINUI         = build_src_filter=+<src/lcd/e3v2/common>
-DWIN_CREALITY_LCD                      = build_src_filter=+<src/lcd/e3v2/creality>
-DWIN_LCD_PROUI                         = build_src_filter=+<src/lcd/e3v2/proui>
-DWIN_CREALITY_LCD_JYERSUI              = build_src_filter=+<src/lcd/e3v2/jyersui>
-IS_DWIN_MARLINUI                       = build_src_filter=+<src/lcd/e3v2/marlinui>
+HAS_DWIN_E3V2|IS_DWIN_MARLINUI         = build_src_filter=+<src/lcd/dwin/common>
+DWIN_CREALITY_LCD                      = build_src_filter=+<src/lcd/dwin/creality>
+DWIN_LCD_PROUI                         = build_src_filter=+<src/lcd/dwin/proui>
+DWIN_CREALITY_LCD_JYERSUI              = build_src_filter=+<src/lcd/dwin/jyersui>
+IS_DWIN_MARLINUI                       = build_src_filter=+<src/lcd/dwin/marlinui>
 SOVOL_SV06_RTS                         = build_src_filter=+<src/lcd/sovol_rts>
 HAS_GRAPHICAL_TFT                      = build_src_filter=+<src/lcd/tft> -<src/lcd/tft/fontdata> -<src/lcd/tft/ui_move_axis_screen_*.cpp>
 HAS_UI_320X.+                          = build_src_filter=+<src/lcd/tft/ui_move_axis_screen_320.cpp>
diff --git a/platformio.ini b/platformio.ini
index df5418cde4..995c29ca17 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -58,7 +58,7 @@ lib_deps           =
 default_src_filter = +<src/*> -<src/config> -<src/tests>
   ; LCDs and Controllers
   -<src/lcd/HD44780> -<src/lcd/dogm> -<src/lcd/TFTGLCD> -<src/lcd/tft> -<src/lcd/tft_io>
-  -<src/lcd/e3v2> -<src/lcd/sovol_rts> -<src/lcd/menu> -<src/lcd/extui> -<src/lcd/touch>
+  -<src/lcd/dwin> -<src/lcd/sovol_rts> -<src/lcd/menu> -<src/lcd/extui> -<src/lcd/touch>
   -<src/lcd/lcdprint.cpp>
   ; Marlin HAL
   -<src/HAL>