diff --git a/navigation-compose/src/androidMain/kotlin/com.chrynan.navigation.compose/AndroidNavContainer.kt b/navigation-compose/src/androidMain/kotlin/com.chrynan.navigation.compose/AndroidNavContainer.kt
index ce41863..7033876 100644
--- a/navigation-compose/src/androidMain/kotlin/com.chrynan.navigation.compose/AndroidNavContainer.kt
+++ b/navigation-compose/src/androidMain/kotlin/com.chrynan.navigation.compose/AndroidNavContainer.kt
@@ -7,14 +7,14 @@ import androidx.compose.runtime.getValue
 
 @Composable
 @ExperimentalNavigationApi
-internal actual fun <T> InternalNavContainer(
-    navigator: BaseComposeNavigatorByContentViewModel<T>
+internal actual fun <Scope, Key> InternalNavContainer(
+    navigator: BaseComposeNavigatorByContentViewModel<Scope, Key>
 ) {
     val contentKey by navigator.keyChanges.collectAsState(initial = navigator.initialKey)
 
-    val scope = object : ComposeNavigationContentScope<T> {
+    val scope = object : ComposeNavigationContentScope<Key> {
 
-        override val navigator: ComposeStackNavigatorByContent<T> = navigator
+        override val navigator: ComposeStackNavigatorByContent<Key> = navigator
     }
 
     Box {
@@ -26,9 +26,9 @@ internal actual fun <T> InternalNavContainer(
 
 @Composable
 @ExperimentalNavigationApi
-internal actual fun <T, S : ComposeNavigationKeyScope<T>> InternalNavContainer(
-    navigator: BaseComposeNavigatorByKeyViewModel<T, S>,
-    scope: S
+internal actual fun <Scope, Key, NavigationScope : ComposeNavigationKeyScope<Key>> InternalNavContainer(
+    navigator: BaseComposeNavigatorByKeyViewModel<Scope, Key, NavigationScope>,
+    scope: NavigationScope
 ) {
     val contentKey by navigator.keyChanges.collectAsState(initial = navigator.initialKey)
 
diff --git a/navigation-compose/src/commonMain/kotlin/com.chrynan.navigation.compose/NavContainer.kt b/navigation-compose/src/commonMain/kotlin/com.chrynan.navigation.compose/NavContainer.kt
index fb650ee..c24bd5b 100644
--- a/navigation-compose/src/commonMain/kotlin/com.chrynan.navigation.compose/NavContainer.kt
+++ b/navigation-compose/src/commonMain/kotlin/com.chrynan.navigation.compose/NavContainer.kt
@@ -7,13 +7,13 @@ import com.chrynan.navigation.NavigationIntent
 
 @Composable
 @ExperimentalNavigationApi
-internal expect fun <T> InternalNavContainer(navigator: BaseComposeNavigatorByContentViewModel<T>)
+internal expect fun <Scope, Key> InternalNavContainer(navigator: BaseComposeNavigatorByContentViewModel<Scope, Key>)
 
 @Composable
 @ExperimentalNavigationApi
-internal expect fun <T, S : ComposeNavigationKeyScope<T>> InternalNavContainer(
-    navigator: BaseComposeNavigatorByKeyViewModel<T, S>,
-    scope: S
+internal expect fun <Scope, Key, NavigationScope : ComposeNavigationKeyScope<Key>> InternalNavContainer(
+    navigator: BaseComposeNavigatorByKeyViewModel<Scope, Key, NavigationScope>,
+    scope: NavigationScope
 )
 
 /**
@@ -37,7 +37,7 @@ internal expect fun <T, S : ComposeNavigationKeyScope<T>> InternalNavContainer(
  */
 @Composable
 @ExperimentalNavigationApi
-fun <T> NavContainer(navigator: ComposeNavigatorByContentViewModel<T>) {
+fun <Scope, Key> NavContainer(navigator: ComposeNavigatorByContentViewModel<Scope, Key>) {
     InternalNavContainer(navigator = navigator)
 }
 
@@ -68,10 +68,10 @@ fun <T> NavContainer(navigator: ComposeNavigatorByContentViewModel<T>) {
  */
 @Composable
 @ExperimentalNavigationApi
-fun <T> NavContainer(navigator: ComposeNavigatorByKeyViewModel<T>) {
-    val scope = object : ComposeNavigationKeyScope<T> {
+fun <Scope, Key> NavContainer(navigator: ComposeNavigatorByKeyViewModel<Scope, Key>) {
+    val scope = object : ComposeNavigationKeyScope<Key> {
 
-        override val navigator: ComposeStackNavigatorByKey<T>
+        override val navigator: ComposeStackNavigatorByKey<Key>
             get() = navigator
     }
 
@@ -104,10 +104,10 @@ fun <T> NavContainer(navigator: ComposeNavigatorByKeyViewModel<T>) {
  */
 @Composable
 @ExperimentalNavigationApi
-fun <T : NavigationIntent> NavContainer(navigator: ComposeNavigationIntentNavigatorByKeyViewModel<T>) {
-    val scope = object : ComposeNavigationIntentScope<T> {
+fun <Scope, Intent : NavigationIntent> NavContainer(navigator: ComposeNavigationIntentNavigatorByKeyViewModel<Scope, Intent>) {
+    val scope = object : ComposeNavigationIntentScope<Intent> {
 
-        override val navigator: ComposeNavigationIntentStackNavigatorByKey<T>
+        override val navigator: ComposeNavigationIntentStackNavigatorByKey<Intent>
             get() = navigator
     }
 
diff --git a/navigation-compose/src/jsMain/kotlin/com.chrynan.navigation.compose/JsNavContainer.kt b/navigation-compose/src/jsMain/kotlin/com.chrynan.navigation.compose/JsNavContainer.kt
index 27be224..c7d458f 100644
--- a/navigation-compose/src/jsMain/kotlin/com.chrynan.navigation.compose/JsNavContainer.kt
+++ b/navigation-compose/src/jsMain/kotlin/com.chrynan.navigation.compose/JsNavContainer.kt
@@ -7,14 +7,14 @@ import org.jetbrains.compose.web.dom.Div
 
 @Composable
 @ExperimentalNavigationApi
-internal actual fun <T> InternalNavContainer(
-    navigator: BaseComposeNavigatorByContentViewModel<T>
+internal actual fun <Scope, Key> InternalNavContainer(
+    navigator: BaseComposeNavigatorByContentViewModel<Scope, Key>
 ) {
     val contentKey by navigator.keyChanges.collectAsState(initial = navigator.initialKey)
 
-    val scope = object : ComposeNavigationContentScope<T> {
+    val scope = object : ComposeNavigationContentScope<Key> {
 
-        override val navigator: ComposeStackNavigatorByContent<T> = navigator
+        override val navigator: ComposeStackNavigatorByContent<Key> = navigator
     }
 
     Div {
@@ -26,9 +26,9 @@ internal actual fun <T> InternalNavContainer(
 
 @Composable
 @ExperimentalNavigationApi
-internal actual fun <T, S : ComposeNavigationKeyScope<T>> InternalNavContainer(
-    navigator: BaseComposeNavigatorByKeyViewModel<T, S>,
-    scope: S
+internal actual fun <Scope, Key, NavigationScope : ComposeNavigationKeyScope<Key>> InternalNavContainer(
+    navigator: BaseComposeNavigatorByKeyViewModel<Scope, Key, NavigationScope>,
+    scope: NavigationScope
 ) {
     val contentKey by navigator.keyChanges.collectAsState(initial = navigator.initialKey)
 
diff --git a/navigation-compose/src/jvmMain/kotlin/com/chrynan/navigation/compose/JvmNavContainer.kt b/navigation-compose/src/jvmMain/kotlin/com/chrynan/navigation/compose/JvmNavContainer.kt
index ce41863..7033876 100644
--- a/navigation-compose/src/jvmMain/kotlin/com/chrynan/navigation/compose/JvmNavContainer.kt
+++ b/navigation-compose/src/jvmMain/kotlin/com/chrynan/navigation/compose/JvmNavContainer.kt
@@ -7,14 +7,14 @@ import androidx.compose.runtime.getValue
 
 @Composable
 @ExperimentalNavigationApi
-internal actual fun <T> InternalNavContainer(
-    navigator: BaseComposeNavigatorByContentViewModel<T>
+internal actual fun <Scope, Key> InternalNavContainer(
+    navigator: BaseComposeNavigatorByContentViewModel<Scope, Key>
 ) {
     val contentKey by navigator.keyChanges.collectAsState(initial = navigator.initialKey)
 
-    val scope = object : ComposeNavigationContentScope<T> {
+    val scope = object : ComposeNavigationContentScope<Key> {
 
-        override val navigator: ComposeStackNavigatorByContent<T> = navigator
+        override val navigator: ComposeStackNavigatorByContent<Key> = navigator
     }
 
     Box {
@@ -26,9 +26,9 @@ internal actual fun <T> InternalNavContainer(
 
 @Composable
 @ExperimentalNavigationApi
-internal actual fun <T, S : ComposeNavigationKeyScope<T>> InternalNavContainer(
-    navigator: BaseComposeNavigatorByKeyViewModel<T, S>,
-    scope: S
+internal actual fun <Scope, Key, NavigationScope : ComposeNavigationKeyScope<Key>> InternalNavContainer(
+    navigator: BaseComposeNavigatorByKeyViewModel<Scope, Key, NavigationScope>,
+    scope: NavigationScope
 ) {
     val contentKey by navigator.keyChanges.collectAsState(initial = navigator.initialKey)