diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml b/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml
index fc6199c24a0..fabbbe5f396 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/etc/jetty-alpn.xml
@@ -14,7 +14,7 @@
   
   <Call name="addConnectionFactory">
     <Arg>
-      <New id="protonego" class="org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory">
+      <New id="alpn" class="org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory">
         <Arg type="String">
           <Property name="alpn.protocols" default="" />
         </Arg>
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_40.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_40.mod
index 0907aa14e2a..a1002a48cce 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_40.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_40.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_45.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_45.mod
index 0907aa14e2a..a1002a48cce 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_45.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_45.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_51.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_51.mod
index 0907aa14e2a..a1002a48cce 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_51.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_51.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_55.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_55.mod
index 0907aa14e2a..a1002a48cce 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_55.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_55.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_60.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_60.mod
index 0907aa14e2a..a1002a48cce 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_60.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_60.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_65.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_65.mod
index 0907aa14e2a..a1002a48cce 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_65.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_65.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_67.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_67.mod
index 0907aa14e2a..a1002a48cce 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_67.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_67.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_71.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_71.mod
index 3c143b9560b..a5543244945 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_71.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_71.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/7.1.2.v20141202|lib/alpn/alpn-boot-7.1.2.v20141202.jar
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_72.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_72.mod
index 3c143b9560b..a5543244945 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_72.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_72.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/7.1.2.v20141202|lib/alpn/alpn-boot-7.1.2.v20141202.jar
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_75.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_75.mod
index 4538b430797..3f6f912c6d9 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_75.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_75.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/7.1.3.v20150130|lib/alpn/alpn-boot-7.1.3.v20150130.jar
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_76.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_76.mod
index 4538b430797..3f6f912c6d9 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_76.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.7.0_76.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/7.1.3.v20150130|lib/alpn/alpn-boot-7.1.3.v20150130.jar
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0.mod
index 3f119b1df03..cb91b4c2fda 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/8.1.0.v20141016|lib/alpn/alpn-boot-8.1.0.v20141016.jar
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_05.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_05.mod
index 3f119b1df03..cb91b4c2fda 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_05.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_05.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/8.1.0.v20141016|lib/alpn/alpn-boot-8.1.0.v20141016.jar
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_11.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_11.mod
index 3f119b1df03..cb91b4c2fda 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_11.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_11.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/8.1.0.v20141016|lib/alpn/alpn-boot-8.1.0.v20141016.jar
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_20.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_20.mod
index 3f119b1df03..cb91b4c2fda 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_20.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_20.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/8.1.0.v20141016|lib/alpn/alpn-boot-8.1.0.v20141016.jar
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_25.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_25.mod
index 9791e631bcb..6d6d75efa4e 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_25.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_25.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/8.1.2.v20141202|lib/alpn/alpn-boot-8.1.2.v20141202.jar
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_31.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_31.mod
index 1f8b44ee355..e52bd23c1c9 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_31.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-1.8.0_31.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/8.1.3.v20150130|lib/alpn/alpn-boot-8.1.3.v20150130.jar
diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod
index dae2a0cb6c3..2a6a1785ec3 100644
--- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod
+++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod
@@ -4,7 +4,7 @@
 # This modification has a tight dependency on specific recent updates of
 # Java 1.7 and Java 1.8 (Java versions prior to 1.7u40 are not supported).
 #
-# The alpn protonego module will use an appropriate alpn-boot jar for your
+# The alpn module will use an appropriate alpn-boot jar for your
 # specific version of Java.
 #
 # IMPORTANT: Versions of Java that exist after this module was created are
diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java b/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java
index 6e2ee52854a..97f326ed5b8 100644
--- a/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java
+++ b/jetty-start/src/test/java/org/eclipse/jetty/start/ModulesTest.java
@@ -84,55 +84,54 @@ public class ModulesTest
         }
 
         List<String> expected = new ArrayList<>();
-        expected.add("jmx");
-        expected.add("client");
+        expected.add("alpn");
+        expected.add("annotations");
         expected.add("cdi");
+        expected.add("client");
         expected.add("continuation");
+        expected.add("debug");
+        expected.add("deploy");
+        expected.add("ext");
+        expected.add("fcgi");
         expected.add("gzip");
         expected.add("hawtio");
