diff --git a/gradle.properties b/gradle.properties
index 92d71634..cf51d0b1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
 group=io.rsocket.rpc
-version=0.2.2
+version=0.2.3
diff --git a/rsocket-rpc-core/build.gradle b/rsocket-rpc-core/build.gradle
index 4ff4e5f9..e99605bb 100644
--- a/rsocket-rpc-core/build.gradle
+++ b/rsocket-rpc-core/build.gradle
@@ -10,8 +10,8 @@ dependencies {
     compile 'io.opentracing:opentracing-api:0.31.0'
     compile 'javax.inject:javax.inject:1'
     compile 'com.google.protobuf:protobuf-java:3.6.1'
-    compile 'io.rsocket:rsocket-core:0.11.7'
-    compile 'io.rsocket:rsocket-transport-netty:0.11.7'
+    compile 'io.rsocket:rsocket-core:0.11.8'
+    compile 'io.rsocket:rsocket-transport-netty:0.11.8'
     compile 'io.micrometer:micrometer-core:1.0.6'
 
     protobuf project(':rsocket-rpc-metrics-idl')
diff --git a/rsocket-rpc-core/src/main/java/io/rsocket/rpc/rsocket/RequestHandlingRSocket.java b/rsocket-rpc-core/src/main/java/io/rsocket/rpc/rsocket/RequestHandlingRSocket.java
index e3a87413..935004b7 100644
--- a/rsocket-rpc-core/src/main/java/io/rsocket/rpc/rsocket/RequestHandlingRSocket.java
+++ b/rsocket-rpc-core/src/main/java/io/rsocket/rpc/rsocket/RequestHandlingRSocket.java
@@ -4,7 +4,7 @@
 import io.netty.util.ReferenceCountUtil;
 import io.rsocket.AbstractRSocket;
 import io.rsocket.Payload;
-import io.rsocket.internal.SwitchTransform;
+import io.rsocket.internal.SwitchTransformFlux;
 import io.rsocket.rpc.RSocketRpcService;
 import io.rsocket.rpc.exception.ServiceNotFound;
 import io.rsocket.rpc.frames.Metadata;
@@ -92,7 +92,7 @@ public Flux<Payload> requestStream(Payload payload) {
 
   @Override
   public Flux<Payload> requestChannel(Publisher<Payload> payloads) {
-    return new SwitchTransform<>(
+    return new SwitchTransformFlux<>(
         payloads,
         (payload, flux) -> {
           try {
diff --git a/rsocket-rpc-protobuf/build.gradle b/rsocket-rpc-protobuf/build.gradle
index 4eea466a..a0542d16 100644
--- a/rsocket-rpc-protobuf/build.gradle
+++ b/rsocket-rpc-protobuf/build.gradle
@@ -54,7 +54,7 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 dependencies {
-    compileOnly 'io.projectreactor:reactor-core:3.1.9.RELEASE'
+    compileOnly 'io.projectreactor:reactor-core:3.2.0.RELEASE'
     compileOnly 'com.google.protobuf:protobuf-java:3.6.1'
     compileOnly 'javax.inject:javax.inject:1'
 }
diff --git a/rsocket-rpc-protobuf/src/java_plugin/cpp/blocking_java_generator.cpp b/rsocket-rpc-protobuf/src/java_plugin/cpp/blocking_java_generator.cpp
index 20e7a208..d529d091 100644
--- a/rsocket-rpc-protobuf/src/java_plugin/cpp/blocking_java_generator.cpp
+++ b/rsocket-rpc-protobuf/src/java_plugin/cpp/blocking_java_generator.cpp
@@ -1006,7 +1006,7 @@ static void PrintServer(const ServiceDescriptor* service,
   } else {
     p->Print(
         *vars,
-        "return new $SwitchTransform$<$Payload$, $Payload$>(payloads, new $BiFunction$<$Payload$, $Flux$<$Payload$>, $Publisher$<? extends $Payload$>>() {\n");
+        "return new $SwitchTransformFlux$<$Payload$, $Payload$>(payloads, new $BiFunction$<$Payload$, $Flux$<$Payload$>, $Publisher$<? extends $Payload$>>() {\n");
     p->Indent();
     p->Print(
         *vars,
@@ -1212,7 +1212,7 @@ void GenerateServer(const ServiceDescriptor* service,
   vars["RSocket"] = "io.rsocket.RSocket";
   vars["Payload"] = "io.rsocket.Payload";
   vars["ByteBufPayload"] = "io.rsocket.util.ByteBufPayload";
-  vars["SwitchTransform"] = "io.rsocket.internal.SwitchTransform";
+  vars["SwitchTransformFlux"] = "io.rsocket.internal.SwitchTransformFlux";
   vars["AbstractRSocketService"] = "io.rsocket.rpc.AbstractRSocketService";
   vars["RSocketRpcMetadata"] = "io.rsocket.rpc.frames.Metadata";
   vars["RSocketRpcMetrics"] = "io.rsocket.rpc.metrics.Metrics";
diff --git a/rsocket-rpc-protobuf/src/java_plugin/cpp/java_generator.cpp b/rsocket-rpc-protobuf/src/java_plugin/cpp/java_generator.cpp
index 5485c890..c7503f1c 100644
--- a/rsocket-rpc-protobuf/src/java_plugin/cpp/java_generator.cpp
+++ b/rsocket-rpc-protobuf/src/java_plugin/cpp/java_generator.cpp
@@ -1394,7 +1394,7 @@ static void PrintServer(const ServiceDescriptor* service,
   } else {
     p->Print(
         *vars,
-        "return new $SwitchTransform$<$Payload$, $Payload$>(payloads, new $BiFunction$<$Payload$, $Flux$<$Payload$>, $Publisher$<? extends $Payload$>>() {\n");
+        "return new $SwitchTransformFlux$<$Payload$, $Payload$>(payloads, new $BiFunction$<$Payload$, $Flux$<$Payload$>, $Publisher$<? extends $Payload$>>() {\n");
     p->Indent();
     p->Print(
         *vars,
@@ -1603,7 +1603,7 @@ void GenerateServer(const ServiceDescriptor* service,
   vars["RSocket"] = "io.rsocket.RSocket";
   vars["Payload"] = "io.rsocket.Payload";
   vars["ByteBufPayload"] = "io.rsocket.util.ByteBufPayload";
-  vars["SwitchTransform"] = "io.rsocket.internal.SwitchTransform";
+  vars["SwitchTransformFlux"] = "io.rsocket.internal.SwitchTransformFlux";
   vars["AbstractRSocketService"] = "io.rsocket.rpc.AbstractRSocketService";
   vars["RSocketRpcMetadata"] = "io.rsocket.rpc.frames.Metadata";
   vars["RSocketRpcMetrics"] = "io.rsocket.rpc.metrics.Metrics";