diff --git a/lib/libesp32_epdiy/.gitignore b/lib/libesp32_eink/epdiy/.gitignore
similarity index 100%
rename from lib/libesp32_epdiy/.gitignore
rename to lib/libesp32_eink/epdiy/.gitignore
diff --git a/lib/libesp32_epdiy/.gitmodules b/lib/libesp32_eink/epdiy/.gitmodules
similarity index 100%
rename from lib/libesp32_epdiy/.gitmodules
rename to lib/libesp32_eink/epdiy/.gitmodules
diff --git a/lib/libesp32_epdiy/.readthedocs.yml b/lib/libesp32_eink/epdiy/.readthedocs.yml
similarity index 100%
rename from lib/libesp32_epdiy/.readthedocs.yml
rename to lib/libesp32_eink/epdiy/.readthedocs.yml
diff --git a/lib/libesp32_epdiy/Makefile b/lib/libesp32_eink/epdiy/Makefile
similarity index 100%
rename from lib/libesp32_epdiy/Makefile
rename to lib/libesp32_eink/epdiy/Makefile
diff --git a/lib/libesp32_epdiy/README.md b/lib/libesp32_eink/epdiy/README.md
similarity index 100%
rename from lib/libesp32_epdiy/README.md
rename to lib/libesp32_eink/epdiy/README.md
diff --git a/lib/libesp32_epdiy/boards.local.txt b/lib/libesp32_eink/epdiy/boards.local.txt
similarity index 100%
rename from lib/libesp32_epdiy/boards.local.txt
rename to lib/libesp32_eink/epdiy/boards.local.txt
diff --git a/lib/libesp32_epdiy/library.properties b/lib/libesp32_eink/epdiy/library.properties
similarity index 100%
rename from lib/libesp32_epdiy/library.properties
rename to lib/libesp32_eink/epdiy/library.properties
diff --git a/lib/libesp32_epdiy/scripts/LICENSE b/lib/libesp32_eink/epdiy/scripts/LICENSE
similarity index 100%
rename from lib/libesp32_epdiy/scripts/LICENSE
rename to lib/libesp32_eink/epdiy/scripts/LICENSE
diff --git a/lib/libesp32_epdiy/scripts/epdiy_waveform_gen.py b/lib/libesp32_eink/epdiy/scripts/epdiy_waveform_gen.py
similarity index 100%
rename from lib/libesp32_epdiy/scripts/epdiy_waveform_gen.py
rename to lib/libesp32_eink/epdiy/scripts/epdiy_waveform_gen.py
diff --git a/lib/libesp32_epdiy/scripts/fontconvert.py b/lib/libesp32_eink/epdiy/scripts/fontconvert.py
similarity index 100%
rename from lib/libesp32_epdiy/scripts/fontconvert.py
rename to lib/libesp32_eink/epdiy/scripts/fontconvert.py
diff --git a/lib/libesp32_epdiy/scripts/imgconvert.py b/lib/libesp32_eink/epdiy/scripts/imgconvert.py
similarity index 100%
rename from lib/libesp32_epdiy/scripts/imgconvert.py
rename to lib/libesp32_eink/epdiy/scripts/imgconvert.py
diff --git a/lib/libesp32_epdiy/scripts/modenames.py b/lib/libesp32_eink/epdiy/scripts/modenames.py
similarity index 100%
rename from lib/libesp32_epdiy/scripts/modenames.py
rename to lib/libesp32_eink/epdiy/scripts/modenames.py
diff --git a/lib/libesp32_epdiy/scripts/waveform_hdrgen.py b/lib/libesp32_eink/epdiy/scripts/waveform_hdrgen.py
similarity index 100%
rename from lib/libesp32_epdiy/scripts/waveform_hdrgen.py
rename to lib/libesp32_eink/epdiy/scripts/waveform_hdrgen.py
diff --git a/lib/libesp32_epdiy/src/epd4in7.cpp b/lib/libesp32_eink/epdiy/src/epd4in7.cpp
similarity index 100%
rename from lib/libesp32_epdiy/src/epd4in7.cpp
rename to lib/libesp32_eink/epdiy/src/epd4in7.cpp
diff --git a/lib/libesp32_epdiy/src/epd4in7.h b/lib/libesp32_eink/epdiy/src/epd4in7.h
similarity index 100%
rename from lib/libesp32_epdiy/src/epd4in7.h
rename to lib/libesp32_eink/epdiy/src/epd4in7.h
diff --git a/lib/libesp32_epdiy/src/epd_driver.h b/lib/libesp32_eink/epdiy/src/epd_driver.h
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver.h
rename to lib/libesp32_eink/epdiy/src/epd_driver.h
diff --git a/lib/libesp32_epdiy/src/epd_driver/CMakeLists.txt b/lib/libesp32_eink/epdiy/src/epd_driver/CMakeLists.txt
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/CMakeLists.txt
rename to lib/libesp32_eink/epdiy/src/epd_driver/CMakeLists.txt
diff --git a/lib/libesp32_epdiy/src/epd_driver/Kconfig b/lib/libesp32_eink/epdiy/src/epd_driver/Kconfig
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/Kconfig
rename to lib/libesp32_eink/epdiy/src/epd_driver/Kconfig
diff --git a/lib/libesp32_epdiy/src/epd_driver/LICENSE b/lib/libesp32_eink/epdiy/src/epd_driver/LICENSE
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/LICENSE
rename to lib/libesp32_eink/epdiy/src/epd_driver/LICENSE
diff --git a/lib/libesp32_epdiy/src/epd_driver/Makefile b/lib/libesp32_eink/epdiy/src/epd_driver/Makefile
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/Makefile
rename to lib/libesp32_eink/epdiy/src/epd_driver/Makefile
diff --git a/lib/libesp32_epdiy/src/epd_driver/builtin_waveforms.c b/lib/libesp32_eink/epdiy/src/epd_driver/builtin_waveforms.c
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/builtin_waveforms.c
rename to lib/libesp32_eink/epdiy/src/epd_driver/builtin_waveforms.c
diff --git a/lib/libesp32_epdiy/src/epd_driver/config_reg_v2.h b/lib/libesp32_eink/epdiy/src/epd_driver/config_reg_v2.h
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/config_reg_v2.h
rename to lib/libesp32_eink/epdiy/src/epd_driver/config_reg_v2.h
diff --git a/lib/libesp32_epdiy/src/epd_driver/config_reg_v4.h b/lib/libesp32_eink/epdiy/src/epd_driver/config_reg_v4.h
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/config_reg_v4.h
rename to lib/libesp32_eink/epdiy/src/epd_driver/config_reg_v4.h
diff --git a/lib/libesp32_epdiy/src/epd_driver/display_ops.c b/lib/libesp32_eink/epdiy/src/epd_driver/display_ops.c
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/display_ops.c
rename to lib/libesp32_eink/epdiy/src/epd_driver/display_ops.c
diff --git a/lib/libesp32_epdiy/src/epd_driver/display_ops.h b/lib/libesp32_eink/epdiy/src/epd_driver/display_ops.h
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/display_ops.h
rename to lib/libesp32_eink/epdiy/src/epd_driver/display_ops.h
diff --git a/lib/libesp32_epdiy/src/epd_driver/epd_driver.c b/lib/libesp32_eink/epdiy/src/epd_driver/epd_driver.c
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/epd_driver.c
rename to lib/libesp32_eink/epdiy/src/epd_driver/epd_driver.c
diff --git a/lib/libesp32_epdiy/src/epd_driver/epd_temperature.c b/lib/libesp32_eink/epdiy/src/epd_driver/epd_temperature.c
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/epd_temperature.c
rename to lib/libesp32_eink/epdiy/src/epd_driver/epd_temperature.c
diff --git a/lib/libesp32_epdiy/src/epd_driver/epd_temperature.h b/lib/libesp32_eink/epdiy/src/epd_driver/epd_temperature.h
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/epd_temperature.h
rename to lib/libesp32_eink/epdiy/src/epd_driver/epd_temperature.h
diff --git a/lib/libesp32_epdiy/src/epd_driver/font.c b/lib/libesp32_eink/epdiy/src/epd_driver/font.c
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/font.c
rename to lib/libesp32_eink/epdiy/src/epd_driver/font.c
diff --git a/lib/libesp32_epdiy/src/epd_driver/hacks.cmake b/lib/libesp32_eink/epdiy/src/epd_driver/hacks.cmake
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/hacks.cmake
rename to lib/libesp32_eink/epdiy/src/epd_driver/hacks.cmake
diff --git a/lib/libesp32_epdiy/src/epd_driver/highlevel.c b/lib/libesp32_eink/epdiy/src/epd_driver/highlevel.c
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/highlevel.c
rename to lib/libesp32_eink/epdiy/src/epd_driver/highlevel.c
diff --git a/lib/libesp32_epdiy/src/epd_driver/i2s_data_bus.c b/lib/libesp32_eink/epdiy/src/epd_driver/i2s_data_bus.c
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/i2s_data_bus.c
rename to lib/libesp32_eink/epdiy/src/epd_driver/i2s_data_bus.c
diff --git a/lib/libesp32_epdiy/src/epd_driver/i2s_data_bus.h b/lib/libesp32_eink/epdiy/src/epd_driver/i2s_data_bus.h
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/i2s_data_bus.h
rename to lib/libesp32_eink/epdiy/src/epd_driver/i2s_data_bus.h
diff --git a/lib/libesp32_epdiy/src/epd_driver/include/epd_driver.h b/lib/libesp32_eink/epdiy/src/epd_driver/include/epd_driver.h
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/include/epd_driver.h
rename to lib/libesp32_eink/epdiy/src/epd_driver/include/epd_driver.h
diff --git a/lib/libesp32_epdiy/src/epd_driver/include/epd_highlevel.h b/lib/libesp32_eink/epdiy/src/epd_driver/include/epd_highlevel.h
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/include/epd_highlevel.h
rename to lib/libesp32_eink/epdiy/src/epd_driver/include/epd_highlevel.h
diff --git a/lib/libesp32_epdiy/src/epd_driver/include/epd_internals.h b/lib/libesp32_eink/epdiy/src/epd_driver/include/epd_internals.h
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/include/epd_internals.h
rename to lib/libesp32_eink/epdiy/src/epd_driver/include/epd_internals.h
diff --git a/lib/libesp32_epdiy/src/epd_driver/lut.c b/lib/libesp32_eink/epdiy/src/epd_driver/lut.c
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/lut.c
rename to lib/libesp32_eink/epdiy/src/epd_driver/lut.c
diff --git a/lib/libesp32_epdiy/src/epd_driver/lut.h b/lib/libesp32_eink/epdiy/src/epd_driver/lut.h
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/lut.h
rename to lib/libesp32_eink/epdiy/src/epd_driver/lut.h
diff --git a/lib/libesp32_epdiy/src/epd_driver/render.c b/lib/libesp32_eink/epdiy/src/epd_driver/render.c
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/render.c
rename to lib/libesp32_eink/epdiy/src/epd_driver/render.c
diff --git a/lib/libesp32_epdiy/src/epd_driver/rmt_pulse.c b/lib/libesp32_eink/epdiy/src/epd_driver/rmt_pulse.c
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/rmt_pulse.c
rename to lib/libesp32_eink/epdiy/src/epd_driver/rmt_pulse.c
diff --git a/lib/libesp32_epdiy/src/epd_driver/rmt_pulse.h b/lib/libesp32_eink/epdiy/src/epd_driver/rmt_pulse.h
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/rmt_pulse.h
rename to lib/libesp32_eink/epdiy/src/epd_driver/rmt_pulse.h
diff --git a/lib/libesp32_epdiy/src/epd_driver/waveforms/ED047TC2.h b/lib/libesp32_eink/epdiy/src/epd_driver/waveforms/ED047TC2.h
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/waveforms/ED047TC2.h
rename to lib/libesp32_eink/epdiy/src/epd_driver/waveforms/ED047TC2.h
diff --git a/lib/libesp32_epdiy/src/epd_driver/waveforms/epdiy_ED047TC1.h b/lib/libesp32_eink/epdiy/src/epd_driver/waveforms/epdiy_ED047TC1.h
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/waveforms/epdiy_ED047TC1.h
rename to lib/libesp32_eink/epdiy/src/epd_driver/waveforms/epdiy_ED047TC1.h
diff --git a/lib/libesp32_epdiy/src/epd_driver/waveforms/epdiy_ED060SC4.h b/lib/libesp32_eink/epdiy/src/epd_driver/waveforms/epdiy_ED060SC4.h
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/waveforms/epdiy_ED060SC4.h
rename to lib/libesp32_eink/epdiy/src/epd_driver/waveforms/epdiy_ED060SC4.h
diff --git a/lib/libesp32_epdiy/src/epd_driver/waveforms/epdiy_ED060SCT.h b/lib/libesp32_eink/epdiy/src/epd_driver/waveforms/epdiy_ED060SCT.h
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/waveforms/epdiy_ED060SCT.h
rename to lib/libesp32_eink/epdiy/src/epd_driver/waveforms/epdiy_ED060SCT.h
diff --git a/lib/libesp32_epdiy/src/epd_driver/waveforms/epdiy_ED060XC3.h b/lib/libesp32_eink/epdiy/src/epd_driver/waveforms/epdiy_ED060XC3.h
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/waveforms/epdiy_ED060XC3.h
rename to lib/libesp32_eink/epdiy/src/epd_driver/waveforms/epdiy_ED060XC3.h
diff --git a/lib/libesp32_epdiy/src/epd_driver/waveforms/epdiy_ED097OC4.h b/lib/libesp32_eink/epdiy/src/epd_driver/waveforms/epdiy_ED097OC4.h
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/waveforms/epdiy_ED097OC4.h
rename to lib/libesp32_eink/epdiy/src/epd_driver/waveforms/epdiy_ED097OC4.h
diff --git a/lib/libesp32_epdiy/src/epd_driver/waveforms/epdiy_ED097TC2.h b/lib/libesp32_eink/epdiy/src/epd_driver/waveforms/epdiy_ED097TC2.h
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/waveforms/epdiy_ED097TC2.h
rename to lib/libesp32_eink/epdiy/src/epd_driver/waveforms/epdiy_ED097TC2.h
diff --git a/lib/libesp32_epdiy/src/epd_driver/waveforms/epdiy_ED133UT2.h b/lib/libesp32_eink/epdiy/src/epd_driver/waveforms/epdiy_ED133UT2.h
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_driver/waveforms/epdiy_ED133UT2.h
rename to lib/libesp32_eink/epdiy/src/epd_driver/waveforms/epdiy_ED133UT2.h
diff --git a/lib/libesp32_epdiy/src/epd_highlevel.h b/lib/libesp32_eink/epdiy/src/epd_highlevel.h
similarity index 100%
rename from lib/libesp32_epdiy/src/epd_highlevel.h
rename to lib/libesp32_eink/epdiy/src/epd_highlevel.h
diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 3ce7709fe..81f1dbded 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -134,7 +134,7 @@ lib_extra_dirs           = ${library.lib_extra_dirs}
 ; *** uncomment the following line if you use Bluetooth or Apple Homekit in a Tasmota32 build. Reduces compile time
 ;                          lib/libesp32_div
 ; *** uncomment the following line if you use Epaper driver epidy in your Tasmota32 build. Reduces compile time 
-;                          lib/libesp32_epdiy
+;                          lib/libesp32_eink
 
 
 [library]
diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini
index c6762bdb7..4d268b71e 100644
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@@ -17,7 +17,7 @@ lib_extra_dirs              = ${common.lib_extra_dirs}
                               lib/libesp32
                               lib/libesp32_lvgl
                               lib/libesp32_div
-                              lib/libesp32_epdiy
+                              lib/libesp32_eink
 lib_ignore                  =
                               ESP RainMaker
                               WiFiProv