Rename compose:runtime-saved-instance-state to compose:runtime-saveable

The code move to the next package will be done in the following CLs

Test: ./gradlew bOS
Relnote: Artefact androidx:compose:runtime:runtime-saved-instance-state was renamed to androidx:compose:runtime:runtime-saveable
Change-Id: I6dcac2489cf4ec4f17b8ce73bba6eab955a54c6d
diff --git a/compose/foundation/foundation/build.gradle b/compose/foundation/foundation/build.gradle
index 48d90dc..583c592 100644
--- a/compose/foundation/foundation/build.gradle
+++ b/compose/foundation/foundation/build.gradle
@@ -41,7 +41,6 @@
         api "androidx.annotation:annotation:1.1.0"
         api project(':compose:animation:animation')
         api project(':compose:runtime:runtime')
-        api project(':compose:runtime:runtime-saved-instance-state')
         api project(':compose:ui:ui')
 
         implementation(KOTLIN_STDLIB_COMMON)
@@ -92,7 +91,6 @@
                 implementation(KOTLIN_STDLIB_COMMON)
                 api project(':compose:animation:animation')
                 api project(':compose:runtime:runtime')
-                api project(':compose:runtime:runtime-saved-instance-state')
                 api project(':compose:ui:ui')
                 implementation project(":compose:ui:ui-text")
                 implementation project(":compose:ui:ui-util")
