diff --git a/README.md b/README.md
index c8953e43d275458cd7d0dc422f67dd489e54f740..6c98d542c23ad7bbaf0b4a3e07e00f848f4f69cc 100644
--- a/README.md
+++ b/README.md
@@ -125,7 +125,7 @@ There are several ways to add a datasource to a WildFly server. We are going to
 ```xml
 <datasource jta="true" jndi-name="java:jboss/datasources/xcs" pool-name="xcs-mysql" enabled="true" use-ccm="true">
     <connection-url>jdbc:mysql://localhost:3306/xcs?useJDBCCompliantTimezoneShift=true&amp;useLegacyDatetimeCode=false&amp;serverTimezone=Europe%2FMadrid</connection-url>
-    <driver>mysql-connector-java-8.1.0.jar</driver>
+    <driver>mysql-connector-j-8.1.0.jar</driver>
     <security>
         <user-name>xcs</user-name>
         <password>xcs</password>
diff --git a/additional-material/wildfly/v10.1.0/standalone.xml b/additional-material/wildfly/v10.1.0/standalone.xml
index e200694ad58c3adc18a8ab2a24c6dff30b7461a9..76e3979934637e71ab961baae9c2c2f88823da7c 100644
--- a/additional-material/wildfly/v10.1.0/standalone.xml
+++ b/additional-material/wildfly/v10.1.0/standalone.xml
@@ -151,7 +151,7 @@
                 </datasource>
                 <datasource jta="true" jndi-name="java:jboss/datasources/xcs" pool-name="xcs-mysql" enabled="true" use-ccm="true">
                     <connection-url>jdbc:mysql://localhost:3306/xcs?useJDBCCompliantTimezoneShift=true&amp;useLegacyDatetimeCode=false&amp;serverTimezone=Europe%2FMadrid</connection-url>
-                    <driver>mysql-connector-java-8.0.21.jar</driver>
+                    <driver>mysql-connector-j-8.0.21.jar</driver>
                     <security>
                         <user-name>xcs</user-name>
                         <password>xcs</password>
diff --git a/additional-material/wildfly/v8.2.1/standalone.xml b/additional-material/wildfly/v8.2.1/standalone.xml
index a974e69164f25a4f93ba581efe7ae33d4ab2c3b3..cd8d902ed94a68eef1bec405a3fc17be09e76410 100644
--- a/additional-material/wildfly/v8.2.1/standalone.xml
+++ b/additional-material/wildfly/v8.2.1/standalone.xml
@@ -154,7 +154,7 @@
                 </datasource>
                 <datasource jta="true" jndi-name="java:jboss/datasources/xcs" pool-name="xcs-mysql" enabled="true" use-ccm="true">
                     <connection-url>jdbc:mysql://localhost:3306/xcs?useJDBCCompliantTimezoneShift=true&amp;useLegacyDatetimeCode=false&amp;serverTimezone=Europe%2FMadrid</connection-url>
-                    <driver>mysql-connector-java-8.0.21.jar</driver>
+                    <driver>mysql-connector-j-8.0.21.jar</driver>
                     <security>
                         <user-name>xcs</user-name>
                         <password>xcs</password>
diff --git a/jsf/src/test/resources-wildfly-embedded-mysql/standalone.xml b/jsf/src/test/resources-wildfly-embedded-mysql/standalone.xml
index d2ee02f56196087604839ce54350d9c3c8108c31..c186112c5ebf0f2a4afc429fb31e69285fab0489 100644
--- a/jsf/src/test/resources-wildfly-embedded-mysql/standalone.xml
+++ b/jsf/src/test/resources-wildfly-embedded-mysql/standalone.xml
@@ -155,7 +155,7 @@
                 <datasource jta="true" jndi-name="java:jboss/datasources/xcs" pool-name="xcs-mysql" enabled="true" use-ccm="true">
                     <connection-url>jdbc:mysql://localhost:3306/xcssampletest</connection-url>
                     <driver-class>com.mysql.jdbc.Driver</driver-class>
-                    <driver>mysql-connector-java-${mysql.version}.jar</driver>
+                    <driver>mysql-connector-j-${mysql.version}.jar</driver>
                     <security>
                         <user-name>xcs</user-name>
                         <password>xcs</password>
diff --git a/pom.xml b/pom.xml
index badb15b3781b79c1f038b05beefb0c105fa25c5c..5bc59e13c1a0480ad7d79917cb16d426cce93453 100644
--- a/pom.xml
+++ b/pom.xml
@@ -619,7 +619,7 @@
 											<type>jar</type>
 											<overWrite>false</overWrite>
 											<outputDirectory>${project.build.directory}</outputDirectory>
-											<destFileName>mysql-connector-java-${mysql.connector.java.version}.jar</destFileName>
+											<destFileName>mysql-connector-j-${mysql.connector.java.version}.jar</destFileName>
 										</artifactItem>
 									</artifactItems>
 								</configuration>
@@ -720,7 +720,7 @@
 											<type>jar</type>
 											<overWrite>false</overWrite>
 											<outputDirectory>${project.build.directory}</outputDirectory>
-											<destFileName>mysql-connector-java-${mysql.connector.java.version}.jar</destFileName>
+											<destFileName>mysql-connector-j-${mysql.connector.java.version}.jar</destFileName>
 										</artifactItem>
 									</artifactItems>
 								</configuration>
@@ -757,9 +757,9 @@
 							<before-deployment>
 								<batch />
 								<commands>
-									<command>deploy ${project.build.directory}/mysql-connector-java-${mysql.connector.java.version}.jar</command>
+									<command>deploy ${project.build.directory}/mysql-connector-j-${mysql.connector.java.version}.jar</command>
 									<command>data-source add --jndi-name=java:jboss/datasources/xcs --name=xcs-sample --jta=true --use-ccm=true
-										--connection-url=jdbc:mysql://localhost:3306/xcs?useJDBCCompliantTimezoneShift=true&amp;useLegacyDatetimeCode=false&amp;serverTimezone=Europe%2FMadrid --driver-name=mysql-connector-java-${mysql.connector.java.version}.jar
+										--connection-url=jdbc:mysql://localhost:3306/xcs?useJDBCCompliantTimezoneShift=true&amp;useLegacyDatetimeCode=false&amp;serverTimezone=Europe%2FMadrid --driver-name=mysql-connector-j-${mysql.connector.java.version}.jar
 										--user-name=xcs --password=xcs</command>
 									<command>/core-service=management/security-realm=RemotingRealm:add</command>
 									<command>/core-service=management/security-realm=RemotingRealm/authentication=jaas:add(name="AppRealmLoopThrough")</command>
diff --git a/rest/src/test/resources-wildfly-embedded-mysql/standalone.xml b/rest/src/test/resources-wildfly-embedded-mysql/standalone.xml
index d2ee02f56196087604839ce54350d9c3c8108c31..c186112c5ebf0f2a4afc429fb31e69285fab0489 100644
--- a/rest/src/test/resources-wildfly-embedded-mysql/standalone.xml
+++ b/rest/src/test/resources-wildfly-embedded-mysql/standalone.xml
@@ -155,7 +155,7 @@
                 <datasource jta="true" jndi-name="java:jboss/datasources/xcs" pool-name="xcs-mysql" enabled="true" use-ccm="true">
                     <connection-url>jdbc:mysql://localhost:3306/xcssampletest</connection-url>
                     <driver-class>com.mysql.jdbc.Driver</driver-class>
-                    <driver>mysql-connector-java-${mysql.version}.jar</driver>
+                    <driver>mysql-connector-j-${mysql.version}.jar</driver>
                     <security>
                         <user-name>xcs</user-name>
                         <password>xcs</password>
diff --git a/service/src/test/resources-wildfly-embedded-mysql/standalone.xml b/service/src/test/resources-wildfly-embedded-mysql/standalone.xml
index d2ee02f56196087604839ce54350d9c3c8108c31..c186112c5ebf0f2a4afc429fb31e69285fab0489 100644
--- a/service/src/test/resources-wildfly-embedded-mysql/standalone.xml
+++ b/service/src/test/resources-wildfly-embedded-mysql/standalone.xml
@@ -155,7 +155,7 @@
                 <datasource jta="true" jndi-name="java:jboss/datasources/xcs" pool-name="xcs-mysql" enabled="true" use-ccm="true">
                     <connection-url>jdbc:mysql://localhost:3306/xcssampletest</connection-url>
                     <driver-class>com.mysql.jdbc.Driver</driver-class>
-                    <driver>mysql-connector-java-${mysql.version}.jar</driver>
+                    <driver>mysql-connector-j-${mysql.version}.jar</driver>
                     <security>
                         <user-name>xcs</user-name>
                         <password>xcs</password>