diff --git a/dist/src/distribution/resources/modules/system/layers/base/org/jboss/as/product/wildfly-full/module.xml b/dist/src/distribution/resources/modules/system/layers/base/org/jboss/as/product/wildfly-full/module.xml
index f0d76d3bbab5..b4c74955a390 100644
--- a/dist/src/distribution/resources/modules/system/layers/base/org/jboss/as/product/wildfly-full/module.xml
+++ b/dist/src/distribution/resources/modules/system/layers/base/org/jboss/as/product/wildfly-full/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.product" slot="wildfly-full">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.product" slot="wildfly-full">
 
     <properties>
         <property name="jboss.api" value="private"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/asm/asm/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/asm/asm/main/module.xml
index faac9ac4e292..4253b23becba 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/asm/asm/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/asm/asm/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="asm.asm">
+<module xmlns="urn:jboss:module:1.5" name="asm.asm">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/ch/qos/cal10n/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/ch/qos/cal10n/main/module.xml
index f3a1b291f9be..e029c28c6c53 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/ch/qos/cal10n/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/ch/qos/cal10n/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="ch.qos.cal10n">
+<module xmlns="urn:jboss:module:1.5" name="ch.qos.cal10n">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/classmate/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/classmate/main/module.xml
index 76c53a4e5007..ceaf10dbc1d0 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/classmate/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/classmate/main/module.xml
@@ -22,7 +22,7 @@
 ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
 
-<module xmlns="urn:jboss:module:1.3" name="com.fasterxml.classmate">
+<module xmlns="urn:jboss:module:1.5" name="com.fasterxml.classmate">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-annotations/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-annotations/main/module.xml
index efb594c735ae..5830ff390752 100755
--- a/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-annotations/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-annotations/main/module.xml
@@ -21,7 +21,7 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module xmlns="urn:jboss:module:1.3" name="com.fasterxml.jackson.core.jackson-annotations">
+<module xmlns="urn:jboss:module:1.5" name="com.fasterxml.jackson.core.jackson-annotations">
      <resources>
         <artifact name="${com.fasterxml.jackson.core:jackson-annotations}"/>
     </resources>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-core/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-core/main/module.xml
index e458e9dd61e9..ae9ab81f2244 100755
--- a/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-core/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-core/main/module.xml
@@ -21,7 +21,7 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module xmlns="urn:jboss:module:1.3" name="com.fasterxml.jackson.core.jackson-core">
+<module xmlns="urn:jboss:module:1.5" name="com.fasterxml.jackson.core.jackson-core">
      <resources>
         <artifact name="${com.fasterxml.jackson.core:jackson-core}"/>
     </resources>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-databind/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-databind/main/module.xml
index 07610c1bb768..65ace2ec025e 100755
--- a/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-databind/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/core/jackson-databind/main/module.xml
@@ -21,7 +21,7 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module xmlns="urn:jboss:module:1.3" name="com.fasterxml.jackson.core.jackson-databind">
+<module xmlns="urn:jboss:module:1.5" name="com.fasterxml.jackson.core.jackson-databind">
      <resources>
         <artifact name="${com.fasterxml.jackson.core:jackson-databind}"/>
     </resources>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/main/module.xml
index 3e7f32556525..18e8d5cdfc6d 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/datatype/jackson-datatype-jdk8/main/module.xml
@@ -21,7 +21,7 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module xmlns="urn:jboss:module:1.3" name="com.fasterxml.jackson.datatype.jackson-datatype-jdk8">
+<module xmlns="urn:jboss:module:1.5" name="com.fasterxml.jackson.datatype.jackson-datatype-jdk8">
      <resources>
         <artifact name="${com.fasterxml.jackson.datatype:jackson-datatype-jdk8}"/>
     </resources>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/main/module.xml
index fc14715a2a92..16fb17c35f70 100755
--- a/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/datatype/jackson-datatype-jsr310/main/module.xml
@@ -21,7 +21,7 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module xmlns="urn:jboss:module:1.3" name="com.fasterxml.jackson.datatype.jackson-datatype-jsr310">
+<module xmlns="urn:jboss:module:1.5" name="com.fasterxml.jackson.datatype.jackson-datatype-jsr310">
      <resources>
         <artifact name="${com.fasterxml.jackson.datatype:jackson-datatype-jsr310}"/>
     </resources>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/main/module.xml
index 6d3389cb2e8b..619657ccc804 100755
--- a/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider/main/module.xml
@@ -21,7 +21,7 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module xmlns="urn:jboss:module:1.3" name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider">
+<module xmlns="urn:jboss:module:1.5" name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider">
      <resources>
         <artifact name="${com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider}"/>
         <artifact name="${com.fasterxml.jackson.jaxrs:jackson-jaxrs-base}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/com/github/relaxng/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/github/relaxng/main/module.xml
index c4985dd64127..d93e8310cd74 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/com/github/relaxng/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/com/github/relaxng/main/module.xml
@@ -23,7 +23,7 @@
   -->
 
 
-<module xmlns="urn:jboss:module:1.3" name="com.github.relaxng">
+<module xmlns="urn:jboss:module:1.5" name="com.github.relaxng">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/com/github/spullara/mustache/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/github/spullara/mustache/main/module.xml
index 662f569aa152..1a5f7c10fbf8 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/com/github/spullara/mustache/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/com/github/spullara/mustache/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="com.github.spullara.mustache">
+<module xmlns="urn:jboss:module:1.5" name="com.github.spullara.mustache">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/com/google/guava/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/google/guava/main/module.xml
index 1358b1d1b9de..7dbf479fc51b 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/com/google/guava/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/com/google/guava/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="com.google.guava">
+<module xmlns="urn:jboss:module:1.5" name="com.google.guava">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/com/h2database/h2/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/h2database/h2/main/module.xml
index 031cda5c001e..06758b71a391 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/com/h2database/h2/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/com/h2database/h2/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="com.h2database.h2">
+<module xmlns="urn:jboss:module:1.5" name="com.h2database.h2">
 
     <resources>
         <artifact name="${com.h2database:h2}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/com/microsoft/azure/storage/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/microsoft/azure/storage/main/module.xml
index 4f1baec0c41c..d71a053d1006 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/com/microsoft/azure/storage/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/com/microsoft/azure/storage/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="com.microsoft.azure.storage">
+<module xmlns="urn:jboss:module:1.5" name="com.microsoft.azure.storage">
 
     <properties>
         <property name="jboss.api" value="private"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/com/sun/istack/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/sun/istack/main/module.xml
index e876e160fd0d..ded7845bcc1f 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/com/sun/istack/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/com/sun/istack/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="com.sun.istack">
+<module xmlns="urn:jboss:module:1.5" name="com.sun.istack">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/com/sun/jsf-impl/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/sun/jsf-impl/main/module.xml
index 1310d4d2bfda..728ed2598f57 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/com/sun/jsf-impl/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/com/sun/jsf-impl/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="com.sun.jsf-impl">
+<module xmlns="urn:jboss:module:1.5" name="com.sun.jsf-impl">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/com/sun/xml/bind/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/sun/xml/bind/main/module.xml
index 4a598e776a18..42863391d3e5 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/com/sun/xml/bind/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/com/sun/xml/bind/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="com.sun.xml.bind">
+<module xmlns="urn:jboss:module:1.5" name="com.sun.xml.bind">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/com/sun/xml/fastinfoset/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/sun/xml/fastinfoset/main/module.xml
index 2f626ce9852f..d269cd039273 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/com/sun/xml/fastinfoset/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/com/sun/xml/fastinfoset/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="com.sun.xml.fastinfoset">
+<module xmlns="urn:jboss:module:1.5" name="com.sun.xml.fastinfoset">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/com/sun/xml/messaging/saaj/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/sun/xml/messaging/saaj/main/module.xml
index 7594bf2ce45e..b7ca4277d0e0 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/com/sun/xml/messaging/saaj/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/com/sun/xml/messaging/saaj/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="com.sun.xml.messaging.saaj">
+<module xmlns="urn:jboss:module:1.5" name="com.sun.xml.messaging.saaj">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/com/sun/xml/txw2/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/sun/xml/txw2/main/module.xml
index 8b31f987004f..1d618ab88a7f 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/com/sun/xml/txw2/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/com/sun/xml/txw2/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="com.sun.xml.txw2">
+<module xmlns="urn:jboss:module:1.5" name="com.sun.xml.txw2">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/com/sun/xsom/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/com/sun/xsom/main/module.xml
index bb0d1bbf68d4..e575f76d53f5 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/com/sun/xsom/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/com/sun/xsom/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="com.sun.xsom">
+<module xmlns="urn:jboss:module:1.5" name="com.sun.xsom">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/gnu/getopt/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/gnu/getopt/main/module.xml
index 22da3ac02a8b..b09a9dbdc8c4 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/gnu/getopt/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/gnu/getopt/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="gnu.getopt">
+<module xmlns="urn:jboss:module:1.5" name="gnu.getopt">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/io/netty/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/io/netty/main/module.xml
index cd1a85f57d26..622a310777e4 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/io/netty/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/io/netty/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="io.netty">
+<module xmlns="urn:jboss:module:1.5" name="io.netty">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/io/undertow/js/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/io/undertow/js/main/module.xml
index 2f525d632114..9b060d916dfe 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/io/undertow/js/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/io/undertow/js/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="io.undertow.js">
+<module xmlns="urn:jboss:module:1.5" name="io.undertow.js">
 
     <resources>
         <artifact name="${io.undertow.js:undertow-js}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/javaee/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javaee/api/main/module.xml
index 65f1324917da..79b87eda6329 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/javaee/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/javaee/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javaee.api">
+<module xmlns="urn:jboss:module:1.5" name="javaee.api">
     <resources>
     </resources>
 
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/javax/batch/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/batch/api/main/module.xml
index ff5f0d850a15..0caa449f0a4d 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/javax/batch/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/javax/batch/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.batch.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.batch.api">
     <resources>
         <artifact name="${org.jboss.spec.javax.batch:jboss-batch-api_1.0_spec}"/>
     </resources>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/javax/ejb/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/ejb/api/main/module.xml
index 5b33b011f3ce..31dcdc1e439e 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/javax/ejb/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/javax/ejb/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.ejb.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.ejb.api">
     <dependencies>
         <!-- This dep is for javax.naming -->
         <module name="javax.api" />
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/javax/faces/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/faces/api/main/module.xml
index 5800e39ba753..1f4799e00860 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/javax/faces/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/javax/faces/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.faces.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.faces.api">
     <dependencies>
         <module name="com.sun.jsf-impl"/>
         <module name="javax.enterprise.api" export="true"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/javax/jms/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/jms/api/main/module.xml
index 9434103570af..d42f0bbfa32d 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/javax/jms/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/javax/jms/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.jms.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.jms.api">
     <dependencies>
         <module name="javax.transaction.api" export="true"/>
     </dependencies>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/javax/json/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/json/api/main/module.xml
index 24ccdc9c045c..5aa66741b663 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/javax/json/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/javax/json/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.json.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.json.api">
 
     <properties>
         <property name="jboss.api" value="public"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/javax/jws/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/jws/api/main/module.xml
index 69a47f90f45a..34029c659ca5 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/javax/jws/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/javax/jws/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.jws.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.jws.api">
     <resources>
         <artifact name="${javax.jws:jsr181-api}"/>
     </resources>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/javax/mail/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/mail/api/main/module.xml
index caf4773bd32b..9701635e4a04 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/javax/mail/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/javax/mail/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.mail.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.mail.api">
     <dependencies>
         <module name="javax.activation.api" />
         <module name="javax.api"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/javax/management/j2ee/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/management/j2ee/api/main/module.xml
index 79db032ca52e..6fd34c8b5b55 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/javax/management/j2ee/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/javax/management/j2ee/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.management.j2ee.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.management.j2ee.api">
     <resources>
         <artifact name="${org.jboss.spec.javax.management.j2ee:jboss-j2eemgmt-api_1.1_spec}"/>
     </resources>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/javax/orb/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/orb/api/main/module.xml
index 3c0e9d05da9b..09524d0bbd0e 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/javax/orb/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/javax/orb/api/main/module.xml
@@ -21,7 +21,7 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module xmlns="urn:jboss:module:1.3" name="javax.orb.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.orb.api">
     <resources>
         <artifact name="${org.jboss.openjdk-orb:openjdk-orb}"/>
     </resources>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/javax/persistence/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/persistence/api/main/module.xml
index ad25960617b5..32451b2f1533 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/javax/persistence/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/javax/persistence/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.persistence.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.persistence.api">
     <dependencies>
         <!-- PersistenceUnitInfo needs javax.sql.DataSource -->
         <module name="javax.api" export="true"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/javax/resource/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/resource/api/main/module.xml
index 74c0b1598055..d088e7cd99aa 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/javax/resource/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/javax/resource/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.resource.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.resource.api">
     <dependencies>
         <module name="javax.transaction.api" export="true"/>
         <module name="javax.api" export="false">
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/javax/rmi/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/rmi/api/main/module.xml
index a8a25ac703f1..51ac90a911b5 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/javax/rmi/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/javax/rmi/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.rmi.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.rmi.api">
     <dependencies>
         <module name="javax.orb.api" export="false">
             <exports>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/javax/ws/rs/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/ws/rs/api/main/module.xml
index dff8d5bc96c1..9c3c790f52f7 100755
--- a/feature-pack/src/main/resources/modules/system/layers/base/javax/ws/rs/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/javax/ws/rs/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.ws.rs.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.ws.rs.api">
     <resources>
         <artifact name="${org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.0_spec}"/>
     </resources>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/javax/wsdl4j/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/wsdl4j/api/main/module.xml
index 8d727077848c..8b72122b36e6 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/javax/wsdl4j/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/javax/wsdl4j/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.wsdl4j.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.wsdl4j.api">
     <resources>
         <artifact name="${wsdl4j:wsdl4j}"/>
     </resources>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/javax/xml/bind/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/xml/bind/api/main/module.xml
