diff --git a/demo/tmail/extensions-jars/tmail-open-ai-jar-with-dependencies.jar b/demo/tmail/extensions-jars/tmail-ai-bot-jar-with-dependencies.jar
similarity index 56%
rename from demo/tmail/extensions-jars/tmail-open-ai-jar-with-dependencies.jar
rename to demo/tmail/extensions-jars/tmail-ai-bot-jar-with-dependencies.jar
index 5ad29e4626..37cff83b4c 100644
Binary files a/demo/tmail/extensions-jars/tmail-open-ai-jar-with-dependencies.jar and b/demo/tmail/extensions-jars/tmail-ai-bot-jar-with-dependencies.jar differ
diff --git a/tmail-backend/tmail-third-party/open-ai/AIBotMailet.adoc b/tmail-backend/tmail-third-party/ai-bot/AIBotMailet.adoc
similarity index 100%
rename from tmail-backend/tmail-third-party/open-ai/AIBotMailet.adoc
rename to tmail-backend/tmail-third-party/ai-bot/AIBotMailet.adoc
diff --git a/tmail-backend/tmail-third-party/open-ai/README.md b/tmail-backend/tmail-third-party/ai-bot/README.md
similarity index 67%
rename from tmail-backend/tmail-third-party/open-ai/README.md
rename to tmail-backend/tmail-third-party/ai-bot/README.md
index 644e03dd59..16f715c3b7 100644
--- a/tmail-backend/tmail-third-party/open-ai/README.md
+++ b/tmail-backend/tmail-third-party/ai-bot/README.md
@@ -1,8 +1,8 @@
-# OpenAI third party
+# AIBot third party
 
-We provide a mailet extension for OpenAI integration. The goal is to provide a mail bot at e.g. `gpt@example.com` that replies to users' questions.
+We provide a mailet extension for OpenAI-compatible APIs integration. The goal is to provide a mail bot at e.g. `gpt@example.com` that replies to users' questions.
 
-To use this extension, please plug the external jar `tmail-open-ai-jar-with-dependencies.jar` into your TMail application.
+To use this extension, please plug the external jar `tmail-ai-bot-jar-with-dependencies.jar` into your TMail application.
 
 Sample `mailetcontainer.xml` configuration:
 
diff --git a/tmail-backend/tmail-third-party/open-ai/RecipientsContain.adoc b/tmail-backend/tmail-third-party/ai-bot/RecipientsContain.adoc
similarity index 100%
rename from tmail-backend/tmail-third-party/open-ai/RecipientsContain.adoc
rename to tmail-backend/tmail-third-party/ai-bot/RecipientsContain.adoc
diff --git a/tmail-backend/tmail-third-party/open-ai/pom.xml b/tmail-backend/tmail-third-party/ai-bot/pom.xml
similarity index 95%
rename from tmail-backend/tmail-third-party/open-ai/pom.xml
rename to tmail-backend/tmail-third-party/ai-bot/pom.xml
index 4c0e40b12d..3f4c418043 100644
--- a/tmail-backend/tmail-third-party/open-ai/pom.xml
+++ b/tmail-backend/tmail-third-party/ai-bot/pom.xml
@@ -9,8 +9,8 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>tmail-open-ai</artifactId>
-    <name>Twake Mail :: Third Party</name>
+    <artifactId>tmail-ai-bot</artifactId>
+    <name>Twake Mail :: Third Party :: AIBot</name>
     <description>OpenAI integration for Twake Mail</description>
 
     <properties>
@@ -80,7 +80,7 @@
                     <descriptorRefs>
                         <descriptorRef>jar-with-dependencies</descriptorRef>
                     </descriptorRefs>
