diff --git a/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java b/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java
index d3bb90660..fe1c95b9c 100644
--- a/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/player/MainPlayer.java
@@ -122,7 +122,7 @@ public final class MainPlayer extends Service {
     }
 
     private void createView() {
-        final View layout = View.inflate(this, R.layout.activity_main_player, null);
+        final View layout = View.inflate(this, R.layout.player, null);
 
         playerImpl = new VideoPlayerImpl(this);
         playerImpl.setup(layout);
@@ -284,9 +284,9 @@ public final class MainPlayer extends Service {
 
     private NotificationCompat.Builder createNotification() {
         notRemoteView = new RemoteViews(BuildConfig.APPLICATION_ID,
-                R.layout.player_background_notification);
+                R.layout.player_notification);
         bigNotRemoteView = new RemoteViews(BuildConfig.APPLICATION_ID,
-                R.layout.player_background_notification_expanded);
+                R.layout.player_notification_expanded);
 
         setupNotification(notRemoteView);
         setupNotification(bigNotRemoteView);
diff --git a/app/src/main/res/layout-large-land/activity_main_player.xml b/app/src/main/res/layout-large-land/player.xml
similarity index 100%
rename from app/src/main/res/layout-large-land/activity_main_player.xml
rename to app/src/main/res/layout-large-land/player.xml
diff --git a/app/src/main/res/layout/activity_main_player.xml b/app/src/main/res/layout/player.xml
similarity index 100%
rename from app/src/main/res/layout/activity_main_player.xml
rename to app/src/main/res/layout/player.xml
diff --git a/app/src/main/res/layout/player_background_notification.xml b/app/src/main/res/layout/player_notification.xml
similarity index 100%
rename from app/src/main/res/layout/player_background_notification.xml
rename to app/src/main/res/layout/player_notification.xml
diff --git a/app/src/main/res/layout/player_background_notification_expanded.xml b/app/src/main/res/layout/player_notification_expanded.xml
similarity index 100%
rename from app/src/main/res/layout/player_background_notification_expanded.xml
rename to app/src/main/res/layout/player_notification_expanded.xml