diff --git a/compose/runtime/runtime-saved-instance-state/OWNERS b/compose/runtime/runtime-saveable/OWNERS
similarity index 100%
rename from compose/runtime/runtime-saved-instance-state/OWNERS
rename to compose/runtime/runtime-saveable/OWNERS
diff --git a/compose/runtime/runtime-saved-instance-state/api/current.txt b/compose/runtime/runtime-saveable/api/current.txt
similarity index 100%
rename from compose/runtime/runtime-saved-instance-state/api/current.txt
rename to compose/runtime/runtime-saveable/api/current.txt
diff --git a/compose/runtime/runtime-saved-instance-state/api/public_plus_experimental_current.txt b/compose/runtime/runtime-saveable/api/public_plus_experimental_current.txt
similarity index 100%
rename from compose/runtime/runtime-saved-instance-state/api/public_plus_experimental_current.txt
rename to compose/runtime/runtime-saveable/api/public_plus_experimental_current.txt
diff --git a/compose/runtime/runtime-saved-instance-state/api/res-current.txt b/compose/runtime/runtime-saveable/api/res-current.txt
similarity index 100%
rename from compose/runtime/runtime-saved-instance-state/api/res-current.txt
rename to compose/runtime/runtime-saveable/api/res-current.txt
diff --git a/compose/runtime/runtime-saved-instance-state/api/restricted_current.txt b/compose/runtime/runtime-saveable/api/restricted_current.txt
similarity index 100%
rename from compose/runtime/runtime-saved-instance-state/api/restricted_current.txt
rename to compose/runtime/runtime-saveable/api/restricted_current.txt
diff --git a/compose/runtime/runtime-saved-instance-state/build.gradle b/compose/runtime/runtime-saveable/build.gradle
similarity index 98%
rename from compose/runtime/runtime-saved-instance-state/build.gradle
rename to compose/runtime/runtime-saveable/build.gradle
index b5e1307..589174c 100644
--- a/compose/runtime/runtime-saved-instance-state/build.gradle
+++ b/compose/runtime/runtime-saveable/build.gradle
@@ -113,7 +113,7 @@
 }
 
 androidx {
-    name = "Compose Saved Instance State support"
+    name = "Compose Saveable"
     publish = Publish.SNAPSHOT_AND_RELEASE
     mavenGroup = LibraryGroups.Compose.RUNTIME
     inceptionYear = "2020"
diff --git a/compose/runtime/runtime-saved-instance-state/lint-baseline.xml b/compose/runtime/runtime-saveable/lint-baseline.xml
similarity index 100%
rename from compose/runtime/runtime-saved-instance-state/lint-baseline.xml
rename to compose/runtime/runtime-saveable/lint-baseline.xml
diff --git a/compose/runtime/runtime-saved-instance-state/samples/build.gradle b/compose/runtime/runtime-saveable/samples/build.gradle
similarity index 94%
rename from compose/runtime/runtime-saved-instance-state/samples/build.gradle
rename to compose/runtime/runtime-saveable/samples/build.gradle
index e20333d..8d35a98 100644
--- a/compose/runtime/runtime-saved-instance-state/samples/build.gradle
+++ b/compose/runtime/runtime-saveable/samples/build.gradle
@@ -36,7 +36,7 @@
     implementation project(":compose:foundation:foundation")
     implementation project(":compose:material:material")
     implementation project(":compose:runtime:runtime")
-    implementation project(":compose:runtime:runtime-saved-instance-state")
+    implementation project(":compose:runtime:runtime-saveable")
 }
 
 androidx {
diff --git a/compose/runtime/runtime-saved-instance-state/samples/lint-baseline.xml b/compose/runtime/runtime-saveable/samples/lint-baseline.xml
similarity index 100%
rename from compose/runtime/runtime-saved-instance-state/samples/lint-baseline.xml
rename to compose/runtime/runtime-saveable/samples/lint-baseline.xml
diff --git a/compose/runtime/runtime-saved-instance-state/samples/src/main/AndroidManifest.xml b/compose/runtime/runtime-saveable/samples/src/main/AndroidManifest.xml
similarity index 88%
rename from compose/runtime/runtime-saved-instance-state/samples/src/main/AndroidManifest.xml
rename to compose/runtime/runtime-saveable/samples/src/main/AndroidManifest.xml
index 7526df7..a96970a 100644
--- a/compose/runtime/runtime-saved-instance-state/samples/src/main/AndroidManifest.xml
+++ b/compose/runtime/runtime-saveable/samples/src/main/AndroidManifest.xml
@@ -14,4 +14,4 @@
   limitations under the License.
   -->
 
-<manifest package="androidx.compose.runtime.savedinstancestate.samples" />
+<manifest package="androidx.compose.runtime.saveable.samples" />
diff --git a/compose/runtime/runtime-saved-instance-state/samples/src/main/java/androidx/compose/runtime/savedinstancestate/samples/RestorableStateHolderSamples.kt b/compose/runtime/runtime-saveable/samples/src/main/java/androidx/compose/runtime/savedinstancestate/samples/RestorableStateHolderSamples.kt
similarity index 100%
rename from compose/runtime/runtime-saved-instance-state/samples/src/main/java/androidx/compose/runtime/savedinstancestate/samples/RestorableStateHolderSamples.kt
rename to compose/runtime/runtime-saveable/samples/src/main/java/androidx/compose/runtime/savedinstancestate/samples/RestorableStateHolderSamples.kt
diff --git a/compose/runtime/runtime-saved-instance-state/samples/src/main/java/androidx/compose/runtime/savedinstancestate/samples/Samples.kt b/compose/runtime/runtime-saveable/samples/src/main/java/androidx/compose/runtime/savedinstancestate/samples/Samples.kt
similarity index 100%
rename from compose/runtime/runtime-saved-instance-state/samples/src/main/java/androidx/compose/runtime/savedinstancestate/samples/Samples.kt
rename to compose/runtime/runtime-saveable/samples/src/main/java/androidx/compose/runtime/savedinstancestate/samples/Samples.kt
diff --git a/compose/runtime/runtime-saved-instance-state/src/androidAndroidTest/AndroidManifest.xml b/compose/runtime/runtime-saveable/src/androidAndroidTest/AndroidManifest.xml
similarity index 95%
rename from compose/runtime/runtime-saved-instance-state/src/androidAndroidTest/AndroidManifest.xml
rename to compose/runtime/runtime-saveable/src/androidAndroidTest/AndroidManifest.xml
index 0c7e4f4..7aeb38a 100644
--- a/compose/runtime/runtime-saved-instance-state/src/androidAndroidTest/AndroidManifest.xml
+++ b/compose/runtime/runtime-saveable/src/androidAndroidTest/AndroidManifest.xml
@@ -16,7 +16,7 @@
   -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="androidx.compose.runtime.savedinstancestate">
+    package="androidx.compose.runtime.saveable">
     <application
         android:requestLegacyExternalStorage="true"
         android:debuggable="false"
diff --git a/compose/runtime/runtime-saved-instance-state/src/androidAndroidTest/kotlin/androidx/compose/runtime/savedinstancestate/ActivityRecreationTest.kt b/compose/runtime/runtime-saveable/src/androidAndroidTest/kotlin/androidx/compose/runtime/savedinstancestate/ActivityRecreationTest.kt
similarity index 98%
rename from compose/runtime/runtime-saved-instance-state/src/androidAndroidTest/kotlin/androidx/compose/runtime/savedinstancestate/ActivityRecreationTest.kt
rename to compose/runtime/runtime-saveable/src/androidAndroidTest/kotlin/androidx/compose/runtime/savedinstancestate/ActivityRecreationTest.kt
index 022cced..36b57fa 100644
--- a/compose/runtime/runtime-saved-instance-state/src/androidAndroidTest/kotlin/androidx/compose/runtime/savedinstancestate/ActivityRecreationTest.kt
+++ b/compose/runtime/runtime-saveable/src/androidAndroidTest/kotlin/androidx/compose/runtime/savedinstancestate/ActivityRecreationTest.kt
@@ -23,7 +23,7 @@
 import android.widget.LinearLayout
 import androidx.activity.ComponentActivity
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.savedinstancestate.test.R
+import androidx.compose.runtime.saveable.test.R
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.setContent
 import androidx.fragment.app.Fragment
diff --git a/compose/runtime/runtime-saved-instance-state/src/androidAndroidTest/kotlin/androidx/compose/runtime/savedinstancestate/Holder.kt b/compose/runtime/runtime-saveable/src/androidAndroidTest/kotlin/androidx/compose/runtime/savedinstancestate/Holder.kt
similarity index 100%
rename from compose/runtime/runtime-saved-instance-state/src/androidAndroidTest/kotlin/androidx/compose/runtime/savedinstancestate/Holder.kt
rename to compose/runtime/runtime-saveable/src/androidAndroidTest/kotlin/androidx/compose/runtime/savedinstancestate/Holder.kt
diff --git a/compose/runtime/runtime-saved-instance-state/src/androidAndroidTest/kotlin/androidx/compose/runtime/savedinstancestate/RememberSavedInstanceStateTest.kt b/compose/runtime/runtime-saveable/src/androidAndroidTest/kotlin/androidx/compose/runtime/savedinstancestate/RememberSavedInstanceStateTest.kt
similarity index 100%
rename from compose/runtime/runtime-saved-instance-state/src/androidAndroidTest/kotlin/androidx/compose/runtime/savedinstancestate/RememberSavedInstanceStateTest.kt
rename to compose/runtime/runtime-saveable/src/androidAndroidTest/kotlin/androidx/compose/runtime/savedinstancestate/RememberSavedInstanceStateTest.kt
diff --git a/compose/runtime/runtime-saved-instance-state/src/androidAndroidTest/kotlin/androidx/compose/runtime/savedinstancestate/RestorableStateHolderTest.kt b/compose/runtime/runtime-saveable/src/androidAndroidTest/kotlin/androidx/compose/runtime/savedinstancestate/RestorableStateHolderTest.kt
similarity index 100%
rename from compose/runtime/runtime-saved-instance-state/src/androidAndroidTest/kotlin/androidx/compose/runtime/savedinstancestate/RestorableStateHolderTest.kt
rename to compose/runtime/runtime-saveable/src/androidAndroidTest/kotlin/androidx/compose/runtime/savedinstancestate/RestorableStateHolderTest.kt
diff --git a/compose/runtime/runtime-saved-instance-state/src/androidAndroidTest/kotlin/androidx/compose/runtime/savedinstancestate/RestorationInVariousScenariosTest.kt b/compose/runtime/runtime-saveable/src/androidAndroidTest/kotlin/androidx/compose/runtime/savedinstancestate/RestorationInVariousScenariosTest.kt
similarity index 100%
rename from compose/runtime/runtime-saved-instance-state/src/androidAndroidTest/kotlin/androidx/compose/runtime/savedinstancestate/RestorationInVariousScenariosTest.kt
rename to compose/runtime/runtime-saveable/src/androidAndroidTest/kotlin/androidx/compose/runtime/savedinstancestate/RestorationInVariousScenariosTest.kt
diff --git a/compose/runtime/runtime-saved-instance-state/src/androidAndroidTest/kotlin/androidx/compose/runtime/savedinstancestate/SavedInstanceStateTest.kt b/compose/runtime/runtime-saveable/src/androidAndroidTest/kotlin/androidx/compose/runtime/savedinstancestate/SavedInstanceStateTest.kt
similarity index 100%
rename from compose/runtime/runtime-saved-instance-state/src/androidAndroidTest/kotlin/androidx/compose/runtime/savedinstancestate/SavedInstanceStateTest.kt
rename to compose/runtime/runtime-saveable/src/androidAndroidTest/kotlin/androidx/compose/runtime/savedinstancestate/SavedInstanceStateTest.kt
diff --git a/compose/runtime/runtime-saved-instance-state/src/androidTest/res/values/ids.xml b/compose/runtime/runtime-saveable/src/androidAndroidTest/res/values/ids.xml
similarity index 100%
rename from compose/runtime/runtime-saved-instance-state/src/androidTest/res/values/ids.xml
rename to compose/runtime/runtime-saveable/src/androidAndroidTest/res/values/ids.xml
diff --git a/compose/runtime/runtime-saved-instance-state/src/androidMain/AndroidManifest.xml b/compose/runtime/runtime-saveable/src/androidMain/AndroidManifest.xml
similarity index 90%
rename from compose/runtime/runtime-saved-instance-state/src/androidMain/AndroidManifest.xml
rename to compose/runtime/runtime-saveable/src/androidMain/AndroidManifest.xml
index f34628a..255b88b 100644
--- a/compose/runtime/runtime-saved-instance-state/src/androidMain/AndroidManifest.xml
+++ b/compose/runtime/runtime-saveable/src/androidMain/AndroidManifest.xml
@@ -14,4 +14,4 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-<manifest package="androidx.compose.runtime.savedinstancestate" />
+<manifest package="androidx.compose.runtime.saveable" />
diff --git a/compose/runtime/runtime-saved-instance-state/src/commonMain/kotlin/androidx/compose/runtime/savedinstancestate/ListSaver.kt b/compose/runtime/runtime-saveable/src/commonMain/kotlin/androidx/compose/runtime/savedinstancestate/ListSaver.kt
similarity index 100%
rename from compose/runtime/runtime-saved-instance-state/src/commonMain/kotlin/androidx/compose/runtime/savedinstancestate/ListSaver.kt
rename to compose/runtime/runtime-saveable/src/commonMain/kotlin/androidx/compose/runtime/savedinstancestate/ListSaver.kt
diff --git a/compose/runtime/runtime-saved-instance-state/src/commonMain/kotlin/androidx/compose/runtime/savedinstancestate/MapSaver.kt b/compose/runtime/runtime-saveable/src/commonMain/kotlin/androidx/compose/runtime/savedinstancestate/MapSaver.kt
similarity index 100%
rename from compose/runtime/runtime-saved-instance-state/src/commonMain/kotlin/androidx/compose/runtime/savedinstancestate/MapSaver.kt
rename to compose/runtime/runtime-saveable/src/commonMain/kotlin/androidx/compose/runtime/savedinstancestate/MapSaver.kt
diff --git a/compose/runtime/runtime-saved-instance-state/src/commonMain/kotlin/androidx/compose/runtime/savedinstancestate/RememberSavedInstanceState.kt b/compose/runtime/runtime-saveable/src/commonMain/kotlin/androidx/compose/runtime/savedinstancestate/RememberSavedInstanceState.kt
similarity index 100%
rename from compose/runtime/runtime-saved-instance-state/src/commonMain/kotlin/androidx/compose/runtime/savedinstancestate/RememberSavedInstanceState.kt
rename to compose/runtime/runtime-saveable/src/commonMain/kotlin/androidx/compose/runtime/savedinstancestate/RememberSavedInstanceState.kt
diff --git a/compose/runtime/runtime-saved-instance-state/src/commonMain/kotlin/androidx/compose/runtime/savedinstancestate/RestorableStateHolder.kt b/compose/runtime/runtime-saveable/src/commonMain/kotlin/androidx/compose/runtime/savedinstancestate/RestorableStateHolder.kt
similarity index 100%
rename from compose/runtime/runtime-saved-instance-state/src/commonMain/kotlin/androidx/compose/runtime/savedinstancestate/RestorableStateHolder.kt
rename to compose/runtime/runtime-saveable/src/commonMain/kotlin/androidx/compose/runtime/savedinstancestate/RestorableStateHolder.kt
diff --git a/compose/runtime/runtime-saved-instance-state/src/commonMain/kotlin/androidx/compose/runtime/savedinstancestate/SavedInstanceState.kt b/compose/runtime/runtime-saveable/src/commonMain/kotlin/androidx/compose/runtime/savedinstancestate/SavedInstanceState.kt
similarity index 100%
rename from compose/runtime/runtime-saved-instance-state/src/commonMain/kotlin/androidx/compose/runtime/savedinstancestate/SavedInstanceState.kt
rename to compose/runtime/runtime-saveable/src/commonMain/kotlin/androidx/compose/runtime/savedinstancestate/SavedInstanceState.kt
diff --git a/compose/runtime/runtime-saved-instance-state/src/commonMain/kotlin/androidx/compose/runtime/savedinstancestate/Saver.kt b/compose/runtime/runtime-saveable/src/commonMain/kotlin/androidx/compose/runtime/savedinstancestate/Saver.kt
similarity index 100%
rename from compose/runtime/runtime-saved-instance-state/src/commonMain/kotlin/androidx/compose/runtime/savedinstancestate/Saver.kt
rename to compose/runtime/runtime-saveable/src/commonMain/kotlin/androidx/compose/runtime/savedinstancestate/Saver.kt
diff --git a/compose/runtime/runtime-saved-instance-state/src/commonMain/kotlin/androidx/compose/runtime/savedinstancestate/UiSavedStateRegistry.kt b/compose/runtime/runtime-saveable/src/commonMain/kotlin/androidx/compose/runtime/savedinstancestate/UiSavedStateRegistry.kt
similarity index 100%
rename from compose/runtime/runtime-saved-instance-state/src/commonMain/kotlin/androidx/compose/runtime/savedinstancestate/UiSavedStateRegistry.kt
rename to compose/runtime/runtime-saveable/src/commonMain/kotlin/androidx/compose/runtime/savedinstancestate/UiSavedStateRegistry.kt
diff --git a/compose/runtime/runtime-saved-instance-state/src/test/java/androidx/compose/runtime/savedinstancestate/AutoSaverTest.kt b/compose/runtime/runtime-saveable/src/test/java/androidx/compose/runtime/savedinstancestate/AutoSaverTest.kt
similarity index 100%
rename from compose/runtime/runtime-saved-instance-state/src/test/java/androidx/compose/runtime/savedinstancestate/AutoSaverTest.kt
rename to compose/runtime/runtime-saveable/src/test/java/androidx/compose/runtime/savedinstancestate/AutoSaverTest.kt
diff --git a/compose/runtime/runtime-saved-instance-state/src/test/java/androidx/compose/runtime/savedinstancestate/ListSaverTest.kt b/compose/runtime/runtime-saveable/src/test/java/androidx/compose/runtime/savedinstancestate/ListSaverTest.kt
similarity index 100%
rename from compose/runtime/runtime-saved-instance-state/src/test/java/androidx/compose/runtime/savedinstancestate/ListSaverTest.kt
rename to compose/runtime/runtime-saveable/src/test/java/androidx/compose/runtime/savedinstancestate/ListSaverTest.kt
diff --git a/compose/runtime/runtime-saved-instance-state/src/test/java/androidx/compose/runtime/savedinstancestate/MapSaverTest.kt b/compose/runtime/runtime-saveable/src/test/java/androidx/compose/runtime/savedinstancestate/MapSaverTest.kt
similarity index 100%
rename from compose/runtime/runtime-saved-instance-state/src/test/java/androidx/compose/runtime/savedinstancestate/MapSaverTest.kt
rename to compose/runtime/runtime-saveable/src/test/java/androidx/compose/runtime/savedinstancestate/MapSaverTest.kt
diff --git a/compose/runtime/runtime-saved-instance-state/src/test/java/androidx/compose/runtime/savedinstancestate/UiSavedStateRegistryTest.kt b/compose/runtime/runtime-saveable/src/test/java/androidx/compose/runtime/savedinstancestate/UiSavedStateRegistryTest.kt
similarity index 100%
rename from compose/runtime/runtime-saved-instance-state/src/test/java/androidx/compose/runtime/savedinstancestate/UiSavedStateRegistryTest.kt
rename to compose/runtime/runtime-saveable/src/test/java/androidx/compose/runtime/savedinstancestate/UiSavedStateRegistryTest.kt
diff --git a/compose/ui/ui-text/build.gradle b/compose/ui/ui-text/build.gradle
index 6ad838b..523b902 100644
--- a/compose/ui/ui-text/build.gradle
+++ b/compose/ui/ui-text/build.gradle
@@ -43,7 +43,7 @@
         api "androidx.annotation:annotation:1.1.0"
 
         implementation project(":compose:runtime:runtime")
-        implementation project(":compose:runtime:runtime-saved-instance-state")
+        implementation project(":compose:runtime:runtime-saveable")
         implementation project(":compose:ui:ui-util")
         implementation(KOTLIN_STDLIB)
         implementation "androidx.collection:collection:1.1.0"
@@ -101,7 +101,7 @@
                 api project(":compose:ui:ui-unit")
 
                 implementation project(":compose:runtime:runtime")
-                implementation project(":compose:runtime:runtime-saved-instance-state")
+                implementation project(":compose:runtime:runtime-saveable")
                 implementation project(":compose:ui:ui-util")
             }
 
