diff --git a/cluster-ha-singleton/pom.xml b/cluster-ha-singleton/pom.xml
index 2de0ee2ab9..9ad744096e 100644
--- a/cluster-ha-singleton/pom.xml
+++ b/cluster-ha-singleton/pom.xml
@@ -50,7 +50,7 @@
         
         <version.jboss.maven.plugin>7.3.Final</version.jboss.maven.plugin>
 
-        <version.jboss.as>7.2.0.Final</version.jboss.as>
+        <version.wildfly>8.0.0.Alpha1-SNAPSHOT</version.wildfly>
         <!-- Alternatively, comment out the above line, and un-comment the 
             line below to use version 7.2.0.Final-redhat-1 which is a release certified 
             to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6 
@@ -95,9 +95,9 @@
                 <scope>import</scope>
             </dependency>
             <dependency>
-                <groupId>org.jboss.as</groupId>
-                <artifactId>jboss-as-ejb-client-bom</artifactId>
-                <version>${version.jboss.as}</version>
+                <groupId>org.wildfly</groupId>
+                <artifactId>wildfly-ejb-client-bom</artifactId>
+                <version>${version.wildfly}</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
diff --git a/cluster-ha-singleton/service/pom.xml b/cluster-ha-singleton/service/pom.xml
index a68eb016da..9ddc74862d 100644
--- a/cluster-ha-singleton/service/pom.xml
+++ b/cluster-ha-singleton/service/pom.xml
@@ -61,8 +61,8 @@
         <!-- Import JBoss AS Clustering Singleton, to allow us to create 
             a singleton service -->
         <dependency>
-            <groupId>org.jboss.as</groupId>
-            <artifactId>jboss-as-clustering-singleton</artifactId>
+            <groupId>org.wildfly</groupId>
+            <artifactId>wildfly-clustering-singleton</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/deltaspike-helloworld-jms/pom.xml b/deltaspike-helloworld-jms/pom.xml
index 7ef0cf575e..c85711688e 100644
--- a/deltaspike-helloworld-jms/pom.xml
+++ b/deltaspike-helloworld-jms/pom.xml
@@ -54,7 +54,7 @@
             maven repository. -->
         <!-- <version.jboss.bom>1.0.4.Final-redhat-3</version.jboss.bom> -->
 
-        <version.jboss.as>7.2.0.Final</version.jboss.as>
+        <version.wildfly>8.0.0.Alpha1-SNAPSHOT</version.wildfly>
         <!-- Alternatively, comment out the above line, and un-comment the 
             line below to use version 7.2.0.Final-redhat-1 which is a release certified 
             to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6 
@@ -90,9 +90,9 @@
             </dependency>
 
             <dependency>
-                <groupId>org.jboss.as</groupId>
-                <artifactId>jboss-as-jms-client-bom</artifactId>
-                <version>${version.jboss.as}</version>
+                <groupId>org.wildfly</groupId>
+                <artifactId>wildfly-jms-client-bom</artifactId>
+                <version>${version.wildfly}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -103,8 +103,8 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.jboss.as</groupId>
-            <artifactId>jboss-as-jms-client-bom</artifactId>
+            <groupId>org.wildfly</groupId>
+            <artifactId>wildfly-jms-client-bom</artifactId>
             <type>pom</type>
         </dependency>
        
diff --git a/ejb-asynchronous/client/pom.xml b/ejb-asynchronous/client/pom.xml
index 07f72287b4..af6b44a174 100644
--- a/ejb-asynchronous/client/pom.xml
+++ b/ejb-asynchronous/client/pom.xml
@@ -58,9 +58,9 @@
                 <scope>import</scope>
             </dependency>
             <dependency>
-                <groupId>org.jboss.as</groupId>
-                <artifactId>jboss-as-ejb-client-bom</artifactId>
-                <version>${version.jboss.as}</version>
+                <groupId>org.wildfly</groupId>
+                <artifactId>wildfly-ejb-client-bom</artifactId>
+                <version>${version.wildfly}</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -116,7 +116,7 @@
 
         <!-- The client needs JBoss remoting to access the server -->
         <dependency>
-            <groupId>org.jboss.remoting3</groupId>
+            <groupId>org.jboss.remoting</groupId>
             <artifactId>jboss-remoting</artifactId>
             <scope>runtime</scope>
         </dependency>
diff --git a/ejb-asynchronous/pom.xml b/ejb-asynchronous/pom.xml
index 9a763c8540..d6dd96bf95 100644
--- a/ejb-asynchronous/pom.xml
+++ b/ejb-asynchronous/pom.xml
@@ -50,7 +50,7 @@
         <!-- JBoss dependency versions -->
         <version.jboss.maven.plugin>7.3.Final</version.jboss.maven.plugin>
 