+        expected.add("home-base-warning");
+        expected.add("http");
+        expected.add("http2");
+        expected.add("https");
+        expected.add("ipaccess");
+        expected.add("jaas");
         expected.add("jamon");
         expected.add("jaspi");
         expected.add("jminix");
+        expected.add("jmx");
         expected.add("jmx-remote");
+        expected.add("jndi");
         expected.add("jolokia");
+        expected.add("jsp");
         expected.add("jstl");
         expected.add("jvm");
+        expected.add("logging");
+        expected.add("lowresources");
+        expected.add("monitor");
+        expected.add("plus");
+        expected.add("proxy");
         expected.add("quickstart");
+        expected.add("requestlog");
+        expected.add("resources");
+        expected.add("rewrite");
+        expected.add("security");
+        expected.add("server");
+        expected.add("servlet");
         expected.add("servlets");
         expected.add("setuid");
         expected.add("spring");
-        expected.add("home-base-warning");
-        expected.add("http2");
-        expected.add("fcgi");
-        expected.add("stats");
-        expected.add("deploy");
-        expected.add("debug");
-        expected.add("security");
-        expected.add("ext");
-        expected.add("websocket");
-        expected.add("rewrite");
-        expected.add("ipaccess");
-        expected.add("xinetd");
-        expected.add("proxy");
-        expected.add("webapp");
-        expected.add("jndi");
-        expected.add("lowresources");
-        expected.add("https");
-        expected.add("plus");
-        expected.add("requestlog");
-        expected.add("jsp");
-        // (only present if enabled) expected.add("jsp-impl");
-        expected.add("monitor");
         expected.add("ssl");
-        expected.add("protonego");
-        expected.add("servlet");
-        expected.add("jaas");
-        expected.add("http");
-        expected.add("server");
-        expected.add("annotations");
-        expected.add("resources");
-        expected.add("logging");
-
+        expected.add("stats");
+        expected.add("webapp");
+        expected.add("websocket");
+        expected.add("xinetd");
+        
         ConfigurationAssert.assertContainsUnordered("All Modules",expected,moduleNames);
     }
 
diff --git a/jetty-start/src/test/java/org/eclipse/jetty/start/TestBadUseCases.java b/jetty-start/src/test/java/org/eclipse/jetty/start/TestBadUseCases.java
index 50119f314d1..9c7c02d53bd 100644
--- a/jetty-start/src/test/java/org/eclipse/jetty/start/TestBadUseCases.java
+++ b/jetty-start/src/test/java/org/eclipse/jetty/start/TestBadUseCases.java
@@ -53,8 +53,8 @@ public class TestBadUseCases
                 null});
 
         ret.add(new Object[]{ "http2", 
-                "Missing referenced dependency: protonego-impl/alpn-1.7.0_01", 
-                new String[]{"java.version=1.7.0_01", "protonego=alpn"}});
+                "Missing referenced dependency: alpn-impl/alpn-1.7.0_01", 
+                new String[]{"java.version=1.7.0_01"}});
         
         return ret;
     }
diff --git a/jetty-start/src/test/resources/assert-home-with-http2.txt b/jetty-start/src/test/resources/assert-home-with-http2.txt
index e35f5038bb7..1d47e654da6 100644
--- a/jetty-start/src/test/resources/assert-home-with-http2.txt
+++ b/jetty-start/src/test/resources/assert-home-with-http2.txt
@@ -3,9 +3,9 @@ XML|${jetty.base}/etc/home-base-warning.xml
 XML|${jetty.base}/etc/jetty.xml
 XML|${jetty.base}/etc/jetty-http.xml
 XML|${jetty.base}/etc/jetty-ssl.xml
-XML|${jetty.base}/etc/protonego-alpn.xml
-XML|${jetty.base}/etc/jetty-http2.xml
+XML|${jetty.base}/etc/jetty-alpn.xml
 XML|${jetty.base}/etc/jetty-deploy.xml
+XML|${jetty.base}/etc/jetty-http2.xml
 XML|${jetty.base}/etc/jetty-plus.xml
 XML|${jetty.base}/etc/jetty-annotations.xml
 
@@ -57,7 +57,6 @@ PROP|jetty.keystore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
 PROP|jetty.secure.port=8443
 PROP|jetty.truststore=etc/keystore
 PROP|jetty.truststore.password=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4
-PROP|protonego=alpn
 PROP|ssl.port=8443
 PROP|ssl.timeout=30000
 # (these are the ones set by default from jetty.home modules)
