diff --git a/build.gradle b/build.gradle
index 413137fb7..b517120d0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -414,7 +414,7 @@ configurations.all {
 }
 
 dependencies {
-    implementation project(':stirling-common')
+    implementation project(':common')
 
     //tmp for security bumps
     implementation 'ch.qos.logback:logback-core:1.5.18'
diff --git a/stirling-common/.gitignore b/common/.gitignore
similarity index 100%
rename from stirling-common/.gitignore
rename to common/.gitignore
diff --git a/stirling-common/src/main/java/stirling/software/common/configuration/AppConfig.java b/common/src/main/java/stirling/software/common/configuration/AppConfig.java
similarity index 100%
rename from stirling-common/src/main/java/stirling/software/common/configuration/AppConfig.java
rename to common/src/main/java/stirling/software/common/configuration/AppConfig.java
diff --git a/stirling-common/src/main/java/stirling/software/common/configuration/DatabaseConfig.java b/common/src/main/java/stirling/software/common/configuration/DatabaseConfig.java
similarity index 100%
rename from stirling-common/src/main/java/stirling/software/common/configuration/DatabaseConfig.java
rename to common/src/main/java/stirling/software/common/configuration/DatabaseConfig.java
diff --git a/stirling-common/src/main/java/stirling/software/common/configuration/FileFallbackTemplateResolver.java b/common/src/main/java/stirling/software/common/configuration/FileFallbackTemplateResolver.java
similarity index 100%
rename from stirling-common/src/main/java/stirling/software/common/configuration/FileFallbackTemplateResolver.java
rename to common/src/main/java/stirling/software/common/configuration/FileFallbackTemplateResolver.java
diff --git a/stirling-common/src/main/java/stirling/software/common/configuration/InstallationPathConfig.java b/common/src/main/java/stirling/software/common/configuration/InstallationPathConfig.java
similarity index 100%
rename from stirling-common/src/main/java/stirling/software/common/configuration/InstallationPathConfig.java
rename to common/src/main/java/stirling/software/common/configuration/InstallationPathConfig.java
diff --git a/stirling-common/src/main/java/stirling/software/common/configuration/YamlConfig.java b/common/src/main/java/stirling/software/common/configuration/YamlConfig.java
similarity index 100%
rename from stirling-common/src/main/java/stirling/software/common/configuration/YamlConfig.java
rename to common/src/main/java/stirling/software/common/configuration/YamlConfig.java
diff --git a/stirling-common/src/main/java/stirling/software/common/configuration/YamlPropertySourceFactory.java b/common/src/main/java/stirling/software/common/configuration/YamlPropertySourceFactory.java
similarity index 100%
rename from stirling-common/src/main/java/stirling/software/common/configuration/YamlPropertySourceFactory.java
rename to common/src/main/java/stirling/software/common/configuration/YamlPropertySourceFactory.java
diff --git a/stirling-common/src/main/java/stirling/software/common/model/ApplicationProperties.java b/common/src/main/java/stirling/software/common/model/ApplicationProperties.java
similarity index 100%
rename from stirling-common/src/main/java/stirling/software/common/model/ApplicationProperties.java
rename to common/src/main/java/stirling/software/common/model/ApplicationProperties.java
diff --git a/stirling-common/src/main/java/stirling/software/common/model/InputStreamTemplateResource.java b/common/src/main/java/stirling/software/common/model/InputStreamTemplateResource.java
similarity index 100%
rename from stirling-common/src/main/java/stirling/software/common/model/InputStreamTemplateResource.java
rename to common/src/main/java/stirling/software/common/model/InputStreamTemplateResource.java
diff --git a/stirling-common/src/main/java/stirling/software/common/model/enumeration/UsernameAttribute.java b/common/src/main/java/stirling/software/common/model/enumeration/UsernameAttribute.java
similarity index 100%
rename from stirling-common/src/main/java/stirling/software/common/model/enumeration/UsernameAttribute.java
rename to common/src/main/java/stirling/software/common/model/enumeration/UsernameAttribute.java
diff --git a/stirling-common/src/main/java/stirling/software/common/model/exception/UnsupportedProviderException.java b/common/src/main/java/stirling/software/common/model/exception/UnsupportedProviderException.java
similarity index 100%
rename from stirling-common/src/main/java/stirling/software/common/model/exception/UnsupportedProviderException.java
rename to common/src/main/java/stirling/software/common/model/exception/UnsupportedProviderException.java
diff --git a/stirling-common/src/main/java/stirling/software/common/model/exception/UnsupportedUsernameAttribute.java b/common/src/main/java/stirling/software/common/model/exception/UnsupportedUsernameAttribute.java
similarity index 100%
rename from stirling-common/src/main/java/stirling/software/common/model/exception/UnsupportedUsernameAttribute.java
rename to common/src/main/java/stirling/software/common/model/exception/UnsupportedUsernameAttribute.java
diff --git a/stirling-common/src/main/java/stirling/software/common/model/provider/GitHubProvider.java b/common/src/main/java/stirling/software/common/model/provider/GitHubProvider.java
similarity index 100%
rename from stirling-common/src/main/java/stirling/software/common/model/provider/GitHubProvider.java
rename to common/src/main/java/stirling/software/common/model/provider/GitHubProvider.java
diff --git a/stirling-common/src/main/java/stirling/software/common/model/provider/GoogleProvider.java b/common/src/main/java/stirling/software/common/model/provider/GoogleProvider.java
similarity index 100%
rename from stirling-common/src/main/java/stirling/software/common/model/provider/GoogleProvider.java
rename to common/src/main/java/stirling/software/common/model/provider/GoogleProvider.java
diff --git a/stirling-common/src/main/java/stirling/software/common/model/provider/KeycloakProvider.java b/common/src/main/java/stirling/software/common/model/provider/KeycloakProvider.java
similarity index 100%
rename from stirling-common/src/main/java/stirling/software/common/model/provider/KeycloakProvider.java
rename to common/src/main/java/stirling/software/common/model/provider/KeycloakProvider.java
diff --git a/stirling-common/src/main/java/stirling/software/common/model/provider/Provider.java b/common/src/main/java/stirling/software/common/model/provider/Provider.java
similarity index 100%
rename from stirling-common/src/main/java/stirling/software/common/model/provider/Provider.java
rename to common/src/main/java/stirling/software/common/model/provider/Provider.java
diff --git a/stirling-common/src/main/java/stirling/software/common/util/Validator.java b/common/src/main/java/stirling/software/common/util/Validator.java
similarity index 100%
rename from stirling-common/src/main/java/stirling/software/common/util/Validator.java
rename to common/src/main/java/stirling/software/common/util/Validator.java
diff --git a/stirling-common/src/test/java/stirling/software/common/util/ValidatorTest.java b/common/src/test/java/stirling/software/common/util/ValidatorTest.java
similarity index 100%
rename from stirling-common/src/test/java/stirling/software/common/util/ValidatorTest.java
rename to common/src/test/java/stirling/software/common/util/ValidatorTest.java
diff --git a/settings.gradle b/settings.gradle
index 03629c96f..2f60c7a82 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,4 +4,4 @@ plugins {
 }
 rootProject.name = 'Stirling-PDF'
 
-include 'stirling-common'
\ No newline at end of file
+include 'common'