index fdb649fa1dab..69deb7c5253b 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/javax/xml/bind/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/javax/xml/bind/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.xml.bind.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.xml.bind.api">
 
 
     <dependencies>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/javax/xml/rpc/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/xml/rpc/api/main/module.xml
index 1e282e136ac7..79bfd1f1cd9e 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/javax/xml/rpc/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/javax/xml/rpc/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.xml.rpc.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.xml.rpc.api">
     <dependencies>
         <module name="javax.api"/>
         <module name="javax.xml.soap.api" export="true"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/javax/xml/soap/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/xml/soap/api/main/module.xml
index 0e403a13c48e..ed9f3837932d 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/javax/xml/soap/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/javax/xml/soap/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.xml.soap.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.xml.soap.api">
     <dependencies>
         <module name="javax.activation.api" export="true"/>
         <module name="javax.api"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/javax/xml/ws/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/xml/ws/api/main/module.xml
index 7bd9c21bc2ae..524f0c4cfe4f 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/javax/xml/ws/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/javax/xml/ws/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.xml.ws.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.xml.ws.api">
     <dependencies>
         <module name="javax.xml.bind.api" export="true"/>
         <module name="javax.xml.soap.api" export="true"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/net/jcip/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/net/jcip/main/module.xml
index 5da1879996c0..3679eba435a5 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/net/jcip/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/net/jcip/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="net.jcip">
+<module xmlns="urn:jboss:module:1.5" name="net.jcip">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/nu/xom/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/nu/xom/main/module.xml
index 042a5e3a5291..4a3d41d181b3 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/nu/xom/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/nu/xom/main/module.xml
@@ -20,7 +20,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="nu.xom">
+<module xmlns="urn:jboss:module:1.5" name="nu.xom">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/antlr/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/antlr/main/module.xml
index d0a399708745..e6faf8051d89 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/antlr/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/antlr/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.antlr">
+<module xmlns="urn:jboss:module:1.5" name="org.antlr">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/activemq/artemis/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/activemq/artemis/main/module.xml
index abd09c44bd0d..b46b4476d4be 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/activemq/artemis/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/activemq/artemis/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.activemq.artemis">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.activemq.artemis">
     <resources>
         <resource-root path="lib"/>
         <artifact name="${org.apache.activemq:artemis-core-client}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/activemq/artemis/protocol/amqp/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/activemq/artemis/protocol/amqp/main/module.xml
index 05d2fc92d14d..61c3e1c19098 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/activemq/artemis/protocol/amqp/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/activemq/artemis/protocol/amqp/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.activemq.artemis.protocol.amqp">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.activemq.artemis.protocol.amqp">
     <resources>
         <artifact name="${org.apache.activemq:artemis-amqp-protocol}"/>
         <artifact name="${org.apache.activemq:artemis-proton-plug}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/activemq/artemis/protocol/hornetq/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/activemq/artemis/protocol/hornetq/main/module.xml
index 49c7debf93c7..1826cc1bfcde 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/activemq/artemis/protocol/hornetq/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/activemq/artemis/protocol/hornetq/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.activemq.artemis.protocol.hornetq">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.activemq.artemis.protocol.hornetq">
     <resources>
         <artifact name="${org.apache.activemq:artemis-hornetq-protocol}"/>
     </resources>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/activemq/artemis/protocol/stomp/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/activemq/artemis/protocol/stomp/main/module.xml
index 509959b62a29..32d5eca057af 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/activemq/artemis/protocol/stomp/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/activemq/artemis/protocol/stomp/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.activemq.artemis.protocol.stomp">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.activemq.artemis.protocol.stomp">
     <resources>
         <artifact name="${org.apache.activemq:artemis-stomp-protocol}"/>
     </resources>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/activemq/artemis/ra/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/activemq/artemis/ra/main/module.xml
index 6ac3b10567f7..05c4742998e7 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/activemq/artemis/ra/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/activemq/artemis/ra/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.activemq.artemis.ra">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.activemq.artemis.ra">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/avro/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/avro/main/module.xml
index 5e06f9702159..d759133b4a15 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/avro/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/avro/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.avro">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.avro">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/beanutils/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/beanutils/main/module.xml
index aa07e08884d9..69c500de7f90 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/beanutils/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/beanutils/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.commons.beanutils">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.commons.beanutils">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/cli/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/cli/main/module.xml
index f6911e7f357d..1cd2b51f687f 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/cli/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/cli/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.commons.cli">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.commons.cli">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/codec/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/codec/main/module.xml
index cf9cb86d56bc..2d8906de97a4 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/codec/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/codec/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.commons.codec">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.commons.codec">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/collections/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/collections/main/module.xml
index f27c2061e4ca..5abc7633ecd0 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/collections/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/collections/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.commons.collections">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.commons.collections">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/io/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/io/main/module.xml
index cf78da5699e8..a6b83a0cea64 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/io/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/io/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.commons.io">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.commons.io">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/lang/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/lang/main/module.xml
index e9c3961a13d4..8af91c65408c 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/lang/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/lang/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.commons.lang">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.commons.lang">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/pool/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/pool/main/module.xml
index 92ea1b8b393e..fe1f9a37c673 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/pool/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/commons/pool/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.commons.pool">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.commons.pool">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/impl/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/impl/main/module.xml
index 15910caeb29f..ec75a817711f 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/impl/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/impl/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.cxf.impl">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.cxf.impl">
 
     <properties>
         <property name="jboss.api" value="private"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/main/module.xml
index dd23419eabc1..75a9e99bcd30 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.cxf">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.cxf">
 
     <resources>
         <artifact name="${org.apache.cxf:cxf-core}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/services-sts/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/services-sts/main/module.xml
index 8325a5aad074..7fbd83a7e52e 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/services-sts/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/services-sts/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.cxf.services-sts">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.cxf.services-sts">
 
     <resources>
         <artifact name="${org.apache.cxf.services.sts:cxf-services-sts-core}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/ws-security/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/ws-security/main/module.xml
index 5a1b0247e3ed..e61aaee4b02f 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/ws-security/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/cxf/ws-security/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.cxf.ws-security">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.cxf.ws-security">
 
     <resources>
         <artifact name="${org.apache.cxf:cxf-rt-ws-security?jandex}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/httpcomponents/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/httpcomponents/main/module.xml
index 3b2e21d47a46..020c6f8f539a 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/httpcomponents/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/httpcomponents/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.httpcomponents">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.httpcomponents">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/james/mime4j/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/james/mime4j/main/module.xml
index 95de37e9d815..e6685e0fe641 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/james/mime4j/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/james/mime4j/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.james.mime4j">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.james.mime4j">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/lucene/internal/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/lucene/internal/main/module.xml
index 147afacf795f..37fcc27189ce 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/lucene/internal/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/lucene/internal/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.lucene.internal">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.lucene.internal">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/lucene/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/lucene/main/module.xml
index 41e1701e9c55..9c647d36bda8 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/lucene/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/lucene/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.lucene">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.lucene">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/neethi/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/neethi/main/module.xml
index f81629cde0b0..1301c6c5e757 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/neethi/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/neethi/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.neethi">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.neethi">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/openjpa/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/openjpa/main/module.xml
index 1b31d47a8fa2..b0e4a4d77732 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/openjpa/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/openjpa/main/module.xml
@@ -23,7 +23,7 @@
   -->
 
 <!-- Represents the OpenJPA module  -->
-<module xmlns="urn:jboss:module:1.3" name="org.apache.openjpa">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.openjpa">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/qpid/proton/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/qpid/proton/main/module.xml
index a84926f6d4fa..f80d850d836d 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/qpid/proton/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/qpid/proton/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.qpid.proton">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.qpid.proton">
     <resources>
         <artifact name="${org.apache.qpid:proton-jms}"/>
         <artifact name="${org.apache.qpid:proton-j}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/santuario/xmlsec/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/santuario/xmlsec/main/module.xml
index 19489d292133..3adebd69f6e2 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/santuario/xmlsec/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/santuario/xmlsec/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.santuario.xmlsec">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.santuario.xmlsec">
 
     <exports>
         <exclude path="javax/**"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/velocity/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/velocity/main/module.xml
index f65fee2fba67..c40737f6813b 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/velocity/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/velocity/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.velocity">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.velocity">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/ws/security/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/ws/security/main/module.xml
index 3747235dcf3a..6474c13cafa9 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/ws/security/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/ws/security/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.ws.security">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.ws.security">
     <resources>
         <artifact name="${org.apache.wss4j:wss4j-bindings}"/>
         <artifact name="${org.apache.wss4j:wss4j-policy}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/ws/xmlschema/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/ws/xmlschema/main/module.xml
index 4529f435c601..17ec7ad819ca 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/apache/ws/xmlschema/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/apache/ws/xmlschema/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.ws.xmlschema">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.ws.xmlschema">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/bouncycastle/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/bouncycastle/main/module.xml
index 2b53729c4657..fd18c214c2de 100755
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/bouncycastle/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/bouncycastle/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.bouncycastle">
+<module xmlns="urn:jboss:module:1.5" name="org.bouncycastle">
 
     <properties>
         <property name="jboss.api" value="private"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-core-asl/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-core-asl/main/module.xml
index a4e269232dfa..c15eed3e2540 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-core-asl/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-core-asl/main/module.xml
@@ -21,7 +21,7 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module xmlns="urn:jboss:module:1.3" name="org.codehaus.jackson.jackson-core-asl">
+<module xmlns="urn:jboss:module:1.5" name="org.codehaus.jackson.jackson-core-asl">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-jaxrs/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-jaxrs/main/module.xml
index 45bcef93bbdc..617f392e01f4 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-jaxrs/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-jaxrs/main/module.xml
@@ -21,7 +21,7 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module xmlns="urn:jboss:module:1.3" name="org.codehaus.jackson.jackson-jaxrs">
+<module xmlns="urn:jboss:module:1.5" name="org.codehaus.jackson.jackson-jaxrs">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-mapper-asl/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-mapper-asl/main/module.xml
index 5e62a8a63b2e..75a1f24a1735 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-mapper-asl/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-mapper-asl/main/module.xml
@@ -21,7 +21,7 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module xmlns="urn:jboss:module:1.3" name="org.codehaus.jackson.jackson-mapper-asl">
+<module xmlns="urn:jboss:module:1.5" name="org.codehaus.jackson.jackson-mapper-asl">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-xc/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-xc/main/module.xml
index 25b7520744d6..97e849e038f2 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-xc/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jackson/jackson-xc/main/module.xml
@@ -21,7 +21,7 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module xmlns="urn:jboss:module:1.3" name="org.codehaus.jackson.jackson-xc">
+<module xmlns="urn:jboss:module:1.5" name="org.codehaus.jackson.jackson-xc">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jettison/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jettison/main/module.xml
index f7685e760c3c..14a691b22d12 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jettison/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/codehaus/jettison/main/module.xml
@@ -21,7 +21,7 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module xmlns="urn:jboss:module:1.3" name="org.codehaus.jettison">
+<module xmlns="urn:jboss:module:1.5" name="org.codehaus.jettison">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/dom4j/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/dom4j/main/module.xml
index f722872c042a..b389d0c83d84 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/dom4j/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/dom4j/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.dom4j">
+<module xmlns="urn:jboss:module:1.5" name="org.dom4j">
   <resources>
     <artifact name="${dom4j:dom4j}"/>
   </resources>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/eclipse/persistence/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/eclipse/persistence/main/module.xml
index 5000518f4962..4664b5883ebd 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/eclipse/persistence/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/eclipse/persistence/main/module.xml
@@ -23,7 +23,7 @@
   -->
 
 <!-- Represents the EclipseLink module  -->
-<module xmlns="urn:jboss:module:1.3" name="org.eclipse.persistence">
+<module xmlns="urn:jboss:module:1.5" name="org.eclipse.persistence">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/glassfish/javax/json/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/glassfish/javax/json/main/module.xml
index 2dc8c0574b4a..9eaafddf5a54 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/glassfish/javax/json/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/glassfish/javax/json/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.glassfish.javax.json">
+<module xmlns="urn:jboss:module:1.5" name="org.glassfish.javax.json">
 
     <properties>
         <property name="jboss.api" value="private"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/4.1/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/4.1/module.xml
index cd773c8e73c8..d925e34fb07f 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/4.1/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/4.1/module.xml
@@ -23,7 +23,7 @@
   -->
 
 <!-- Represents the Hibernate 4.1.x (works with Hibernate 4.2.x jars also) module  -->
-<module xmlns="urn:jboss:module:1.3" name="org.hibernate" slot="4.1">
+<module xmlns="urn:jboss:module:1.5" name="org.hibernate" slot="4.1">
     <resources>
         <artifact name="${org.wildfly:jipijapa-hibernate4-1}"/>
     </resources>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/4.3/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/4.3/module.xml
index 52ed2d790712..b8739c5223d5 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/4.3/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/4.3/module.xml
@@ -23,7 +23,7 @@
   -->
 
 <!-- Represents the Hibernate 4.3.x module  -->
-<module xmlns="urn:jboss:module:1.3" name="org.hibernate" slot="4.3">
+<module xmlns="urn:jboss:module:1.5" name="org.hibernate" slot="4.3">
    <resources>
     </resources>
 
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/5.0/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/5.0/module.xml
index b0992ecdf829..e0a8099d15e8 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/5.0/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/5.0/module.xml
@@ -23,5 +23,5 @@
   -->
 
 <!-- Represents the Hibernate 5.0.x module-->