diff --git a/compose/ui/ui/build.gradle b/compose/ui/ui/build.gradle
index 108a403..b50126b 100644
--- a/compose/ui/ui/build.gradle
+++ b/compose/ui/ui/build.gradle
@@ -45,7 +45,7 @@
         // TODO: b/160602714 create a lower level module to avoid this dependency on the
         // animation group
         api project(":compose:animation:animation-core")
-        api project(":compose:runtime:runtime-saved-instance-state")
+        api project(":compose:runtime:runtime-saveable")
         api project(":compose:ui:ui-geometry")
         api project(":compose:ui:ui-graphics")
         api project(":compose:ui:ui-text")
@@ -129,7 +129,7 @@
                 // TODO: b/160602714 create a lower level module to avoid this dependency on the
                 // animation group
                 api project(":compose:animation:animation-core")
-                api project(":compose:runtime:runtime-saved-instance-state")
+                api project(":compose:runtime:runtime-saveable")
                 api project(":compose:ui:ui-geometry")
                 api project(":compose:ui:ui-graphics")
                 api project(":compose:ui:ui-text")
diff --git a/development/build_log_simplifier/messages.ignore b/development/build_log_simplifier/messages.ignore
index f0d0d9e..ee13e90 100644
--- a/development/build_log_simplifier/messages.ignore
+++ b/development/build_log_simplifier/messages.ignore
@@ -288,8 +288,8 @@
 # > Task :compose:integration-tests:benchmark:processReleaseAndroidTestManifest
 \$OUT_DIR/androidx/compose/integration\-tests/benchmark/build/intermediates/tmp/manifest/androidTest/release/manifestMerger[0-9]+\.xml:[0-9]+:[0-9]+\-[0-9]+:[0-9]+ Warning:
 # > Task :compose:navigation:navigation:processDebugAndroidTestManifest
