diff --git a/jetty.bundles.f.source/feature.xml b/jetty.bundles.f.source/feature.xml
index 4b57ae6..b2e76ad 100644
--- a/jetty.bundles.f.source/feature.xml
+++ b/jetty.bundles.f.source/feature.xml
@@ -184,35 +184,36 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.jetty.spdy.client.source"
+         id="org.eclipse.jetty.http2.client.source"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.jetty.spdy.core.source"
+         id="org.eclipse.jetty.http2.client.http.source"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+
+   <plugin
+         id="org.eclipse.jetty.http2.server.source"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
     <plugin
-         id="org.eclipse.jetty.spdy.http.common.source"
+         id="org.eclipse.jetty.http2.common.source"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.jetty.spdy.http.server.source"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jetty.spdy.server.source"
+         id="org.eclipse.jetty.http2.hpack.source"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/jetty.bundles.f/feature.xml b/jetty.bundles.f/feature.xml
index 41ba2db..9d72c38 100644
--- a/jetty.bundles.f/feature.xml
+++ b/jetty.bundles.f/feature.xml
@@ -208,39 +208,41 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.jetty.spdy.client"
+         id="org.eclipse.jetty.http2.client"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.jetty.spdy.core"
+         id="org.eclipse.jetty.http2.client.http"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+
+   <plugin
+         id="org.eclipse.jetty.http2.server"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.jetty.spdy.http.common"
+         id="org.eclipse.jetty.http2.common"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.jetty.spdy.http.server"
+         id="org.eclipse.jetty.http2.hpack"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.jetty.spdy.server"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
 
    <plugin
          id="org.eclipse.jetty.util"
diff --git a/pom.xml b/pom.xml
index 248bbb9..1d43a9d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -218,28 +218,28 @@
       <version>${jetty-version}</version>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.spdy</groupId>
-      <artifactId>spdy-client</artifactId>
+      <groupId>org.eclipse.jetty.http2</groupId>
+      <artifactId>http2-client</artifactId>
       <version>${jetty-version}</version>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.spdy</groupId>
-      <artifactId>spdy-core</artifactId>
+      <groupId>org.eclipse.jetty.http2</groupId>
+      <artifactId>http2-http-client-transport</artifactId>
       <version>${jetty-version}</version>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.spdy</groupId>
-      <artifactId>spdy-http-common</artifactId>
+      <groupId>org.eclipse.jetty.http2</groupId>
+      <artifactId>http2-server</artifactId>
       <version>${jetty-version}</version>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.spdy</groupId>
-      <artifactId>spdy-http-server</artifactId>
+      <groupId>org.eclipse.jetty.http2</groupId>
+      <artifactId>http2-common</artifactId>
       <version>${jetty-version}</version>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.spdy</groupId>
-      <artifactId>spdy-server</artifactId>
+      <groupId>org.eclipse.jetty.http2</groupId>
+      <artifactId>http2-hpack</artifactId>
       <version>${jetty-version}</version>
     </dependency>
     <dependency>
@@ -470,33 +470,33 @@
       <version>${jetty-version}</version>
       <classifier>sources</classifier>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.spdy</groupId>
-      <artifactId>spdy-client</artifactId>
+  <dependency>
+      <groupId>org.eclipse.jetty.http2</groupId>
+      <artifactId>http2-client</artifactId>
+      <version>${jetty-version}</version>
+      <classifier>sources</classifier>
+    </dependency>
+  <dependency>
+      <groupId>org.eclipse.jetty.http2</groupId>
+      <artifactId>http2-http-client-transport</artifactId>
+      <version>${jetty-version}</version>
+      <classifier>sources</classifier>
+    </dependency>
+  <dependency>
+      <groupId>org.eclipse.jetty.http2</groupId>
+      <artifactId>http2-server</artifactId>
       <version>${jetty-version}</version>
       <classifier>sources</classifier>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.spdy</groupId>
-      <artifactId>spdy-core</artifactId>
+      <groupId>org.eclipse.jetty.http2</groupId>
+      <artifactId>http2-common</artifactId>
       <version>${jetty-version}</version>
       <classifier>sources</classifier>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.spdy</groupId>
-      <artifactId>spdy-http-common</artifactId>
-      <version>${jetty-version}</version>
-      <classifier>sources</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.spdy</groupId>
-      <artifactId>spdy-http-server</artifactId>
-      <version>${jetty-version}</version>
-      <classifier>sources</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.spdy</groupId>
-      <artifactId>spdy-server</artifactId>
+      <groupId>org.eclipse.jetty.http2</groupId>
+      <artifactId>http2-hpack</artifactId>
       <version>${jetty-version}</version>
       <classifier>sources</classifier>
     </dependency>