diff --git a/samples/ktor-all-platforms-app/composeApp/build.gradle.kts b/samples/ktor-all-platforms-app/composeApp/build.gradle.kts
index 7532a5ef..47087793 100644
--- a/samples/ktor-all-platforms-app/composeApp/build.gradle.kts
+++ b/samples/ktor-all-platforms-app/composeApp/build.gradle.kts
@@ -48,9 +48,9 @@ kotlin {
             implementation(compose.components.resources)
             implementation(projects.shared)
 
-            implementation(libs.kotlinx.rpc.runtime.client)
-            implementation(libs.kotlinx.rpc.runtime.serialization.json)
-            implementation(libs.kotlinx.rpc.transport.ktor.client)
+            implementation(libs.kotlinx.rpc.krpc.client)
+            implementation(libs.kotlinx.rpc.krpc.serialization.json)
+            implementation(libs.kotlinx.rpc.krpc.ktor.client)
             implementation(libs.ktor.client.cio)
             implementation(libs.ktor.client.core)
             implementation(libs.ktor.client.websockets)
diff --git a/samples/ktor-all-platforms-app/composeApp/src/commonMain/kotlin/App.kt b/samples/ktor-all-platforms-app/composeApp/src/commonMain/kotlin/App.kt
index dd3f6395..700b074f 100644
--- a/samples/ktor-all-platforms-app/composeApp/src/commonMain/kotlin/App.kt
+++ b/samples/ktor-all-platforms-app/composeApp/src/commonMain/kotlin/App.kt
@@ -15,8 +15,8 @@ import androidx.compose.ui.Modifier
 import io.ktor.client.*
 import io.ktor.http.*
 import kotlinx.rpc.client.withService
-import kotlinx.rpc.internal.streamScoped
 import kotlinx.rpc.serialization.json
+import kotlinx.rpc.streamScoped
 import kotlinx.rpc.transport.ktor.client.installRPC
 import kotlinx.rpc.transport.ktor.client.rpc
 import kotlinx.rpc.transport.ktor.client.rpcConfig
diff --git a/samples/ktor-all-platforms-app/gradle/libs.versions.toml b/samples/ktor-all-platforms-app/gradle/libs.versions.toml
index c041c088..0eb08291 100644
--- a/samples/ktor-all-platforms-app/gradle/libs.versions.toml
+++ b/samples/ktor-all-platforms-app/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
-kotlin = "1.9.23"
-ksp = "1.9.23-1.0.19"
+kotlin = "1.9.24"
+ksp = "1.9.24-1.0.20"
 
 agp = "8.2.0"
 android-compileSdk = "34"
@@ -13,14 +13,14 @@ androidx-core-ktx = "1.12.0"
 androidx-espresso-core = "3.5.1"
 androidx-material = "1.11.0"
 androidx-test-junit = "1.1.5"
-compose = "1.6.1"
-compose-plugin = "1.6.1"
+compose = "1.6.8"
+compose-plugin = "1.6.11"
 junit = "4.13.2"
 ktor = "2.3.11"
 logback = "1.5.6"
 kotlinx-serialization-json = "1.6.3"
 kotlinx-coroutines-core = "1.8.1"
-kotlinx-rpc = "0.1.0"
+kotlinx-rpc = "0.2.0"
 
 [libraries]
 # kotlin
@@ -58,12 +58,12 @@ ktor-client-websockets = { module = "io.ktor:ktor-client-websockets", version.re
 ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
 
 # kotlinx-rpc
-kotlinx-rpc-runtime = { module = "org.jetbrains.kotlinx:kotlinx-rpc-runtime" }
-kotlinx-rpc-runtime-client = { module = "org.jetbrains.kotlinx:kotlinx-rpc-runtime-client" }
-kotlinx-rpc-runtime-server = { module = "org.jetbrains.kotlinx:kotlinx-rpc-runtime-server" }
-kotlinx-rpc-transport-ktor-client = { module = "org.jetbrains.kotlinx:kotlinx-rpc-transport-ktor-client" }
-kotlinx-rpc-transport-ktor-server = { module = "org.jetbrains.kotlinx:kotlinx-rpc-transport-ktor-server" }
-kotlinx-rpc-runtime-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-rpc-runtime-serialization-json" }
+kotlinx-rpc-core = { module = "org.jetbrains.kotlinx:kotlinx-rpc-core" }
+kotlinx-rpc-krpc-client = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-client" }
+kotlinx-rpc-krpc-server = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-server" }
+kotlinx-rpc-krpc-ktor-client = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-client" }
+kotlinx-rpc-krpc-ktor-server = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-server" }
+kotlinx-rpc-krpc-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-serialization-json" }
 
 # other
 logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
diff --git a/samples/ktor-all-platforms-app/server/build.gradle.kts b/samples/ktor-all-platforms-app/server/build.gradle.kts
index 6052b1c8..36da35ac 100644
--- a/samples/ktor-all-platforms-app/server/build.gradle.kts
+++ b/samples/ktor-all-platforms-app/server/build.gradle.kts
@@ -25,11 +25,11 @@ dependencies {
     implementation(libs.ktor.server.cors.jvm)
     implementation(libs.ktor.server.websockets.jvm)
     implementation(libs.ktor.server.host.common.jvm)
-    implementation(libs.kotlinx.rpc.runtime.server)
-    implementation(libs.kotlinx.rpc.runtime.serialization.json)
-    implementation(libs.kotlinx.rpc.transport.ktor.server)
+    implementation(libs.kotlinx.rpc.krpc.server)
+    implementation(libs.kotlinx.rpc.krpc.serialization.json)
+    implementation(libs.kotlinx.rpc.krpc.ktor.server)
     testImplementation(libs.ktor.server.tests)
-    testImplementation(libs.kotlinx.rpc.runtime.client)
-    testImplementation(libs.kotlinx.rpc.transport.ktor.client)
+    testImplementation(libs.kotlinx.rpc.krpc.client)
+    testImplementation(libs.kotlinx.rpc.krpc.ktor.client)
     testImplementation(libs.kotlin.test.junit)
 }
diff --git a/samples/ktor-all-platforms-app/server/src/test/kotlin/kotlinx/rpc/sample/ApplicationTest.kt b/samples/ktor-all-platforms-app/server/src/test/kotlin/kotlinx/rpc/sample/ApplicationTest.kt
index 1e134e1f..2244d79d 100644
--- a/samples/ktor-all-platforms-app/server/src/test/kotlin/kotlinx/rpc/sample/ApplicationTest.kt
+++ b/samples/ktor-all-platforms-app/server/src/test/kotlin/kotlinx/rpc/sample/ApplicationTest.kt
@@ -9,8 +9,8 @@ import UserService
 import io.ktor.server.testing.*
 import kotlinx.coroutines.flow.toList
 import kotlinx.rpc.client.withService
-import kotlinx.rpc.internal.streamScoped
 import kotlinx.rpc.serialization.json
+import kotlinx.rpc.streamScoped
 import kotlinx.rpc.transport.ktor.client.installRPC
 import kotlinx.rpc.transport.ktor.client.rpc
 import kotlinx.rpc.transport.ktor.client.rpcConfig
diff --git a/samples/ktor-all-platforms-app/settings.gradle.kts b/samples/ktor-all-platforms-app/settings.gradle.kts
index 0c6162cb..e538d5e3 100644
--- a/samples/ktor-all-platforms-app/settings.gradle.kts
+++ b/samples/ktor-all-platforms-app/settings.gradle.kts
@@ -8,7 +8,6 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 pluginManagement {
     repositories {
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
-        maven("https://maven.pkg.jetbrains.space/public/p/krpc/maven")
         google()
         gradlePluginPortal()
         mavenCentral()
@@ -20,7 +19,6 @@ dependencyResolutionManagement {
         google()
         mavenCentral()
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
-        maven("https://maven.pkg.jetbrains.space/public/p/krpc/maven")
     }
 }
 
diff --git a/samples/ktor-all-platforms-app/shared/build.gradle.kts b/samples/ktor-all-platforms-app/shared/build.gradle.kts
index 7c4b2845..f24339af 100644
--- a/samples/ktor-all-platforms-app/shared/build.gradle.kts
+++ b/samples/ktor-all-platforms-app/shared/build.gradle.kts
@@ -29,7 +29,7 @@ kotlin {
         commonMain.dependencies {
             api(libs.kotlinx.coroutines.core)
 
-            implementation(libs.kotlinx.rpc.runtime)
+            implementation(libs.kotlinx.rpc.core)
             implementation(libs.kotlinx.serialization.json)
         }
     }
diff --git a/samples/ktor-android-app/app/build.gradle.kts b/samples/ktor-android-app/app/build.gradle.kts
index b502824c..a84fcd95 100644
--- a/samples/ktor-android-app/app/build.gradle.kts
+++ b/samples/ktor-android-app/app/build.gradle.kts
@@ -65,12 +65,12 @@ android {
 
 dependencies {
     implementation(project(":common"))
-    testImplementation(libs.kotlinx.rpc.runtime.client)
-    testImplementation(libs.kotlinx.rpc.runtime.server)
-    implementation(libs.kotlinx.rpc.runtime.serialization.json)
+    testImplementation(libs.kotlinx.rpc.krpc.client)
+    testImplementation(libs.kotlinx.rpc.krpc.server)
+    implementation(libs.kotlinx.rpc.krpc.serialization.json)
 
-    implementation(libs.kotlinx.rpc.transport.ktor.client)
-    implementation(libs.kotlinx.rpc.transport.ktor.server)
+    implementation(libs.kotlinx.rpc.krpc.ktor.client)
+    implementation(libs.kotlinx.rpc.krpc.ktor.server)
 
     implementation(libs.ktor.server.cio)
     implementation(libs.ktor.server.core.jvm)
diff --git a/samples/ktor-android-app/app/src/main/kotlin/kotlinx/rpc/sample/ui/AppViewModel.kt b/samples/ktor-android-app/app/src/main/kotlin/kotlinx/rpc/sample/ui/AppViewModel.kt
index a21a7a5f..ef9eef12 100644
--- a/samples/ktor-android-app/app/src/main/kotlin/kotlinx/rpc/sample/ui/AppViewModel.kt
+++ b/samples/ktor-android-app/app/src/main/kotlin/kotlinx/rpc/sample/ui/AppViewModel.kt
@@ -15,7 +15,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import kotlinx.rpc.RPCClient
-import kotlinx.rpc.internal.streamScoped
+import kotlinx.rpc.streamScoped
 import kotlinx.rpc.client.withService
 import kotlinx.rpc.sample.MyService
 import kotlinx.rpc.sample.UserData
diff --git a/samples/ktor-android-app/common/build.gradle.kts b/samples/ktor-android-app/common/build.gradle.kts
index 5fa8a988..176a9d92 100644
--- a/samples/ktor-android-app/common/build.gradle.kts
+++ b/samples/ktor-android-app/common/build.gradle.kts
@@ -15,6 +15,6 @@ dependencies {
     implementation(libs.ktor.server.core.jvm)
     implementation(libs.ktor.server.websockets.jvm)
     implementation(libs.kotlinx.serialization.json)
-    implementation(libs.kotlinx.rpc.transport.ktor.server)
-    implementation(libs.kotlinx.rpc.runtime.serialization.json)
+    implementation(libs.kotlinx.rpc.krpc.ktor.server)
+    implementation(libs.kotlinx.rpc.krpc.serialization.json)
 }
\ No newline at end of file
diff --git a/samples/ktor-android-app/gradle/libs.versions.toml b/samples/ktor-android-app/gradle/libs.versions.toml
index 5100dc1d..fc24e548 100644
--- a/samples/ktor-android-app/gradle/libs.versions.toml
+++ b/samples/ktor-android-app/gradle/libs.versions.toml
@@ -1,20 +1,20 @@
 [versions]
 agp = "8.1.3"
-kotlin = "1.9.22"
+kotlin = "1.9.24"
 androidx-activityCompose = "1.8.2"
 androidx-appcompat = "1.6.1"
 androidx-constraintlayout = "2.1.4"
 androidx-core-ktx = "1.12.0"
 androidx-test-junit = "1.1.5"
-compose = "1.6.0"
+compose = "1.6.11"
 material3 = "1.2.0"
 junit = "4.13.2"
 ktor = "2.3.11"
 kotlinx-serialization-json = "1.6.1"
 kotlinx-coroutines-core = "1.8.1"
 logback = "1.5.6"
-kotlinx-rpc = "0.1.0"
-ksp = "1.9.22-1.0.17"
+kotlinx-rpc = "0.2.0"
+ksp = "1.9.24-1.0.20"
 
 [libraries]
 # kotlin
@@ -64,12 +64,12 @@ junit = { group = "junit", name = "junit", version.ref = "junit" }
 androidx-test-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-junit" }
 
 # kotlinx-rpc
-kotlinx-rpc-runtime = { module = "org.jetbrains.kotlinx:kotlinx-rpc-runtime" }
-kotlinx-rpc-runtime-client = { module = "org.jetbrains.kotlinx:kotlinx-rpc-runtime-client" }
-kotlinx-rpc-runtime-server = { module = "org.jetbrains.kotlinx:kotlinx-rpc-runtime-server" }
-kotlinx-rpc-transport-ktor-client = { module = "org.jetbrains.kotlinx:kotlinx-rpc-transport-ktor-client" }
-kotlinx-rpc-transport-ktor-server = { module = "org.jetbrains.kotlinx:kotlinx-rpc-transport-ktor-server" }
-kotlinx-rpc-runtime-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-rpc-runtime-serialization-json" }
+kotlinx-rpc-core = { module = "org.jetbrains.kotlinx:kotlinx-rpc-core" }
+kotlinx-rpc-krpc-client = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-client" }
+kotlinx-rpc-krpc-server = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-server" }
+kotlinx-rpc-krpc-ktor-client = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-client" }
+kotlinx-rpc-krpc-ktor-server = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-server" }
+kotlinx-rpc-krpc-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-serialization-json" }
 
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "agp" }
diff --git a/samples/ktor-android-app/server/build.gradle.kts b/samples/ktor-android-app/server/build.gradle.kts
index b2173a6e..a07fd9b9 100644
--- a/samples/ktor-android-app/server/build.gradle.kts
+++ b/samples/ktor-android-app/server/build.gradle.kts
@@ -31,11 +31,11 @@ dependencies {
     implementation(libs.kotlinx.coroutines.core.jvm)
     implementation(libs.logback.classic)
 
-    implementation(libs.kotlinx.rpc.transport.ktor.server)
-    implementation(libs.kotlinx.rpc.runtime.serialization.json)
+    implementation(libs.kotlinx.rpc.krpc.ktor.server)
+    implementation(libs.kotlinx.rpc.krpc.serialization.json)
 
-    testImplementation(libs.kotlinx.rpc.runtime.client)
-    testImplementation(libs.kotlinx.rpc.transport.ktor.client)
+    testImplementation(libs.kotlinx.rpc.krpc.client)
+    testImplementation(libs.kotlinx.rpc.krpc.ktor.client)
     testImplementation(libs.kotlin.test)
     testImplementation(libs.ktor.server.test.host)
 }
\ No newline at end of file
diff --git a/samples/ktor-android-app/server/src/test/kotlin/ApplicationTest.kt b/samples/ktor-android-app/server/src/test/kotlin/ApplicationTest.kt
index f6744767..470b973b 100644
--- a/samples/ktor-android-app/server/src/test/kotlin/ApplicationTest.kt
+++ b/samples/ktor-android-app/server/src/test/kotlin/ApplicationTest.kt
@@ -11,10 +11,10 @@ import io.ktor.server.routing.*
 import io.ktor.server.testing.*
 import kotlinx.coroutines.flow.toList
 import kotlinx.rpc.client.withService
-import kotlinx.rpc.internal.streamScoped
 import kotlinx.rpc.sample.MyService
 import kotlinx.rpc.sample.UserData
 import kotlinx.rpc.serialization.json
+import kotlinx.rpc.streamScoped
 import kotlinx.rpc.transport.ktor.client.installRPC
 import kotlinx.rpc.transport.ktor.client.rpc
 import kotlinx.rpc.transport.ktor.client.rpcConfig
diff --git a/samples/ktor-android-app/settings.gradle.kts b/samples/ktor-android-app/settings.gradle.kts
index 229994e9..6ab42830 100644
--- a/samples/ktor-android-app/settings.gradle.kts
+++ b/samples/ktor-android-app/settings.gradle.kts
@@ -6,14 +6,12 @@ pluginManagement {
     repositories {
         google()
         mavenCentral()
-        maven(url = "https://maven.pkg.jetbrains.space/public/p/krpc/maven")
         gradlePluginPortal()
     }
 }
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
-        maven(url = "https://maven.pkg.jetbrains.space/public/p/krpc/maven")
         google()
         mavenCentral()
     }
diff --git a/samples/ktor-web-app/build.gradle.kts b/samples/ktor-web-app/build.gradle.kts
index d264a0e6..cb370c7a 100644
--- a/samples/ktor-web-app/build.gradle.kts
+++ b/samples/ktor-web-app/build.gradle.kts
@@ -13,7 +13,6 @@ allprojects {
     version = "0.1"
 
     repositories {
-        maven("https://maven.pkg.jetbrains.space/public/p/krpc/maven")
         mavenCentral()
     }
 }
diff --git a/samples/ktor-web-app/common/build.gradle.kts b/samples/ktor-web-app/common/build.gradle.kts
index b3b1cdae..9e34b692 100644
--- a/samples/ktor-web-app/common/build.gradle.kts
+++ b/samples/ktor-web-app/common/build.gradle.kts
@@ -22,5 +22,5 @@ dependencies {
     commonMainApi(libs.kotlinx.serialization.json)
     commonMainApi(libs.ktor.client.core)
     commonMainApi(libs.kotlinx.coroutines.core)
-    commonMainApi(libs.kotlinx.rpc.runtime)
+    commonMainApi(libs.kotlinx.rpc.core)
 }
diff --git a/samples/ktor-web-app/frontend/build.gradle.kts b/samples/ktor-web-app/frontend/build.gradle.kts
index 5928f422..41051805 100644
--- a/samples/ktor-web-app/frontend/build.gradle.kts
+++ b/samples/ktor-web-app/frontend/build.gradle.kts
@@ -37,8 +37,8 @@ kotlin {
                 implementation(libs.kotlin.stdlib.js)
                 implementation(libs.ktor.client.js)
                 implementation(libs.ktor.client.websockets.js)
-                implementation(libs.kotlinx.rpc.transport.ktor.client)
-                implementation(libs.kotlinx.rpc.runtime.serialization.json)
+                implementation(libs.kotlinx.rpc.krpc.ktor.client)
+                implementation(libs.kotlinx.rpc.krpc.serialization.json)
 
                 implementation(project.dependencies.platform(libs.kotlin.wrappers.bom))
                 implementation(libs.react)
diff --git a/samples/ktor-web-app/frontend/src/jsMain/kotlin/App.kt b/samples/ktor-web-app/frontend/src/jsMain/kotlin/App.kt
index c62842fc..1f474b03 100644
--- a/samples/ktor-web-app/frontend/src/jsMain/kotlin/App.kt
+++ b/samples/ktor-web-app/frontend/src/jsMain/kotlin/App.kt
@@ -5,7 +5,7 @@
 import kotlinx.coroutines.flow.flow
 import kotlinx.rpc.RPCClient
 import kotlinx.rpc.client.withService
-import kotlinx.rpc.internal.streamScoped
+import kotlinx.rpc.streamScoped
 import react.FC
 import react.Props
 import react.dom.html.ReactHTML.div
diff --git a/samples/ktor-web-app/gradle/libs.versions.toml b/samples/ktor-web-app/gradle/libs.versions.toml
index 95e7db0b..e6ee70b4 100644
--- a/samples/ktor-web-app/gradle/libs.versions.toml
+++ b/samples/ktor-web-app/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ ktor = "2.3.11"
 kotlinx-serialization-json = "1.6.1"
 kotlinx-coroutines-core = "1.8.1"
 logback = "1.5.6"
-krpc = "0.1.0"
+krpc = "0.2.0"
 ksp = "1.9.24-1.0.20"
 
 [libraries]
@@ -42,12 +42,12 @@ ktor-client-js = { module = "io.ktor:ktor-client-js", version.ref = "ktor" }
 logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
 
 # krpc
-kotlinx-rpc-runtime = { module = "org.jetbrains.kotlinx:kotlinx-rpc-runtime" }
-kotlinx-rpc-runtime-client = { module = "org.jetbrains.kotlinx:kotlinx-rpc-runtime-client" }
-kotlinx-rpc-runtime-server = { module = "org.jetbrains.kotlinx:kotlinx-rpc-runtime-server" }
-kotlinx-rpc-transport-ktor-client = { module = "org.jetbrains.kotlinx:kotlinx-rpc-transport-ktor-client" }
-kotlinx-rpc-transport-ktor-server = { module = "org.jetbrains.kotlinx:kotlinx-rpc-transport-ktor-server" }
-kotlinx-rpc-runtime-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-rpc-runtime-serialization-json" }
+kotlinx-rpc-core = { module = "org.jetbrains.kotlinx:kotlinx-rpc-core" }
+kotlinx-rpc-krpc-client = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-client" }
+kotlinx-rpc-krpc-server = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-server" }
+kotlinx-rpc-krpc-ktor-client = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-client" }
+kotlinx-rpc-krpc-ktor-server = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-server" }
+kotlinx-rpc-krpc-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-rpc-krpc-serialization-json" }
 
 [plugins]
 kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
diff --git a/samples/ktor-web-app/server/build.gradle.kts b/samples/ktor-web-app/server/build.gradle.kts
index 580b5abc..d2f1e627 100644
--- a/samples/ktor-web-app/server/build.gradle.kts
+++ b/samples/ktor-web-app/server/build.gradle.kts
@@ -28,11 +28,11 @@ dependencies {
     implementation(libs.kotlinx.coroutines.core.jvm)
     implementation(libs.logback.classic)
 
-    implementation(libs.kotlinx.rpc.transport.ktor.server)
-    implementation(libs.kotlinx.rpc.runtime.serialization.json)
+    implementation(libs.kotlinx.rpc.krpc.ktor.server)
+    implementation(libs.kotlinx.rpc.krpc.serialization.json)
 
-    testImplementation(libs.kotlinx.rpc.runtime.client)
-    testImplementation(libs.kotlinx.rpc.transport.ktor.client)
+    testImplementation(libs.kotlinx.rpc.krpc.client)
+    testImplementation(libs.kotlinx.rpc.krpc.ktor.client)
     testImplementation(libs.kotlin.test)
     testImplementation(libs.ktor.server.test.host)
 }
diff --git a/samples/ktor-web-app/server/src/test/kotlin/ApplicationTest.kt b/samples/ktor-web-app/server/src/test/kotlin/ApplicationTest.kt
index 9a099d76..7ccf4fdd 100644
--- a/samples/ktor-web-app/server/src/test/kotlin/ApplicationTest.kt
+++ b/samples/ktor-web-app/server/src/test/kotlin/ApplicationTest.kt
@@ -5,8 +5,8 @@
 import io.ktor.server.testing.*
 import kotlinx.coroutines.flow.toList
 import kotlinx.rpc.client.withService
-import kotlinx.rpc.internal.streamScoped
 import kotlinx.rpc.serialization.json
+import kotlinx.rpc.streamScoped
 import kotlinx.rpc.transport.ktor.client.installRPC
 import kotlinx.rpc.transport.ktor.client.rpc
 import kotlinx.rpc.transport.ktor.client.rpcConfig
diff --git a/samples/ktor-web-app/settings.gradle.kts b/samples/ktor-web-app/settings.gradle.kts
index 2a8508c4..0eb0ca64 100644
--- a/samples/ktor-web-app/settings.gradle.kts
+++ b/samples/ktor-web-app/settings.gradle.kts
@@ -4,11 +4,4 @@
 
 rootProject.name = "ktor-web-app"
 
-pluginManagement {
-    repositories {
-        maven("https://maven.pkg.jetbrains.space/public/p/krpc/maven")
-        gradlePluginPortal()
-    }
-}
-
 include("common", "frontend", "server")
diff --git a/samples/simple-ktor-app/build.gradle.kts b/samples/simple-ktor-app/build.gradle.kts
index 844a8008..6d277554 100644
--- a/samples/simple-ktor-app/build.gradle.kts
+++ b/samples/simple-ktor-app/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
     kotlin("plugin.serialization") version "1.9.24"
     id("io.ktor.plugin") version "2.3.11"
     id("com.google.devtools.ksp") version "1.9.24-1.0.20"
-    id("org.jetbrains.kotlinx.rpc.plugin") version "0.1.0"
+    id("org.jetbrains.kotlinx.rpc.plugin") version "0.2.0"
 }
 
 val kotlin_version: String by project
@@ -24,7 +24,6 @@ application {
 }
 
 repositories {
-    maven(url = "https://maven.pkg.jetbrains.space/public/p/krpc/maven")
     mavenCentral()
 }
 
@@ -33,12 +32,12 @@ kotlin {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlinx:kotlinx-rpc-runtime-client")
-    implementation("org.jetbrains.kotlinx:kotlinx-rpc-runtime-server")
-    implementation("org.jetbrains.kotlinx:kotlinx-rpc-runtime-serialization-json")
+    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-client")
+    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-server")
+    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-serialization-json")
 
-    implementation("org.jetbrains.kotlinx:kotlinx-rpc-transport-ktor-client")
-    implementation("org.jetbrains.kotlinx:kotlinx-rpc-transport-ktor-server")
+    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-client")
+    implementation("org.jetbrains.kotlinx:kotlinx-rpc-krpc-ktor-server")
 
     implementation("io.ktor:ktor-client-cio-jvm")
     implementation("io.ktor:ktor-server-netty-jvm")
diff --git a/samples/simple-ktor-app/settings.gradle.kts b/samples/simple-ktor-app/settings.gradle.kts
index 911c4ed5..defdac52 100644
--- a/samples/simple-ktor-app/settings.gradle.kts
+++ b/samples/simple-ktor-app/settings.gradle.kts
@@ -3,10 +3,3 @@
  */
 
 rootProject.name = "simple-ktor-app"
-
-pluginManagement {
-    repositories {
-        maven(url = "https://maven.pkg.jetbrains.space/public/p/krpc/maven")
-        gradlePluginPortal()
-    }
-}
diff --git a/samples/simple-ktor-app/src/main/kotlin/Client.kt b/samples/simple-ktor-app/src/main/kotlin/Client.kt
index ce068274..111220a4 100644
--- a/samples/simple-ktor-app/src/main/kotlin/Client.kt
+++ b/samples/simple-ktor-app/src/main/kotlin/Client.kt
@@ -10,8 +10,8 @@ import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.rpc.client.withService
-import kotlinx.rpc.internal.streamScoped
 import kotlinx.rpc.serialization.json
+import kotlinx.rpc.streamScoped
 import kotlinx.rpc.transport.ktor.client.rpc
 import kotlinx.rpc.transport.ktor.client.rpcConfig