diff --git a/gradle.properties b/gradle.properties
index 0a6dec9ba9..648ab2dfe4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,7 @@ android.useAndroidX=true
 systemProp.org.gradle.internal.publish.checksums.insecure=true
 
 GROUP=com.squareup.workflow1
-VERSION_NAME=1.8.0-uiUpdate02-SNAPSHOT
+VERSION_NAME=1.8.0-uiUpdate03-SNAPSHOT
 
 POM_DESCRIPTION=Square Workflow
 
diff --git a/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/BackStackContainer.kt b/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/BackStackContainer.kt
index e4c3253b5f..0e179d5fbc 100644
--- a/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/BackStackContainer.kt
+++ b/workflow-ui/core-android/src/main/java/com/squareup/workflow1/ui/container/BackStackContainer.kt
@@ -28,7 +28,6 @@ import com.squareup.workflow1.ui.canShow
 import com.squareup.workflow1.ui.compatible
 import com.squareup.workflow1.ui.container.BackStackConfig.First
 import com.squareup.workflow1.ui.container.BackStackConfig.Other
-import com.squareup.workflow1.ui.container.ViewStateCache.Saved
 import com.squareup.workflow1.ui.show
 import com.squareup.workflow1.ui.startShowing
 import com.squareup.workflow1.ui.toViewFactory
@@ -201,7 +200,7 @@ public open class BackStackContainer @JvmOverloads constructor(
     }
 
     public constructor(source: Parcel) : super(source) {
-      this.savedViewState = source.readParcelable(ViewStateCache.Saved::class.java.classLoader)!!
+      savedViewState = source.readParcelable(ViewStateCache.Saved::class.java.classLoader)!!
     }
 
     public val savedViewState: ViewStateCache.Saved
diff --git a/workflow-ui/core-common/src/main/java/com/squareup/workflow1/ui/AsScreen.kt b/workflow-ui/core-common/src/main/java/com/squareup/workflow1/ui/AsScreen.kt
index 1195568a41..d62cea1084 100644
--- a/workflow-ui/core-common/src/main/java/com/squareup/workflow1/ui/AsScreen.kt
+++ b/workflow-ui/core-common/src/main/java/com/squareup/workflow1/ui/AsScreen.kt
@@ -19,7 +19,7 @@ public class AsScreen<W : Any>(
   }
 
   override val compatibilityKey: String
-    get() = Compatible.keyFor(rendering)
+    get() = Compatible.keyFor(rendering, "AsScreen")
 }
 
 /**
diff --git a/workflow-ui/core-common/src/main/java/com/squareup/workflow1/ui/Named.kt b/workflow-ui/core-common/src/main/java/com/squareup/workflow1/ui/Named.kt
index acaccef7ab..85db722c19 100644
--- a/workflow-ui/core-common/src/main/java/com/squareup/workflow1/ui/Named.kt
+++ b/workflow-ui/core-common/src/main/java/com/squareup/workflow1/ui/Named.kt
@@ -15,7 +15,7 @@ public data class Named<W : Any>(
     require(name.isNotBlank()) { "name must not be blank." }
   }
 
-  override val compatibilityKey: String = Compatible.keyFor(wrapped, name)
+  override val compatibilityKey: String = Compatible.keyFor(wrapped, "Named($name)")
 
   override fun toString(): String {
     return "${super.toString()}: $compatibilityKey"
diff --git a/workflow-ui/core-common/src/main/java/com/squareup/workflow1/ui/NamedScreen.kt b/workflow-ui/core-common/src/main/java/com/squareup/workflow1/ui/NamedScreen.kt
index 28c6eef6b3..c351609772 100644
--- a/workflow-ui/core-common/src/main/java/com/squareup/workflow1/ui/NamedScreen.kt
+++ b/workflow-ui/core-common/src/main/java/com/squareup/workflow1/ui/NamedScreen.kt
@@ -16,7 +16,7 @@ public data class NamedScreen<W : Screen>(
     require(name.isNotBlank()) { "name must not be blank." }
   }
 
-  override val compatibilityKey: String = Compatible.keyFor(wrapped, name)
+  override val compatibilityKey: String = Compatible.keyFor(wrapped, "NamedScreen($name)")
 
   override fun toString(): String {
     return "${super.toString()}: $compatibilityKey"
diff --git a/workflow-ui/core-common/src/test/java/com/squareup/workflow1/ui/NamedScreenTest.kt b/workflow-ui/core-common/src/test/java/com/squareup/workflow1/ui/NamedScreenTest.kt
index 7730fc086e..7b1ebac56c 100644
--- a/workflow-ui/core-common/src/test/java/com/squareup/workflow1/ui/NamedScreenTest.kt
+++ b/workflow-ui/core-common/src/test/java/com/squareup/workflow1/ui/NamedScreenTest.kt
@@ -58,7 +58,7 @@ internal class NamedScreenTest {
 
   @Test fun `recursive keys are legible`() {
     assertThat(NamedScreen(NamedScreen(Hey, "one"), "ho").compatibilityKey)
-      .isEqualTo("com.squareup.workflow1.ui.NamedScreenTest\$Hey+one+ho")
+      .isEqualTo("com.squareup.workflow1.ui.NamedScreenTest\$Hey+NamedScreen(one)+NamedScreen(ho)")
   }
 
   private class Foo(override val compatibilityKey: String) : Compatible, Screen
diff --git a/workflow-ui/core-common/src/test/java/com/squareup/workflow1/ui/NamedTest.kt b/workflow-ui/core-common/src/test/java/com/squareup/workflow1/ui/NamedTest.kt
index 8c93257176..5be393a606 100644
--- a/workflow-ui/core-common/src/test/java/com/squareup/workflow1/ui/NamedTest.kt
+++ b/workflow-ui/core-common/src/test/java/com/squareup/workflow1/ui/NamedTest.kt
@@ -58,7 +58,7 @@ internal class NamedTest {
 
   @Test fun `recursive keys are legible`() {
     assertThat(Named(Named(Hey, "one"), "ho").compatibilityKey)
-      .isEqualTo("com.squareup.workflow1.ui.NamedTest\$Hey+one+ho")
+      .isEqualTo("com.squareup.workflow1.ui.NamedTest\$Hey+Named(one)+Named(ho)")
   }
 
   private class Foo(override val compatibilityKey: String) : Compatible