diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
index 5c1e528..eb3fcd8 100644
--- a/.idea/checkstyle-idea.xml
+++ b/.idea/checkstyle-idea.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CheckStyle-IDEA" serialisationVersion="2">
-    <checkstyleVersion>10.14.0</checkstyleVersion>
+    <checkstyleVersion>10.15.0</checkstyleVersion>
     <scanScope>JavaOnlyWithTests</scanScope>
     <suppressErrors>true</suppressErrors>
     <copyLibs>true</copyLibs>
diff --git a/.run/Run Demo.run.xml b/.run/Run Demo.run.xml
index f9f0b56..1b70513 100644
--- a/.run/Run Demo.run.xml	
+++ b/.run/Run Demo.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run Demo" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="software.xdev.Application" />
-    <module name="testcontainers-java-junit4-mock-demo" />
+    <module name="testcontainers-junit4-mock-demo" />
     <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
     <extension name="coverage">
       <pattern>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d5441b..000b088 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,2 +1,5 @@
+# 1.0.1
+Rename artifactId from ``testcontainers-java-junit4-mock`` to ``testcontainers-junit4-mock``
+
 # 1.0.0
 _Initial release_
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d79abde..bb2a9db 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -33,10 +33,10 @@ You should have the following things installed:
   * Ensure that the JDK/Java-Version is correct
 
 
-## Releasing [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/testcontainers-java-junit4-mock/release.yml?branch=master)](https://github.com/xdev-software/testcontainers-java-junit4-mock/actions/workflows/release.yml)
+## Releasing [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/testcontainers-junit4-mock/release.yml?branch=master)](https://github.com/xdev-software/testcontainers-junit4-mock/actions/workflows/release.yml)
 
 Before releasing:
