diff --git a/packages/SettingsLib/Spa/codelab/Android.bp b/packages/SettingsLib/Spa/gallery/Android.bp
similarity index 96%
rename from packages/SettingsLib/Spa/codelab/Android.bp
rename to packages/SettingsLib/Spa/gallery/Android.bp
index 8fbbf9a..bc083c9 100644
--- a/packages/SettingsLib/Spa/codelab/Android.bp
+++ b/packages/SettingsLib/Spa/gallery/Android.bp
@@ -19,7 +19,7 @@
 }
 
 android_app {
-    name: "SpaLibCodelab",
+    name: "SpaLibGallery",
 
     srcs: ["src/**/*.kt"],
 
diff --git a/packages/SettingsLib/Spa/codelab/AndroidManifest.xml b/packages/SettingsLib/Spa/gallery/AndroidManifest.xml
similarity index 90%
rename from packages/SettingsLib/Spa/codelab/AndroidManifest.xml
rename to packages/SettingsLib/Spa/gallery/AndroidManifest.xml
index 36b9313..cde47f2 100644
--- a/packages/SettingsLib/Spa/codelab/AndroidManifest.xml
+++ b/packages/SettingsLib/Spa/gallery/AndroidManifest.xml
@@ -15,14 +15,14 @@
   limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.settingslib.spa.codelab">
+    package="com.android.settingslib.spa.gallery">
 
     <application
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/Theme.SpaLib.DayNight">
         <activity
-            android:name="com.android.settingslib.spa.codelab.MainActivity"
+            android:name="com.android.settingslib.spa.gallery.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/packages/SettingsLib/Spa/codelab/build.gradle b/packages/SettingsLib/Spa/gallery/build.gradle
similarity index 93%
rename from packages/SettingsLib/Spa/codelab/build.gradle
rename to packages/SettingsLib/Spa/gallery/build.gradle
index 169ecf0..98e6745 100644
--- a/packages/SettingsLib/Spa/codelab/build.gradle
+++ b/packages/SettingsLib/Spa/gallery/build.gradle
@@ -20,11 +20,11 @@
 }
 
 android {
-    namespace 'com.android.settingslib.spa.codelab'
+    namespace 'com.android.settingslib.spa.gallery'
     compileSdk 33
 
     defaultConfig {
-        applicationId "com.android.settingslib.spa.codelab"
+        applicationId "com.android.settingslib.spa.gallery"
         minSdk spa_min_sdk
         targetSdk 33
         versionCode 1
diff --git a/packages/SettingsLib/Spa/codelab/res/values/strings.xml b/packages/SettingsLib/Spa/gallery/res/values/strings.xml
similarity index 84%
rename from packages/SettingsLib/Spa/codelab/res/values/strings.xml
rename to packages/SettingsLib/Spa/gallery/res/values/strings.xml
index 6fdbba0..510e6c2 100644
--- a/packages/SettingsLib/Spa/codelab/res/values/strings.xml
+++ b/packages/SettingsLib/Spa/gallery/res/values/strings.xml
@@ -14,6 +14,6 @@
   limitations under the License.
   -->
 <resources>
-    <!-- Codelab App name. [DO NOT TRANSLATE] -->
-    <string name="app_name" translatable="false">SpaLib Codelab</string>
+    <!-- Gallery App name. [DO NOT TRANSLATE] -->
+    <string name="app_name" translatable="false">SpaLib Gallery</string>
 </resources>
diff --git a/packages/SettingsLib/Spa/codelab/src/com/android/settingslib/spa/codelab/MainActivity.kt b/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/MainActivity.kt
similarity index 80%
rename from packages/SettingsLib/Spa/codelab/src/com/android/settingslib/spa/codelab/MainActivity.kt
rename to packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/MainActivity.kt
index eef81e0..7db53b4 100644
--- a/packages/SettingsLib/Spa/codelab/src/com/android/settingslib/spa/codelab/MainActivity.kt
+++ b/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/MainActivity.kt
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.settingslib.spa.codelab
+package com.android.settingslib.spa.gallery
 
-import com.android.settingslib.spa.codelab.page.codelabPageRepository
 import com.android.settingslib.spa.framework.SpaActivity
+import com.android.settingslib.spa.gallery.page.galleryPageRepository
 
-class MainActivity : SpaActivity(codelabPageRepository)
+class MainActivity : SpaActivity(galleryPageRepository)
diff --git a/packages/SettingsLib/Spa/codelab/src/com/android/settingslib/spa/codelab/page/ArgumentPage.kt b/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/ArgumentPage.kt
similarity index 98%
rename from packages/SettingsLib/Spa/codelab/src/com/android/settingslib/spa/codelab/page/ArgumentPage.kt
rename to packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/ArgumentPage.kt
index 5c6b609..937e594 100644
--- a/packages/SettingsLib/Spa/codelab/src/com/android/settingslib/spa/codelab/page/ArgumentPage.kt
+++ b/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/ArgumentPage.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settingslib.spa.codelab.page
+package com.android.settingslib.spa.gallery.page
 
 import android.os.Bundle
 import androidx.compose.foundation.layout.Column
diff --git a/packages/SettingsLib/Spa/codelab/src/com/android/settingslib/spa/codelab/page/FooterPage.kt b/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/FooterPage.kt
similarity index 97%
rename from packages/SettingsLib/Spa/codelab/src/com/android/settingslib/spa/codelab/page/FooterPage.kt
rename to packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/FooterPage.kt
index 9fcbff8..143c365 100644
--- a/packages/SettingsLib/Spa/codelab/src/com/android/settingslib/spa/codelab/page/FooterPage.kt
+++ b/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/FooterPage.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settingslib.spa.codelab.page
+package com.android.settingslib.spa.gallery.page
 
 import android.os.Bundle
 import androidx.compose.foundation.layout.Column
diff --git a/packages/SettingsLib/Spa/codelab/src/com/android/settingslib/spa/codelab/page/HomePage.kt b/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/HomePage.kt
similarity index 95%
rename from packages/SettingsLib/Spa/codelab/src/com/android/settingslib/spa/codelab/page/HomePage.kt
rename to packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/HomePage.kt
index 57a69c4..0d17cd2 100644
--- a/packages/SettingsLib/Spa/codelab/src/com/android/settingslib/spa/codelab/page/HomePage.kt
+++ b/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/HomePage.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settingslib.spa.codelab.page
+package com.android.settingslib.spa.gallery.page
 
 import android.os.Bundle
 import androidx.compose.foundation.layout.Column
@@ -25,10 +25,10 @@
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
-import com.android.settingslib.spa.codelab.R
 import com.android.settingslib.spa.framework.api.SettingsPageProvider
 import com.android.settingslib.spa.framework.theme.SettingsDimension
 import com.android.settingslib.spa.framework.theme.SettingsTheme
+import com.android.settingslib.spa.gallery.R
 
 object HomePageProvider : SettingsPageProvider {
     override val name = Destinations.Home
diff --git a/packages/SettingsLib/Spa/codelab/src/com/android/settingslib/spa/codelab/page/PageRepository.kt b/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/PageRepository.kt
similarity index 91%
rename from packages/SettingsLib/Spa/codelab/src/com/android/settingslib/spa/codelab/page/PageRepository.kt
rename to packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/PageRepository.kt
index 54c588a..8f38d82 100644
--- a/packages/SettingsLib/Spa/codelab/src/com/android/settingslib/spa/codelab/page/PageRepository.kt
+++ b/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/PageRepository.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settingslib.spa.codelab.page
+package com.android.settingslib.spa.gallery.page
 
 import com.android.settingslib.spa.framework.api.SettingsPageRepository
 
@@ -26,7 +26,7 @@
     const val Slider = "Slider"
 }
 
-val codelabPageRepository = SettingsPageRepository(
+val galleryPageRepository = SettingsPageRepository(
     allPages = listOf(
         HomePageProvider,
         PreferencePageProvider,
diff --git a/packages/SettingsLib/Spa/codelab/src/com/android/settingslib/spa/codelab/page/PreferencePage.kt b/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/PreferencePage.kt
similarity index 98%
rename from packages/SettingsLib/Spa/codelab/src/com/android/settingslib/spa/codelab/page/PreferencePage.kt
rename to packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/PreferencePage.kt
index d53562d..3077a15 100644
--- a/packages/SettingsLib/Spa/codelab/src/com/android/settingslib/spa/codelab/page/PreferencePage.kt
+++ b/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/PreferencePage.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settingslib.spa.codelab.page
+package com.android.settingslib.spa.gallery.page
 
 import android.os.Bundle
 import androidx.compose.foundation.layout.Column
diff --git a/packages/SettingsLib/Spa/codelab/src/com/android/settingslib/spa/codelab/page/SliderPage.kt b/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/SliderPage.kt
similarity index 98%
rename from packages/SettingsLib/Spa/codelab/src/com/android/settingslib/spa/codelab/page/SliderPage.kt
rename to packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/SliderPage.kt
index 6e96581..9bcac1b 100644
--- a/packages/SettingsLib/Spa/codelab/src/com/android/settingslib/spa/codelab/page/SliderPage.kt
+++ b/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/SliderPage.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settingslib.spa.codelab.page
+package com.android.settingslib.spa.gallery.page
 
 import android.os.Bundle
 import androidx.compose.foundation.layout.Column
diff --git a/packages/SettingsLib/Spa/codelab/src/com/android/settingslib/spa/codelab/page/SwitchPreferencePage.kt b/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/SwitchPreferencePage.kt
similarity index 98%
rename from packages/SettingsLib/Spa/codelab/src/com/android/settingslib/spa/codelab/page/SwitchPreferencePage.kt
rename to packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/SwitchPreferencePage.kt
index b566afa..b6f7258 100644
--- a/packages/SettingsLib/Spa/codelab/src/com/android/settingslib/spa/codelab/page/SwitchPreferencePage.kt
+++ b/packages/SettingsLib/Spa/gallery/src/com/android/settingslib/spa/gallery/page/SwitchPreferencePage.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settingslib.spa.codelab.page
+package com.android.settingslib.spa.gallery.page
 
 import android.os.Bundle
 import androidx.compose.foundation.layout.Column
diff --git a/packages/SettingsLib/Spa/settings.gradle b/packages/SettingsLib/Spa/settings.gradle
index 1b69c1e..897fa67 100644
--- a/packages/SettingsLib/Spa/settings.gradle
+++ b/packages/SettingsLib/Spa/settings.gradle
@@ -30,5 +30,5 @@
 }
 rootProject.name = "SpaLib"
 include ':spa'
-include ':codelab'
+include ':gallery'
 include ':tests'