-<module-alias xmlns="urn:jboss:module:1.3" name="org.hibernate" slot="5.0"  target-name="org.hibernate"/>
+<module-alias xmlns="urn:jboss:module:1.5" name="org.hibernate" slot="5.0"  target-name="org.hibernate"/>
 
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/commons-annotations/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/commons-annotations/main/module.xml
index 4337064cf786..102fcf465cae 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/commons-annotations/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/commons-annotations/main/module.xml
@@ -23,7 +23,7 @@
   -->
 
 <!-- Represents the Hibernate 4.0.x module-->
-<module xmlns="urn:jboss:module:1.3" name="org.hibernate.commons-annotations">
+<module xmlns="urn:jboss:module:1.5" name="org.hibernate.commons-annotations">
     <resources>
         <artifact name="${org.hibernate.common:hibernate-commons-annotations}"/>
     </resources>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/envers/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/envers/main/module.xml
index 2432dd5c72eb..cfe46809fe7c 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/envers/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/envers/main/module.xml
@@ -22,4 +22,4 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module-alias xmlns="urn:jboss:module:1.3" name="org.hibernate.envers" target-name="org.hibernate"/>
+<module-alias xmlns="urn:jboss:module:1.5" name="org.hibernate.envers" target-name="org.hibernate"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/infinispan/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/infinispan/main/module.xml
index 10bcb6ab87e3..5856ea0e0d5b 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/infinispan/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/infinispan/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.hibernate.infinispan">
+<module xmlns="urn:jboss:module:1.5" name="org.hibernate.infinispan">
 
     <properties>
         <property name="jboss.api" value="private"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/jipijapa-hibernate4-3/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/jipijapa-hibernate4-3/main/module.xml
index 36489cfb9f40..cf8e90e74c38 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/jipijapa-hibernate4-3/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/jipijapa-hibernate4-3/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.hibernate.jipijapa-hibernate4-3">
+<module xmlns="urn:jboss:module:1.5" name="org.hibernate.jipijapa-hibernate4-3">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/jipijapa-hibernate5/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/jipijapa-hibernate5/main/module.xml
index 52f203832ea9..1369db3b3eef 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/jipijapa-hibernate5/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/jipijapa-hibernate5/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.hibernate.jipijapa-hibernate5">
+<module xmlns="urn:jboss:module:1.5" name="org.hibernate.jipijapa-hibernate5">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/main/module.xml
index 7134bfe7be2e..c2a00abf5b4a 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/main/module.xml
@@ -23,7 +23,7 @@
   -->
 
 <!-- Represents the Hibernate 5.0.x module-->
-<module xmlns="urn:jboss:module:1.3" name="org.hibernate">
+<module xmlns="urn:jboss:module:1.5" name="org.hibernate">
     <resources>
         <artifact name="${org.hibernate:hibernate-core}"/>
         <artifact name="${org.hibernate:hibernate-envers}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/search/backend-jgroups/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/search/backend-jgroups/main/module.xml
index a1a7181d592d..59ed67435ac8 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/search/backend-jgroups/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/search/backend-jgroups/main/module.xml
@@ -21,7 +21,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="org.hibernate.search.backend-jgroups">
+<module xmlns="urn:jboss:module:1.5" name="org.hibernate.search.backend-jgroups">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/search/backend-jms/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/search/backend-jms/main/module.xml
index cc177cc8fc00..094fcc65757b 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/search/backend-jms/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/search/backend-jms/main/module.xml
@@ -21,7 +21,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="org.hibernate.search.backend-jms">
+<module xmlns="urn:jboss:module:1.5" name="org.hibernate.search.backend-jms">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/search/engine/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/search/engine/main/module.xml
index 03ca04077879..982c3088d81a 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/search/engine/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/search/engine/main/module.xml
@@ -25,7 +25,7 @@
 <!-- Hibernate Search Engine: the fulltext indexing and query capabilities
      without the ORM integration bits. This is reused by several other project
      outside of the Hibernate group. -->
-<module xmlns="urn:jboss:module:1.3" name="org.hibernate.search.engine">
+<module xmlns="urn:jboss:module:1.5" name="org.hibernate.search.engine">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/search/orm/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/search/orm/main/module.xml
index f1a09518c99c..13146ed9d3f0 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/search/orm/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/search/orm/main/module.xml
@@ -24,7 +24,7 @@
 <!-- Hibernate Search ORM: integrates org.hibernate.search.engine with
      Hibernate ORM to provide Hibernate Search functionality to
      JPA Applications -->
-<module xmlns="urn:jboss:module:1.3" name="org.hibernate.search.orm">
+<module xmlns="urn:jboss:module:1.5" name="org.hibernate.search.orm">
     <resources>
         <artifact name="${org.hibernate:hibernate-search-orm}"/>
     </resources>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/search/serialization-avro/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/search/serialization-avro/main/module.xml
index 56949cb204ca..69813448ca28 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/search/serialization-avro/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/search/serialization-avro/main/module.xml
@@ -21,7 +21,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="org.hibernate.search.serialization-avro">
+<module xmlns="urn:jboss:module:1.5" name="org.hibernate.search.serialization-avro">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/validator/cdi/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/validator/cdi/main/module.xml
index 12e1d5e086e5..a05963d1f716 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/validator/cdi/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/validator/cdi/main/module.xml
@@ -22,7 +22,7 @@
 ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.hibernate.validator.cdi">
+<module xmlns="urn:jboss:module:1.5" name="org.hibernate.validator.cdi">
 
   <resources>
     <artifact name="${org.hibernate:hibernate-validator-cdi}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/validator/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/validator/main/module.xml
index 54767b27fca9..4749f4c76cb3 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/validator/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/hibernate/validator/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.hibernate.validator">
+<module xmlns="urn:jboss:module:1.5" name="org.hibernate.validator">
 
   <resources>
     <artifact name="${org.hibernate:hibernate-validator}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/hornetq/client/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/hornetq/client/main/module.xml
index 0969d910a1a5..b864f7939bde 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/hornetq/client/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/hornetq/client/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.hornetq.client">
+<module xmlns="urn:jboss:module:1.5" name="org.hornetq.client">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/cachestore/jdbc/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/cachestore/jdbc/main/module.xml
index 7725fa3b62e2..2d6ae10f945a 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/cachestore/jdbc/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/cachestore/jdbc/main/module.xml
@@ -20,7 +20,7 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module xmlns="urn:jboss:module:1.3" name="org.infinispan.cachestore.jdbc">
+<module xmlns="urn:jboss:module:1.5" name="org.infinispan.cachestore.jdbc">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/cachestore/remote/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/cachestore/remote/main/module.xml
index ee0c33e421ec..2c59cd90fc50 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/cachestore/remote/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/cachestore/remote/main/module.xml
@@ -20,7 +20,7 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module xmlns="urn:jboss:module:1.3" name="org.infinispan.cachestore.remote">
+<module xmlns="urn:jboss:module:1.5" name="org.infinispan.cachestore.remote">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/client/hotrod/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/client/hotrod/main/module.xml
index 184fb658c558..0144ca5b3ef4 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/client/hotrod/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/client/hotrod/main/module.xml
@@ -20,7 +20,7 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module xmlns="urn:jboss:module:1.3" name="org.infinispan.client.hotrod">
+<module xmlns="urn:jboss:module:1.5" name="org.infinispan.client.hotrod">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/commons/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/commons/main/module.xml
index 662149c338a5..aa0499d4d21f 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/commons/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/commons/main/module.xml
@@ -20,7 +20,7 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module xmlns="urn:jboss:module:1.3" name="org.infinispan.commons">
+<module xmlns="urn:jboss:module:1.5" name="org.infinispan.commons">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/main/module.xml
index e943d51158a4..650ecfb740b8 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/infinispan/main/module.xml
@@ -20,7 +20,7 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module xmlns="urn:jboss:module:1.3" name="org.infinispan">
+<module xmlns="urn:jboss:module:1.5" name="org.infinispan">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/javassist/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/javassist/main/module.xml
index 1ffec75f5357..262e8b38081c 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/javassist/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/javassist/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.javassist">
+<module xmlns="urn:jboss:module:1.5" name="org.javassist">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jaxen/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jaxen/main/module.xml
index 9b6be99f129e..1ad19d08e7d7 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jaxen/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jaxen/main/module.xml
@@ -20,7 +20,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jaxen">
+<module xmlns="urn:jboss:module:1.5" name="org.jaxen">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jberet/jberet-core/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jberet/jberet-core/main/module.xml
index 08123133277c..b89c13b50eba 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jberet/jberet-core/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jberet/jberet-core/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jberet.jberet-core">
+<module xmlns="urn:jboss:module:1.5" name="org.jberet.jberet-core">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/appclient/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/appclient/main/module.xml
index baa681da3c5f..26a7bdc8dbd6 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/appclient/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/appclient/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.appclient">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.appclient">
     <properties>
         <property name="jboss.api" value="private"/>
         <property name="jboss.require-java-version" value="1.7"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/common/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/common/main/module.xml
index 91d03cedb34f..e152c02f7452 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/common/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/common/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.clustering.common">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.clustering.common">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/ejb3/infinispan/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/ejb3/infinispan/main/module.xml
index 14eaebcf2c41..2d7ad0bc8244 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/ejb3/infinispan/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/ejb3/infinispan/main/module.xml
@@ -21,4 +21,4 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module-alias xmlns="urn:jboss:module:1.3" name="org.jboss.as.clustering.ejb3.infinispan" target-name="org.wildfly.clustering.ejb.infinispan"/>
+<module-alias xmlns="urn:jboss:module:1.5" name="org.jboss.as.clustering.ejb3.infinispan" target-name="org.wildfly.clustering.ejb.infinispan"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/infinispan/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/infinispan/main/module.xml
index c237cae9caa6..2fb8cddbec4e 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/infinispan/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/infinispan/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.clustering.infinispan">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.clustering.infinispan">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/jgroups/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/jgroups/main/module.xml
index 2cf1a88d50d4..d620bd641e19 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/jgroups/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/jgroups/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.clustering.jgroups">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.clustering.jgroups">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/web/infinispan/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/web/infinispan/main/module.xml
index b7e62b2f11f3..cecd8117d548 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/web/infinispan/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/clustering/web/infinispan/main/module.xml
@@ -21,4 +21,4 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module-alias xmlns="urn:jboss:module:1.3" name="org.jboss.as.clustering.web.infinispan" target-name="org.wildfly.clustering.web.infinispan"/>
+<module-alias xmlns="urn:jboss:module:1.5" name="org.jboss.as.clustering.web.infinispan" target-name="org.wildfly.clustering.web.infinispan"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/cmp/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/cmp/main/module.xml
index ed9847f653ce..73703a6a546b 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/cmp/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/cmp/main/module.xml
@@ -20,7 +20,7 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.cmp">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.cmp">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/configadmin/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/configadmin/main/module.xml
index 02626c71e2a1..56bb2e542452 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/configadmin/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/configadmin/main/module.xml
@@ -20,7 +20,7 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.configadmin">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.configadmin">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/connector/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/connector/main/module.xml
index f551e4a9e29a..e82adb64e58a 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/connector/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/connector/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.connector">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.connector">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/console/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/console/main/module.xml
index e8b71b57a531..0be7eafc76f6 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/console/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/console/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.console">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.console">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/ejb3/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/ejb3/main/module.xml
index 7ac36a5e9f8f..f920a1fc47f0 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/ejb3/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/ejb3/main/module.xml
@@ -20,7 +20,7 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.ejb3">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.ejb3">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jacorb/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jacorb/main/module.xml
index 8f82405b0c2e..7c07d499f1af 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jacorb/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jacorb/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.jacorb">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.jacorb">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jaxr/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jaxr/main/module.xml
index e943492b585e..8081fb6fb28c 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jaxr/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jaxr/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.jaxr">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.jaxr">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jaxrs/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jaxrs/main/module.xml
index 730ea9f4c053..5bd86dbad431 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jaxrs/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jaxrs/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.jaxrs">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.jaxrs">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jdr/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jdr/main/module.xml
index 608c2a4c35fc..2931b90383e9 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jdr/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jdr/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.jdr">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.jdr">
     <properties>
         <property name="jboss.api" value="private"/>
         <property name="jboss.require-java-version" value="1.7"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/hibernate/4/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/hibernate/4/module.xml
index 45f6b19c7923..ce3b64495269 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/hibernate/4/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/hibernate/4/module.xml
@@ -29,7 +29,7 @@
      or use module org.hibernate which contains the JPA integration classes for Hibernate 4.3.x
 -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.jpa.hibernate" slot="4">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.jpa.hibernate" slot="4">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/main/module.xml
index 0b10f8e07b30..27ddd74b4ff7 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.jpa">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.jpa">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/openjpa/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/openjpa/main/module.xml
index e1d36c744373..e1653ae94a7d 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/openjpa/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/openjpa/main/module.xml
@@ -23,7 +23,7 @@
   -->
 
 <!-- contains the JPA integration classes for OpenJPA 2.x --> 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.jpa.openjpa">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.jpa.openjpa">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/spi/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/spi/main/module.xml
index 24407dfe3b9d..d799c4e6c11e 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/spi/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jpa/spi/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.jpa.spi">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.jpa.spi">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jsf-injection/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jsf-injection/main/module.xml
index 24ee24883849..6e7e353d7538 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jsf-injection/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jsf-injection/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.jsf-injection">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.jsf-injection">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jsf/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jsf/main/module.xml
index 33e08714c0ff..75851299172c 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jsf/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jsf/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.jsf">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.jsf">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jsr77/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jsr77/main/module.xml
index f199aee19f45..42fc47548482 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jsr77/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/jsr77/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.jsr77">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.jsr77">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/mail/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/mail/main/module.xml
index 583bae59ac67..b9a5be7d6258 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/mail/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/mail/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.mail">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.mail">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/messaging/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/messaging/main/module.xml
index be4d3d68abb5..edc3daec79b9 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/messaging/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/messaging/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.messaging">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.messaging">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/modcluster/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/modcluster/main/module.xml
index e8226c559cd8..8b12410a04b0 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/modcluster/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/modcluster/main/module.xml
@@ -21,4 +21,4 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module-alias xmlns="urn:jboss:module:1.3" name="org.jboss.as.modcluster" target-name="org.wildfly.extension.mod_cluster"/>
+<module-alias xmlns="urn:jboss:module:1.5" name="org.jboss.as.modcluster" target-name="org.wildfly.extension.mod_cluster"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/pojo/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/pojo/main/module.xml
index 6f8d06a44bdd..a5c94f511a86 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/pojo/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/pojo/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.pojo">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.pojo">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/sar/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/sar/main/module.xml
index 25e2ca2b7e38..a40c98aad87c 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/sar/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/sar/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.sar">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.sar">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/security-api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/security-api/main/module.xml
index 2c5be6ca7672..ca83801f37d5 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/security-api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/security-api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.security-api">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.security-api">
 
     <properties>
         <property name="jboss.api" value="deprecated"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/system-jmx/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/system-jmx/main/module.xml