-        <version.jboss.as>7.2.0.Final</version.jboss.as>
+        <version.wildfly>8.0.0.Alpha1-SNAPSHOT</version.wildfly>
         <!-- Alternatively, comment out the above line, and un-comment the 
             line below to use version 7.2.0.Final-redhat-1 which is a release certified 
             to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6 
@@ -95,9 +95,9 @@
                 <scope>import</scope>
             </dependency>
             <dependency>
-                <groupId>org.jboss.as</groupId>
-                <artifactId>jboss-as-ejb-client-bom</artifactId>
-                <version>${version.jboss.as}</version>
+                <groupId>org.wildfly</groupId>
+                <artifactId>wildfly-ejb-client-bom</artifactId>
+                <version>${version.wildfly}</version>
                 <scope>runtime</scope>
                 <type>pom</type>
             </dependency>
diff --git a/ejb-in-ear/pom.xml b/ejb-in-ear/pom.xml
index 5b374f68ad..ff8e312559 100644
--- a/ejb-in-ear/pom.xml
+++ b/ejb-in-ear/pom.xml
@@ -51,7 +51,7 @@
 
         <version.jboss.maven.plugin>7.3.Final</version.jboss.maven.plugin>
         
-        <version.jboss.as>7.2.0.Final</version.jboss.as>
+        <version.wildfly>8.0.0.Alpha1-SNAPSHOT</version.wildfly>
         <!-- Alternatively, comment out the above line, and un-comment the 
             line below to use version 7.2.0.Final-redhat-1 which is a release certified 
             to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6 
diff --git a/ejb-remote/client/pom.xml b/ejb-remote/client/pom.xml
index 47008e75e1..24ca7f5c07 100644
--- a/ejb-remote/client/pom.xml
+++ b/ejb-remote/client/pom.xml
@@ -46,7 +46,7 @@
 
        <version.jboss.maven.plugin>7.3.Final</version.jboss.maven.plugin>
 
-        <version.jboss.as>7.2.0.Final</version.jboss.as>
+        <version.wildfly>8.0.0.Alpha1-SNAPSHOT</version.wildfly>
         <!-- Alternatively, comment out the above line, and un-comment the 
             line below to use version 7.2.0.Final-redhat-1 which is a release certified 
             to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6 
@@ -89,9 +89,9 @@
          </dependency>
 
          <dependency>
-             <groupId>org.jboss.as</groupId>
-             <artifactId>jboss-as-ejb-client-bom</artifactId>
-             <version>${version.jboss.as}</version>
+             <groupId>org.wildfly</groupId>
+             <artifactId>wildfly-ejb-client-bom</artifactId>
+             <version>${version.wildfly}</version>
              <type>pom</type>
              <scope>import</scope>
          </dependency>
@@ -147,7 +147,7 @@
 
       <!-- The client needs JBoss remoting to access the server -->
        <dependency>
-            <groupId>org.jboss.remoting3</groupId>
+            <groupId>org.jboss.remoting</groupId>
             <artifactId>jboss-remoting</artifactId>
             <scope>runtime</scope>
         </dependency>
diff --git a/ejb-security-interceptors/pom.xml b/ejb-security-interceptors/pom.xml
index 34b6001cb7..35bd540322 100644
--- a/ejb-security-interceptors/pom.xml
+++ b/ejb-security-interceptors/pom.xml
@@ -46,7 +46,7 @@
 
         <version.jboss.maven.plugin>7.3.Final</version.jboss.maven.plugin>
 
-        <version.jboss.as>7.2.0.Final</version.jboss.as>
+        <version.wildfly>8.0.0.Alpha1-SNAPSHOT</version.wildfly>
         <!-- Alternatively, comment out the above line, and un-comment the 
             line below to use version 7.2.0.Final-redhat-1 which is a release certified 
             to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6 
@@ -86,9 +86,9 @@
                 <scope>import</scope>
             </dependency>
             <dependency>
-                <groupId>org.jboss.as</groupId>
-                <artifactId>jboss-as-ejb-client-bom</artifactId>
-                <version>${version.jboss.as}</version>
+                <groupId>org.wildfly</groupId>
+                <artifactId>wildfly-ejb-client-bom</artifactId>
+                <version>${version.wildfly}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -98,8 +98,8 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.jboss.as</groupId>
-            <artifactId>jboss-as-security</artifactId>
+            <groupId>org.wildfly</groupId>
+            <artifactId>wildfly-security</artifactId>
         </dependency>
 
           <!-- Import the CDI API, we use provided scope as the API is included in 
diff --git a/ejb-security-plus/pom.xml b/ejb-security-plus/pom.xml
index 168003fc23..9838471efc 100644
--- a/ejb-security-plus/pom.xml
+++ b/ejb-security-plus/pom.xml
@@ -46,7 +46,7 @@
 
         <version.jboss.maven.plugin>7.3.Final</version.jboss.maven.plugin>
 
