diff --git a/app/src/main/java/com/aurora/store/MainActivity.kt b/app/src/main/java/com/aurora/store/MainActivity.kt
index bcc56bcd8..aef587da4 100644
--- a/app/src/main/java/com/aurora/store/MainActivity.kt
+++ b/app/src/main/java/com/aurora/store/MainActivity.kt
@@ -165,16 +165,16 @@ class MainActivity : AppCompatActivity(), NetworkProvider.NetworkListener {
 
         // Handle intents
         when (intent?.action) {
-            Constants.NAVIGATION_UPDATES -> B.navView.selectedItemId = R.id.navigation_updates
+            Constants.NAVIGATION_UPDATES -> B.navView.selectedItemId = R.id.updatesFragment
             else -> Log.i("Unhandled intent action: ${intent.action}")
         }
 
         // Handle views on fragments
         navController.addOnDestinationChangedListener { _, navDestination, _ ->
             when (navDestination.id) {
-                R.id.navigation_apps,
-                R.id.navigation_games,
-                R.id.navigation_updates -> {
+                R.id.appsContainerFragment,
+                R.id.gamesContainerFragment,
+                R.id.updatesFragment -> {
                     B.searchFab.visibility = View.VISIBLE
                     B.navView.visibility = View.VISIBLE
                     B.viewToolbar.root.visibility = View.VISIBLE
diff --git a/app/src/main/res/menu/menu_bottom_nav.xml b/app/src/main/res/menu/menu_bottom_nav.xml
index 796c0bc45..84ef7308a 100644
--- a/app/src/main/res/menu/menu_bottom_nav.xml
+++ b/app/src/main/res/menu/menu_bottom_nav.xml
@@ -20,17 +20,17 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
-        android:id="@+id/navigation_apps"
+        android:id="@id/appsContainerFragment"
         android:icon="@drawable/ic_apps"
         android:title="@string/title_apps" />
 
     <item
-        android:id="@+id/navigation_games"
+        android:id="@id/gamesContainerFragment"
         android:icon="@drawable/ic_games"
         android:title="@string/title_games" />
 
     <item
-        android:id="@+id/navigation_updates"
+        android:id="@id/updatesFragment"
         android:icon="@drawable/ic_updates"
         android:title="@string/title_updates" />
 
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 115b164cb..27e56286d 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -24,19 +24,17 @@
     app:startDestination="@id/splashFragment">
 
     <fragment
-        android:id="@+id/navigation_apps"
+        android:id="@+id/appsContainerFragment"
         android:name="com.aurora.store.view.ui.apps.AppsContainerFragment"
         android:label="@string/title_apps"
         tools:layout="@layout/fragment_apps_games" />
-
     <fragment
-        android:id="@+id/navigation_games"
+        android:id="@+id/gamesContainerFragment"
         android:name="com.aurora.store.view.ui.games.GamesContainerFragment"
         android:label="@string/title_games"
         tools:layout="@layout/fragment_apps_games" />
-
     <fragment
-        android:id="@+id/navigation_updates"
+        android:id="@+id/updatesFragment"
         android:name="com.aurora.store.view.ui.updates.UpdatesFragment"
         android:label="@string/title_updates"
         tools:layout="@layout/fragment_updates" />
@@ -240,7 +238,7 @@
         tools:layout="@layout/fragment_splash" >
         <action
             android:id="@+id/action_splashFragment_to_navigation_apps"
-            app:destination="@id/navigation_apps"
+            app:destination="@id/appsContainerFragment"
             app:launchSingleTop="true"
             app:popUpTo="@id/mobile_navigation"
             app:popUpToInclusive="true" />