-* Consider doing a [test-deployment](https://github.com/xdev-software/testcontainers-java-junit4-mock/actions/workflows/test-deploy.yml?query=branch%3Adevelop) before actually releasing.
+* Consider doing a [test-deployment](https://github.com/xdev-software/testcontainers-junit4-mock/actions/workflows/test-deploy.yml?query=branch%3Adevelop) before actually releasing.
 * Check the [changelog](CHANGELOG.md)
 
 If the ``develop`` is ready for release, create a pull request to the ``master``-Branch and merge the changes
diff --git a/README.md b/README.md
index 99be187..96be8bf 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-[![Latest version](https://img.shields.io/maven-central/v/software.xdev/testcontainers-java-junit4-mock?logo=apache%20maven)](https://mvnrepository.com/artifact/software.xdev/testcontainers-java-junit4-mock)
-[![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/testcontainers-java-junit4-mock/checkBuild.yml?branch=develop)](https://github.com/xdev-software/testcontainers-java-junit4-mock/actions/workflows/checkBuild.yml?query=branch%3Adevelop)
-[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_testcontainers-java-junit4-mock&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_testcontainers-java-junit4-mock)
+[![Latest version](https://img.shields.io/maven-central/v/software.xdev/testcontainers-junit4-mock?logo=apache%20maven)](https://mvnrepository.com/artifact/software.xdev/testcontainers-junit4-mock)
+[![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/testcontainers-junit4-mock/checkBuild.yml?branch=develop)](https://github.com/xdev-software/testcontainers-junit4-mock/actions/workflows/checkBuild.yml?query=branch%3Adevelop)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_testcontainers-junit4-mock&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_testcontainers-junit4-mock)
 
-# testcontainers-java-junit4-mock
+# JUnit4-Mock for Testcontainers Java
 
 Mocks the few [JUnit 4](https://github.com/junit-team/junit4) classes that [testcontainers](https://github.com/testcontainers/testcontainers-java) needs so that JUnit 4 can be excluded.
 
@@ -12,7 +12,7 @@ Fixes/Works around [testcontainers-java#970](https://github.com/testcontainers/t
 ```xml
 <dependency>
     <groupId>software.xdev</groupId>
-    <artifactId>testcontainers-java-junit4-mock</artifactId>
+    <artifactId>testcontainers-junit4-mock</artifactId>
 </dependency>
 
 <dependency>
@@ -30,7 +30,7 @@ Fixes/Works around [testcontainers-java#970](https://github.com/testcontainers/t
 _Please note that you may need to insert the corresponding versions_
 
 ## Installation
-[Installation guide for the latest release](https://github.com/xdev-software/testcontainers-java-junit4-mock/releases/latest#Installation)
+[Installation guide for the latest release](https://github.com/xdev-software/testcontainers-junit4-mock/releases/latest#Installation)
 
 ## Support
 If you need support as soon as possible and you can't wait for any pull request, feel free to use [our support](https://xdev.software/en/services/support).
@@ -39,4 +39,4 @@ If you need support as soon as possible and you can't wait for any pull request,
 See the [contributing guide](./CONTRIBUTING.md) for detailed instructions on how to get started with our project.
 
 ## Dependencies and Licenses
-View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/testcontainers-java-junit4-mock/dependencies)
+View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/testcontainers-junit4-mock/dependencies)
diff --git a/SECURITY.md b/SECURITY.md
index fc146da..1cbd4e7 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -2,4 +2,4 @@
 
 ## Reporting a Vulnerability
 
-Please report a security vulnerability [on GitHub Security Advisories](https://github.com/xdev-software/testcontainers-java-junit4-mock/security/advisories/new).
+Please report a security vulnerability [on GitHub Security Advisories](https://github.com/xdev-software/testcontainers-junit4-mock/security/advisories/new).
diff --git a/pom.xml b/pom.xml
index 43ae268..972f5bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>software.xdev</groupId>
-	<artifactId>testcontainers-java-junit4-mock-root</artifactId>
+	<artifactId>testcontainers-junit4-mock-root</artifactId>
 	<version>1.0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
@@ -15,8 +15,8 @@
 	</organization>
 
 	<modules>
-		<module>testcontainers-java-junit4-mock</module>
-		<module>testcontainers-java-junit4-mock-demo</module>
+		<module>testcontainers-junit4-mock</module>
+		<module>testcontainers-junit4-mock-demo</module>
 	</modules>
 
 	<licenses>
diff --git a/testcontainers-java-junit4-mock-demo/pom.xml b/testcontainers-junit4-mock-demo/pom.xml
similarity index 96%
rename from testcontainers-java-junit4-mock-demo/pom.xml
rename to testcontainers-junit4-mock-demo/pom.xml
index 9deae0c..a307e29 100644
--- a/testcontainers-java-junit4-mock-demo/pom.xml
+++ b/testcontainers-junit4-mock-demo/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>software.xdev</groupId>
-	<artifactId>testcontainers-java-junit4-mock-demo</artifactId>
+	<artifactId>testcontainers-junit4-mock-demo</artifactId>
 	<version>1.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
@@ -27,7 +27,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>software.xdev</groupId>
-			<artifactId>testcontainers-java-junit4-mock</artifactId>
+			<artifactId>testcontainers-junit4-mock</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 
diff --git a/testcontainers-java-junit4-mock-demo/src/main/java/software/xdev/Application.java b/testcontainers-junit4-mock-demo/src/main/java/software/xdev/Application.java
similarity index 100%
rename from testcontainers-java-junit4-mock-demo/src/main/java/software/xdev/Application.java
rename to testcontainers-junit4-mock-demo/src/main/java/software/xdev/Application.java
diff --git a/testcontainers-java-junit4-mock/pom.xml b/testcontainers-junit4-mock/pom.xml
similarity index 95%
rename from testcontainers-java-junit4-mock/pom.xml
rename to testcontainers-junit4-mock/pom.xml
index ef00f09..b0d61e5 100644
--- a/testcontainers-java-junit4-mock/pom.xml
+++ b/testcontainers-junit4-mock/pom.xml
@@ -5,17 +5,17 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>software.xdev</groupId>
-	<artifactId>testcontainers-java-junit4-mock</artifactId>
+	<artifactId>testcontainers-junit4-mock</artifactId>
 	<version>1.0.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
-	<name>testcontainers-java-junit4-mock</name>
-	<description>testcontainers-java-junit4-mock</description>
-	<url>https://github.com/xdev-software/testcontainers-java-junit4-mock</url>
+	<name>testcontainers-junit4-mock</name>
+	<description>testcontainers-junit4-mock</description>
+	<url>https://github.com/xdev-software/testcontainers-junit4-mock</url>
 
 	<scm>
-		<url>https://github.com/xdev-software/testcontainers-java-junit4-mock</url>
-		<connection>scm:git:https://github.com/xdev-software/testcontainers-java-junit4-mock.git</connection>
+		<url>https://github.com/xdev-software/testcontainers-junit4-mock</url>
+		<connection>scm:git:https://github.com/xdev-software/testcontainers-junit4-mock.git</connection>
 	</scm>
 
 	<inceptionYear>2024</inceptionYear>
diff --git a/testcontainers-java-junit4-mock/src/main/java/org/junit/package-info.java b/testcontainers-junit4-mock/src/main/java/org/junit/package-info.java
similarity index 100%
rename from testcontainers-java-junit4-mock/src/main/java/org/junit/package-info.java
rename to testcontainers-junit4-mock/src/main/java/org/junit/package-info.java
diff --git a/testcontainers-java-junit4-mock/src/main/java/org/junit/rules/ExternalResource.java b/testcontainers-junit4-mock/src/main/java/org/junit/rules/ExternalResource.java
similarity index 100%
rename from testcontainers-java-junit4-mock/src/main/java/org/junit/rules/ExternalResource.java
rename to testcontainers-junit4-mock/src/main/java/org/junit/rules/ExternalResource.java
diff --git a/testcontainers-java-junit4-mock/src/main/java/org/junit/rules/TestRule.java b/testcontainers-junit4-mock/src/main/java/org/junit/rules/TestRule.java
similarity index 100%
rename from testcontainers-java-junit4-mock/src/main/java/org/junit/rules/TestRule.java
rename to testcontainers-junit4-mock/src/main/java/org/junit/rules/TestRule.java
diff --git a/testcontainers-java-junit4-mock/src/main/java/org/junit/runner/Description.java b/testcontainers-junit4-mock/src/main/java/org/junit/runner/Description.java
similarity index 100%
rename from testcontainers-java-junit4-mock/src/main/java/org/junit/runner/Description.java
rename to testcontainers-junit4-mock/src/main/java/org/junit/runner/Description.java
diff --git a/testcontainers-java-junit4-mock/src/main/java/org/junit/runners/model/Statement.java b/testcontainers-junit4-mock/src/main/java/org/junit/runners/model/Statement.java
similarity index 100%
rename from testcontainers-java-junit4-mock/src/main/java/org/junit/runners/model/Statement.java
rename to testcontainers-junit4-mock/src/main/java/org/junit/runners/model/Statement.java
diff --git a/testcontainers-java-junit4-mock/src/test/java/software/xdev/testcontainers/junit4mock/MockTest.java b/testcontainers-junit4-mock/src/test/java/software/xdev/testcontainers/junit4mock/MockTest.java
similarity index 100%
rename from testcontainers-java-junit4-mock/src/test/java/software/xdev/testcontainers/junit4mock/MockTest.java
rename to testcontainers-junit4-mock/src/test/java/software/xdev/testcontainers/junit4mock/MockTest.java