-                    <finalName>tmail-open-ai</finalName>
+                    <finalName>tmail-ai-bot</finalName>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/tmail-backend/tmail-third-party/open-ai/src/main/java/com/linagora/tmail/mailet/AIBotConfig.java b/tmail-backend/tmail-third-party/ai-bot/src/main/java/com/linagora/tmail/mailet/AIBotConfig.java
similarity index 100%
rename from tmail-backend/tmail-third-party/open-ai/src/main/java/com/linagora/tmail/mailet/AIBotConfig.java
rename to tmail-backend/tmail-third-party/ai-bot/src/main/java/com/linagora/tmail/mailet/AIBotConfig.java
diff --git a/tmail-backend/tmail-third-party/open-ai/src/main/java/com/linagora/tmail/mailet/AIBotMailet.java b/tmail-backend/tmail-third-party/ai-bot/src/main/java/com/linagora/tmail/mailet/AIBotMailet.java
similarity index 100%
rename from tmail-backend/tmail-third-party/open-ai/src/main/java/com/linagora/tmail/mailet/AIBotMailet.java
rename to tmail-backend/tmail-third-party/ai-bot/src/main/java/com/linagora/tmail/mailet/AIBotMailet.java
diff --git a/tmail-backend/tmail-third-party/open-ai/src/main/java/com/linagora/tmail/mailet/ChatLanguageModelFactory.java b/tmail-backend/tmail-third-party/ai-bot/src/main/java/com/linagora/tmail/mailet/ChatLanguageModelFactory.java
similarity index 100%
rename from tmail-backend/tmail-third-party/open-ai/src/main/java/com/linagora/tmail/mailet/ChatLanguageModelFactory.java
rename to tmail-backend/tmail-third-party/ai-bot/src/main/java/com/linagora/tmail/mailet/ChatLanguageModelFactory.java
diff --git a/tmail-backend/tmail-third-party/open-ai/src/main/java/com/linagora/tmail/mailet/LlmModel.java b/tmail-backend/tmail-third-party/ai-bot/src/main/java/com/linagora/tmail/mailet/LlmModel.java
similarity index 100%
rename from tmail-backend/tmail-third-party/open-ai/src/main/java/com/linagora/tmail/mailet/LlmModel.java
rename to tmail-backend/tmail-third-party/ai-bot/src/main/java/com/linagora/tmail/mailet/LlmModel.java
diff --git a/tmail-backend/tmail-third-party/open-ai/src/main/java/com/linagora/tmail/mailet/RecipientsContain.java b/tmail-backend/tmail-third-party/ai-bot/src/main/java/com/linagora/tmail/mailet/RecipientsContain.java
similarity index 100%
rename from tmail-backend/tmail-third-party/open-ai/src/main/java/com/linagora/tmail/mailet/RecipientsContain.java
rename to tmail-backend/tmail-third-party/ai-bot/src/main/java/com/linagora/tmail/mailet/RecipientsContain.java
diff --git a/tmail-backend/tmail-third-party/open-ai/src/test/java/com/linagora/tmail/mailet/AIBotIntegrationTest.java b/tmail-backend/tmail-third-party/ai-bot/src/test/java/com/linagora/tmail/mailet/AIBotIntegrationTest.java
similarity index 100%
rename from tmail-backend/tmail-third-party/open-ai/src/test/java/com/linagora/tmail/mailet/AIBotIntegrationTest.java
rename to tmail-backend/tmail-third-party/ai-bot/src/test/java/com/linagora/tmail/mailet/AIBotIntegrationTest.java
diff --git a/tmail-backend/tmail-third-party/open-ai/src/test/java/com/linagora/tmail/mailet/AIBotMailetTest.java b/tmail-backend/tmail-third-party/ai-bot/src/test/java/com/linagora/tmail/mailet/AIBotMailetTest.java
similarity index 100%
rename from tmail-backend/tmail-third-party/open-ai/src/test/java/com/linagora/tmail/mailet/AIBotMailetTest.java
rename to tmail-backend/tmail-third-party/ai-bot/src/test/java/com/linagora/tmail/mailet/AIBotMailetTest.java
diff --git a/tmail-backend/tmail-third-party/pom.xml b/tmail-backend/tmail-third-party/pom.xml
index ba8c99b381..1c70bead76 100644
--- a/tmail-backend/tmail-third-party/pom.xml
+++ b/tmail-backend/tmail-third-party/pom.xml
@@ -17,7 +17,7 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>open-ai</module>
+        <module>ai-bot</module>
         <module>openpaas</module>
     </modules>
 </project>
\ No newline at end of file