diff --git a/clients/algoliasearch-client-java-2/algoliasearch-core/build.gradle b/clients/algoliasearch-client-java-2/algoliasearch-core/build.gradle
index f4d91ce3f1..9ab9e40c35 100644
--- a/clients/algoliasearch-client-java-2/algoliasearch-core/build.gradle
+++ b/clients/algoliasearch-client-java-2/algoliasearch-core/build.gradle
@@ -4,9 +4,6 @@ plugins {
     id 'com.github.johnrengelman.shadow' version '7.0.0'
 }
 
-description = 'algoliasearch-client-java-2'
-java.sourceCompatibility = JavaVersion.VERSION_1_8
-
 repositories {
     mavenCentral()
 }
diff --git a/clients/algoliasearch-client-java-2/algoliasearch-core/gradle.properties b/clients/algoliasearch-client-java-2/algoliasearch-core/gradle.properties
new file mode 100644
index 0000000000..9f79feb3e1
--- /dev/null
+++ b/clients/algoliasearch-client-java-2/algoliasearch-core/gradle.properties
@@ -0,0 +1 @@
+POM_ARTIFACT_ID=algoliasearch-client-java
diff --git a/clients/algoliasearch-client-java-2/gradlew b/clients/algoliasearch-client-java-2/gradlew
old mode 100644
new mode 100755
diff --git a/clients/algoliasearch-client-java-2/settings.gradle b/clients/algoliasearch-client-java-2/settings.gradle
index fc7c0252fd..b60cb778ab 100644
--- a/clients/algoliasearch-client-java-2/settings.gradle
+++ b/clients/algoliasearch-client-java-2/settings.gradle
@@ -1,3 +1,3 @@
-rootProject.name = "algoliasearch-client-java-2"
+rootProject.name = "algoliasearch-client-java"
 
 include(":algoliasearch-core")