index 27baf2eddaa3..3b9c6626d000 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/system-jmx/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/system-jmx/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.system-jmx">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.system-jmx">
 
     <exports>
         <exclude path="org/jboss/system/logging"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/transactions/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/transactions/main/module.xml
index f94d61f8fe50..a93e4fa14d9e 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/transactions/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/transactions/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.transactions">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.transactions">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/vault-tool/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/vault-tool/main/module.xml
index 2f9b79785f57..2908d44f29d1 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/vault-tool/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/vault-tool/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.vault-tool">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.vault-tool">
     <properties>
         <property name="jboss.api" value="private"/>
         <property name="jboss.require-java-version" value="1.7"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/web/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/web/main/module.xml
index 0ec1f9bf2571..b3428c6215eb 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/web/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/web/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.web">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.web">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/webservices/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/webservices/main/module.xml
index f232c295c75d..f84c38e6694d 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/webservices/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/webservices/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.webservices">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.webservices">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/webservices/server/integration/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/webservices/server/integration/main/module.xml
index 17044448fa14..ef6356cd3020 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/webservices/server/integration/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/webservices/server/integration/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.webservices.server.integration">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.webservices.server.integration">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/weld/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/weld/main/module.xml
index b08255e8d771..75b80e7cd7da 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/weld/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/weld/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.weld">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.weld">
 
     <properties>
         <property name="jboss.api" value="private"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/xts/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/xts/main/module.xml
index 55088b3ebbaf..38e78b49ffe1 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/xts/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/xts/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.xts">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.xts">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/deployers/jboss-service-deployer/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/deployers/jboss-service-deployer/main/module.xml
index 062593453d48..973873769e6c 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/deployers/jboss-service-deployer/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/deployers/jboss-service-deployer/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.deployers.jboss-service-deployer">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.deployers.jboss-service-deployer">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ejb-client/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ejb-client/main/module.xml
index 63b48d488ea9..905faeed7c92 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ejb-client/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ejb-client/main/module.xml
@@ -20,7 +20,7 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.ejb-client">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.ejb-client">
 
     <resources>
         <artifact name="${org.jboss:jboss-ejb-client}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ejb/remote/protocol/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ejb/remote/protocol/main/module.xml
index 25fa14144b1a..f5d4d168e1a4 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ejb/remote/protocol/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ejb/remote/protocol/main/module.xml
@@ -20,7 +20,7 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.ejb.remote.protocol">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.ejb.remote.protocol">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ejb3/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ejb3/main/module.xml
index ac9425aaa6bf..60015bc07e61 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ejb3/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ejb3/main/module.xml
@@ -20,7 +20,7 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.ejb3">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.ejb3">
 
     <resources>
         <artifact name="${org.jboss.ejb3:jboss-ejb3-ext-api}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/genericjms/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/genericjms/main/module.xml
index bc71e78cae0a..2915a0c62815 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/genericjms/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/genericjms/main/module.xml
@@ -20,7 +20,7 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.genericjms">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.genericjms">
     <resources>
        <resource-root path="."/>
         <artifact name="${org.jboss.genericjms:generic-jms-ra-jar}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/iiop-client/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/iiop-client/main/module.xml
index c2e54e59da9e..cbf3bc67fa15 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/iiop-client/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/iiop-client/main/module.xml
@@ -20,7 +20,7 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.iiop-client">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.iiop-client">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/integration/ext-content/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/integration/ext-content/main/module.xml
index 5b27770c6684..10d2ac6eaea0 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/integration/ext-content/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/integration/ext-content/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.integration.ext-content">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.integration.ext-content">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ironjacamar/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ironjacamar/api/main/module.xml
index 4e4376073943..258094018d03 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ironjacamar/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ironjacamar/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.ironjacamar.api">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.ironjacamar.api">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ironjacamar/impl/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ironjacamar/impl/main/module.xml
index 19662bb1cfe5..3ebf3e99a86c 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ironjacamar/impl/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ironjacamar/impl/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.ironjacamar.impl">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.ironjacamar.impl">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ironjacamar/jdbcadapters/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ironjacamar/jdbcadapters/main/module.xml
index 69b66a60bd12..bf8547bd013a 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ironjacamar/jdbcadapters/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ironjacamar/jdbcadapters/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.ironjacamar.jdbcadapters">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.ironjacamar.jdbcadapters">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/jaxbintros/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/jaxbintros/main/module.xml
index 06dc68db0322..3abcfb2525e7 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/jaxbintros/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/jaxbintros/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.jaxbintros">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.jaxbintros">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/jboss-transaction-spi/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/jboss-transaction-spi/main/module.xml
index a6ee668674bc..ddf18119e340 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/jboss-transaction-spi/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/jboss-transaction-spi/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.jboss-transaction-spi">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.jboss-transaction-spi">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/jts/integration/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/jts/integration/main/module.xml
index 7f25cccac916..c5a13eef4a64 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/jts/integration/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/jts/integration/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.jts.integration">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.jts.integration">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/jts/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/jts/main/module.xml
index 93fa4b784c5d..7049bcfb1f2b 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/jts/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/jts/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.jts">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.jts">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/appclient/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/appclient/main/module.xml
index 4980eef77224..6292de67b8dd 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/appclient/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/appclient/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.metadata.appclient">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.metadata.appclient">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/ejb/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/ejb/main/module.xml
index b80db4b0d750..12239d2c76fa 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/ejb/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/ejb/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.metadata.ejb">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.metadata.ejb">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/mod_cluster/container/spi/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/mod_cluster/container/spi/main/module.xml
index 7a1d5ce96e05..37a4a34ffa45 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/mod_cluster/container/spi/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/mod_cluster/container/spi/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.mod_cluster.container.spi">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.mod_cluster.container.spi">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/mod_cluster/core/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/mod_cluster/core/main/module.xml
index 153ac92332ca..b7268006afca 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/mod_cluster/core/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/mod_cluster/core/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.mod_cluster.core">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.mod_cluster.core">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/narayana/compensations/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/narayana/compensations/main/module.xml
index 2e61d91ce723..2520e38bc604 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/narayana/compensations/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/narayana/compensations/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.narayana.compensations">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.narayana.compensations">
 
     <resources>
         <artifact name="${org.jboss.narayana.compensations:compensations}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/narayana/rts/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/narayana/rts/main/module.xml
index ce1ba1c70b2a..a9bde7947d33 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/narayana/rts/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/narayana/rts/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.narayana.rts">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.narayana.rts">
     <resources>
         <artifact name="${org.jboss.narayana.rts:restat-api}"/>
         <artifact name="${org.jboss.narayana.rts:restat-util}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/narayana/txframework/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/narayana/txframework/main/module.xml
index bdb27b514704..5f0601de6bfc 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/narayana/txframework/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/narayana/txframework/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.narayana.txframework">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.narayana.txframework">
 
     <resources>
         <artifact name="${org.jboss.narayana.txframework:txframework}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/remoting3/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/remoting3/main/module.xml
index 92211bbe5666..555522ba0a94 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/remoting3/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/remoting3/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.remoting3">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.remoting3">
     <!-- This module is deprecated and subject to being removed in a subsequent release.      -->
 
     <!-- Any use of the Remoting library should now reference the org.jboss.remoting          -->
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/remoting3/remoting-jmx/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/remoting3/remoting-jmx/main/module.xml
index da5dc3f8a449..36f036ec87fc 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/remoting3/remoting-jmx/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/remoting3/remoting-jmx/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.remoting3.remoting-jmx">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.remoting3.remoting-jmx">
     <!-- This module is deprecated and subject to being removed in a subsequent release.      -->
     
     <!-- Any use of the Remoting JMX library should now reference the org.jboss.remoting-jmx  -->
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/jose-jwt/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/jose-jwt/main/module.xml
index 6d06309b2d45..2f549b92a4c3 100755
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/jose-jwt/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/jose-jwt/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.resteasy.jose-jwt">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.resteasy.jose-jwt">
 
     <properties>
         <property name="jboss.api" value="private"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-atom-provider/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-atom-provider/main/module.xml
index ff0c558705b4..c1cbb766b37b 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-atom-provider/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-atom-provider/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.resteasy.resteasy-atom-provider">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.resteasy.resteasy-atom-provider">
 
     <resources>
         <artifact name="${org.jboss.resteasy:resteasy-atom-provider}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-cdi/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-cdi/main/module.xml
index 6037cddda915..d39db77898ac 100755
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-cdi/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-cdi/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.resteasy.resteasy-cdi">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.resteasy.resteasy-cdi">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-crypto/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-crypto/main/module.xml
index 0a1b78be4f4a..8772de798edd 100755
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-crypto/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-crypto/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.resteasy.resteasy-crypto">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.resteasy.resteasy-crypto">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jackson-provider/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jackson-provider/main/module.xml
index fbcaf2666d0e..0bf1c6bca127 100755
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jackson-provider/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jackson-provider/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.resteasy.resteasy-jackson-provider">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.resteasy.resteasy-jackson-provider">
 
     <resources>
         <artifact name="${org.jboss.resteasy:resteasy-jackson-provider}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jackson2-provider/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jackson2-provider/main/module.xml
index 201dabcaf9d9..898fbdc231ce 100755
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jackson2-provider/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jackson2-provider/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.resteasy.resteasy-jackson2-provider">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.resteasy.resteasy-jackson2-provider">
     <resources>
         <artifact name="${org.jboss.resteasy:resteasy-jackson2-provider}"/>
     </resources>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxb-provider/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxb-provider/main/module.xml
index 9379251ff46b..b2ae9ef9437c 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxb-provider/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxb-provider/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.resteasy.resteasy-jaxb-provider">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.resteasy.resteasy-jaxb-provider">
 
     <resources>
         <artifact name="${org.jboss.resteasy:resteasy-jaxb-provider}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxrs/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxrs/main/module.xml
index 7c2f68d622a8..6f788fe54f8a 100755
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxrs/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jaxrs/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.resteasy.resteasy-jaxrs">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.resteasy.resteasy-jaxrs">
 
     <resources>
         <artifact name="${org.jboss.resteasy:async-http-servlet-3.0}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jettison-provider/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jettison-provider/main/module.xml
index 9a47d2955da9..18e41d547f94 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jettison-provider/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jettison-provider/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.resteasy.resteasy-jettison-provider">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.resteasy.resteasy-jettison-provider">
     <!-- This module is deprecated and subject to being removed in a subsequent release. -->
     <properties>
         <property name="jboss.api" value="deprecated"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jsapi/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jsapi/main/module.xml
index d00d023bccab..674d511bb22d 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jsapi/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-jsapi/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.resteasy.resteasy-jsapi">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.resteasy.resteasy-jsapi">
 
     <resources>
         <artifact name="${org.jboss.resteasy:resteasy-jsapi}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-json-p-provider/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-json-p-provider/main/module.xml
index e486d440ae8f..d08ab9cbea7d 100755
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-json-p-provider/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-json-p-provider/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.resteasy.resteasy-json-p-provider">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.resteasy.resteasy-json-p-provider">
 
     <resources>
         <artifact name="${org.jboss.resteasy:resteasy-json-p-provider}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-multipart-provider/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-multipart-provider/main/module.xml
index 722f3a239be7..2548fed50b41 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-multipart-provider/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-multipart-provider/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.resteasy.resteasy-multipart-provider">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.resteasy.resteasy-multipart-provider">
 
     <resources>
         <artifact name="${org.jboss.resteasy:resteasy-multipart-provider}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-spring/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-spring/main/module.xml
index 5afd50f84e44..f5f7aa616c8c 100755
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-spring/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-spring/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.resteasy.resteasy-spring">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.resteasy.resteasy-spring">
 
     <resources>
         <!-- This module just contains the jar as a resource root. It cannot be depended on to get
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-validator-provider-11/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-validator-provider-11/main/module.xml
index 6913cf3ae88b..9d724af37d38 100755
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-validator-provider-11/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-validator-provider-11/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.resteasy.resteasy-validator-provider-11">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.resteasy.resteasy-validator-provider-11">
     <resources>
         <artifact name="${org.jboss.resteasy:resteasy-validator-provider-11}"/>
     </resources>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-yaml-provider/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-yaml-provider/main/module.xml
index 7ccb4265f2aa..65f9812d6217 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-yaml-provider/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/resteasy/resteasy-yaml-provider/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.resteasy.resteasy-yaml-provider">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.resteasy.resteasy-yaml-provider">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/security/xacml/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/security/xacml/main/module.xml
index ba5dfbde0259..33c8343b0aff 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/security/xacml/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/security/xacml/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.security.xacml">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.security.xacml">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/weld/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/weld/api/main/module.xml
index c17b5f7651f7..06bc7d5911c8 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/weld/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/weld/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.weld.api">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.weld.api">
 
     <resources>
         <artifact name="${org.jboss.weld:weld-api}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/weld/core/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/weld/core/main/module.xml
