diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketClientExtensionHandlerTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketClientExtensionHandlerTest.java
index acaa8e7be7..ab219fb7f1 100644
--- a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketClientExtensionHandlerTest.java
+++ b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketClientExtensionHandlerTest.java
@@ -15,22 +15,21 @@
  */
 package io.netty.handler.codec.http.websocketx.extensions;
 
-import static io.netty.handler.codec.http.websocketx.extensions.WebSocketExtensionTestUtil.*;
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
-import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.embedded.EmbeddedChannel;
 import io.netty.handler.codec.CodecException;
-import io.netty.handler.codec.http.HttpHeaders.Names;
+import io.netty.handler.codec.http.HttpHeaderNames;
 import io.netty.handler.codec.http.HttpRequest;
 import io.netty.handler.codec.http.HttpResponse;
-import io.netty.handler.codec.http.websocketx.WebSocketFrame;
 
 import java.util.Collections;
 import java.util.List;
 
 import org.junit.Test;
 
+import static io.netty.handler.codec.http.websocketx.extensions.WebSocketExtensionTestUtil.*;
+import static org.easymock.EasyMock.*;
+import static org.junit.Assert.*;
+
 public class WebSocketClientExtensionHandlerTest {
 
     WebSocketClientExtensionHandshaker mainHandshakerMock =
@@ -69,14 +68,14 @@ public class WebSocketClientExtensionHandlerTest {
 
         HttpRequest req2 = ch.readOutbound();
         List<WebSocketExtensionData> reqExts = WebSocketExtensionUtil.extractExtensions(
-                req2.headers().get(Names.SEC_WEBSOCKET_EXTENSIONS));
+                req2.headers().get(HttpHeaderNames.SEC_WEBSOCKET_EXTENSIONS));
 
         HttpResponse res = newUpgradeResponse("main");
         ch.writeInbound(res);
 
         HttpResponse res2 = ch.readInbound();
         List<WebSocketExtensionData> resExts = WebSocketExtensionUtil.extractExtensions(
-                res2.headers().get(Names.SEC_WEBSOCKET_EXTENSIONS));
+                res2.headers().get(HttpHeaderNames.SEC_WEBSOCKET_EXTENSIONS));
 
         // test
         assertEquals(2, reqExts.size());
@@ -119,14 +118,14 @@ public class WebSocketClientExtensionHandlerTest {
 
         HttpRequest req2 = ch.readOutbound();
         List<WebSocketExtensionData> reqExts = WebSocketExtensionUtil.extractExtensions(
-                req2.headers().get(Names.SEC_WEBSOCKET_EXTENSIONS));
+                req2.headers().get(HttpHeaderNames.SEC_WEBSOCKET_EXTENSIONS));
 
         HttpResponse res = newUpgradeResponse("fallback");
         ch.writeInbound(res);
 
         HttpResponse res2 = ch.readInbound();
         List<WebSocketExtensionData> resExts = WebSocketExtensionUtil.extractExtensions(
-                res2.headers().get(Names.SEC_WEBSOCKET_EXTENSIONS));
+                res2.headers().get(HttpHeaderNames.SEC_WEBSOCKET_EXTENSIONS));
 
         // test
         assertEquals(2, reqExts.size());
@@ -182,14 +181,14 @@ public class WebSocketClientExtensionHandlerTest {
 
         HttpRequest req2 = ch.readOutbound();
         List<WebSocketExtensionData> reqExts = WebSocketExtensionUtil.extractExtensions(
-                req2.headers().get(Names.SEC_WEBSOCKET_EXTENSIONS));
+                req2.headers().get(HttpHeaderNames.SEC_WEBSOCKET_EXTENSIONS));
 
         HttpResponse res = newUpgradeResponse("main, fallback");
         ch.writeInbound(res);
 
         HttpResponse res2 = ch.readInbound();
         List<WebSocketExtensionData> resExts = WebSocketExtensionUtil.extractExtensions(
-                res2.headers().get(Names.SEC_WEBSOCKET_EXTENSIONS));
+                res2.headers().get(HttpHeaderNames.SEC_WEBSOCKET_EXTENSIONS));
 
         // test
         assertEquals(2, reqExts.size());