diff --git a/jetty-start/src/test/resources/dist-home/etc/jetty-alpn.xml b/jetty-start/src/test/resources/dist-home/etc/jetty-alpn.xml
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_40.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_40.mod
similarity index 92%
rename from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_40.mod
rename to jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_40.mod
index 0907aa14e2a..a1002a48cce 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_40.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_40.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_45.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_45.mod
similarity index 92%
rename from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_45.mod
rename to jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_45.mod
index 0907aa14e2a..a1002a48cce 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_45.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_45.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_51.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_51.mod
similarity index 92%
rename from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_51.mod
rename to jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_51.mod
index 0907aa14e2a..a1002a48cce 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_51.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_51.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_55.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_55.mod
similarity index 92%
rename from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_55.mod
rename to jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_55.mod
index 0907aa14e2a..a1002a48cce 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_55.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_55.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_60.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_60.mod
similarity index 92%
rename from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_60.mod
rename to jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_60.mod
index 0907aa14e2a..a1002a48cce 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_60.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_60.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_65.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_65.mod
similarity index 92%
rename from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_65.mod
rename to jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_65.mod
index 0907aa14e2a..a1002a48cce 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_65.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_65.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_67.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_67.mod
similarity index 92%
rename from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_67.mod
rename to jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_67.mod
index 0907aa14e2a..a1002a48cce 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_67.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_67.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/7.1.0.v20141016|lib/alpn/alpn-boot-7.1.0.v20141016.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_71.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_71.mod
similarity index 92%
rename from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_71.mod
rename to jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_71.mod
index 3c143b9560b..a5543244945 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_71.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_71.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/7.1.2.v20141202|lib/alpn/alpn-boot-7.1.2.v20141202.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_72.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_72.mod
similarity index 92%
rename from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_72.mod
rename to jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_72.mod
index 3c143b9560b..a5543244945 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_72.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_72.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/7.1.2.v20141202|lib/alpn/alpn-boot-7.1.2.v20141202.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_75.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_75.mod
similarity index 92%
rename from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_75.mod
rename to jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_75.mod
index 4538b430797..3f6f912c6d9 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_75.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_75.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/7.1.3.v20150130|lib/alpn/alpn-boot-7.1.3.v20150130.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_76.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_76.mod
similarity index 92%
rename from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_76.mod
rename to jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_76.mod
index 4538b430797..3f6f912c6d9 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.7.0_76.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.7.0_76.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/7.1.3.v20150130|lib/alpn/alpn-boot-7.1.3.v20150130.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0.mod
similarity index 92%
rename from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0.mod
rename to jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0.mod
index 3f119b1df03..cb91b4c2fda 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/8.1.0.v20141016|lib/alpn/alpn-boot-8.1.0.v20141016.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_05.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_05.mod
similarity index 92%
rename from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_05.mod
rename to jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_05.mod
index 3f119b1df03..cb91b4c2fda 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_05.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_05.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/8.1.0.v20141016|lib/alpn/alpn-boot-8.1.0.v20141016.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_11.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_11.mod
similarity index 92%
rename from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_11.mod
rename to jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_11.mod
index 3f119b1df03..cb91b4c2fda 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_11.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_11.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/8.1.0.v20141016|lib/alpn/alpn-boot-8.1.0.v20141016.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_20.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_20.mod
similarity index 92%
rename from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_20.mod
rename to jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_20.mod
index 3f119b1df03..cb91b4c2fda 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_20.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_20.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/8.1.0.v20141016|lib/alpn/alpn-boot-8.1.0.v20141016.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_25.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_25.mod
similarity index 92%
rename from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_25.mod
rename to jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_25.mod
index 9791e631bcb..6d6d75efa4e 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_25.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_25.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/8.1.2.v20141202|lib/alpn/alpn-boot-8.1.2.v20141202.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_31.mod b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_31.mod
similarity index 92%
rename from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_31.mod
rename to jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_31.mod
index 1f8b44ee355..e52bd23c1c9 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_31.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn-impl/alpn-1.8.0_31.mod
@@ -1,5 +1,5 @@
 [name]
