diff --git a/connectors/odata/feature-pack-odata/src/main/resources/modules/system/layers/dv/org/apache/commons/lang/3.3.2/module.xml b/connectors/odata/feature-pack-odata/src/main/resources/modules/system/layers/dv/org/apache/commons/commons-lang3/main/module.xml
similarity index 71%
rename from connectors/odata/feature-pack-odata/src/main/resources/modules/system/layers/dv/org/apache/commons/lang/3.3.2/module.xml
rename to connectors/odata/feature-pack-odata/src/main/resources/modules/system/layers/dv/org/apache/commons/commons-lang3/main/module.xml
index 0521b9bb75..6c29bddde9 100644
--- a/connectors/odata/feature-pack-odata/src/main/resources/modules/system/layers/dv/org/apache/commons/lang/3.3.2/module.xml
+++ b/connectors/odata/feature-pack-odata/src/main/resources/modules/system/layers/dv/org/apache/commons/commons-lang3/main/module.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module xmlns="urn:jboss:module:1.3" name="org.apache.commons.lang" slot="3.3.2">
+<module xmlns="urn:jboss:module:1.3" name="org.apache.commons.commons-lang3">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/connectors/odata/feature-pack-odata/src/main/resources/modules/system/layers/dv/org/apache/olingo/client/main/module.xml b/connectors/odata/feature-pack-odata/src/main/resources/modules/system/layers/dv/org/apache/olingo/client/main/module.xml
index acc536337f..56a5e0a8e6 100644
--- a/connectors/odata/feature-pack-odata/src/main/resources/modules/system/layers/dv/org/apache/olingo/client/main/module.xml
+++ b/connectors/odata/feature-pack-odata/src/main/resources/modules/system/layers/dv/org/apache/olingo/client/main/module.xml
@@ -10,7 +10,7 @@
     <dependencies>
         <module name="javax.api"/>
         <module name="javax.xml.stream.api"/>
-        <module name="org.apache.commons.lang" slot="3.3.2"/>
+        <module name="org.apache.commons.commons-lang3"/>
         <module name="org.apache.commons.io"/>
         <module name="org.jboss.teiid.olingo.common"/>
         <module name="org.slf4j"/>
diff --git a/connectors/swagger/feature-pack-swagger/src/main/resources/modules/system/layers/dv/io/swagger/core/main/module.xml b/connectors/swagger/feature-pack-swagger/src/main/resources/modules/system/layers/dv/io/swagger/core/main/module.xml
index a3d1f7ed54..4f999d9989 100644
--- a/connectors/swagger/feature-pack-swagger/src/main/resources/modules/system/layers/dv/io/swagger/core/main/module.xml
+++ b/connectors/swagger/feature-pack-swagger/src/main/resources/modules/system/layers/dv/io/swagger/core/main/module.xml
@@ -25,7 +25,7 @@
         <module name="javax.validation.api"/>
         <module name="com.google.guava"/>
         <module name="org.slf4j"/>
-        <module name="org.apache.commons.lang" slot="3.3.2"/>
+        <module name="org.apache.commons.commons-lang3"/>
         <module name="javax.xml.bind.api"/>
         <module name="org.apache.commons.io"/>
     </dependencies>