-# > Task :compose:runtime:runtime-saved-instance-state:processDebugAndroidTestManifest
-\$OUT_DIR/androidx/compose/runtime/runtime\-saved\-instance\-state/build/intermediates/tmp/manifest/androidTest/debug/manifestMerger[0-9]+\.xml:[0-9]+:[0-9]+\-[0-9]+:[0-9]+ Warning:
+# > Task :compose:runtime:runtime-saveable:processDebugAndroidTestManifest
+\$OUT_DIR/androidx/compose/runtime/runtime\-saveable/build/intermediates/tmp/manifest/androidTest/debug/manifestMerger[0-9]+\.xml:[0-9]+:[0-9]+\-[0-9]+:[0-9]+ Warning:
 # > Task :compose:ui:ui-graphics:compileKotlinMetadata
 w: \$SUPPORT/compose/ui/ui\-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/Color\.kt: \([0-9]+, [0-9]+\): The feature "inline classes" is experimental
 w: \$SUPPORT/compose/ui/ui\-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/Float[0-9]+\.kt: \([0-9]+, [0-9]+\): The feature "inline classes" is experimental
@@ -968,7 +968,7 @@
 # > Task :compose:runtime:runtime-rxjava2:lintDebug
 # > Task :compose:ui:ui-util:lintDebug
 # > Task :compose:ui:ui-geometry:lintDebug