index 99e94c60a8fa..cb1b7c552ae3 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/weld/core/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/weld/core/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.weld.core">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.weld.core">
 
     <properties>
         <property name="jboss.api" value="private"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/weld/probe/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/weld/probe/main/module.xml
index c006b40883a8..0c00ad2756e2 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/weld/probe/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/weld/probe/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.weld.probe">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.weld.probe">
 
     <properties>
         <property name="jboss.api" value="private"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/weld/spi/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/weld/spi/main/module.xml
index 3e05db3b8d79..72368ea9dfdd 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/weld/spi/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/weld/spi/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.weld.spi">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.weld.spi">
 
     <properties>
         <property name="jboss.api" value="private"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/api/main/module.xml
index f77ecc72902c..cd2a5ea6d67e 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.ws.api">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.ws.api">
 
     <resources>
         <artifact name="${org.jboss.ws:jbossws-api}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/common/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/common/main/module.xml
index 5d436b81744f..bc5daf01c87b 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/common/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/common/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.ws.common">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.ws.common">
 
     <properties>
         <property name="jboss.api" value="private"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
index 2a28c83dfaf5..78629f876e4a 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-client/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.ws.cxf.jbossws-cxf-client">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.ws.cxf.jbossws-cxf-client">
 
     <resources>
     </resources>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml
index c8d4505551f5..beb4c65907a9 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-factories/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.ws.cxf.jbossws-cxf-factories">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.ws.cxf.jbossws-cxf-factories">
 
     <properties>
         <property name="jboss.api" value="private"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
index 2f9cd1571bc9..1c86a2c9afe9 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-server/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.ws.cxf.jbossws-cxf-server">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.ws.cxf.jbossws-cxf-server">
 
     <properties>
         <property name="jboss.api" value="private"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml
index c82dad7e82e7..841bb9495177 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-transports-udp/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.ws.cxf.jbossws-cxf-transports-udp">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.ws.cxf.jbossws-cxf-transports-udp">
 
     <properties>
         <property name="jboss.api" value="private"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/main/module.xml
index e14ecd5b6315..18e225834fca 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/jbossws-cxf-transports-undertow/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.ws.cxf.jbossws-cxf-transports-undertow">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.ws.cxf.jbossws-cxf-transports-undertow">
 
     <properties>
         <property name="jboss.api" value="private"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/sts/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/sts/main/module.xml
index 1743ad0f7043..31d86d3db662 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/sts/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/cxf/sts/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.ws.cxf.sts">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.ws.cxf.sts">
     
     <resources/>
 
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-client/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-client/main/module.xml
index f00c9171a431..6320cc35858f 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-client/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-client/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.ws.jaxws-client">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.ws.jaxws-client">
 
     <properties>
         <property name="jboss.api" value="private"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-undertow-httpspi/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-undertow-httpspi/main/module.xml
index 675f0a0dba9a..4e77b1b59f69 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-undertow-httpspi/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/jaxws-undertow-httpspi/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.ws.jaxws-undertow-httpspi">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.ws.jaxws-undertow-httpspi">
 
     <properties>
         <property name="jboss.api" value="private"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/saaj-impl/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/saaj-impl/main/module.xml
index 640adfde10c5..1e4ea67deccd 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/saaj-impl/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/saaj-impl/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.ws.saaj-impl">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.ws.saaj-impl">
 
     <properties>
         <property name="jboss.api" value="private"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/spi/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/spi/main/module.xml
index b1199fe353af..e511b1bf82c6 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/spi/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/spi/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.ws.spi">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.ws.spi">
 
     <properties>
         <property name="jboss.api" value="private"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/tools/common/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/tools/common/main/module.xml
index df6d8dc64363..fc2334c21ac8 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/tools/common/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/tools/common/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.ws.tools.common">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.ws.tools.common">
 
     <properties>
         <property name="jboss.api" value="private"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/tools/wsconsume/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/tools/wsconsume/main/module.xml
index 82db1e0812c7..1d4275fa4ab0 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/tools/wsconsume/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/tools/wsconsume/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.ws.tools.wsconsume">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.ws.tools.wsconsume">
 
     <properties>
         <property name="jboss.api" value="private"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/tools/wsprovide/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/tools/wsprovide/main/module.xml
index 2b55a5f914c7..2de86ec20725 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/tools/wsprovide/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/ws/tools/wsprovide/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.ws.tools.wsprovide">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.ws.tools.wsprovide">
 
     <properties>
         <property name="jboss.api" value="private"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/xnio/netty/netty-xnio-transport/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/xnio/netty/netty-xnio-transport/main/module.xml
index 1f3215d2d2dd..d7dc4cd09ec4 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/xnio/netty/netty-xnio-transport/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/xnio/netty/netty-xnio-transport/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.xnio.netty.netty-xnio-transport">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.xnio.netty.netty-xnio-transport">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/xts/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/xts/main/module.xml
index 9711fa219677..86e86ff6a0e7 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/xts/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jboss/xts/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.xts">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.xts">
 
     <resources>
         <artifact name="${org.jboss.narayana.xts:jbossxts}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jdom/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jdom/main/module.xml
index 9f4ea6c48f99..ca34d7b1d34b 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jdom/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jdom/main/module.xml
@@ -20,7 +20,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jdom">
+<module xmlns="urn:jboss:module:1.5" name="org.jdom">
 
     <dependencies>
         <module name="org.jaxen"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jgroups/azure/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jgroups/azure/main/module.xml
index 2786f532dde5..5cb9be836d2f 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jgroups/azure/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jgroups/azure/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jgroups.azure">
+<module xmlns="urn:jboss:module:1.5" name="org.jgroups.azure">
 
     <resources>
         <artifact name="${org.jgroups:jgroups-azure}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jgroups/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jgroups/main/module.xml
index 053c87d7befd..a7e86fc18c28 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jgroups/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jgroups/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jgroups">
+<module xmlns="urn:jboss:module:1.5" name="org.jgroups">
 
     <resources>
         <artifact name="${org.jgroups:jgroups}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/joda/time/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/joda/time/main/module.xml
index c4b1b52621e3..fbb1e6e2edc9 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/joda/time/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/joda/time/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.joda.time">
+<module xmlns="urn:jboss:module:1.5" name="org.joda.time">
 
     <resources>
         <artifact name="${joda-time:joda-time}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/jsoup/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/jsoup/main/module.xml
index 2cbf37584437..d90d3f02afaf 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/jsoup/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/jsoup/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jsoup">
+<module xmlns="urn:jboss:module:1.5" name="org.jsoup">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/omg/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/omg/api/main/module.xml
index 27df83c9eb53..babb803ca2f8 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/omg/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/omg/api/main/module.xml
@@ -21,7 +21,7 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module xmlns="urn:jboss:module:1.3" name="org.omg.api">
+<module xmlns="urn:jboss:module:1.5" name="org.omg.api">
     <dependencies>
         <module name="javax.orb.api" export="false">
             <exports>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/opensaml/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/opensaml/main/module.xml
index 6c972370e1f4..43ad8f845d7e 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/opensaml/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/opensaml/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.opensaml">
+<module xmlns="urn:jboss:module:1.5" name="org.opensaml">
 
     <resources>
         <artifact name="${org.opensaml:opensaml-core}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/common/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/common/main/module.xml
index a865739e23da..42d47f4ac8e4 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/common/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/common/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.picketlink.common">
+<module xmlns="urn:jboss:module:1.5" name="org.picketlink.common">
     <!-- This module is deprecated and subject to being removed in a subsequent release. -->
     <properties>
         <property name="jboss.api" value="deprecated"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/config/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/config/main/module.xml
index be794e86b9dd..880ad2b3efba 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/config/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/config/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.picketlink.config">
+<module xmlns="urn:jboss:module:1.5" name="org.picketlink.config">
     <!-- This module is deprecated and subject to being removed in a subsequent release. -->
     <properties>
         <property name="jboss.api" value="deprecated"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/core/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/core/api/main/module.xml
index b2ce50ec1038..0acd68e3be10 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/core/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/core/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.picketlink.core.api">
+<module xmlns="urn:jboss:module:1.5" name="org.picketlink.core.api">
     <!-- This module is deprecated and subject to being removed in a subsequent release. -->
     <properties>
         <property name="jboss.api" value="deprecated"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/core/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/core/main/module.xml
index 3a9073aa73e7..24dc9af608fe 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/core/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/core/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.picketlink.core">
+<module xmlns="urn:jboss:module:1.5" name="org.picketlink.core">
     <!-- This module is deprecated and subject to being removed in a subsequent release. -->
     <properties>
         <property name="jboss.api" value="deprecated"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/federation/bindings/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/federation/bindings/main/module.xml
index e0fcea0d8a0d..8d60d341bf35 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/federation/bindings/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/federation/bindings/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.picketlink.federation.bindings">
+<module xmlns="urn:jboss:module:1.5" name="org.picketlink.federation.bindings">
     <!-- This module is deprecated and subject to being removed in a subsequent release. -->
     <properties>
         <property name="jboss.api" value="deprecated"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/federation/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/federation/main/module.xml
index ba1dc3a24a15..f023c2f8a1cd 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/federation/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/federation/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.picketlink.federation">
+<module xmlns="urn:jboss:module:1.5" name="org.picketlink.federation">
     <!-- This module is deprecated and subject to being removed in a subsequent release. -->
     <properties>
         <property name="jboss.api" value="deprecated"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/idm/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/idm/api/main/module.xml
index a6eb1f5cd5fb..980aeabbc7de 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/idm/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/idm/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.picketlink.idm.api">
+<module xmlns="urn:jboss:module:1.5" name="org.picketlink.idm.api">
     <!-- This module is deprecated and subject to being removed in a subsequent release. -->
     <properties>
         <property name="jboss.api" value="deprecated"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/idm/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/idm/main/module.xml
index 5645c86b4f85..2936709b231d 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/idm/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/idm/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.picketlink.idm">
+<module xmlns="urn:jboss:module:1.5" name="org.picketlink.idm">
     <!-- This module is deprecated and subject to being removed in a subsequent release. -->
     <properties>
         <property name="jboss.api" value="deprecated"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/idm/schema/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/idm/schema/main/module.xml
index 164ffcc56970..dba5a00723c8 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/idm/schema/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/idm/schema/main/module.xml
@@ -15,7 +15,7 @@
         Franklin St, Fifth Floor, Boston, MA ~ 02110-1301 USA, or see the FSF site:
         http://www.fsf.org. -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.picketlink.idm.schema">
+<module xmlns="urn:jboss:module:1.5" name="org.picketlink.idm.schema">
     <!-- This module is deprecated and subject to being removed in a subsequent release. -->
     <properties>
         <property name="jboss.api" value="deprecated"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/main/module.xml
index 979f167dd639..fafe8075d10d 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/picketlink/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.picketlink">
+<module xmlns="urn:jboss:module:1.5" name="org.picketlink">
     <!-- This module is deprecated and subject to being removed in a subsequent release. -->
     <properties>
         <property name="jboss.api" value="deprecated"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/slf4j/ext/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/slf4j/ext/main/module.xml
index 05959edbb9b3..6eb1fc70604a 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/slf4j/ext/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/slf4j/ext/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.slf4j.ext">
+<module xmlns="urn:jboss:module:1.5" name="org.slf4j.ext">
 
     <properties>
         <property name="jboss.api" value="deprecated"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/api/main/module.xml
index 40540f1b88b1..4360f0332d02 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.clustering.api">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.clustering.api">
 
     <resources>
         <artifact name="${org.wildfly:wildfly-clustering-api}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/ee/infinispan/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/ee/infinispan/main/module.xml
index 9b8d3b8c0a51..46513914ec60 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/ee/infinispan/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/ee/infinispan/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.clustering.ee.infinispan">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.clustering.ee.infinispan">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/ee/spi/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/ee/spi/main/module.xml
index 88deab22c596..3ca1fc24a025 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/ee/spi/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/ee/spi/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.clustering.ee.spi">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.clustering.ee.spi">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/ejb/infinispan/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/ejb/infinispan/main/module.xml
index f669a6b25555..4b1fd3023172 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/ejb/infinispan/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/ejb/infinispan/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.clustering.ejb.infinispan">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.clustering.ejb.infinispan">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/ejb/spi/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/ejb/spi/main/module.xml
index 5d1d1419a32e..a31c07b23ed7 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/ejb/spi/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/ejb/spi/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.clustering.ejb.spi">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.clustering.ejb.spi">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/infinispan/spi/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/infinispan/spi/main/module.xml
index 1597cbc17403..5c817c454d0a 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/infinispan/spi/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/infinispan/spi/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.clustering.infinispan.spi">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.clustering.infinispan.spi">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/jgroups/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/jgroups/api/main/module.xml
index 8fc88f30f7f6..26b995b9c486 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/jgroups/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/jgroups/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.clustering.jgroups.api">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.clustering.jgroups.api">
     <resources>
         <artifact name="${org.wildfly:wildfly-clustering-jgroups-api}"/>
     </resources>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/jgroups/spi/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/jgroups/spi/main/module.xml
index 12cb5172f858..30ee19f99aaf 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/jgroups/spi/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/jgroups/spi/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.clustering.jgroups.spi">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.clustering.jgroups.spi">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/marshalling/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/marshalling/api/main/module.xml
index 19c2958932dd..1abe1040c5cc 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/marshalling/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/marshalling/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.clustering.marshalling.api">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.clustering.marshalling.api">
 
     <resources>
         <artifact name="${org.wildfly:wildfly-clustering-marshalling-api}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/marshalling/jboss/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/marshalling/jboss/main/module.xml