@@ -239,7 +238,7 @@ public class WebSocketClientExtensionHandlerTest {
 
         HttpRequest req2 = ch.readOutbound();
         List<WebSocketExtensionData> reqExts = WebSocketExtensionUtil.extractExtensions(
-                req2.headers().get(Names.SEC_WEBSOCKET_EXTENSIONS));
+                req2.headers().get(HttpHeaderNames.SEC_WEBSOCKET_EXTENSIONS));
 
         HttpResponse res = newUpgradeResponse("main, fallback");
         ch.writeInbound(res);
diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketExtensionTestUtil.java b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketExtensionTestUtil.java
index b802246a61..6b7f8ec1c6 100644
--- a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketExtensionTestUtil.java
+++ b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketExtensionTestUtil.java
@@ -17,14 +17,14 @@ package io.netty.handler.codec.http.websocketx.extensions;
 
 import java.util.List;
 
+import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaderValues;
 import org.easymock.EasyMock;
 import org.easymock.IArgumentMatcher;
 
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.http.DefaultHttpRequest;
 import io.netty.handler.codec.http.DefaultHttpResponse;
-import io.netty.handler.codec.http.HttpHeaders.Names;
-import io.netty.handler.codec.http.HttpHeaders.Values;
 import io.netty.handler.codec.http.websocketx.WebSocketFrame;
 import io.netty.handler.codec.http.HttpMethod;
 import io.netty.handler.codec.http.HttpRequest;