-        <version.jboss.as>7.2.0.Final</version.jboss.as>
+        <version.wildfly>8.0.0.Alpha1-SNAPSHOT</version.wildfly>
         <!-- Alternatively, comment out the above line, and un-comment the 
             line below to use version 7.2.0.Final-redhat-1 which is a release certified 
             to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6 
@@ -86,9 +86,9 @@
                 <scope>import</scope>
             </dependency>
             <dependency>
-                <groupId>org.jboss.as</groupId>
-                <artifactId>jboss-as-ejb-client-bom</artifactId>
-                <version>${version.jboss.as}</version>
+                <groupId>org.wildfly</groupId>
+                <artifactId>wildfly-ejb-client-bom</artifactId>
+                <version>${version.wildfly}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -98,8 +98,8 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.jboss.as</groupId>
-            <artifactId>jboss-as-security</artifactId>
+            <groupId>org.wildfly</groupId>
+            <artifactId>wildfly-security</artifactId>
         </dependency>
 
           <!-- Import the CDI API, we use provided scope as the API is included in 
diff --git a/ejb-security/pom.xml b/ejb-security/pom.xml
index 1b50f0acf3..7b120c40d8 100644
--- a/ejb-security/pom.xml
+++ b/ejb-security/pom.xml
@@ -45,7 +45,7 @@
 
         <version.jboss.maven.plugin>7.3.Final</version.jboss.maven.plugin>
 
-        <version.jboss.as>7.2.0.Final</version.jboss.as>
+        <version.wildfly>8.0.0.Alpha1-SNAPSHOT</version.wildfly>
         <!-- Alternatively, comment out the above line, and un-comment the 
             line below to use version 7.2.0.Final-redhat-1 which is a release certified 
             to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6 
@@ -83,9 +83,9 @@
                 <scope>import</scope>
             </dependency>
             <dependency>
-                <groupId>org.jboss.as</groupId>
-                <artifactId>jboss-as-ejb-client-bom</artifactId>
-                <version>${version.jboss.as}</version>
+                <groupId>org.wildfly</groupId>
+                <artifactId>wildfly-ejb-client-bom</artifactId>
+                <version>${version.wildfly}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/ejb-throws-exception/pom.xml b/ejb-throws-exception/pom.xml
index 2a7dff1436..19e53e9f51 100644
--- a/ejb-throws-exception/pom.xml
+++ b/ejb-throws-exception/pom.xml
@@ -54,7 +54,7 @@
         <!-- JBoss dependency versions -->
         <version.jboss.maven.plugin>7.3.Final</version.jboss.maven.plugin>
 
-        <version.jboss.as>7.2.0.Final</version.jboss.as>
+        <version.wildfly>8.0.0.Alpha1-SNAPSHOT</version.wildfly>
 
         <!-- Alternatively, comment out the above line, and un-comment the
              line below to use version 7.2.0.Final-redhat-1 which is a release certified
diff --git a/helloworld-jms/pom.xml b/helloworld-jms/pom.xml
index c2dd37ccad..38d6142ee0 100644
--- a/helloworld-jms/pom.xml
+++ b/helloworld-jms/pom.xml
@@ -45,7 +45,7 @@
 
         <version.jboss.maven.plugin>7.3.Final</version.jboss.maven.plugin>
 
-        <version.jboss.as>7.2.0.Final</version.jboss.as>
+        <version.wildfly>8.0.0.Alpha1-SNAPSHOT</version.wildfly>
         <!-- Alternatively, comment out the above line, and un-comment the 
             line below to use version 7.2.0.Final-redhat-1 which is a release certified 
             to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6 
@@ -64,9 +64,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.jboss.as</groupId>
-            <artifactId>jboss-as-jms-client-bom</artifactId>
-            <version>${version.jboss.as}</version>
+            <groupId>org.wildfly</groupId>
+            <artifactId>wildfly-jms-client-bom</artifactId>
+            <version>${version.wildfly}</version>
             <type>pom</type>
         </dependency>
     </dependencies>
diff --git a/hibernate4/pom.xml b/hibernate4/pom.xml
index 2dbf7b86af..f2a43adb95 100644
--- a/hibernate4/pom.xml
+++ b/hibernate4/pom.xml
@@ -52,7 +52,7 @@
             maven repository. -->
         <!-- <version.jboss.bom>1.0.4.Final-redhat-3</version.jboss.bom> -->
 
-        <version.jboss.as>7.2.0.Final</version.jboss.as>
+        <version.wildfly>8.0.0.Alpha1-SNAPSHOT</version.wildfly>
         <!-- Alternatively, comment out the above line, and un-comment the 
             line below to use version 7.2.0.Final-redhat-1 which is a release certified 
             to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6 
