diff --git a/src/dorkbox/network/rmi/messages/ObjectResponseSerializer.kt b/src/dorkbox/network/rmi/messages/RmiObjectSerializer.kt
similarity index 96%
rename from src/dorkbox/network/rmi/messages/ObjectResponseSerializer.kt
rename to src/dorkbox/network/rmi/messages/RmiObjectSerializer.kt
index 022936e1..28a01f2e 100644
--- a/src/dorkbox/network/rmi/messages/ObjectResponseSerializer.kt
+++ b/src/dorkbox/network/rmi/messages/RmiObjectSerializer.kt
@@ -51,7 +51,7 @@ import dorkbox.network.serialization.KryoExtra
  *
  * @author Nathan Sweet <misc></misc>@n4te.com>
  */
-class ObjectResponseSerializer(private val rmiImplToIface: IdentityMap<Class<*>, Class<*>>) : Serializer<Any>(false) {
+class RmiObjectSerializer(private val rmiImplToIface: IdentityMap<Class<*>, Class<*>>) : Serializer<Any>(false) {
     override fun write(kryo: Kryo, output: Output, `object`: Any) {
         println(" FIX ObjectResponseSerializer ")
         val kryoExtra = kryo as KryoExtra
diff --git a/src/dorkbox/network/serialization/ClassRegistrationIfaceAndImpl.kt b/src/dorkbox/network/serialization/ClassRegistrationIfaceAndImpl.kt
index dc6db16f..43926476 100644
--- a/src/dorkbox/network/serialization/ClassRegistrationIfaceAndImpl.kt
+++ b/src/dorkbox/network/serialization/ClassRegistrationIfaceAndImpl.kt
@@ -15,12 +15,13 @@
  */
 package dorkbox.network.serialization
 
-import dorkbox.network.rmi.messages.ObjectResponseSerializer
+import dorkbox.network.rmi.messages.RmiObjectSerializer
 
-internal class ClassRegistrationIfaceAndImpl(ifaceClass: Class<*>, val implClass: Class<*>, objectResponseSerializer: ObjectResponseSerializer) : ClassRegistration(ifaceClass) {
+internal class ClassRegistrationIfaceAndImpl(ifaceClass: Class<*>, val implClass: Class<*>, rmiObjectSerializer: RmiObjectSerializer) :
+        ClassRegistration(implClass) {
 
     init {
-        this.serializer = objectResponseSerializer
+        this.serializer = rmiObjectSerializer
     }
 
     override fun register(kryo: KryoExtra) {
diff --git a/src/dorkbox/network/serialization/Serialization.kt b/src/dorkbox/network/serialization/Serialization.kt
index 99fecd7b..94ffbf0b 100644
--- a/src/dorkbox/network/serialization/Serialization.kt
+++ b/src/dorkbox/network/serialization/Serialization.kt
@@ -36,8 +36,8 @@ import dorkbox.network.rmi.messages.MethodRequest
 import dorkbox.network.rmi.messages.MethodRequestSerializer
 import dorkbox.network.rmi.messages.MethodResponse
 import dorkbox.network.rmi.messages.MethodResponseSerializer
-import dorkbox.network.rmi.messages.ObjectResponseSerializer
 import dorkbox.network.rmi.messages.RmiClientRequestSerializer
+import dorkbox.network.rmi.messages.RmiObjectSerializer
 import dorkbox.os.OS
 import dorkbox.util.serialization.SerializationDefaults
 import kotlinx.coroutines.channels.Channel
@@ -133,7 +133,7 @@ class Serialization(private val references: Boolean,
     private val methodRequestSerializer = MethodRequestSerializer()
     private val methodResponseSerializer = MethodResponseSerializer()
     private val objectRequestSerializer = RmiClientRequestSerializer()
-    private val objectResponseSerializer = ObjectResponseSerializer(rmiImplToIface)
+    private val objectResponseSerializer = RmiObjectSerializer(rmiImplToIface)
     private val continuationRequestSerializer = ContinuationSerializer()