@@ -39,12 +39,12 @@ public final class WebSocketExtensionTestUtil {
         HttpRequest req = ReferenceCountUtil.releaseLater(new DefaultHttpRequest(
                 HttpVersion.HTTP_1_1, HttpMethod.GET, "/chat"));
 
-        req.headers().set(Names.HOST, "server.example.com");
-        req.headers().set(Names.UPGRADE, Values.WEBSOCKET.toString().toLowerCase());
-        req.headers().set(Names.CONNECTION, "Upgrade");
-        req.headers().set(Names.ORIGIN, "http://example.com");
+        req.headers().set(HttpHeaderNames.HOST, "server.example.com");
+        req.headers().set(HttpHeaderNames.UPGRADE, HttpHeaderValues.WEBSOCKET.toString().toLowerCase());
+        req.headers().set(HttpHeaderNames.CONNECTION, "Upgrade");
+        req.headers().set(HttpHeaderNames.ORIGIN, "http://example.com");
         if (ext != null) {
-            req.headers().set(Names.SEC_WEBSOCKET_EXTENSIONS, ext);
+            req.headers().set(HttpHeaderNames.SEC_WEBSOCKET_EXTENSIONS, ext);
         }
 
         return req;
@@ -54,12 +54,12 @@ public final class WebSocketExtensionTestUtil {
         HttpResponse res = ReferenceCountUtil.releaseLater(new DefaultHttpResponse(
                 HttpVersion.HTTP_1_1, HttpResponseStatus.SWITCHING_PROTOCOLS));
 
-        res.headers().set(Names.HOST, "server.example.com");
-        res.headers().set(Names.UPGRADE, Values.WEBSOCKET.toString().toLowerCase());
-        res.headers().set(Names.CONNECTION, "Upgrade");
-        res.headers().set(Names.ORIGIN, "http://example.com");
+        res.headers().set(HttpHeaderNames.HOST, "server.example.com");
+        res.headers().set(HttpHeaderNames.UPGRADE, HttpHeaderValues.WEBSOCKET.toString().toLowerCase());
+        res.headers().set(HttpHeaderNames.CONNECTION, "Upgrade");
+        res.headers().set(HttpHeaderNames.ORIGIN, "http://example.com");
         if (ext != null) {
-            res.headers().set(Names.SEC_WEBSOCKET_EXTENSIONS, ext);
+            res.headers().set(HttpHeaderNames.SEC_WEBSOCKET_EXTENSIONS, ext);
         }
 
         return res;
diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketServerExtensionHandlerTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketServerExtensionHandlerTest.java
index cf1bd420ec..81e4a00a25 100644
--- a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketServerExtensionHandlerTest.java
+++ b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/WebSocketServerExtensionHandlerTest.java
@@ -15,22 +15,20 @@
  */
 package io.netty.handler.codec.http.websocketx.extensions;
 
-import static io.netty.handler.codec.http.websocketx.extensions.WebSocketExtensionTestUtil.*;
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
-import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.embedded.EmbeddedChannel;
-import io.netty.handler.codec.CodecException;
-import io.netty.handler.codec.http.HttpHeaders.Names;
+import io.netty.handler.codec.http.HttpHeaderNames;
 import io.netty.handler.codec.http.HttpRequest;
 import io.netty.handler.codec.http.HttpResponse;
-import io.netty.handler.codec.http.websocketx.WebSocketFrame;
 
 import java.util.Collections;
 import java.util.List;
 
 import org.junit.Test;
 
+import static io.netty.handler.codec.http.websocketx.extensions.WebSocketExtensionTestUtil.*;
+import static org.easymock.EasyMock.*;
+import static org.junit.Assert.*;
+
 public class WebSocketServerExtensionHandlerTest {
 
     WebSocketServerExtensionHandshaker mainHandshakerMock =
@@ -79,7 +77,7 @@ public class WebSocketServerExtensionHandlerTest {
 
         HttpResponse res2 = ch.readOutbound();
         List<WebSocketExtensionData> resExts = WebSocketExtensionUtil.extractExtensions(
-                res2.headers().get(Names.SEC_WEBSOCKET_EXTENSIONS));
+                res2.headers().get(HttpHeaderNames.SEC_WEBSOCKET_EXTENSIONS));
 
         // test
         assertEquals(1, resExts.size());
@@ -130,7 +128,7 @@ public class WebSocketServerExtensionHandlerTest {
 
         HttpResponse res2 = ch.readOutbound();
         List<WebSocketExtensionData> resExts = WebSocketExtensionUtil.extractExtensions(
-                res2.headers().get(Names.SEC_WEBSOCKET_EXTENSIONS));
+                res2.headers().get(HttpHeaderNames.SEC_WEBSOCKET_EXTENSIONS));
 
         // test
         assertEquals(2, resExts.size());
@@ -170,7 +168,7 @@ public class WebSocketServerExtensionHandlerTest {
         HttpResponse res2 = ch.readOutbound();
 
         // test
-        assertFalse(res2.headers().contains(Names.SEC_WEBSOCKET_EXTENSIONS));
+        assertFalse(res2.headers().contains(HttpHeaderNames.SEC_WEBSOCKET_EXTENSIONS));
     }
 
 }
diff --git a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/WebSocketServerCompressionHandlerTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/WebSocketServerCompressionHandlerTest.java
index 0b9b48fcee..d01fb30abb 100644
--- a/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/WebSocketServerCompressionHandlerTest.java
+++ b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/extensions/compression/WebSocketServerCompressionHandlerTest.java
@@ -15,22 +15,23 @@
  */
 package io.netty.handler.codec.http.websocketx.extensions.compression;
 
-import static io.netty.handler.codec.http.websocketx.extensions.compression.
-        PerMessageDeflateServerExtensionHandshaker.*;
-import static io.netty.handler.codec.http.websocketx.extensions.WebSocketExtensionTestUtil.*;
 import io.netty.channel.embedded.EmbeddedChannel;
+import io.netty.handler.codec.http.HttpHeaderNames;
 import io.netty.handler.codec.http.HttpRequest;
 import io.netty.handler.codec.http.HttpResponse;
 import io.netty.handler.codec.http.websocketx.extensions.WebSocketExtensionData;
 import io.netty.handler.codec.http.websocketx.extensions.WebSocketExtensionUtil;
 import io.netty.handler.codec.http.websocketx.extensions.WebSocketServerExtensionHandler;
-import io.netty.handler.codec.http.HttpHeaders.Names;
 
 import java.util.List;
 
 import org.junit.Assert;
 import org.junit.Test;
 
+import static io.netty.handler.codec.http.websocketx.extensions.compression.
+        PerMessageDeflateServerExtensionHandshaker.*;
+import static io.netty.handler.codec.http.websocketx.extensions.WebSocketExtensionTestUtil.*;
+
 public class WebSocketServerCompressionHandlerTest {
 
     @Test
@@ -45,7 +46,7 @@ public class WebSocketServerCompressionHandlerTest {
 
         HttpResponse res2 = ch.readOutbound();
         List<WebSocketExtensionData> exts = WebSocketExtensionUtil.extractExtensions(
-                res2.headers().get(Names.SEC_WEBSOCKET_EXTENSIONS));
+                res2.headers().get(HttpHeaderNames.SEC_WEBSOCKET_EXTENSIONS));
 
         Assert.assertEquals(PERMESSAGE_DEFLATE_EXTENSION, exts.get(0).name());
         Assert.assertTrue(exts.get(0).parameters().isEmpty());
@@ -66,7 +67,7 @@ public class WebSocketServerCompressionHandlerTest {
 
         HttpResponse res2 = ch.readOutbound();
         List<WebSocketExtensionData> exts = WebSocketExtensionUtil.extractExtensions(
-                res2.headers().get(Names.SEC_WEBSOCKET_EXTENSIONS));
+                res2.headers().get(HttpHeaderNames.SEC_WEBSOCKET_EXTENSIONS));
 
         Assert.assertEquals(PERMESSAGE_DEFLATE_EXTENSION, exts.get(0).name());
         Assert.assertEquals("10", exts.get(0).parameters().get(CLIENT_MAX_WINDOW));
@@ -87,7 +88,7 @@ public class WebSocketServerCompressionHandlerTest {
 
         HttpResponse res2 = ch.readOutbound();
         List<WebSocketExtensionData> exts = WebSocketExtensionUtil.extractExtensions(
-                res2.headers().get(Names.SEC_WEBSOCKET_EXTENSIONS));
+                res2.headers().get(HttpHeaderNames.SEC_WEBSOCKET_EXTENSIONS));
 
         Assert.assertEquals(PERMESSAGE_DEFLATE_EXTENSION, exts.get(0).name());
         Assert.assertTrue(exts.get(0).parameters().isEmpty());
@@ -108,7 +109,7 @@ public class WebSocketServerCompressionHandlerTest {
 
         HttpResponse res2 = ch.readOutbound();
         List<WebSocketExtensionData> exts = WebSocketExtensionUtil.extractExtensions(
-                res2.headers().get(Names.SEC_WEBSOCKET_EXTENSIONS));
+                res2.headers().get(HttpHeaderNames.SEC_WEBSOCKET_EXTENSIONS));
 
         Assert.assertEquals(PERMESSAGE_DEFLATE_EXTENSION, exts.get(0).name());
         Assert.assertEquals("10", exts.get(0).parameters().get(SERVER_MAX_WINDOW));
@@ -129,7 +130,7 @@ public class WebSocketServerCompressionHandlerTest {
 
         HttpResponse res2 = ch.readOutbound();
 
-        Assert.assertFalse(res2.headers().contains(Names.SEC_WEBSOCKET_EXTENSIONS));
+        Assert.assertFalse(res2.headers().contains(HttpHeaderNames.SEC_WEBSOCKET_EXTENSIONS));
         Assert.assertTrue(ch.pipeline().get(PerMessageDeflateDecoder.class) == null);
         Assert.assertTrue(ch.pipeline().get(PerMessageDeflateEncoder.class) == null);
     }
@@ -146,7 +147,7 @@ public class WebSocketServerCompressionHandlerTest {
 
         HttpResponse res2 = ch.readOutbound();
 
-        Assert.assertFalse(res2.headers().contains(Names.SEC_WEBSOCKET_EXTENSIONS));
+        Assert.assertFalse(res2.headers().contains(HttpHeaderNames.SEC_WEBSOCKET_EXTENSIONS));
         Assert.assertTrue(ch.pipeline().get(PerMessageDeflateDecoder.class) == null);
         Assert.assertTrue(ch.pipeline().get(PerMessageDeflateEncoder.class) == null);
     }
@@ -163,7 +164,7 @@ public class WebSocketServerCompressionHandlerTest {
 
         HttpResponse res2 = ch.readOutbound();
         List<WebSocketExtensionData> exts = WebSocketExtensionUtil.extractExtensions(
-                res2.headers().get(Names.SEC_WEBSOCKET_EXTENSIONS));
+                res2.headers().get(HttpHeaderNames.SEC_WEBSOCKET_EXTENSIONS));
 
         Assert.assertEquals(PERMESSAGE_DEFLATE_EXTENSION, exts.get(0).name());
         Assert.assertTrue(exts.get(0).parameters().isEmpty());
@@ -185,7 +186,7 @@ public class WebSocketServerCompressionHandlerTest {
 
         HttpResponse res2 = ch.readOutbound();
         List<WebSocketExtensionData> exts = WebSocketExtensionUtil.extractExtensions(
-                res2.headers().get(Names.SEC_WEBSOCKET_EXTENSIONS));
+                res2.headers().get(HttpHeaderNames.SEC_WEBSOCKET_EXTENSIONS));
 
         Assert.assertEquals(PERMESSAGE_DEFLATE_EXTENSION, exts.get(0).name());
         Assert.assertTrue(exts.get(0).parameters().isEmpty());