diff --git a/components/platform_display/CMakeLists.txt b/components/display/CMakeLists.txt
similarity index 100%
rename from components/platform_display/CMakeLists.txt
rename to components/display/CMakeLists.txt
diff --git a/components/platform_display/SH1106.c b/components/display/SH1106.c
similarity index 100%
rename from components/platform_display/SH1106.c
rename to components/display/SH1106.c
diff --git a/components/platform_display/SSD1306.c b/components/display/SSD1306.c
similarity index 100%
rename from components/platform_display/SSD1306.c
rename to components/display/SSD1306.c
diff --git a/components/platform_display/SSD132x.c b/components/display/SSD132x.c
similarity index 100%
rename from components/platform_display/SSD132x.c
rename to components/display/SSD132x.c
diff --git a/components/platform_display/component.mk b/components/display/component.mk
similarity index 100%
rename from components/platform_display/component.mk
rename to components/display/component.mk
diff --git a/components/platform_display/core/gds.c b/components/display/core/gds.c
similarity index 100%
rename from components/platform_display/core/gds.c
rename to components/display/core/gds.c
diff --git a/components/platform_display/core/gds.h b/components/display/core/gds.h
similarity index 100%
rename from components/platform_display/core/gds.h
rename to components/display/core/gds.h
diff --git a/components/platform_display/core/gds_default_if.h b/components/display/core/gds_default_if.h
similarity index 100%
rename from components/platform_display/core/gds_default_if.h
rename to components/display/core/gds_default_if.h
diff --git a/components/platform_display/core/gds_draw.c b/components/display/core/gds_draw.c
similarity index 100%
rename from components/platform_display/core/gds_draw.c
rename to components/display/core/gds_draw.c
diff --git a/components/platform_display/core/gds_draw.h b/components/display/core/gds_draw.h
similarity index 100%
rename from components/platform_display/core/gds_draw.h
rename to components/display/core/gds_draw.h
diff --git a/components/platform_display/core/gds_err.h b/components/display/core/gds_err.h
similarity index 100%
rename from components/platform_display/core/gds_err.h
rename to components/display/core/gds_err.h
diff --git a/components/platform_display/core/gds_font.c b/components/display/core/gds_font.c
similarity index 100%
rename from components/platform_display/core/gds_font.c
rename to components/display/core/gds_font.c
diff --git a/components/platform_display/core/gds_font.h b/components/display/core/gds_font.h
similarity index 100%
rename from components/platform_display/core/gds_font.h
rename to components/display/core/gds_font.h
diff --git a/components/platform_display/core/gds_image.c b/components/display/core/gds_image.c
similarity index 100%
rename from components/platform_display/core/gds_image.c
rename to components/display/core/gds_image.c
diff --git a/components/platform_display/core/gds_image.h b/components/display/core/gds_image.h
similarity index 100%
rename from components/platform_display/core/gds_image.h
rename to components/display/core/gds_image.h
diff --git a/components/platform_display/core/gds_private.h b/components/display/core/gds_private.h
similarity index 100%
rename from components/platform_display/core/gds_private.h
rename to components/display/core/gds_private.h
diff --git a/components/platform_display/core/gds_text.c b/components/display/core/gds_text.c
similarity index 100%
rename from components/platform_display/core/gds_text.c
rename to components/display/core/gds_text.c
diff --git a/components/platform_display/core/gds_text.h b/components/display/core/gds_text.h
similarity index 100%
rename from components/platform_display/core/gds_text.h
rename to components/display/core/gds_text.h
diff --git a/components/platform_display/core/ifaces/default_if_i2c.c b/components/display/core/ifaces/default_if_i2c.c
similarity index 100%
rename from components/platform_display/core/ifaces/default_if_i2c.c
rename to components/display/core/ifaces/default_if_i2c.c
diff --git a/components/platform_display/core/ifaces/default_if_spi.c b/components/display/core/ifaces/default_if_spi.c
similarity index 100%
rename from components/platform_display/core/ifaces/default_if_spi.c
rename to components/display/core/ifaces/default_if_spi.c
diff --git a/components/platform_display/display.c b/components/display/display.c
similarity index 100%
rename from components/platform_display/display.c
rename to components/display/display.c
diff --git a/components/platform_display/display.h b/components/display/display.h
similarity index 100%
rename from components/platform_display/display.h
rename to components/display/display.h
diff --git a/components/platform_display/fonts/LICENSE-apache b/components/display/fonts/LICENSE-apache
similarity index 100%
rename from components/platform_display/fonts/LICENSE-apache
rename to components/display/fonts/LICENSE-apache
diff --git a/components/platform_display/fonts/LICENSE-liberation-mono b/components/display/fonts/LICENSE-liberation-mono
similarity index 100%
rename from components/platform_display/fonts/LICENSE-liberation-mono
rename to components/display/fonts/LICENSE-liberation-mono
diff --git a/components/platform_display/fonts/font_droid_sans_fallback_11x13.c b/components/display/fonts/font_droid_sans_fallback_11x13.c
similarity index 100%
rename from components/platform_display/fonts/font_droid_sans_fallback_11x13.c
rename to components/display/fonts/font_droid_sans_fallback_11x13.c
diff --git a/components/platform_display/fonts/font_droid_sans_fallback_15x17.c b/components/display/fonts/font_droid_sans_fallback_15x17.c
similarity index 100%
rename from components/platform_display/fonts/font_droid_sans_fallback_15x17.c
rename to components/display/fonts/font_droid_sans_fallback_15x17.c
diff --git a/components/platform_display/fonts/font_droid_sans_fallback_24x28.c b/components/display/fonts/font_droid_sans_fallback_24x28.c
similarity index 100%
rename from components/platform_display/fonts/font_droid_sans_fallback_24x28.c
rename to components/display/fonts/font_droid_sans_fallback_24x28.c
diff --git a/components/platform_display/fonts/font_droid_sans_mono_13x24.c b/components/display/fonts/font_droid_sans_mono_13x24.c
similarity index 100%
rename from components/platform_display/fonts/font_droid_sans_mono_13x24.c
rename to components/display/fonts/font_droid_sans_mono_13x24.c
diff --git a/components/platform_display/fonts/font_droid_sans_mono_16x31.c b/components/display/fonts/font_droid_sans_mono_16x31.c
similarity index 100%
rename from components/platform_display/fonts/font_droid_sans_mono_16x31.c
rename to components/display/fonts/font_droid_sans_mono_16x31.c
diff --git a/components/platform_display/fonts/font_droid_sans_mono_7x13.c b/components/display/fonts/font_droid_sans_mono_7x13.c
similarity index 100%
rename from components/platform_display/fonts/font_droid_sans_mono_7x13.c
rename to components/display/fonts/font_droid_sans_mono_7x13.c
diff --git a/components/platform_display/fonts/font_liberation_mono_13x21.c b/components/display/fonts/font_liberation_mono_13x21.c
similarity index 100%
rename from components/platform_display/fonts/font_liberation_mono_13x21.c
rename to components/display/fonts/font_liberation_mono_13x21.c
diff --git a/components/platform_display/fonts/font_liberation_mono_17x30.c b/components/display/fonts/font_liberation_mono_17x30.c
similarity index 100%
rename from components/platform_display/fonts/font_liberation_mono_17x30.c
rename to components/display/fonts/font_liberation_mono_17x30.c
diff --git a/components/platform_display/fonts/font_liberation_mono_9x15.c b/components/display/fonts/font_liberation_mono_9x15.c
similarity index 100%
rename from components/platform_display/fonts/font_liberation_mono_9x15.c
rename to components/display/fonts/font_liberation_mono_9x15.c
diff --git a/components/platform_display/fonts/font_line_1.c b/components/display/fonts/font_line_1.c
similarity index 100%
rename from components/platform_display/fonts/font_line_1.c
rename to components/display/fonts/font_line_1.c
diff --git a/components/platform_display/fonts/font_line_2.c b/components/display/fonts/font_line_2.c
similarity index 100%
rename from components/platform_display/fonts/font_line_2.c
rename to components/display/fonts/font_line_2.c
diff --git a/components/platform_display/fonts/font_tarable7seg_16x32.c b/components/display/fonts/font_tarable7seg_16x32.c
similarity index 100%
rename from components/platform_display/fonts/font_tarable7seg_16x32.c
rename to components/display/fonts/font_tarable7seg_16x32.c
diff --git a/components/platform_display/fonts/font_tarable7seg_32x64.c b/components/display/fonts/font_tarable7seg_32x64.c
similarity index 100%
rename from components/platform_display/fonts/font_tarable7seg_32x64.c
rename to components/display/fonts/font_tarable7seg_32x64.c
diff --git a/components/platform_bluetooth/CMakeLists.txt b/components/platform_bluetooth/CMakeLists.txt
index 3c5fb106..3aaa7463 100644
--- a/components/platform_bluetooth/CMakeLists.txt
+++ b/components/platform_bluetooth/CMakeLists.txt
@@ -2,7 +2,7 @@ idf_component_register(SRCS platform_bt_core.c
 							platform_bt_sink.c
 							platform_bt_source.c
                        INCLUDE_DIRS .
-                       REQUIRES bt platform_display  esp_common freertos  nvs_flash esp32 spi_flash newlib log  pthread platform_config
+                       REQUIRES bt display  esp_common freertos  nvs_flash esp32 spi_flash newlib log  pthread platform_config
 
 )
 
diff --git a/components/raop/CMakeLists.txt b/components/raop/CMakeLists.txt
index d8749734..0f4c32b7 100644
--- a/components/raop/CMakeLists.txt
+++ b/components/raop/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 idf_component_register(SRCS dmap_parser.c raop_sink.c raop.c rtp.c util.c   
 						INCLUDE_DIRS .   
-						REQUIRES newlib platform_config services codecs tools platform_display
+						REQUIRES newlib platform_config services codecs tools display
 						  
 )
diff --git a/components/squeezelite/CMakeLists.txt b/components/squeezelite/CMakeLists.txt
index 5675f3fe..7aa0ee5e 100644
--- a/components/squeezelite/CMakeLists.txt
+++ b/components/squeezelite/CMakeLists.txt
@@ -33,7 +33,7 @@ idf_component_register(SRCS "alac.c"
 						REQUIRES 	newlib 
 									esp_common 
 									esp-dsp
-						  			platform_display 
+						  			display 
 						 			platform_config 
 						 			platform_bluetooth 
 						 			codecs