diff --git a/jta-crash-rec/pom.xml b/jta-crash-rec/pom.xml
index b398cf40ac..c0bea2e660 100644
--- a/jta-crash-rec/pom.xml
+++ b/jta-crash-rec/pom.xml
@@ -45,7 +45,7 @@
         
         <version.jboss.maven.plugin>7.3.Final</version.jboss.maven.plugin>
 
-        <version.jboss.as>7.2.0.Final</version.jboss.as>
+        <version.wildfly>8.0.0.Alpha1-SNAPSHOT</version.wildfly>
         <!-- Alternatively, comment out the above line, and un-comment the 
             line below to use version 7.2.0.Final-redhat-1 which is a release certified 
             to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6 
diff --git a/kitchensink-ear/pom.xml b/kitchensink-ear/pom.xml
index 38fd3ecafc..cc7fbd7731 100644
--- a/kitchensink-ear/pom.xml
+++ b/kitchensink-ear/pom.xml
@@ -57,7 +57,7 @@
             maven repository. -->
         <!-- <version.jboss.bom>1.0.4.Final-redhat-3</version.jboss.bom> -->
 
-        <version.jboss.as>7.2.0.Final</version.jboss.as>
+        <version.wildfly>8.0.0.Alpha1-SNAPSHOT</version.wildfly>
         <!-- Alternatively, comment out the above line, and un-comment the 
             line below to use version 7.2.0.Final-redhat-1 which is a release certified 
             to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6 
diff --git a/kitchensink-ml-ear/pom.xml b/kitchensink-ml-ear/pom.xml
index 8d61d4842b..445a6a2c00 100644
--- a/kitchensink-ml-ear/pom.xml
+++ b/kitchensink-ml-ear/pom.xml
@@ -57,7 +57,7 @@
             maven repository. -->
         <!-- <version.jboss.bom>1.0.4.Final-redhat-3</version.jboss.bom>  -->
 
-        <version.jboss.as>7.2.0.Final</version.jboss.as>
+        <version.wildfly>8.0.0.Alpha1-SNAPSHOT</version.wildfly>
         <!-- Alternatively, comment out the above line, and un-comment the 
             line below to use version 7.2.0.Final-redhat-1 which is a release certified 
             to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6 
diff --git a/shopping-cart/client/pom.xml b/shopping-cart/client/pom.xml
index bf08f02863..4ee774214d 100644
--- a/shopping-cart/client/pom.xml
+++ b/shopping-cart/client/pom.xml
@@ -49,8 +49,8 @@
             client API isn't directly used in this example. We just need it in our runtime 
             classpath -->
         <dependency>
-            <groupId>org.jboss.as</groupId>
-            <artifactId>jboss-as-ejb-client-bom</artifactId>
+            <groupId>org.wildfly</groupId>
+            <artifactId>wildfly-ejb-client-bom</artifactId>
             <scope>runtime</scope>
             <type>pom</type>
         </dependency>
diff --git a/shopping-cart/pom.xml b/shopping-cart/pom.xml
index bceb843b8a..6cfd488904 100644
--- a/shopping-cart/pom.xml
+++ b/shopping-cart/pom.xml
@@ -57,7 +57,7 @@
         
         <version.jboss.maven.plugin>7.3.Final</version.jboss.maven.plugin>
         
-        <version.jboss.as>7.2.0.Final</version.jboss.as>
+        <version.wildfly>8.0.0.Alpha1-SNAPSHOT</version.wildfly>
         <!-- Alternatively, comment out the above line, and un-comment the 
             line below to use version 7.2.0.Final-redhat-1 which is a release certified 
             to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6 
@@ -105,9 +105,9 @@
             
             <!-- We need the EJB Client -->
             <dependency>
-                <groupId>org.jboss.as</groupId>
-                <artifactId>jboss-as-ejb-client-bom</artifactId>
-                <version>${version.jboss.as}</version>
+                <groupId>org.wildfly</groupId>
+                <artifactId>wildfly-ejb-client-bom</artifactId>
+                <version>${version.wildfly}</version>
                 <type>pom</type>
             </dependency>
         </dependencies>
diff --git a/tasks/pom.xml b/tasks/pom.xml
index 462f01679e..64a679fd50 100644
--- a/tasks/pom.xml
+++ b/tasks/pom.xml
@@ -54,7 +54,7 @@
             maven repository. -->
         <!-- <version.jboss.bom>1.0.4.Final-redhat-3</version.jboss.bom> -->
 
-        <version.jboss.as>7.2.0.Final</version.jboss.as>
+        <version.wildfly>8.0.0.Alpha1-SNAPSHOT</version.wildfly>
         <!-- Alternatively, comment out the above line, and un-comment the 
             line below to use version 7.2.0.Final-redhat-1 which is a release certified 
             to work with JBoss EAP 6. It requires you have access to the JBoss EAP 6