index a0d71e5bddf4..9b5eccc00573 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/marshalling/jboss/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/marshalling/jboss/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.clustering.marshalling.jboss">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.clustering.marshalling.jboss">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/server/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/server/main/module.xml
index a876431fc329..172be1656d5f 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/server/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/server/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.clustering.server">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.clustering.server">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/service/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/service/main/module.xml
index 1620dddcc17f..bbb94847c147 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/service/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/service/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.clustering.service">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.clustering.service">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/singleton/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/singleton/main/module.xml
index 332d5bcfe268..619c6166dd19 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/singleton/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/singleton/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.clustering.singleton">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.clustering.singleton">
 
     <resources>
         <artifact name="${org.wildfly:wildfly-clustering-singleton-api}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/spi/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/spi/main/module.xml
index 654b21ffec57..8be01759d11b 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/spi/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/spi/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.clustering.spi">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.clustering.spi">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/api/main/module.xml
index f8d7aaf78e5f..eebd81089691 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.clustering.web.api">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.clustering.web.api">
 
     <resources>
         <artifact name="${org.wildfly:wildfly-clustering-web-api}"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/infinispan/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/infinispan/main/module.xml
index 5b583756207f..57b958a09a61 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/infinispan/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/infinispan/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.clustering.web.infinispan">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.clustering.web.infinispan">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/spi/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/spi/main/module.xml
index cd7e4b2a5191..ee8a2eb3e2ef 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/spi/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/spi/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.clustering.web.spi">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.clustering.web.spi">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/undertow/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/undertow/main/module.xml
index 4f126d33fe55..7951601b82e0 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/undertow/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/clustering/web/undertow/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.clustering.web.undertow">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.clustering.web.undertow">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/batch/jberet/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/batch/jberet/main/module.xml
index dd286938b3d1..e42944ccb536 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/batch/jberet/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/batch/jberet/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.extension.batch.jberet">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.extension.batch.jberet">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/batch/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/batch/main/module.xml
index 030f3bf77431..9918b1207e34 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/batch/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/batch/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.extension.batch">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.extension.batch">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/bean-validation/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/bean-validation/main/module.xml
index 4ebd85dfac5d..d9a24ed4784d 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/bean-validation/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/bean-validation/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.extension.bean-validation">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.extension.bean-validation">
 
     <properties>
         <property name="jboss.api" value="private"/>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/clustering/singleton/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/clustering/singleton/main/module.xml
index 1b2bec83bb7f..f4ca037a5296 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/clustering/singleton/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/clustering/singleton/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.extension.clustering.singleton">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.extension.clustering.singleton">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/messaging-activemq/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/messaging-activemq/main/module.xml
index 6cc81cd72a04..1cdc9bba616d 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/messaging-activemq/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/messaging-activemq/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.extension.messaging-activemq">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.extension.messaging-activemq">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/mod_cluster/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/mod_cluster/main/module.xml
index 79e7296f6398..ab877c2ab191 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/mod_cluster/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/mod_cluster/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.extension.mod_cluster">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.extension.mod_cluster">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/picketlink/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/picketlink/main/module.xml
index f46ee2ce28fa..c1441c3160a1 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/picketlink/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/picketlink/main/module.xml
@@ -15,7 +15,7 @@
         Franklin St, Fifth Floor, Boston, MA ~ 02110-1301 USA, or see the FSF site:
         http://www.fsf.org. -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.extension.picketlink">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.extension.picketlink">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/rts/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/rts/main/module.xml
index e78af19d753f..5852ca175931 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/rts/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/rts/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.extension.rts">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.extension.rts">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/iiop-openjdk/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/iiop-openjdk/main/module.xml
index 9c606c0fe9ff..4c9ba256008d 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/iiop-openjdk/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/iiop-openjdk/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.iiop-openjdk">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.iiop-openjdk">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/jberet/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/jberet/main/module.xml
index 6ad2405e9b2d..34a1e73b1547 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/jberet/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/jberet/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.jberet">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.jberet">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/mod_cluster/undertow/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/mod_cluster/undertow/main/module.xml
index 4e760ad048b9..544bfddec27e 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/mod_cluster/undertow/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/mod_cluster/undertow/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.mod_cluster.undertow">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.mod_cluster.undertow">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/org/yaml/snakeyaml/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/org/yaml/snakeyaml/main/module.xml
index fc65be5b23db..7b314d68a38e 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/org/yaml/snakeyaml/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/org/yaml/snakeyaml/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.yaml.snakeyaml">
+<module xmlns="urn:jboss:module:1.5" name="org.yaml.snakeyaml">
 
     <properties>
         <property name="jboss.api" value="private"/>
diff --git a/jsf/multi-jsf-installer/src/main/resources/mojarra-api-module.xml b/jsf/multi-jsf-installer/src/main/resources/mojarra-api-module.xml
index 0db10850ca89..aae817c4c9c6 100644
--- a/jsf/multi-jsf-installer/src/main/resources/mojarra-api-module.xml
+++ b/jsf/multi-jsf-installer/src/main/resources/mojarra-api-module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="javax.faces.api" slot="${jsf-impl-name}-${jsf-version}">
+<module xmlns="urn:jboss:module:1.5" name="javax.faces.api" slot="${jsf-impl-name}-${jsf-version}">
     <dependencies>
         <module name="com.sun.jsf-impl" slot="${jsf-impl-name}-${jsf-version}"/>
         <module name="javax.enterprise.api" export="true"/>
diff --git a/jsf/multi-jsf-installer/src/main/resources/mojarra-impl-module.xml b/jsf/multi-jsf-installer/src/main/resources/mojarra-impl-module.xml
index 75534f346343..ac1a54f12eab 100644
--- a/jsf/multi-jsf-installer/src/main/resources/mojarra-impl-module.xml
+++ b/jsf/multi-jsf-installer/src/main/resources/mojarra-impl-module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="com.sun.jsf-impl" slot="${jsf-impl-name}-${jsf-version}">
+<module xmlns="urn:jboss:module:1.5" name="com.sun.jsf-impl" slot="${jsf-impl-name}-${jsf-version}">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/jsf/multi-jsf-installer/src/main/resources/mojarra-injection-module.xml b/jsf/multi-jsf-installer/src/main/resources/mojarra-injection-module.xml
index 0e6ce2892dfa..949a9af5552f 100644
--- a/jsf/multi-jsf-installer/src/main/resources/mojarra-injection-module.xml
+++ b/jsf/multi-jsf-installer/src/main/resources/mojarra-injection-module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.jsf-injection" slot="${jsf-impl-name}-${jsf-version}">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.jsf-injection" slot="${jsf-impl-name}-${jsf-version}">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/jsf/multi-jsf-installer/src/main/resources/myfaces-api-module.xml b/jsf/multi-jsf-installer/src/main/resources/myfaces-api-module.xml
index 77bb578fde27..6588cc6341f8 100644
--- a/jsf/multi-jsf-installer/src/main/resources/myfaces-api-module.xml
+++ b/jsf/multi-jsf-installer/src/main/resources/myfaces-api-module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="javax.faces.api" slot="${jsf-impl-name}-${jsf-version}">
+<module xmlns="urn:jboss:module:1.5" name="javax.faces.api" slot="${jsf-impl-name}-${jsf-version}">
     <dependencies>
         <module name="javax.enterprise.api" export="true"/>
         <module name="javax.servlet.api" export="true"/>
diff --git a/jsf/multi-jsf-installer/src/main/resources/myfaces-digester-module.xml b/jsf/multi-jsf-installer/src/main/resources/myfaces-digester-module.xml
index 5e20a2b7902f..00b0f82c8b6b 100644
--- a/jsf/multi-jsf-installer/src/main/resources/myfaces-digester-module.xml
+++ b/jsf/multi-jsf-installer/src/main/resources/myfaces-digester-module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="org.apache.commons.digester">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.commons.digester">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/jsf/multi-jsf-installer/src/main/resources/myfaces-impl-module.xml b/jsf/multi-jsf-installer/src/main/resources/myfaces-impl-module.xml
index 3a341bced982..d3b58231d1c6 100644
--- a/jsf/multi-jsf-installer/src/main/resources/myfaces-impl-module.xml
+++ b/jsf/multi-jsf-installer/src/main/resources/myfaces-impl-module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="com.sun.jsf-impl" slot="${jsf-impl-name}-${jsf-version}">
+<module xmlns="urn:jboss:module:1.5" name="com.sun.jsf-impl" slot="${jsf-impl-name}-${jsf-version}">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/jsf/multi-jsf-installer/src/main/resources/myfaces-injection-module.xml b/jsf/multi-jsf-installer/src/main/resources/myfaces-injection-module.xml
index 2e1566dd66c4..feef868cdff7 100644
--- a/jsf/multi-jsf-installer/src/main/resources/myfaces-injection-module.xml
+++ b/jsf/multi-jsf-installer/src/main/resources/myfaces-injection-module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.jsf-injection" slot="${jsf-impl-name}-${jsf-version}">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.jsf-injection" slot="${jsf-impl-name}-${jsf-version}">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/jsf/subsystem/src/test/resources/modules/com/sun/jsf-impl/main/module.xml b/jsf/subsystem/src/test/resources/modules/com/sun/jsf-impl/main/module.xml
index 49d2ebf6981d..082c8ee0d0f3 100644
--- a/jsf/subsystem/src/test/resources/modules/com/sun/jsf-impl/main/module.xml
+++ b/jsf/subsystem/src/test/resources/modules/com/sun/jsf-impl/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="com.sun.jsf-impl">
+<module xmlns="urn:jboss:module:1.5" name="com.sun.jsf-impl">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/jsf/subsystem/src/test/resources/modules/com/sun/jsf-impl/myfaces/module.xml b/jsf/subsystem/src/test/resources/modules/com/sun/jsf-impl/myfaces/module.xml
index fb523e71214e..eefe4acec118 100644
--- a/jsf/subsystem/src/test/resources/modules/com/sun/jsf-impl/myfaces/module.xml
+++ b/jsf/subsystem/src/test/resources/modules/com/sun/jsf-impl/myfaces/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="com.sun.jsf-impl" slot="myfaces">
+<module xmlns="urn:jboss:module:1.5" name="com.sun.jsf-impl" slot="myfaces">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/jsf/subsystem/src/test/resources/modules/javax/faces/api/main/module.xml b/jsf/subsystem/src/test/resources/modules/javax/faces/api/main/module.xml
index 4a8c2d944466..61d970fb3573 100644
--- a/jsf/subsystem/src/test/resources/modules/javax/faces/api/main/module.xml
+++ b/jsf/subsystem/src/test/resources/modules/javax/faces/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="javax.faces.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.faces.api">
     <dependencies>
         <module name="javax.el.api" export="true"/>
         <module name="javax.servlet.api" export="true"/>
diff --git a/jsf/subsystem/src/test/resources/modules/javax/faces/api/myfaces/module.xml b/jsf/subsystem/src/test/resources/modules/javax/faces/api/myfaces/module.xml
index a9509f2d8a1b..466f98e99a86 100644
--- a/jsf/subsystem/src/test/resources/modules/javax/faces/api/myfaces/module.xml
+++ b/jsf/subsystem/src/test/resources/modules/javax/faces/api/myfaces/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="javax.faces.api" slot="myfaces">
+<module xmlns="urn:jboss:module:1.5" name="javax.faces.api" slot="myfaces">
     <dependencies>
         <module name="javax.el.api" export="true"/>
         <module name="javax.servlet.api" export="true"/>
diff --git a/jsf/subsystem/src/test/resources/modules/org/jboss/as/jsf-injection/1.2/module.xml b/jsf/subsystem/src/test/resources/modules/org/jboss/as/jsf-injection/1.2/module.xml
index 638f6caf626e..412f1d718987 100644
--- a/jsf/subsystem/src/test/resources/modules/org/jboss/as/jsf-injection/1.2/module.xml
+++ b/jsf/subsystem/src/test/resources/modules/org/jboss/as/jsf-injection/1.2/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.jsf-injection" slot="1.2">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.jsf-injection" slot="1.2">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/jsf/subsystem/src/test/resources/modules/org/jboss/as/jsf-injection/main/module.xml b/jsf/subsystem/src/test/resources/modules/org/jboss/as/jsf-injection/main/module.xml
index 044edf66074c..409a20926de3 100644
--- a/jsf/subsystem/src/test/resources/modules/org/jboss/as/jsf-injection/main/module.xml
+++ b/jsf/subsystem/src/test/resources/modules/org/jboss/as/jsf-injection/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.jsf-injection">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.jsf-injection">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/jsf/subsystem/src/test/resources/modules/org/jboss/as/jsf-injection/myfaces/module.xml b/jsf/subsystem/src/test/resources/modules/org/jboss/as/jsf-injection/myfaces/module.xml
index 35857eda9293..c8d334702af6 100644
--- a/jsf/subsystem/src/test/resources/modules/org/jboss/as/jsf-injection/myfaces/module.xml
+++ b/jsf/subsystem/src/test/resources/modules/org/jboss/as/jsf-injection/myfaces/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.jsf-injection" slot="myfaces">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.jsf-injection" slot="myfaces">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/jsf/subsystem/src/test/resources/modules2/com/sun/jsf-impl/myfaces2/module.xml b/jsf/subsystem/src/test/resources/modules2/com/sun/jsf-impl/myfaces2/module.xml
index 0f2b0783204f..e58e281dc084 100644
--- a/jsf/subsystem/src/test/resources/modules2/com/sun/jsf-impl/myfaces2/module.xml
+++ b/jsf/subsystem/src/test/resources/modules2/com/sun/jsf-impl/myfaces2/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="com.sun.jsf-impl" slot="myfaces2">
+<module xmlns="urn:jboss:module:1.5" name="com.sun.jsf-impl" slot="myfaces2">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/jsf/subsystem/src/test/resources/modules2/javax/faces/api/myfaces2/module.xml b/jsf/subsystem/src/test/resources/modules2/javax/faces/api/myfaces2/module.xml
index ed2c8661b639..47bc4ccc28c6 100644
--- a/jsf/subsystem/src/test/resources/modules2/javax/faces/api/myfaces2/module.xml
+++ b/jsf/subsystem/src/test/resources/modules2/javax/faces/api/myfaces2/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="javax.faces.api" slot="myfaces2">
+<module xmlns="urn:jboss:module:1.5" name="javax.faces.api" slot="myfaces2">
     <dependencies>
         <module name="javax.el.api" export="true"/>
         <module name="javax.servlet.api" export="true"/>
