diff --git a/src/main/java/org/jboss/netty/handler/codec/marshalling/ThreadLocalUnmarshallingProvider.java b/src/main/java/org/jboss/netty/handler/codec/marshalling/ThreadLocalUnmarshallerProvider.java
similarity index 90%
rename from src/main/java/org/jboss/netty/handler/codec/marshalling/ThreadLocalUnmarshallingProvider.java
rename to src/main/java/org/jboss/netty/handler/codec/marshalling/ThreadLocalUnmarshallerProvider.java
index 317c4cdf2c..6fe5afcf11 100644
--- a/src/main/java/org/jboss/netty/handler/codec/marshalling/ThreadLocalUnmarshallingProvider.java
+++ b/src/main/java/org/jboss/netty/handler/codec/marshalling/ThreadLocalUnmarshallerProvider.java
@@ -27,19 +27,19 @@ import org.jboss.netty.channel.Channel;
  * 
  *
  */
-public class ThreadLocalUnmarshallingProvider implements UnmarshallerProvider {
+public class ThreadLocalUnmarshallerProvider implements UnmarshallerProvider {
     private final ThreadLocal<Unmarshaller> unmarshallers = new ThreadLocal<Unmarshaller>();
 
     private final MarshallerFactory factory;
     private final MarshallingConfiguration config;
     
     /**
-     * Create a new instance of the {@link ThreadLocalUnmarshallingProvider}
+     * Create a new instance of the {@link ThreadLocalUnmarshallerProvider}
      * 
      * @param factory   the {@link MarshallerFactory} to use to create {@link Unmarshaller}'s if needed
      * @param config    the {@link MarshallingConfiguration} to use
      */
-    public ThreadLocalUnmarshallingProvider(MarshallerFactory factory, MarshallingConfiguration config) {
+    public ThreadLocalUnmarshallerProvider(MarshallerFactory factory, MarshallingConfiguration config) {
         this.factory = factory;
         this.config = config;
     }
diff --git a/src/test/java/org/jboss/netty/handler/codec/marshalling/RiverThreadLocalCompatibleMarshallingDecoderTest.java b/src/test/java/org/jboss/netty/handler/codec/marshalling/RiverThreadLocalCompatibleMarshallingDecoderTest.java
index 343f5272d5..bfee9cf0b1 100644
--- a/src/test/java/org/jboss/netty/handler/codec/marshalling/RiverThreadLocalCompatibleMarshallingDecoderTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/marshalling/RiverThreadLocalCompatibleMarshallingDecoderTest.java
@@ -22,7 +22,7 @@ public class RiverThreadLocalCompatibleMarshallingDecoderTest extends RiverCompa
 
     @Override
     protected UnmarshallerProvider createProvider(MarshallerFactory factory, MarshallingConfiguration config) {
-        return new ThreadLocalUnmarshallingProvider(factory, config);
+        return new ThreadLocalUnmarshallerProvider(factory, config);
     }
 
 
diff --git a/src/test/java/org/jboss/netty/handler/codec/marshalling/SerialThreadLocalCompatibleMarshallingDecoderTest.java b/src/test/java/org/jboss/netty/handler/codec/marshalling/SerialThreadLocalCompatibleMarshallingDecoderTest.java
index 2aa745719e..fe13d6dae8 100644
--- a/src/test/java/org/jboss/netty/handler/codec/marshalling/SerialThreadLocalCompatibleMarshallingDecoderTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/marshalling/SerialThreadLocalCompatibleMarshallingDecoderTest.java
@@ -23,7 +23,7 @@ public class SerialThreadLocalCompatibleMarshallingDecoderTest extends SerialCom
 
     @Override
     protected UnmarshallerProvider createProvider(MarshallerFactory factory, MarshallingConfiguration config) {
-        return new ThreadLocalUnmarshallingProvider(factory, config);
+        return new ThreadLocalUnmarshallerProvider(factory, config);
     }
 
 }