diff --git a/config/generation.config.js b/config/generation.config.js
index 408ff73a0e..045389f962 100644
--- a/config/generation.config.js
+++ b/config/generation.config.js
@@ -11,9 +11,11 @@ module.exports = {
 
     // Java
     '!clients/algoliasearch-client-java-2/*.gradle',
+    '!clients/algoliasearch-client-java-2/gradlew',
     '!clients/algoliasearch-client-java-2/.gitignore',
     '!clients/algoliasearch-client-java-2/gradle/wrapper/**',
     '!clients/algoliasearch-client-java-2/algoliasearch-core/build.gradle',
+    '!clients/algoliasearch-client-java-2/algoliasearch-core/gradle.properties',
     '!clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/exceptions/**',
     '!clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/utils/**',
 
diff --git a/config/openapitools.json b/config/openapitools.json
index 3c99c907bb..f69d91489b 100644
--- a/config/openapitools.json
+++ b/config/openapitools.json
@@ -135,7 +135,6 @@
       },
       "java-search": {
         "output": "#{cwd}/clients/algoliasearch-client-java-2",
-        "artifactId": "algoliasearch-client-java-2",
         "groupId": "com.algolia",
         "apiPackage": "com.algolia.api",
         "invokerPackage": "com.algolia",
@@ -143,12 +142,11 @@
         "library": "okhttp-gson",
         "gitRepoId": "algoliasearch-client-java-2",
         "additionalProperties": {
-          "packageName": "algoliasearch-client-java-2"
+          "packageName": "algoliasearch-client-java"
         }
       },
       "java-recommend": {
         "output": "#{cwd}/clients/algoliasearch-client-java-2",
-        "artifactId": "algoliasearch-client-java-2",
         "groupId": "com.algolia",
         "apiPackage": "com.algolia.api",
         "invokerPackage": "com.algolia",
@@ -156,12 +154,11 @@
         "library": "okhttp-gson",
         "gitRepoId": "algoliasearch-client-java-2",
         "additionalProperties": {
-          "packageName": "algoliasearch-client-java-2"
+          "packageName": "algoliasearch-client-java"
         }
       },
       "java-personalization": {
         "output": "#{cwd}/clients/algoliasearch-client-java-2",
-        "artifactId": "algoliasearch-client-java-2",
         "groupId": "com.algolia",
         "apiPackage": "com.algolia.api",
         "invokerPackage": "com.algolia",
@@ -169,13 +166,12 @@
         "library": "okhttp-gson",
         "gitRepoId": "algoliasearch-client-java-2",
         "additionalProperties": {
-          "packageName": "algoliasearch-client-java-2",
+          "packageName": "algoliasearch-client-java",
           "hasRegionalHost": true
         }
       },
       "java-analytics": {
         "output": "#{cwd}/clients/algoliasearch-client-java-2",
-        "artifactId": "algoliasearch-client-java-2",
         "groupId": "com.algolia",
         "apiPackage": "com.algolia.api",
         "invokerPackage": "com.algolia",
@@ -183,13 +179,12 @@
         "library": "okhttp-gson",
         "gitRepoId": "algoliasearch-client-java-2",
         "additionalProperties": {
-          "packageName": "algoliasearch-client-java-2",
+          "packageName": "algoliasearch-client-java",
           "hasRegionalHost": true
         }
       },
       "java-insights": {
         "output": "#{cwd}/clients/algoliasearch-client-java-2",
-        "artifactId": "algoliasearch-client-java-2",
         "groupId": "com.algolia",
         "apiPackage": "com.algolia.api",
         "invokerPackage": "com.algolia",
@@ -197,13 +192,12 @@
         "library": "okhttp-gson",
         "gitRepoId": "algoliasearch-client-java-2",
         "additionalProperties": {
-          "packageName": "algoliasearch-client-java-2",
+          "packageName": "algoliasearch-client-java",
           "hasRegionalHost": true
         }
       },
       "java-abtesting": {
         "output": "#{cwd}/clients/algoliasearch-client-java-2",
-        "artifactId": "algoliasearch-client-java-2",
         "groupId": "com.algolia",
         "apiPackage": "com.algolia.api",
         "invokerPackage": "com.algolia",
@@ -211,13 +205,12 @@
         "library": "okhttp-gson",
         "gitRepoId": "algoliasearch-client-java-2",
         "additionalProperties": {
-          "packageName": "algoliasearch-client-java-2",
+          "packageName": "algoliasearch-client-java",
           "hasRegionalHost": true
         }
       },
       "java-query-suggestions": {
         "output": "#{cwd}/clients/algoliasearch-client-java-2",
-        "artifactId": "algoliasearch-client-java-2",
         "groupId": "com.algolia",
         "apiPackage": "com.algolia.api",
         "invokerPackage": "com.algolia",
@@ -225,13 +218,12 @@
         "library": "okhttp-gson",
         "gitRepoId": "algoliasearch-client-java-2",
         "additionalProperties": {
-          "packageName": "algoliasearch-client-java-2",
+          "packageName": "algoliasearch-client-java",
           "hasRegionalHost": true
         }
       },
       "java-predict": {
         "output": "#{cwd}/clients/algoliasearch-client-java-2",
-        "artifactId": "algoliasearch-client-java-2",
         "groupId": "com.algolia",
         "apiPackage": "com.algolia.api",
         "invokerPackage": "com.algolia",
@@ -239,7 +231,7 @@
         "library": "okhttp-gson",
         "gitRepoId": "algoliasearch-client-java-2",
         "additionalProperties": {
-          "packageName": "algoliasearch-client-java-2"
+          "packageName": "algoliasearch-client-java"
         }
       },
       "php-search": {
diff --git a/playground/java/build.gradle b/playground/java/build.gradle
index e15b9dd01e..0f30e1a025 100644
--- a/playground/java/build.gradle
+++ b/playground/java/build.gradle
@@ -9,7 +9,7 @@ repositories {
 
 dependencies {
     implementation 'io.github.cdimascio:dotenv-java:2.2.2'
-    implementation 'com.algolia:algoliasearch-core:0.0.1-SNAPSHOT'
+    implementation 'com.algolia:algoliasearch-client-java:0.0.1-SNAPSHOT'
 }
 
 group = 'com.algolia'
diff --git a/playground/java/settings.gradle b/playground/java/settings.gradle
index b01009b5ab..5fd134fcb4 100644
--- a/playground/java/settings.gradle
+++ b/playground/java/settings.gradle
@@ -1,3 +1,7 @@
 rootProject.name = 'java-playground'
 
-includeBuild '../../clients/algoliasearch-client-java-2'
+includeBuild('../../clients/algoliasearch-client-java-2') {
+    dependencySubstitution {
+        substitute module('com.algolia:algoliasearch-client-java') using project(':algoliasearch-core')
+    }
+}
diff --git a/tests/output/java/build.gradle b/tests/output/java/build.gradle
index 314b66c94c..052deec0c3 100644
--- a/tests/output/java/build.gradle
+++ b/tests/output/java/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation 'com.algolia:algoliasearch-core:0.0.1-SNAPSHOT'
+    testImplementation 'com.algolia:algoliasearch-client-java:0.0.1-SNAPSHOT'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
     testImplementation 'org.skyscreamer:jsonassert:1.5.0'
     testImplementation 'com.google.code.gson:gson:2.8.9'
diff --git a/tests/output/java/settings.gradle b/tests/output/java/settings.gradle
index 345d4299a8..623dbe0748 100644
--- a/tests/output/java/settings.gradle
+++ b/tests/output/java/settings.gradle
@@ -1,3 +1,7 @@
 rootProject.name = 'java-tests'
 
-includeBuild '../../../clients/algoliasearch-client-java-2'
+includeBuild('../../../clients/algoliasearch-client-java-2') {
+    dependencySubstitution {
+        substitute module('com.algolia:algoliasearch-client-java') using project(':algoliasearch-core')
+    }
+}
diff --git a/website/docs/api-clients/installation.mdx b/website/docs/api-clients/installation.mdx
index 434c4d01f9..f75041b268 100644
--- a/website/docs/api-clients/installation.mdx
+++ b/website/docs/api-clients/installation.mdx
@@ -157,7 +157,7 @@ $res = $client->getUserTokenProfile('<YOUR_TOKEN>');
 
 <TabItem value="java">
 
-To get started, add the [algoliasearch-core](https://oss.sonatype.org/content/repositories/snapshots/com/algolia/algoliasearch-core/0.0.1-SNAPSHOT/) dependency to your project, either with [Maven](https://maven.apache.org/):
+To get started, add the [algoliasearch-client-java](https://oss.sonatype.org/content/repositories/snapshots/com/algolia/algoliasearch-client-java/0.0.1-SNAPSHOT/) dependency to your project, either with [Maven](https://maven.apache.org/):
 ```xml
 <repositories>
   <repository>
@@ -174,7 +174,7 @@ To get started, add the [algoliasearch-core](https://oss.sonatype.org/content/re
 
 <dependency>
   <groupId>com.algolia</groupId>
-  <artifactId>algoliasearch-core</artifactId>
+  <artifactId>algoliasearch-client-java</artifactId>
   <version>0.0.1-SNAPSHOT</version>
 </dependency>
 ```
@@ -186,7 +186,7 @@ repositories() {
 }
 
 dependencies {
-  testImplementation 'com.algolia:algoliasearch-core:0.0.1-SNAPSHOT'
+  testImplementation 'com.algolia:algoliasearch-client-java:0.0.1-SNAPSHOT'
 }
 ```
 
diff --git a/website/docs/automation/release-process.md b/website/docs/automation/release-process.md
index 2b53920299..36b87c9d72 100644
--- a/website/docs/automation/release-process.md
+++ b/website/docs/automation/release-process.md
@@ -43,7 +43,7 @@ Each language repository should have their own release process, and should run o
 
 ### Java
 
-Java is released to [sonatype](https://oss.sonatype.org/) before being sent to [Maven](https://search.maven.org/artifact/com.algolia/algoliasearch-core) central repository, the `jar` need to be signed before publishing, and then verified on sonatype by using `closeAndRelease` target on Gradle.
+Java is released to [sonatype](https://oss.sonatype.org/) before being sent to [Maven](https://search.maven.org/artifact/com.algolia/algoliasearch-client-java) central repository, the `jar` need to be signed before publishing, and then verified on sonatype by using `closeAndRelease` target on Gradle.
 All of this is handled in the [release action](https://github.com/algolia/algoliasearch-client-java-2/tree/next/.github/workflows/release.yml), executed on the [Java repository](https://github.com/algolia/algoliasearch-client-java-2).
 If you want to release manually, you need to copy some secrets to either:
 
@@ -76,7 +76,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.algolia:algoliasearch-core:0.0.1-SNAPSHOT'
+    implementation 'com.algolia:algoliasearch-client-java:0.0.1-SNAPSHOT'
 }
 ```