diff --git a/jsf/subsystem/src/test/resources/modules2/org/jboss/as/jsf-injection/bogus2/module.xml b/jsf/subsystem/src/test/resources/modules2/org/jboss/as/jsf-injection/bogus2/module.xml
index 7d1f38595f9c..360962de6d29 100644
--- a/jsf/subsystem/src/test/resources/modules2/org/jboss/as/jsf-injection/bogus2/module.xml
+++ b/jsf/subsystem/src/test/resources/modules2/org/jboss/as/jsf-injection/bogus2/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.jsf-injection" slot="myfaces2">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.jsf-injection" slot="myfaces2">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/jsf/subsystem/src/test/resources/modules2/org/jboss/as/jsf-injection/myfaces2/module.xml b/jsf/subsystem/src/test/resources/modules2/org/jboss/as/jsf-injection/myfaces2/module.xml
index 7d1f38595f9c..360962de6d29 100644
--- a/jsf/subsystem/src/test/resources/modules2/org/jboss/as/jsf-injection/myfaces2/module.xml
+++ b/jsf/subsystem/src/test/resources/modules2/org/jboss/as/jsf-injection/myfaces2/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.jsf-injection" slot="myfaces2">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.jsf-injection" slot="myfaces2">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/servlet-dist/src/distribution/resources/modules/system/layers/base/org/jboss/as/product/wildfly-web/module.xml b/servlet-dist/src/distribution/resources/modules/system/layers/base/org/jboss/as/product/wildfly-web/module.xml
index 3b3db53e099f..db33c5cc9e21 100644
--- a/servlet-dist/src/distribution/resources/modules/system/layers/base/org/jboss/as/product/wildfly-web/module.xml
+++ b/servlet-dist/src/distribution/resources/modules/system/layers/base/org/jboss/as/product/wildfly-web/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.product" slot="wildfly-web">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.product" slot="wildfly-web">
 
     <properties>
         <property name="jboss.api" value="private"/>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/io/undertow/jsp/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/io/undertow/jsp/main/module.xml
index 692ee544b627..58a41dffd386 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/io/undertow/jsp/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/io/undertow/jsp/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="io.undertow.jsp">
+<module xmlns="urn:jboss:module:1.5" name="io.undertow.jsp">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/io/undertow/servlet/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/io/undertow/servlet/main/module.xml
index 4d2a800aad2d..5f4118866a05 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/io/undertow/servlet/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/io/undertow/servlet/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="io.undertow.servlet">
+<module xmlns="urn:jboss:module:1.5" name="io.undertow.servlet">
     <resources>
         <artifact name="${io.undertow:undertow-servlet}"/>
     </resources>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/io/undertow/websocket/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/io/undertow/websocket/main/module.xml
index 53e5c20db42d..1b2e57bc7701 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/io/undertow/websocket/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/io/undertow/websocket/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="io.undertow.websocket">
+<module xmlns="urn:jboss:module:1.5" name="io.undertow.websocket">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/activation/api/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/activation/api/main/module.xml
index e4fb5e5dd7c7..2de564c9e89c 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/activation/api/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/activation/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.activation.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.activation.api">
     <dependencies>
         <module name="javax.api" />
         <module name="javax.mail.api" optional="true">
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/annotation/api/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/annotation/api/main/module.xml
index 6ebec9113a9a..383a98cbec2e 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/annotation/api/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/annotation/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.annotation.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.annotation.api">
     <resources>
         <artifact name="${org.jboss.spec.javax.annotation:jboss-annotations-api_1.2_spec}"/>
     </resources>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/el/api/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/el/api/main/module.xml
index 25bc14a2bab7..d0b93bcb5cff 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/el/api/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/el/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.el.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.el.api">
     <resources>
         <artifact name="${org.jboss.spec.javax.el:jboss-el-api_3.0_spec}"/>
     </resources>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/enterprise/api/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/enterprise/api/main/module.xml
index ea4d7364b577..7c9363fca8c1 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/enterprise/api/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/enterprise/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.enterprise.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.enterprise.api">
     <dependencies>
         <module name="org.glassfish.javax.el" export="true"/>
         <module name="javax.inject.api" export="true"/>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/enterprise/concurrent/api/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/enterprise/concurrent/api/main/module.xml
index c78eeead4e7a..b6545f585597 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/enterprise/concurrent/api/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/enterprise/concurrent/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.enterprise.concurrent.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.enterprise.concurrent.api">
     
     <dependencies>
     </dependencies>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/inject/api/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/inject/api/main/module.xml
index 2526b2fe1376..abf9d4a7a126 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/inject/api/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/inject/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.inject.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.inject.api">
     <resources>
         <artifact name="${javax.inject:javax.inject}"/>
     </resources>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/security/auth/message/api/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/security/auth/message/api/main/module.xml
index 14e57046a71b..083d28d1e458 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/security/auth/message/api/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/security/auth/message/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.security.auth.message.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.security.auth.message.api">
 
     <dependencies>
         <!-- Needed for javax.security.auth -->
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/security/jacc/api/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/security/jacc/api/main/module.xml
index 3a997707804c..15b851d21928 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/security/jacc/api/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/security/jacc/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.security.jacc.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.security.jacc.api">
     <dependencies>
         <module name="javax.servlet.api"/>
     </dependencies>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/servlet/api/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/servlet/api/main/module.xml
index 42ac364ccd4d..c5d661c60a0f 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/servlet/api/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/servlet/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.servlet.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.servlet.api">
     <resources>
         <artifact name="${org.jboss.spec.javax.servlet:jboss-servlet-api_3.1_spec}"/>
     </resources>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/servlet/jsp/api/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/servlet/jsp/api/main/module.xml
index 297b30c09433..cb5759f3126f 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/servlet/jsp/api/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/servlet/jsp/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.servlet.jsp.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.servlet.jsp.api">
     <dependencies>
         <module name="javax.servlet.api" export="true"/>
         <module name="org.glassfish.javax.el" export="true"/>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/servlet/jstl/api/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/servlet/jstl/api/main/module.xml
index f3ad211e7f24..ecb1253f7682 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/servlet/jstl/api/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/servlet/jstl/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.servlet.jstl.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.servlet.jstl.api">
     <dependencies>
         <!-- org.xml.sax -->
         <module name="javax.api" export="false"/>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/validation/api/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/validation/api/main/module.xml
index 69e470a0c6f5..cc4ff420dbe9 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/validation/api/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/validation/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.validation.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.validation.api">
     <resources>
         <artifact name="${javax.validation:validation-api}"/>
     </resources>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/websocket/api/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/websocket/api/main/module.xml
index f9a4457171cd..d8f4d3f88080 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/websocket/api/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/websocket/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.websocket.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.websocket.api">
     <resources>
         <artifact name="${org.jboss.spec.javax.websocket:jboss-websocket-api_1.1_spec}"/>
     </resources>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/apache/xalan/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/apache/xalan/main/module.xml
index dbef2fe5d978..cadf256c532e 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/apache/xalan/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/apache/xalan/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.apache.xalan">
+<module xmlns="urn:jboss:module:1.5" name="org.apache.xalan">
 
     <resources>
         <artifact name="${xalan:serializer}"/>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/eclipse/jdt/ecj/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/eclipse/jdt/ecj/main/module.xml
index 543db13d7b51..06410cb184d4 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/eclipse/jdt/ecj/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/eclipse/jdt/ecj/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.eclipse.jdt.ecj">
+<module xmlns="urn:jboss:module:1.5" name="org.eclipse.jdt.ecj">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/glassfish/javax/el/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/glassfish/javax/el/main/module.xml
index 421225162ec6..c30ab344a978 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/glassfish/javax/el/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/glassfish/javax/el/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.glassfish.javax.el">
+<module xmlns="urn:jboss:module:1.5" name="org.glassfish.javax.el">
 
     <properties>
         <property name="jboss.api" value="private"/>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/glassfish/javax/enterprise/concurrent/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/glassfish/javax/enterprise/concurrent/main/module.xml
index 6fbddf4d4df9..9bc08629e7ca 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/glassfish/javax/enterprise/concurrent/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/glassfish/javax/enterprise/concurrent/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.glassfish.javax.enterprise.concurrent">
+<module xmlns="urn:jboss:module:1.5" name="org.glassfish.javax.enterprise.concurrent">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/ee/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/ee/main/module.xml
index 70bf2646b222..b4630b178739 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/ee/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/ee/main/module.xml
@@ -21,7 +21,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.ee">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.ee">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/naming/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/naming/main/module.xml
index d4ca56016c61..4a480141a1e1 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/naming/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/naming/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.naming">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.naming">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/security/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/security/main/module.xml
index 2df27be5fc3c..6164ef897075 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/security/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/security/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.security">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.security">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/web-common/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/web-common/main/module.xml
index 0b6f5a9e18d7..aa96aac965d7 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/web-common/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/as/web-common/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.web-common">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.web-common">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/common-beans/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/common-beans/main/module.xml
index 707f976c3c2e..041b28ad2d3f 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/common-beans/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/common-beans/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.common-beans">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.common-beans">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/common/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/common/main/module.xml
index 10373c04b04c..534095900c62 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/common/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/common/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.metadata.common">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.metadata.common">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/ear/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/ear/main/module.xml
index 28ac205b0491..c55325a2c648 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/ear/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/ear/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.metadata.ear">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.metadata.ear">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/main/module.xml
index 2d3521ca4fb7..e7211a193aa5 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.metadata">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.metadata">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/web/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/web/main/module.xml
index 8e37afe769b2..2463553cb046 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/web/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/metadata/web/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.metadata.web">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.metadata.web">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/remote-naming/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/remote-naming/main/module.xml
index 75a9bb61ed9f..d186c24a88bd 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/remote-naming/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/remote-naming/main/module.xml
@@ -20,7 +20,7 @@
   ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.remote-naming">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.remote-naming">
 
     <resources>
         <artifact name="${org.jboss:jboss-remote-naming}"/>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/security/negotiation/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/security/negotiation/main/module.xml
index b081eafe82a0..150b714f15bd 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/security/negotiation/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/jboss/security/negotiation/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.security.negotiation">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.security.negotiation">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/picketbox/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/picketbox/main/module.xml
index ea2401bf89cf..244dfec59c37 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/picketbox/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/picketbox/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.picketbox">
+<module xmlns="urn:jboss:module:1.5" name="org.picketbox">
     <!-- This module is deprecated and subject to being removed in a subsequent release. -->
     <properties>
       <property name="jboss.api" value="deprecated"/>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/elytron/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/elytron/main/module.xml
index 8133ca62816e..25ec4cb3bd88 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/elytron/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/elytron/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.extension.elytron">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.extension.elytron">
     <resources>
         <artifact name="${org.wildfly.security:elytron-subsystem}"/>
     </resources>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/security/manager/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/security/manager/main/module.xml
index 253a885b4af2..3ca5a0fd5848 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/security/manager/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/security/manager/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.extension.security.manager">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.extension.security.manager">
 
     <properties>
         <property name="jboss.api" value="private"/>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/undertow/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/undertow/main/module.xml
index 0ed0acd2dbc5..6b2dcfdca271 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/undertow/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/extension/undertow/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.extension.undertow">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.extension.undertow">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/naming/main/module.xml b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/naming/main/module.xml
index a39270882f48..b63f46b4d35f 100644
--- a/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/naming/main/module.xml
+++ b/servlet-feature-pack/src/main/resources/modules/system/layers/base/org/wildfly/naming/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.wildfly.naming">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.naming">
     <properties>
         <property name="jboss.api" value="public"/>
     </properties>
diff --git a/testsuite/compat/src/test/scripts/build-jars.xml b/testsuite/compat/src/test/scripts/build-jars.xml
index 8d864df945b3..907fb358c2f6 100644
--- a/testsuite/compat/src/test/scripts/build-jars.xml
+++ b/testsuite/compat/src/test/scripts/build-jars.xml
@@ -36,7 +36,7 @@
     <copy file="${org.wildfly:jipijapa-eclipselink:jar}"           tofile="${tests.output.dir}/modules/org/eclipse/persistence/test/jipijapa-eclipselink.jar"/>
 
     <echo file="${tests.output.dir}/modules/org/eclipse/persistence/test/module.xml" append="false">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;module xmlns="urn:jboss:module:1.1" name="org.eclipse.persistence" slot="test"&gt;
+&lt;module xmlns="urn:jboss:module:1.5" name="org.eclipse.persistence" slot="test"&gt;
 &lt;resources&gt;
 
 &lt;resource-root path="eclipselink.jar"&gt;
@@ -72,7 +72,7 @@
     <copy file="${org.apache.openjpa:openjpa-all:jar}"         tofile="${tests.output.dir}/modules/org/apache/openjpa/test/openjpa-all.jar"/>
     <copy file="${org.wildfly:jipijapa-openjpa:jar}"      tofile="${tests.output.dir}/modules/org/apache/openjpa/test/jipijapa-openjpa.jar"/>
     <echo file="${tests.output.dir}/modules/org/apache/openjpa/test/module.xml" append="false">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;module xmlns="urn:jboss:module:1.1" name="org.apache.openjpa" slot="test"&gt;
+&lt;module xmlns="urn:jboss:module:1.5" name="org.apache.openjpa" slot="test"&gt;
 &lt;resources&gt;
 
 &lt;resource-root path="openjpa-all.jar"&gt;