-# > Task :compose:runtime:runtime-saved-instance-state:lintDebug
+# > Task :compose:runtime:runtime-saveable:lintDebug
 # > Task :compose:ui:ui-unit:lintDebug
 # > Task :compose:ui:ui-graphics:lintDebug
 # > Task :compose:ui:ui:lintDebug
@@ -991,7 +991,7 @@
 # > Task :paging:paging-compose:paging-compose-samples:lintDebug
 # > Task :navigation:navigation-compose:navigation-compose-samples:lintDebug
 # > Task :compose:runtime:runtime-rxjava2:runtime-rxjava2-samples:lintDebug
-# > Task :compose:runtime:runtime-saved-instance-state:runtime-saved-instance-state-samples:lintDebug
+# > Task :compose:runtime:runtime-saveable:runtime-saveable-samples:lintDebug
 # > Task :compose:animation:animation:animation-samples:lintDebug
 # > Task :compose:material:material-icons-core:material-icons-core-samples:lintDebug
 # > Task :compose:animation:animation-core:animation-core-samples:lintDebug
diff --git a/docs-tip-of-tree/build.gradle b/docs-tip-of-tree/build.gradle
index 94b0515..39f1a89 100644
--- a/docs-tip-of-tree/build.gradle
+++ b/docs-tip-of-tree/build.gradle
@@ -60,8 +60,8 @@
     samples(project(":compose:runtime:runtime-livedata:runtime-livedata-samples"))
     docs(project(":compose:runtime:runtime-rxjava2"))
     samples(project(":compose:runtime:runtime-rxjava2:runtime-rxjava2-samples"))
