diff --git a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaderBlockCompressor.java b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaderBlockCompressor.java
index 8be832c9e4..8587e69488 100644
--- a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaderBlockCompressor.java
+++ b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaderBlockCompressor.java
@@ -37,11 +37,14 @@ abstract class SpdyHeaderBlockCompressor {
         USE_ZLIB = java7;
     }
 
-    static SpdyHeaderBlockCompressor newInstance(int compressionLevel, int windowBits, int memLevel) {
+    static SpdyHeaderBlockCompressor newInstance(
+            int compressionLevel, int windowBits, int memLevel) {
+
         if (USE_ZLIB) {
-            return new SpdyZlibEncoder(compressionLevel);
+            return new SpdyHeaderBlockZlibCompressor(compressionLevel);
         } else {
-            return new SpdyJZlibEncoder(compressionLevel, windowBits, memLevel);
+            return new SpdyHeaderBlockJZlibCompressor(
+                    compressionLevel, windowBits, memLevel);
         }
     }
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaderBlockDecompressor.java b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaderBlockDecompressor.java
index e2325033cf..044ea3527d 100644
--- a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaderBlockDecompressor.java
+++ b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaderBlockDecompressor.java
@@ -20,7 +20,7 @@ import org.jboss.netty.buffer.ChannelBuffer;
 abstract class SpdyHeaderBlockDecompressor {
 
     static SpdyHeaderBlockDecompressor newInstance() {
-        return new SpdyJZlibDecoder();
+        return new SpdyHeaderBlockJZlibDecompressor();
     }
 
     abstract void setInput(ChannelBuffer compressed);
diff --git a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyJZlibEncoder.java b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaderBlockJZlibCompressor.java
similarity index 95%
rename from src/main/java/org/jboss/netty/handler/codec/spdy/SpdyJZlibEncoder.java
rename to src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaderBlockJZlibCompressor.java
index 7ac0f19883..b59d6f100d 100644
--- a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyJZlibEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaderBlockJZlibCompressor.java
@@ -22,11 +22,11 @@ import org.jboss.netty.handler.codec.compression.CompressionException;
 import org.jboss.netty.util.internal.jzlib.JZlib;
 import org.jboss.netty.util.internal.jzlib.ZStream;
 
-class SpdyJZlibEncoder extends SpdyHeaderBlockCompressor {
+class SpdyHeaderBlockJZlibCompressor extends SpdyHeaderBlockCompressor {
 
     private final ZStream z = new ZStream();
 
-    public SpdyJZlibEncoder(int compressionLevel, int windowBits, int memLevel) {
+    public SpdyHeaderBlockJZlibCompressor(int compressionLevel, int windowBits, int memLevel) {
         if (compressionLevel < 0 || compressionLevel > 9) {
             throw new IllegalArgumentException(
                     "compressionLevel: " + compressionLevel + " (expected: 0-9)");
diff --git a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyJZlibDecoder.java b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaderBlockJZlibDecompressor.java
similarity index 94%
rename from src/main/java/org/jboss/netty/handler/codec/spdy/SpdyJZlibDecoder.java
rename to src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaderBlockJZlibDecompressor.java
index 0e1a3930f3..63f31f1b49 100644
--- a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyJZlibDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaderBlockJZlibDecompressor.java
@@ -22,12 +22,12 @@ import org.jboss.netty.util.internal.jzlib.ZStream;
 
 import static org.jboss.netty.handler.codec.spdy.SpdyCodecUtil.*;
 
-class SpdyJZlibDecoder extends SpdyHeaderBlockDecompressor {
+class SpdyHeaderBlockJZlibDecompressor extends SpdyHeaderBlockDecompressor {
 
     private final byte[] out = new byte[8192];
     private final ZStream z = new ZStream();
 
-    public SpdyJZlibDecoder() {
+    public SpdyHeaderBlockJZlibDecompressor() {
         int resultCode;
         resultCode = z.inflateInit(JZlib.W_ZLIB);
         if (resultCode != JZlib.Z_OK) {
diff --git a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyZlibEncoder.java b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaderBlockZlibCompressor.java
similarity index 92%
rename from src/main/java/org/jboss/netty/handler/codec/spdy/SpdyZlibEncoder.java
rename to src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaderBlockZlibCompressor.java
index 4a57ccc1da..ea8dc3f7d1 100644
--- a/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyZlibEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/spdy/SpdyHeaderBlockZlibCompressor.java
@@ -21,12 +21,12 @@ import org.jboss.netty.buffer.ChannelBuffer;
 
 import static org.jboss.netty.handler.codec.spdy.SpdyCodecUtil.*;
 
-class SpdyZlibEncoder extends SpdyHeaderBlockCompressor {
+class SpdyHeaderBlockZlibCompressor extends SpdyHeaderBlockCompressor {
 
     private final byte[] out = new byte[8192];
     private final Deflater compressor;
 
-    public SpdyZlibEncoder(int compressionLevel) {
+    public SpdyHeaderBlockZlibCompressor(int compressionLevel) {
         if (compressionLevel < 0 || compressionLevel > 9) {
             throw new IllegalArgumentException(
                     "compressionLevel: " + compressionLevel + " (expected: 0-9)");