diff --git a/jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/HTTPSPDYServerConnector.java b/jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/HTTPSPDYServerConnector.java
index 540c23c2746..876fb4c467f 100644
--- a/jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/HTTPSPDYServerConnector.java
+++ b/jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/HTTPSPDYServerConnector.java
@@ -52,9 +52,9 @@ public class HTTPSPDYServerConnector extends SPDYServerConnector
         super(server, sslContextFactory, null);
         clearConnectionFactories();
         // The "spdy/3" protocol handles HTTP over SPDY
-        putConnectionFactory("spdy/3", new ServerHTTPSPDYAsyncConnectionFactory(SPDY.V3, getByteBufferPool(), getExecutor(), getScheduler(), this, getPushStrategy(SPDY.V3, pushStrategies)));
+        putConnectionFactory("spdy/3", new ServerHTTPSPDYConnectionFactory(SPDY.V3, getByteBufferPool(), getExecutor(), getScheduler(), this, getPushStrategy(SPDY.V3, pushStrategies)));
         // The "spdy/2" protocol handles HTTP over SPDY
-        putConnectionFactory("spdy/2", new ServerHTTPSPDYAsyncConnectionFactory(SPDY.V2, getByteBufferPool(), getExecutor(), getScheduler(), this, getPushStrategy(SPDY.V2, pushStrategies)));
+        putConnectionFactory("spdy/2", new ServerHTTPSPDYConnectionFactory(SPDY.V2, getByteBufferPool(), getExecutor(), getScheduler(), this, getPushStrategy(SPDY.V2, pushStrategies)));
         // The "http/1.1" protocol handles browsers that support NPN but not SPDY
         putConnectionFactory("http/1.1", new HttpServerConnectionFactory(this));
         // The default connection factory handles plain HTTP on non-SSL or non-NPN connections
diff --git a/jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnectionFactory.java b/jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYConnectionFactory.java
similarity index 93%
rename from jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnectionFactory.java
rename to jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYConnectionFactory.java
index ac4b38a8974..12db87c674a 100644
--- a/jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnectionFactory.java
+++ b/jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYConnectionFactory.java
@@ -38,16 +38,16 @@ import org.eclipse.jetty.spdy.api.server.ServerSessionFrameListener;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;
 