-protonego-boot
+alpn-boot
 
 [files]
 maven://org.mortbay.jetty.alpn/alpn-boot/8.1.3.v20150130|lib/alpn/alpn-boot-8.1.3.v20150130.jar
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn.mod b/jetty-start/src/test/resources/dist-home/modules/alpn.mod
similarity index 73%
rename from jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn.mod
rename to jetty-start/src/test/resources/dist-home/modules/alpn.mod
index 502c50603ce..2a6a1785ec3 100644
--- a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/alpn.mod
@@ -1,11 +1,10 @@
 # ALPN is provided via a -Xbootclasspath that modifies the secure connections
-# in java to support the ALPN layer needed for HTTP/2
+# in java to support the ALPN layer needed for HTTP/2.
 #
 # This modification has a tight dependency on specific recent updates of
-# Java 1.7 and Java 1.8
-# (Java versions prior to 1.7u40 are not supported)
+# Java 1.7 and Java 1.8 (Java versions prior to 1.7u40 are not supported).
 #
-# The alpn protonego module will use an appropriate alpn-boot jar for your
+# The alpn module will use an appropriate alpn-boot jar for your
 # specific version of Java.
 #
 # IMPORTANT: Versions of Java that exist after this module was created are
@@ -18,19 +17,28 @@
 # http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/
 
 [name]
-protonego-impl
+alpn
 
 [depend]
-protonego-impl/alpn-${java.version}
+ssl
+alpn-impl/alpn-${java.version}
 
 [lib]
 lib/jetty-alpn-client-${jetty.version}.jar
 lib/jetty-alpn-server-${jetty.version}.jar
 
+[xml]
+etc/jetty-alpn.xml
+
 [files]
 lib/
 lib/alpn/
 
+[ini-template]
+# Configuration for ALPN
+# alpn.protocols=h2-14,http/1.1
+# alpn.defaultProtocol=http/1.1
+
 [license]
 ALPN is a hosted at github under the GPL v2 with ClassPath Exception.
 ALPN replaces/modifies OpenJDK classes in the java.sun.security.ssl package.
diff --git a/jetty-start/src/test/resources/dist-home/modules/http2.mod b/jetty-start/src/test/resources/dist-home/modules/http2.mod
index b8aed5c512c..2be7e7e5241 100644
--- a/jetty-start/src/test/resources/dist-home/modules/http2.mod
+++ b/jetty-start/src/test/resources/dist-home/modules/http2.mod
@@ -4,13 +4,12 @@
 
 [depend]
 ssl
-protonego
+alpn
 
 [lib]
 lib/http2/*.jar
 
 [xml]
-etc/protonego-${protonego}.xml
 etc/jetty-http2.xml
 
 [ini-template]
diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego.mod b/jetty-start/src/test/resources/dist-home/modules/protonego.mod
deleted file mode 100644
index 818692bf9af..00000000000
--- a/jetty-start/src/test/resources/dist-home/modules/protonego.mod
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Protocol Negotiatin Selection Module
-#
-
-[depend]
-protonego-impl/${protonego}
-
-[ini-template]
-# Protocol Negotiation Implementation Selection
-# Always set to 'alpn'
-protonego=alpn
-
-# Configuration for ALPN
-# alpn.protocols=h2-14,http/1.1
-# alpn.defaultProtocol=http/1.1
-
diff --git a/jetty-start/src/test/resources/usecases/http2.assert.txt b/jetty-start/src/test/resources/usecases/http2.assert.txt
index e2b729c05ff..7510468136b 100644
--- a/jetty-start/src/test/resources/usecases/http2.assert.txt
+++ b/jetty-start/src/test/resources/usecases/http2.assert.txt
@@ -3,7 +3,7 @@ XML|${jetty.home}/etc/jetty.xml
 XML|${jetty.home}/etc/jetty-http.xml
 XML|${jetty.home}/etc/jetty-jmx.xml
 XML|${jetty.home}/etc/jetty-ssl.xml
-XML|${jetty.home}/etc/protonego-alpn.xml
+XML|${jetty.home}/etc/jetty-alpn.xml
 XML|${jetty.home}/etc/jetty-http2.xml
 
 
@@ -31,7 +31,6 @@ PROP|jetty.keymanager.password=icecream
 PROP|jetty.truststore=etc/keystore
 PROP|jetty.truststore.password=sundae
 PROP|java.version=1.7.0_60
-PROP|protonego=alpn
 PROP|ssl.port=8443
 PROP|ssl.timeout=30000
 # (these are the ones set by default from jetty.home modules)