diff --git a/components/homeThing/HomeThingMenuNowPlayingHeader.cpp b/components/homeThing/HomeThingNowPlayingHeader.cpp
similarity index 99%
rename from components/homeThing/HomeThingMenuNowPlayingHeader.cpp
rename to components/homeThing/HomeThingNowPlayingHeader.cpp
index a52b1e37..9c8e67dd 100644
--- a/components/homeThing/HomeThingMenuNowPlayingHeader.cpp
+++ b/components/homeThing/HomeThingNowPlayingHeader.cpp
@@ -1,4 +1,4 @@
-#include "esphome/components/homeThing/HomeThingMenuNowPlayingHeader.h"
+#include "esphome/components/homeThing/HomeThingNowPlayingHeader.h"
 
 namespace esphome {
 namespace homething_menu_now_playing {
diff --git a/components/homeThing/HomeThingMenuNowPlayingHeader.h b/components/homeThing/HomeThingNowPlayingHeader.h
similarity index 100%
rename from components/homeThing/HomeThingMenuNowPlayingHeader.h
rename to components/homeThing/HomeThingNowPlayingHeader.h
diff --git a/components/homeThing/homeThingMenuBase.h b/components/homeThing/homeThingMenuBase.h
index f90e7051..35d20c6d 100644
--- a/components/homeThing/homeThingMenuBase.h
+++ b/components/homeThing/homeThingMenuBase.h
@@ -16,11 +16,7 @@
 #include "esphome/components/homeThing/homeThingMenuTitle.h"
 
 #ifdef USE_MEDIA_PLAYER_GROUP
-#include "esphome/components/homeThing/homeThingMenuNowPlayingControl.h"
-// #include "esphome/components/homeThing/homeThingMenuNowPlaying.h"
-// #include "esphome/components/homeThing/homeThingMenuNowPlayingOptionMenu.h"
-// #include "esphome/components/homeThing/homeThingOptionMenu.h"
-// #include "esphome/components/homeassistant_media_player/HomeAssistantMediaPlayerGroup.h"
+#include "esphome/components/homeThing/homeThingNowPlayingControl.h"
 #endif
 
 #include "esphome/core/automation.h"
diff --git a/components/homeThing/homeThingMenuDisplay.h b/components/homeThing/homeThingMenuDisplay.h
index 5c9bdd33..2f6ed832 100644
--- a/components/homeThing/homeThingMenuDisplay.h
+++ b/components/homeThing/homeThingMenuDisplay.h
@@ -18,7 +18,7 @@
 #endif
 
 #ifdef USE_MEDIA_PLAYER_GROUP
-#include "esphome/components/homeThing/homeThingMenuNowPlaying.h"
+#include "esphome/components/homeThing/homeThingNowPlayingDisplay.h"
 #include "esphome/components/homeassistant_media_player/HomeAssistantMediaPlayerGroup.h"
 #endif
 
diff --git a/components/homeThing/homeThingMenuNowPlayingControl.cpp b/components/homeThing/homeThingNowPlayingControl.cpp
similarity index 99%
rename from components/homeThing/homeThingMenuNowPlayingControl.cpp
rename to components/homeThing/homeThingNowPlayingControl.cpp
index d813a459..289ebf50 100644
--- a/components/homeThing/homeThingMenuNowPlayingControl.cpp
+++ b/components/homeThing/homeThingNowPlayingControl.cpp
@@ -1,4 +1,4 @@
-#include "homeThingMenuNowPlayingControl.h"
+#include "homeThingNowPlayingControl.h"
 
 namespace esphome {
 namespace homething_menu_now_playing {
diff --git a/components/homeThing/homeThingMenuNowPlayingControl.h b/components/homeThing/homeThingNowPlayingControl.h
similarity index 94%
rename from components/homeThing/homeThingMenuNowPlayingControl.h
rename to components/homeThing/homeThingNowPlayingControl.h
index c096f7c6..442733ba 100644
--- a/components/homeThing/homeThingMenuNowPlayingControl.h
+++ b/components/homeThing/homeThingNowPlayingControl.h
@@ -2,13 +2,13 @@
 
 #include "esphome/components/homeThing/homeThingMenuApp.h"
 #include "esphome/components/homeThing/homeThingMenuHeader.h"
-#include "esphome/components/homeThing/homeThingMenuNowPlaying.h"
-#include "esphome/components/homeThing/homeThingMenuNowPlayingOptionMenu.h"
 #include "esphome/components/homeThing/homeThingMenuTitle.h"
+#include "esphome/components/homeThing/homeThingNowPlayingDisplay.h"
+#include "esphome/components/homeThing/homeThingNowPlayingOptionMenu.h"
 #include "esphome/components/homeThing/homeThingOptionMenu.h"
 #include "esphome/components/homeassistant_media_player/HomeAssistantMediaPlayerGroup.h"
 
-#include "esphome/components/homeThing/HomeThingMenuNowPlayingHeader.h"
+#include "esphome/components/homeThing/HomeThingNowPlayingHeader.h"
 #include "esphome/components/homeThing/homeThingMenuDisplayState.h"
 #include "esphome/components/homeThing/homeThingMenuScreen.h"
 #include "esphome/components/homeThing/homeThingMenuTextHelpers.h"
diff --git a/components/homeThing/homeThingMenuNowPlaying.cpp b/components/homeThing/homeThingNowPlayingDisplay.cpp
similarity index 99%
rename from components/homeThing/homeThingMenuNowPlaying.cpp
rename to components/homeThing/homeThingNowPlayingDisplay.cpp
index e3f570e9..f855bfa5 100644
--- a/components/homeThing/homeThingMenuNowPlaying.cpp
+++ b/components/homeThing/homeThingNowPlayingDisplay.cpp
@@ -1,5 +1,5 @@
 #ifdef USE_MEDIA_PLAYER_GROUP
-#include "homeThingMenuNowPlaying.h"
+#include "homeThingNowPlayingDisplay.h"
 #include "esphome/components/homeThing/homeThingMenuDisplayState.h"
 #include "esphome/components/homeThing/homeThingMenuTextHelpers.h"
 #include "esphome/components/homeThing/homeThingOptionMenu.h"
diff --git a/components/homeThing/homeThingMenuNowPlaying.h b/components/homeThing/homeThingNowPlayingDisplay.h
similarity index 100%
rename from components/homeThing/homeThingMenuNowPlaying.h
rename to components/homeThing/homeThingNowPlayingDisplay.h
diff --git a/components/homeThing/homeThingMenuNowPlayingOptionMenu.cpp b/components/homeThing/homeThingNowPlayingOptionMenu.cpp
similarity index 98%
rename from components/homeThing/homeThingMenuNowPlayingOptionMenu.cpp
rename to components/homeThing/homeThingNowPlayingOptionMenu.cpp
index b0a81d07..4df96dd7 100644
--- a/components/homeThing/homeThingMenuNowPlayingOptionMenu.cpp
+++ b/components/homeThing/homeThingNowPlayingOptionMenu.cpp
@@ -1,5 +1,5 @@
 #ifdef USE_MEDIA_PLAYER_GROUP
-#include "homeThingMenuNowPlayingOptionMenu.h"
+#include "homeThingNowPlayingOptionMenu.h"
 
 namespace esphome {
 namespace homething_menu_now_playing {
diff --git a/components/homeThing/homeThingMenuNowPlayingOptionMenu.h b/components/homeThing/homeThingNowPlayingOptionMenu.h
similarity index 100%
rename from components/homeThing/homeThingMenuNowPlayingOptionMenu.h
rename to components/homeThing/homeThingNowPlayingOptionMenu.h