diff --git a/app/src/main/java/org/mozilla/fenix/wallpapers/Wallpaper.kt b/app/src/main/java/org/mozilla/fenix/wallpapers/Wallpaper.kt
index 1e7ab2e51..e67bdbce3 100644
--- a/app/src/main/java/org/mozilla/fenix/wallpapers/Wallpaper.kt
+++ b/app/src/main/java/org/mozilla/fenix/wallpapers/Wallpaper.kt
@@ -22,6 +22,13 @@ sealed class Wallpaper {
         override val name = "default"
     }
 
+    /**
+     * If a user had previously selected a wallpaper, they are allowed to retain it even if
+     * the wallpaper is otherwise expired. This type exists as a wrapper around that current
+     * wallpaper.
+     */
+    data class Expired(override val name: String) : Wallpaper()
+
     /**
      * Wallpapers that are included directly in the shipped APK.
      *
@@ -39,15 +46,9 @@ sealed class Wallpaper {
      */
     sealed class Remote : Wallpaper() {
         abstract val expirationDate: Date?
-        data class Focus(override val name: String, override val expirationDate: Date? = null) : Remote()
-
-        /**
-         * If a user had previously selected a wallpaper, they are allowed to retain it even if
-         * the wallpaper is otherwise expired. This type exists as a wrapper around that current
-         * wallpaper.
-         */
-        data class Expired(override val name: String) : Remote() {
-            override val expirationDate: Date? = null
+        abstract val remoteParentDirName: String
+        data class Focus(override val name: String, override val expirationDate: Date? = null) : Remote() {
+            override val remoteParentDirName: String = "focus"
         }
     }
 
diff --git a/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperDownloader.kt b/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperDownloader.kt
index 4dca35138..945cb8fd7 100644
--- a/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperDownloader.kt
+++ b/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperDownloader.kt
@@ -73,9 +73,12 @@ class WallpaperDownloader(
     private fun Wallpaper.Remote.toMetadata(context: Context): List<WallpaperMetadata> =
         listOf("landscape", "portrait").flatMap { orientation ->
             listOf("light", "dark").map { theme ->
-                val remoteParent = this::class.simpleName!!.lowercase()
                 val localPath = "wallpapers/$orientation/$theme/$name.png"
-                val remotePath = "${context.resolutionSegment()}/$orientation/$theme/$remoteParent/$name.png"
+                val remotePath = "${context.resolutionSegment()}/" +
+                    "$orientation/" +
+                    "$theme/" +
+                    "$remoteParentDirName/" +
+                    "$name.png"
                 WallpaperMetadata(remotePath, localPath)
             }
         }
diff --git a/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperFileManager.kt b/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperFileManager.kt
index 034ae5d73..6fe6c95b9 100644
--- a/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperFileManager.kt
+++ b/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperFileManager.kt
@@ -23,9 +23,9 @@ class WallpaperFileManager(
      * files for each of the following orientation and theme combinations:
      * light/portrait - light/landscape - dark/portrait - dark/landscape
      */
-    fun lookupExpiredWallpaper(name: String): Wallpaper.Remote.Expired? {
+    fun lookupExpiredWallpaper(name: String): Wallpaper.Expired? {
         return if (getAllLocalWallpaperPaths(name).all { File(rootDirectory, it).exists() }) {
-            Wallpaper.Remote.Expired(name)
+            Wallpaper.Expired(name)
         } else null
     }
 
diff --git a/app/src/test/java/org/mozilla/fenix/wallpapers/WallpaperFileManagerTest.kt b/app/src/test/java/org/mozilla/fenix/wallpapers/WallpaperFileManagerTest.kt
index 4e2a5d374..c15d919df 100644
--- a/app/src/test/java/org/mozilla/fenix/wallpapers/WallpaperFileManagerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/wallpapers/WallpaperFileManagerTest.kt
@@ -43,7 +43,7 @@ class WallpaperFileManagerTest {
         val wallpaperName = "name"
         createAllFiles(wallpaperName)
 
-        val expected = Wallpaper.Remote.Expired(name = wallpaperName)
+        val expected = Wallpaper.Expired(name = wallpaperName)
         assertEquals(expected, fileManager.lookupExpiredWallpaper(wallpaperName))
     }
 
@@ -59,7 +59,7 @@ class WallpaperFileManagerTest {
     @Test
     fun `WHEN cleaned THEN current wallpaper and available wallpapers kept`() {
         val currentName = "current"
-        val currentWallpaper = Wallpaper.Remote.Expired(currentName)
+        val currentWallpaper = Wallpaper.Expired(currentName)
         val availableName = "available"
         val available = Wallpaper.Remote.Focus(name = availableName)
         val unavailableName = "unavailable"
diff --git a/app/src/test/java/org/mozilla/fenix/wallpapers/WallpaperManagerTest.kt b/app/src/test/java/org/mozilla/fenix/wallpapers/WallpaperManagerTest.kt
index b74f12c88..96a169c2d 100644
--- a/app/src/test/java/org/mozilla/fenix/wallpapers/WallpaperManagerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/wallpapers/WallpaperManagerTest.kt
@@ -91,7 +91,7 @@ class WallpaperManagerTest {
         val currentExpiredWallpaper = makeFakeRemoteWallpaper(TimeRelation.BEFORE, name = currentWallpaperName)
         every { mockSettings.currentWallpaper } returns currentWallpaperName
         val expiredRemoteWallpaper = makeFakeRemoteWallpaper(TimeRelation.BEFORE, "expired")
-        val expected = Wallpaper.Remote.Expired(currentWallpaperName)
+        val expected = Wallpaper.Expired(currentWallpaperName)
         every { mockFileManager.lookupExpiredWallpaper(currentWallpaperName) } returns expected
 
         val wallpaperManager = WallpaperManager(
@@ -111,7 +111,7 @@ class WallpaperManagerTest {
     fun `GIVEN current wallpaper is expired THEN it is available even if not listed in initial parameter`() {
         val currentWallpaperName = "named"
         every { mockSettings.currentWallpaper } returns currentWallpaperName
-        val expected = Wallpaper.Remote.Expired(currentWallpaperName)
+        val expected = Wallpaper.Expired(currentWallpaperName)
         every { mockFileManager.lookupExpiredWallpaper(currentWallpaperName) } returns expected
 
         val wallpaperManager = WallpaperManager(