-    docs(project(":compose:runtime:runtime-saved-instance-state"))
-    samples(project(":compose:runtime:runtime-saved-instance-state:runtime-saved-instance-state-samples"))
+    docs(project(":compose:runtime:runtime-saveable"))
+    samples(project(":compose:runtime:runtime-saveable:runtime-saveable-samples"))
     samples(project(":compose:runtime:runtime:runtime-samples"))
     docs(project(":compose:ui:ui"))
     docs(project(":compose:ui:ui-android-stubs"))
diff --git a/navigation/navigation-compose/build.gradle b/navigation/navigation-compose/build.gradle
index 274af7d..9de1beb 100644
--- a/navigation/navigation-compose/build.gradle
+++ b/navigation/navigation-compose/build.gradle
@@ -33,7 +33,7 @@
 
     implementation(KOTLIN_STDLIB)
     api projectOrArtifact(":compose:runtime:runtime")
-    api projectOrArtifact(":compose:runtime:runtime-saved-instance-state")
+    api projectOrArtifact(":compose:runtime:runtime-saveable")
     api projectOrArtifact(":compose:ui:ui")
     api "androidx.navigation:navigation-runtime-ktx:2.3.1"
 
diff --git a/settings.gradle b/settings.gradle
index 29643c7..41e1eb6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -245,8 +245,8 @@
 includeProject(":compose:runtime:runtime-rxjava2:runtime-rxjava2-samples", "compose/runtime/runtime-rxjava2/samples", [BuildType.COMPOSE])
 includeProject(":compose:runtime:runtime-rxjava3", "compose/runtime/runtime-rxjava3", [BuildType.COMPOSE])
 includeProject(":compose:runtime:runtime-rxjava3:runtime-rxjava3-samples", "compose/runtime/runtime-rxjava3/samples", [BuildType.COMPOSE])
-includeProject(":compose:runtime:runtime-saved-instance-state", "compose/runtime/runtime-saved-instance-state", [BuildType.COMPOSE])
-includeProject(":compose:runtime:runtime-saved-instance-state:runtime-saved-instance-state-samples", "compose/runtime/runtime-saved-instance-state/samples", [BuildType.COMPOSE])
+includeProject(":compose:runtime:runtime-saveable", "compose/runtime/runtime-saveable", [BuildType.COMPOSE])
+includeProject(":compose:runtime:runtime-saveable:runtime-saveable-samples", "compose/runtime/runtime-saveable/samples", [BuildType.COMPOSE])
 includeProject(":compose:runtime:runtime:benchmark", "compose/runtime/runtime/compose-runtime-benchmark", [BuildType.COMPOSE])
 includeProject(":compose:runtime:runtime:integration-tests", "compose/runtime/runtime/integration-tests", [BuildType.COMPOSE])
 includeProject(":compose:runtime:runtime:runtime-samples", "compose/runtime/runtime/samples", [BuildType.COMPOSE])