diff --git a/connectors/swagger/feature-pack-swagger/src/main/resources/modules/system/layers/dv/org/apache/commons/lang/3.3.2/module.xml b/connectors/swagger/feature-pack-swagger/src/main/resources/modules/system/layers/dv/org/apache/commons/commons-lang3/main/module.xml
similarity index 77%
rename from connectors/swagger/feature-pack-swagger/src/main/resources/modules/system/layers/dv/org/apache/commons/lang/3.3.2/module.xml
rename to connectors/swagger/feature-pack-swagger/src/main/resources/modules/system/layers/dv/org/apache/commons/commons-lang3/main/module.xml
index f93ec9b24a..11bb4e46de 100644
--- a/connectors/swagger/feature-pack-swagger/src/main/resources/modules/system/layers/dv/org/apache/commons/lang/3.3.2/module.xml
+++ b/connectors/swagger/feature-pack-swagger/src/main/resources/modules/system/layers/dv/org/apache/commons/commons-lang3/main/module.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module xmlns="urn:jboss:module:1.3" name="org.apache.commons.lang" slot="3.3.2">
+<module xmlns="urn:jboss:module:1.3" name="org.apache.commons.commons-lang3">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/teiid-feature-pack/olingo-feature-pack/src/main/resources/modules/system/layers/dv/org/apache/commons/lang/3.3.2/module.xml b/teiid-feature-pack/olingo-feature-pack/src/main/resources/modules/system/layers/dv/org/apache/commons/commons-lang3/main/module.xml
similarity index 71%
rename from teiid-feature-pack/olingo-feature-pack/src/main/resources/modules/system/layers/dv/org/apache/commons/lang/3.3.2/module.xml
rename to teiid-feature-pack/olingo-feature-pack/src/main/resources/modules/system/layers/dv/org/apache/commons/commons-lang3/main/module.xml
index 0521b9bb75..6c29bddde9 100644
--- a/teiid-feature-pack/olingo-feature-pack/src/main/resources/modules/system/layers/dv/org/apache/commons/lang/3.3.2/module.xml
+++ b/teiid-feature-pack/olingo-feature-pack/src/main/resources/modules/system/layers/dv/org/apache/commons/commons-lang3/main/module.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module xmlns="urn:jboss:module:1.3" name="org.apache.commons.lang" slot="3.3.2">
+<module xmlns="urn:jboss:module:1.3" name="org.apache.commons.commons-lang3">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>
diff --git a/teiid-feature-pack/olingo-feature-pack/src/main/resources/modules/system/layers/dv/org/jboss/teiid/olingo/main/module.xml b/teiid-feature-pack/olingo-feature-pack/src/main/resources/modules/system/layers/dv/org/jboss/teiid/olingo/main/module.xml
index 6a097f507c..1cc0f39f5f 100644
--- a/teiid-feature-pack/olingo-feature-pack/src/main/resources/modules/system/layers/dv/org/jboss/teiid/olingo/main/module.xml
+++ b/teiid-feature-pack/olingo-feature-pack/src/main/resources/modules/system/layers/dv/org/jboss/teiid/olingo/main/module.xml
@@ -18,7 +18,7 @@
         <module name="org.jboss.teiid.admin"/>
         <module name="org.jboss.teiid.api"/>
         <module name="org.jboss.teiid"/>
-        <module name="org.apache.commons.lang" slot="3.3.2"/>
+        <module name="org.apache.commons.commons-lang3"/>
     </dependencies>
 
 </module>
\ No newline at end of file
diff --git a/teiid-feature-pack/rest-service-feature-pack/src/main/resources/modules/system/layers/dv/org/apache/commons/lang/3.3.2/module.xml b/teiid-feature-pack/rest-service-feature-pack/src/main/resources/modules/system/layers/dv/org/apache/commons/commons-lang3/main/module.xml
similarity index 71%
rename from teiid-feature-pack/rest-service-feature-pack/src/main/resources/modules/system/layers/dv/org/apache/commons/lang/3.3.2/module.xml
rename to teiid-feature-pack/rest-service-feature-pack/src/main/resources/modules/system/layers/dv/org/apache/commons/commons-lang3/main/module.xml
index 0521b9bb75..6c29bddde9 100644
--- a/teiid-feature-pack/rest-service-feature-pack/src/main/resources/modules/system/layers/dv/org/apache/commons/lang/3.3.2/module.xml
+++ b/teiid-feature-pack/rest-service-feature-pack/src/main/resources/modules/system/layers/dv/org/apache/commons/commons-lang3/main/module.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module xmlns="urn:jboss:module:1.3" name="org.apache.commons.lang" slot="3.3.2">
+<module xmlns="urn:jboss:module:1.3" name="org.apache.commons.commons-lang3">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>