diff --git a/app/build.gradle b/app/build.gradle
index c0427a6e7..73d62e75e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,7 +24,7 @@ android {
         vectorDrawables.useSupportLibrary = true
 
         applicationId 'io.github.muntashirakon.Music'
-        versionCode 440
+        versionCode 441
         versionName '3.5.8'
 
         multiDexEnabled true
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index b58c71e0b..38176e77b 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -60,7 +60,7 @@
 #-keep class org.jaudiotagger.** { *; }
 
 #For cast
--keep class code.name.monkey.retromusic.cast.CastOptionsProvider { *; }
+-keep class io.github.muntashirakon.music.cast.CastOptionsProvider { *; }
 -keep class android.support.** { *; }
 -keep class com.google.** { *; }
 -keep class java.nio.file.** { *; }
diff --git a/app/src/main/java/io/github/muntashirakon/music/service/MusicService.java b/app/src/main/java/io/github/muntashirakon/music/service/MusicService.java
index 8ae2400bf..db81d7574 100644
--- a/app/src/main/java/io/github/muntashirakon/music/service/MusicService.java
+++ b/app/src/main/java/io/github/muntashirakon/music/service/MusicService.java
@@ -98,7 +98,7 @@ public class MusicService extends Service implements
         SharedPreferences.OnSharedPreferenceChangeListener, Playback.PlaybackCallbacks {
 
     public static final String TAG = MusicService.class.getSimpleName();
-    public static final String RETRO_MUSIC_PACKAGE_NAME = "code.name.monkey.retromusic";
+    public static final String RETRO_MUSIC_PACKAGE_NAME = "io.github.muntashirakon.music";
     public static final String MUSIC_PACKAGE_NAME = "com.android.music";
     public static final String ACTION_TOGGLE_PAUSE = RETRO_MUSIC_PACKAGE_NAME + ".togglepause";
     public static final String ACTION_PLAY = RETRO_MUSIC_PACKAGE_NAME + ".play";
@@ -392,7 +392,7 @@ public class MusicService extends Service implements
 
         restoreState();
 
-        sendBroadcast(new Intent("code.name.monkey.retromusic.RETRO_MUSIC_SERVICE_CREATED"));
+        sendBroadcast(new Intent(RETRO_MUSIC_PACKAGE_NAME + ".RETRO_MUSIC_SERVICE_CREATED"));
 
         registerHeadsetEvents();
         registerBluetoothConnected();
@@ -421,7 +421,7 @@ public class MusicService extends Service implements
         PreferenceUtil.INSTANCE.unregisterOnSharedPreferenceChangedListener(this);
         wakeLock.release();
 
-        sendBroadcast(new Intent("code.name.monkey.retromusic.RETRO_MUSIC_SERVICE_DESTROYED"));
+        sendBroadcast(new Intent(RETRO_MUSIC_PACKAGE_NAME + ".RETRO_MUSIC_SERVICE_DESTROYED"));
     }
 
     public void acquireWakeLock(long milli) {
@@ -1053,17 +1053,15 @@ public class MusicService extends Service implements
 
         final Song song = getCurrentSong();
 
-        if (song != null) {
-            intent.putExtra("id", song.getId());
-            intent.putExtra("artist", song.getArtistName());
-            intent.putExtra("album", song.getAlbumName());
-            intent.putExtra("track", song.getTitle());
-            intent.putExtra("duration", song.getDuration());
-            intent.putExtra("position", (long) getSongProgressMillis());
-            intent.putExtra("playing", isPlaying());
-            intent.putExtra("scrobbling_source", RETRO_MUSIC_PACKAGE_NAME);
-            sendStickyBroadcast(intent);
-        }
+        intent.putExtra("id", song.getId());
+        intent.putExtra("artist", song.getArtistName());
+        intent.putExtra("album", song.getAlbumName());
+        intent.putExtra("track", song.getTitle());
+        intent.putExtra("duration", song.getDuration());
+        intent.putExtra("position", (long) getSongProgressMillis());
+        intent.putExtra("playing", isPlaying());
+        intent.putExtra("scrobbling_source", RETRO_MUSIC_PACKAGE_NAME);
+        sendStickyBroadcast(intent);
     }
 
     public void toggleShuffle() {
@@ -1350,7 +1348,7 @@ public class MusicService extends Service implements
                 0);
 
         mediaSession = new MediaSessionCompat(this,
-                "RetroMusicPlayer",
+                "M",
                 mediaButtonReceiverComponentName,
                 mediaButtonReceiverPendingIntent);
         MediaSessionCallback mediasessionCallback = new MediaSessionCallback(
diff --git a/app/src/main/res/layout/fragment_blur.xml b/app/src/main/res/layout/fragment_blur.xml
index 96a470d3d..cb30d9300 100644
--- a/app/src/main/res/layout/fragment_blur.xml
+++ b/app/src/main/res/layout/fragment_blur.xml
@@ -44,7 +44,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -54,7 +54,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.blur.BlurPlaybackControlsFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.blur.BlurPlaybackControlsFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toTopOf="@id/playerToolbar"
@@ -75,4 +75,4 @@
         app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment"
         app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_classic_player.xml b/app/src/main/res/layout/fragment_classic_player.xml
index 223ac8c7d..573f0f443 100644
--- a/app/src/main/res/layout/fragment_classic_player.xml
+++ b/app/src/main/res/layout/fragment_classic_player.xml
@@ -14,7 +14,7 @@
 
         <androidx.fragment.app.FragmentContainerView
             android:id="@+id/playerAlbumCoverFragment"
-            android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+            android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:layout_constraintDimensionRatio="1:1"
@@ -73,7 +73,7 @@
         app:behavior_hideable="false"
         app:cardCornerRadius="0dp"
         app:cardElevation="12dp"
-        app:layout_behavior="code.name.monkey.retromusic.io.github.muntashirakon.music.RetroBottomSheetBehavior">
+        app:layout_behavior="io.github.muntashirakon.music.RetroBottomSheetBehavior">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -133,4 +133,4 @@
         </LinearLayout>
 
     </com.google.android.material.card.MaterialCardView>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_color_player.xml b/app/src/main/res/layout/fragment_color_player.xml
index 0d3c596f0..283037fb8 100644
--- a/app/src/main/res/layout/fragment_color_player.xml
+++ b/app/src/main/res/layout/fragment_color_player.xml
@@ -33,7 +33,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -43,7 +43,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.color.ColorPlaybackControlsFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.color.ColorPlaybackControlsFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toTopOf="@id/playerToolbar"
@@ -64,4 +64,4 @@
         app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment"
         app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_fit.xml b/app/src/main/res/layout/fragment_fit.xml
index 9134e5f8c..d9f3cdeea 100644
--- a/app/src/main/res/layout/fragment_fit.xml
+++ b/app/src/main/res/layout/fragment_fit.xml
@@ -24,7 +24,7 @@
 
             <androidx.fragment.app.FragmentContainerView
                 android:id="@+id/playerAlbumCoverFragment"
-                android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 tools:layout="@layout/fragment_album_full_cover" />
@@ -39,7 +39,7 @@
 
             <androidx.fragment.app.FragmentContainerView
                 android:id="@+id/playbackControlsFragment"
-                android:name="code.name.monkey.retromusic.fragments.player.fit.FitPlaybackControlsFragment"
+                android:name="io.github.muntashirakon.music.fragments.player.fit.FitPlaybackControlsFragment"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 tools:layout="@layout/fragment_gradient_controls" />
diff --git a/app/src/main/res/layout/fragment_flat_player.xml b/app/src/main/res/layout/fragment_flat_player.xml
index 390b788bb..758743da6 100644
--- a/app/src/main/res/layout/fragment_flat_player.xml
+++ b/app/src/main/res/layout/fragment_flat_player.xml
@@ -45,7 +45,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -57,7 +57,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.flat.FlatPlaybackControlsFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.flat.FlatPlaybackControlsFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -66,4 +66,4 @@
         app:layout_constraintTop_toBottomOf="@id/playerAlbumCoverFragment"
         tools:layout="@layout/fragment_flat_player_playback_controls" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_full.xml b/app/src/main/res/layout/fragment_full.xml
index 70f13aaaa..fc052b123 100644
--- a/app/src/main/res/layout/fragment_full.xml
+++ b/app/src/main/res/layout/fragment_full.xml
@@ -10,7 +10,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -33,7 +33,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.full.FullPlaybackControlsFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.full.FullPlaybackControlsFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_gravity="bottom"
diff --git a/app/src/main/res/layout/fragment_gradient_player.xml b/app/src/main/res/layout/fragment_gradient_player.xml
index 369518d44..bdf35c689 100644
--- a/app/src/main/res/layout/fragment_gradient_player.xml
+++ b/app/src/main/res/layout/fragment_gradient_player.xml
@@ -14,7 +14,7 @@
 
         <androidx.fragment.app.FragmentContainerView
             android:id="@+id/playerAlbumCoverFragment"
-            android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+            android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
             android:layout_width="0dp"
             android:layout_height="0dp"
             app:layout_constrainedHeight="true"
@@ -63,7 +63,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:behavior_hideable="false"
-        app:layout_behavior="code.name.monkey.retromusic.io.github.muntashirakon.music.RetroBottomSheetBehavior">
+        app:layout_behavior="io.github.muntashirakon.music.RetroBottomSheetBehavior">
 
         <LinearLayout
             android:id="@+id/container"
@@ -150,4 +150,4 @@
             tools:listitem="@layout/item_list" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_home_player.xml b/app/src/main/res/layout/fragment_home_player.xml
index a5a4e266c..9096c6fec 100644
--- a/app/src/main/res/layout/fragment_home_player.xml
+++ b/app/src/main/res/layout/fragment_home_player.xml
@@ -7,7 +7,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -97,4 +97,4 @@
             android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
             app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
     </LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_material.xml b/app/src/main/res/layout/fragment_material.xml
index a07ce51e6..34816c449 100644
--- a/app/src/main/res/layout/fragment_material.xml
+++ b/app/src/main/res/layout/fragment_material.xml
@@ -24,7 +24,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -34,7 +34,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.material.MaterialControlsFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.material.MaterialControlsFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toTopOf="@id/playerToolbar"
diff --git a/app/src/main/res/layout/fragment_peak_player.xml b/app/src/main/res/layout/fragment_peak_player.xml
index f063fd2db..2fb0feeec 100644
--- a/app/src/main/res/layout/fragment_peak_player.xml
+++ b/app/src/main/res/layout/fragment_peak_player.xml
@@ -49,7 +49,7 @@
 
         <androidx.fragment.app.FragmentContainerView
             android:id="@+id/playerAlbumCoverFragment"
-            android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+            android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
             android:layout_width="72dp"
             android:layout_height="72dp"
             android:layout_marginStart="16dp"
@@ -116,7 +116,7 @@
 
         <androidx.fragment.app.FragmentContainerView
             android:id="@+id/playbackControlsFragment"
-            android:name="code.name.monkey.retromusic.fragments.player.peak.PeakPlayerControlFragment"
+            android:name="io.github.muntashirakon.music.fragments.player.peak.PeakPlayerControlFragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:layout_constraintEnd_toEndOf="parent"
@@ -125,4 +125,4 @@
             tools:layout="@layout/fragment_peak_control_player" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_plain_player.xml b/app/src/main/res/layout/fragment_plain_player.xml
index 64b442686..aa52f8db8 100644
--- a/app/src/main/res/layout/fragment_plain_player.xml
+++ b/app/src/main/res/layout/fragment_plain_player.xml
@@ -63,7 +63,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -73,7 +73,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.plain.PlainPlaybackControlsFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.plain.PlainPlaybackControlsFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toTopOf="@id/playerToolbar"
@@ -92,4 +92,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment"
         app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_simple_player.xml b/app/src/main/res/layout/fragment_simple_player.xml
index 1eabf24b2..28d00066c 100644
--- a/app/src/main/res/layout/fragment_simple_player.xml
+++ b/app/src/main/res/layout/fragment_simple_player.xml
@@ -27,7 +27,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -37,7 +37,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playbackControlsFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.simple.SimplePlaybackControlsFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.simple.SimplePlaybackControlsFragment"
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toTopOf="@id/playerToolbar"
@@ -57,4 +57,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment"
         app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_tiny_player.xml b/app/src/main/res/layout/fragment_tiny_player.xml
index b0b3d9d89..d0002d46d 100644
--- a/app/src/main/res/layout/fragment_tiny_player.xml
+++ b/app/src/main/res/layout/fragment_tiny_player.xml
@@ -9,7 +9,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+        android:name="io.github.muntashirakon.music.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -107,7 +107,7 @@
 
         <androidx.fragment.app.FragmentContainerView
             android:id="@+id/playbackControlsFragment"
-            android:name="code.name.monkey.retromusic.fragments.player.tiny.TinyPlaybackControlsFragment"
+            android:name="io.github.muntashirakon.music.fragments.player.tiny.TinyPlaybackControlsFragment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             tools:layout="@layout/fragment_tiny_controls_fragment" />
@@ -155,4 +155,4 @@
         app:layout_constraintTop_toBottomOf="@id/status_bar"
         tools:text="@tools:sample/lorem/random" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>