diff --git a/testsuite/domain/src/test/resources/extension/blocker-module.xml b/testsuite/domain/src/test/resources/extension/blocker-module.xml
index 13c154ce7adc..054c8eb03da3 100644
--- a/testsuite/domain/src/test/resources/extension/blocker-module.xml
+++ b/testsuite/domain/src/test/resources/extension/blocker-module.xml
@@ -1,4 +1,4 @@
-<module xmlns="urn:jboss:module:1.1" name="org.wildfly.extension.blocker-test">
+<module xmlns="urn:jboss:module:1.5" name="org.wildfly.extension.blocker-test">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/testsuite/domain/src/test/resources/extension/module.xml b/testsuite/domain/src/test/resources/extension/module.xml
index ec40e1c9084f..e9be76a2577b 100644
--- a/testsuite/domain/src/test/resources/extension/module.xml
+++ b/testsuite/domain/src/test/resources/extension/module.xml
@@ -1,4 +1,4 @@
-<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.test.extension">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.test.extension">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/testsuite/domain/src/test/resources/extension/transformers-module.xml b/testsuite/domain/src/test/resources/extension/transformers-module.xml
index 93089480535f..81d4cad653c2 100644
--- a/testsuite/domain/src/test/resources/extension/transformers-module.xml
+++ b/testsuite/domain/src/test/resources/extension/transformers-module.xml
@@ -1,4 +1,4 @@
-<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.test.transformers">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.test.transformers">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/globalmodules/module.xml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/globalmodules/module.xml
index ab82ac4e9145..68e3e79fbb72 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/globalmodules/module.xml
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/ee/globalmodules/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="org.jboss.test.globalModule">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.test.globalModule">
 
     <resources>
         <resource-root path="globalTest.jar"/>
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jca/moduledeployment/module-jar.xml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jca/moduledeployment/module-jar.xml
index 6cc09dffe744..df62453d1905 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jca/moduledeployment/module-jar.xml
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jca/moduledeployment/module-jar.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="org.jboss.ironjacamar.ra16out" slot="main">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.ironjacamar.ra16out" slot="main">
 
     <resources>
         <resource-root path="."/>
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jca/moduledeployment/module.xml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jca/moduledeployment/module.xml
index f682b1aacff6..414cff92eb38 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jca/moduledeployment/module.xml
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jca/moduledeployment/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="org.jboss.ironjacamar.ra16out" slot="main">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.ironjacamar.ra16out" slot="main">
 
     <resources>
         <resource-root path="."/>
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jca/moduledeployment/module1-jar.xml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jca/moduledeployment/module1-jar.xml
index 67442effa6fa..06667950768a 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jca/moduledeployment/module1-jar.xml
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jca/moduledeployment/module1-jar.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="org.jboss.ironjacamar.ra16out1" slot="main">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.ironjacamar.ra16out1" slot="main">
 
     <resources>
         <resource-root path="."/>
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jca/moduledeployment/module1.xml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jca/moduledeployment/module1.xml
index 6936368b5287..c18ede2f1a5a 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jca/moduledeployment/module1.xml
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/jca/moduledeployment/module1.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="org.jboss.ironjacamar.ra16out1" slot="main">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.ironjacamar.ra16out1" slot="main">
 
     <resources>
         <resource-root path="."/>
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/management/cli/DeploymentArchiveTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/management/cli/DeploymentArchiveTestCase.java
index dcde247b9f2d..7d8890ce8e93 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/management/cli/DeploymentArchiveTestCase.java
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/management/cli/DeploymentArchiveTestCase.java
@@ -76,7 +76,7 @@ public class DeploymentArchiveTestCase extends AbstractCliTestBase {
 
     private static final String MODULE_XML =
               "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
-              "<module xmlns=\"urn:jboss:module:1.1\" name=\"" + MODULE_NAME + "\" slot=\"main\">" +
+              "<module xmlns=\"urn:jboss:module:1.5\" name=\"" + MODULE_NAME + "\" slot=\"main\">" +
               "    <resources>" +
               "        <resource-root path=\"" + MODULE_ARCHIVE + "\"/>" +
               "    </resources>" +
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/naming/ObjectFactoryWithEnvironmentBindingTestCase-module.xml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/naming/ObjectFactoryWithEnvironmentBindingTestCase-module.xml
index 1385f5a58c99..9d7ffcde8d80 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/naming/ObjectFactoryWithEnvironmentBindingTestCase-module.xml
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/naming/ObjectFactoryWithEnvironmentBindingTestCase-module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="objectFactoryWithEnvironmentBindingModule">
+<module xmlns="urn:jboss:module:1.5" name="objectFactoryWithEnvironmentBindingModule">
 
     <resources>
         <resource-root path="objectFactoryWithEnvironmentBinding.jar"/>
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/extensions/cdiportableextensions/module.xml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/extensions/cdiportableextensions/module.xml
index 72010a1fb2f0..267f835fbf29 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/extensions/cdiportableextensions/module.xml
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/extensions/cdiportableextensions/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="cidExtensionModule">
+<module xmlns="urn:jboss:module:1.5" name="cidExtensionModule">
     <resources>
         <resource-root path="weldTest.jar"/>
     </resources>
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/access/test-module.xml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/access/test-module.xml
index 69a0d8b84b6c..c83d82b51da4 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/access/test-module.xml
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/access/test-module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="test.module-accessibility">
+<module xmlns="urn:jboss:module:1.5" name="test.module-accessibility">
 
     <resources>
         <resource-root path="module-accessibility.jar"/>
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/alpha-module.xml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/alpha-module.xml
index 57563a6cadeb..058f59a0bfef 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/alpha-module.xml
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/alpha-module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="test.alpha">
+<module xmlns="urn:jboss:module:1.5" name="test.alpha">
 
     <resources>
         <resource-root path="alpha.jar"/>
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/bravo-module.xml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/bravo-module.xml
index dc66f0dee5c2..fb9c6b0d41a6 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/bravo-module.xml
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/bravo-module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="test.bravo">
+<module xmlns="urn:jboss:module:1.5" name="test.bravo">
 
     <resources>
         <resource-root path="bravo.jar"/>
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/charlie-module.xml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/charlie-module.xml
index 0c12de6fa798..12b269933de1 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/charlie-module.xml
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/charlie-module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="test.charlie">
+<module xmlns="urn:jboss:module:1.5" name="test.charlie">
 
     <resources>
         <resource-root path="charlie.jar"/>
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/delta-module.xml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/delta-module.xml
index b3ed09a17fb4..90746785a2d6 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/delta-module.xml
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/delta-module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="test.delta">
+<module xmlns="urn:jboss:module:1.5" name="test.delta">
 
     <resources>
         <resource-root path="delta.jar"/>
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/export/alpha-module.xml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/export/alpha-module.xml
index 833a40a86309..871ac18805ab 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/export/alpha-module.xml
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/export/alpha-module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="test.export-alpha">
+<module xmlns="urn:jboss:module:1.5" name="test.export-alpha">
 
     <resources>
         <resource-root path="export-alpha.jar"/>
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/export/bravo-module.xml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/export/bravo-module.xml
index eaa32dc4f084..f878bef50f19 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/export/bravo-module.xml
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/export/bravo-module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="test.export-bravo">
+<module xmlns="urn:jboss:module:1.5" name="test.export-bravo">
 
     <resources>
         <resource-root path="export-bravo.jar"/>
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/export/charlie-module.xml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/export/charlie-module.xml
index 5781cefe9c80..3c1a9d8ae59e 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/export/charlie-module.xml
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/export/charlie-module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="test.export-charlie">
+<module xmlns="urn:jboss:module:1.5" name="test.export-charlie">
 
     <resources>
         <resource-root path="export-charlie.jar"/>
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/multiple-module.xml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/multiple-module.xml
index 0253f2484ddb..d5bed5149cd5 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/multiple-module.xml
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/multiple-module.xml
@@ -22,7 +22,7 @@
   ~ 2110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="test.multiple">
+<module xmlns="urn:jboss:module:1.5" name="test.multiple">
 
     <resources>
         <resource-root path="m1.jar"/>
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/portable-extension-module.xml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/portable-extension-module.xml
index b196ddea9f40..3b7a457a24b4 100755
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/portable-extension-module.xml
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/modules/portable-extension-module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="test.portable-extension">
+<module xmlns="urn:jboss:module:1.5" name="test.portable-extension">
 
     <resources>
         <resource-root path="portable-extension.jar"/>
diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/multideployment/module.xml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/multideployment/module.xml
index 1694b2c91578..998e5b4d63f3 100644
--- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/multideployment/module.xml
+++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/weld/multideployment/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="org.jboss.test.weldModule">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.test.weldModule">
 
     <resources>
         <resource-root path="weldTest.jar"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/layered/product-module.xml b/testsuite/integration/manualmode/src/test/resources/layered/product-module.xml
index a616f191d54b..d4cb79786b0d 100644
--- a/testsuite/integration/manualmode/src/test/resources/layered/product-module.xml
+++ b/testsuite/integration/manualmode/src/test/resources/layered/product-module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.product" slot="test">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.as.product" slot="test">
 
     <resources>
         <resource-root path="classes"/>
diff --git a/testsuite/integration/manualmode/src/test/resources/layered/test-module.xml b/testsuite/integration/manualmode/src/test/resources/layered/test-module.xml
index adfc823f73f7..d271ab3b8cef 100644
--- a/testsuite/integration/manualmode/src/test/resources/layered/test-module.xml
+++ b/testsuite/integration/manualmode/src/test/resources/layered/test-module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.1" name="org.jboss.ldtc" slot="main">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.ldtc" slot="main">
 
     <resources>
         <resource-root path="test-module.jar"/>
diff --git a/testsuite/integration/picketlink/src/test/java/org/wildfly/test/integration/security/picketlink/idm/JPAEMFFromModuleBasedPartitionManagerTestCase-module.xml b/testsuite/integration/picketlink/src/test/java/org/wildfly/test/integration/security/picketlink/idm/JPAEMFFromModuleBasedPartitionManagerTestCase-module.xml
index 109b330ff263..ce22c42bc99b 100644
--- a/testsuite/integration/picketlink/src/test/java/org/wildfly/test/integration/security/picketlink/idm/JPAEMFFromModuleBasedPartitionManagerTestCase-module.xml
+++ b/testsuite/integration/picketlink/src/test/java/org/wildfly/test/integration/security/picketlink/idm/JPAEMFFromModuleBasedPartitionManagerTestCase-module.xml
@@ -15,7 +15,7 @@
 	Franklin St, Fifth Floor, Boston, MA ~ 02110-1301 USA, or see the FSF site: 
 	http://www.fsf.org. -->
 
-<module xmlns="urn:jboss:module:1.1" name="test.picketlink-emf-module-test">
+<module xmlns="urn:jboss:module:1.5" name="test.picketlink-emf-module-test">
   <resources>
     <resource-root path="picketlink-emf-module-test.jar"/>
   </resources>
diff --git a/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/custompermissions/module.xml b/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/custompermissions/module.xml
index 20c62c58d0f3..673a66f25879 100644
--- a/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/custompermissions/module.xml
+++ b/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/custompermissions/module.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<module xmlns="urn:jboss:module:1.2" name="org.jboss.test">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.test">
 	<resources>
 		<resource-root path="moduleperm.jar" />
 	</resources>
diff --git a/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/module/module-deny.xml b/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/module/module-deny.xml
index 5a93f532f6af..1bc96b1cb644 100644
--- a/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/module/module-deny.xml
+++ b/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/module/module-deny.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 
-<module xmlns="urn:jboss:module:1.2" name="org.jboss.test.secman.deny">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.test.secman.deny">
 
 	<permissions/>
 
diff --git a/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/module/module-grant.xml b/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/module/module-grant.xml
index b95d1c8c45c1..6b56d047ff78 100644
--- a/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/module/module-grant.xml
+++ b/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/module/module-grant.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 
-<module xmlns="urn:jboss:module:1.2" name="org.jboss.test.secman.grant">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.test.secman.grant">
 	<resources>
 		<resource-root path="modperm.jar" />
 	</resources>
diff --git a/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/module/module-limited.xml b/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/module/module-limited.xml
index 0c922ef4afdf..7f1e6db66b5a 100644
--- a/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/module/module-limited.xml
+++ b/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/module/module-limited.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 
-<module xmlns="urn:jboss:module:1.2" name="org.jboss.test.secman.limited">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.test.secman.limited">
 
 	<permissions>
 		<grant permission="java.lang.RuntimePermission" name="secman.test.*" />
diff --git a/testsuite/integration/src/test/xslt/changeModule.xsl b/testsuite/integration/src/test/xslt/changeModule.xsl
index 59d7ab19d48c..de0c08674911 100644
--- a/testsuite/integration/src/test/xslt/changeModule.xsl
+++ b/testsuite/integration/src/test/xslt/changeModule.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:ml="urn:jboss:module:1.0">
+                xmlns:ml="urn:jboss:module:1.5">
     <xsl:output method="xml" indent="yes"/>
 
     <xsl:param name="ds.jdbc.driver.resource" select="'fred'"/>
diff --git a/testsuite/integration/src/test/xslt/module.xml b/testsuite/integration/src/test/xslt/module.xml
index 211029c7c753..78dac853ab97 100644
--- a/testsuite/integration/src/test/xslt/module.xml
+++ b/testsuite/integration/src/test/xslt/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
  
-<module xmlns="urn:jboss:module:1.0" name="module-name">
+<module xmlns="urn:jboss:module:1.5" name="module-name">
   <resources>
     <resource-root path="resource-path"/>
   </resources>
diff --git a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/annotationsmodule/module.xml b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/annotationsmodule/module.xml
index dc5b8ddc32de..7f68ebc60e74 100644
--- a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/annotationsmodule/module.xml
+++ b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/annotationsmodule/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.test.webModule">
+<module xmlns="urn:jboss:module:1.5" name="org.jboss.test.webModule">
 
     <resources>
         <resource-root path="webTest.jar"/>