-public class ServerHTTPSPDYAsyncConnectionFactory extends ServerSPDYConnectionFactory
+public class ServerHTTPSPDYConnectionFactory extends ServerSPDYConnectionFactory
 {
     private static final String CHANNEL_ATTRIBUTE = "org.eclipse.jetty.spdy.http.HTTPChannelOverSPDY";
-    private static final Logger logger = Log.getLogger(ServerHTTPSPDYAsyncConnectionFactory.class);
+    private static final Logger logger = Log.getLogger(ServerHTTPSPDYConnectionFactory.class);
 
     private final Connector connector;
     private final PushStrategy pushStrategy;
     private final HttpConfiguration configuration;
 
-    public ServerHTTPSPDYAsyncConnectionFactory(short version, ByteBufferPool bufferPool, Executor threadPool, ScheduledExecutorService scheduler, Connector connector, PushStrategy pushStrategy)
+    public ServerHTTPSPDYConnectionFactory(short version, ByteBufferPool bufferPool, Executor threadPool, ScheduledExecutorService scheduler, Connector connector, PushStrategy pushStrategy)
     {
         super(version, bufferPool, threadPool, scheduler);
         this.connector = connector;
diff --git a/jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/AbstractHTTPSPDYTest.java b/jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/AbstractHTTPSPDYTest.java
index f226ac2f805..d9e44e43a9a 100644
--- a/jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/AbstractHTTPSPDYTest.java
+++ b/jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/AbstractHTTPSPDYTest.java
@@ -93,7 +93,7 @@ public abstract class AbstractHTTPSPDYTest
     {
         // For these tests, we need the connector to speak HTTP over SPDY even in non-SSL
         SPDYServerConnector connector = new HTTPSPDYServerConnector(server);
-        ConnectionFactory defaultFactory = new ServerHTTPSPDYAsyncConnectionFactory(version, connector.getByteBufferPool(), connector.getExecutor(), connector.getScheduler(), connector, new PushStrategy.None());
+        ConnectionFactory defaultFactory = new ServerHTTPSPDYConnectionFactory(version, connector.getByteBufferPool(), connector.getExecutor(), connector.getScheduler(), connector, new PushStrategy.None());
         connector.setDefaultConnectionFactory(defaultFactory);
         return connector;
     }
diff --git a/jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/ReferrerPushStrategyTest.java b/jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/ReferrerPushStrategyTest.java
index b4a97b9b053..7c32b34546f 100644
--- a/jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/ReferrerPushStrategyTest.java
+++ b/jetty-spdy/spdy-jetty-http/src/test/java/org/eclipse/jetty/spdy/http/ReferrerPushStrategyTest.java
@@ -57,7 +57,7 @@ public class ReferrerPushStrategyTest extends AbstractHTTPSPDYTest
     protected SPDYServerConnector newHTTPSPDYServerConnector(short version)
     {
         SPDYServerConnector connector = super.newHTTPSPDYServerConnector(version);
-        ConnectionFactory defaultFactory = new ServerHTTPSPDYAsyncConnectionFactory(version, connector.getByteBufferPool(), connector.getExecutor(), connector.getScheduler(), connector, new ReferrerPushStrategy());
+        ConnectionFactory defaultFactory = new ServerHTTPSPDYConnectionFactory(version, connector.getByteBufferPool(), connector.getExecutor(), connector.getScheduler(), connector, new ReferrerPushStrategy());
         connector.setDefaultConnectionFactory(defaultFactory);
         return connector;
     }
@@ -70,7 +70,7 @@ public class ReferrerPushStrategyTest extends AbstractHTTPSPDYTest
         ReferrerPushStrategy pushStrategy = new ReferrerPushStrategy();
         int referrerPushPeriod = 1000;
         pushStrategy.setReferrerPushPeriod(referrerPushPeriod);
-        ConnectionFactory defaultFactory = new ServerHTTPSPDYAsyncConnectionFactory(version, connector.getByteBufferPool(), connector.getExecutor(), connector.getScheduler(), connector, pushStrategy);
+        ConnectionFactory defaultFactory = new ServerHTTPSPDYConnectionFactory(version, connector.getByteBufferPool(), connector.getExecutor(), connector.getScheduler(), connector, pushStrategy);
         connector.setDefaultConnectionFactory(defaultFactory);
 
         Headers mainRequestHeaders = createHeadersWithoutReferrer(mainResource);
@@ -92,7 +92,7 @@ public class ReferrerPushStrategyTest extends AbstractHTTPSPDYTest
         ReferrerPushStrategy pushStrategy = new ReferrerPushStrategy();
         int referrerPushPeriod = 1000;
         pushStrategy.setReferrerPushPeriod(referrerPushPeriod);
-        ConnectionFactory defaultFactory = new ServerHTTPSPDYAsyncConnectionFactory(version,
+        ConnectionFactory defaultFactory = new ServerHTTPSPDYConnectionFactory(version,
                 connector.getByteBufferPool(), connector.getExecutor(), connector.getScheduler(), connector, pushStrategy);
         connector.setDefaultConnectionFactory(defaultFactory);
 
@@ -114,7 +114,7 @@ public class ReferrerPushStrategyTest extends AbstractHTTPSPDYTest
 
         ReferrerPushStrategy pushStrategy = new ReferrerPushStrategy();
         pushStrategy.setMaxAssociatedResources(1);
-        ConnectionFactory defaultFactory = new ServerHTTPSPDYAsyncConnectionFactory(version,
+        ConnectionFactory defaultFactory = new ServerHTTPSPDYConnectionFactory(version,
                 connector.getByteBufferPool(), connector.getExecutor(), connector.getScheduler(), connector, pushStrategy);
         connector.setDefaultConnectionFactory(defaultFactory);