diff --git a/src/main/java/com/meilisearch/sdk/Documents.java b/src/main/java/com/meilisearch/sdk/Documents.java
index 48b7631f..57d8e028 100644
--- a/src/main/java/com/meilisearch/sdk/Documents.java
+++ b/src/main/java/com/meilisearch/sdk/Documents.java
@@ -6,12 +6,12 @@
 import com.meilisearch.sdk.model.Task;
 import java.util.List;
 
-/** Wrapper around MeiliSearchHttpRequest class to use for Meilisearch documents */
+/** Wrapper around MeilisearchHttpRequest class to use for Meilisearch documents */
 class Documents {
-    private final MeiliSearchHttpRequest meilisearchHttpRequest;
+    private final MeilisearchHttpRequest meilisearchHttpRequest;
 
     protected Documents(Config config) {
-        meilisearchHttpRequest = new MeiliSearchHttpRequest(config);
+        meilisearchHttpRequest = new MeilisearchHttpRequest(config);
     }
 
     /**
diff --git a/src/main/java/com/meilisearch/sdk/Index.java b/src/main/java/com/meilisearch/sdk/Index.java
index 3dd02910..e93db3a2 100644
--- a/src/main/java/com/meilisearch/sdk/Index.java
+++ b/src/main/java/com/meilisearch/sdk/Index.java
@@ -651,7 +651,7 @@ public void waitForTask(int taskId, int timeoutInMs, int intervalInMs)
      */
     public void fetchPrimaryKey() throws MeilisearchException {
         String requestQuery = "/indexes/" + this.uid;
-        MeiliSearchHttpRequest meilisearchHttpRequest = new MeiliSearchHttpRequest(config);
+        MeilisearchHttpRequest meilisearchHttpRequest = new MeilisearchHttpRequest(config);
         Index retrievedIndex =
                 config.jsonHandler.decode(meilisearchHttpRequest.get(requestQuery), Index.class);
         this.primaryKey = retrievedIndex.getPrimaryKey();
diff --git a/src/main/java/com/meilisearch/sdk/IndexesHandler.java b/src/main/java/com/meilisearch/sdk/IndexesHandler.java
index bbae8096..f7fad638 100644
--- a/src/main/java/com/meilisearch/sdk/IndexesHandler.java
+++ b/src/main/java/com/meilisearch/sdk/IndexesHandler.java
@@ -5,7 +5,7 @@
 
 /** Wrapper around the MeiliSearchHttpRequest class to ease usage for Meilisearch indexes */
 class IndexesHandler {
-    MeiliSearchHttpRequest meilisearchHttpRequest;
+    MeilisearchHttpRequest meilisearchHttpRequest;
 
     /**
      * Creates and sets up an instance of IndexesHandler to simplify Meilisearch API calls to manage
@@ -14,7 +14,7 @@ class IndexesHandler {
      * @param config Meilisearch configuration
      */
     IndexesHandler(Config config) {
-        this.meilisearchHttpRequest = new MeiliSearchHttpRequest(config);
+        this.meilisearchHttpRequest = new MeilisearchHttpRequest(config);
     }
 
     /**
diff --git a/src/main/java/com/meilisearch/sdk/KeysHandler.java b/src/main/java/com/meilisearch/sdk/KeysHandler.java
index 3f7edc6e..5e9f01f0 100644
--- a/src/main/java/com/meilisearch/sdk/KeysHandler.java
+++ b/src/main/java/com/meilisearch/sdk/KeysHandler.java
@@ -10,7 +10,7 @@
  * <p>Refer https://docs.meilisearch.com/reference/api/keys.html
  */
 public class KeysHandler {
-    private final MeiliSearchHttpRequest meilisearchHttpRequest;
+    private final MeilisearchHttpRequest meilisearchHttpRequest;
 
     /**
      * Creates and sets up an instance of Key to simplify Meilisearch API calls to manage keys
@@ -18,7 +18,7 @@ public class KeysHandler {
      * @param config Meilisearch configuration
      */
     public KeysHandler(Config config) {
-        this.meilisearchHttpRequest = new MeiliSearchHttpRequest(config);
+        this.meilisearchHttpRequest = new MeilisearchHttpRequest(config);
     }
 
     /**
diff --git a/src/main/java/com/meilisearch/sdk/MeiliSearchHttpRequest.java b/src/main/java/com/meilisearch/sdk/MeilisearchHttpRequest.java
similarity index 94%
rename from src/main/java/com/meilisearch/sdk/MeiliSearchHttpRequest.java
rename to src/main/java/com/meilisearch/sdk/MeilisearchHttpRequest.java
index f5d660d3..4a0b114b 100644
--- a/src/main/java/com/meilisearch/sdk/MeiliSearchHttpRequest.java
+++ b/src/main/java/com/meilisearch/sdk/MeilisearchHttpRequest.java
@@ -14,29 +14,29 @@
 import java.util.Collections;
 
 /** The HTTP requests for the different functions to be done through Meilisearch */
-public class MeiliSearchHttpRequest {
+public class MeilisearchHttpRequest {
     private final AbstractHttpClient client;
     private final RequestFactory factory;
     protected final JsonHandler jsonHandler;
 
     /**
-     * Constructor for the MeiliSearchHttpRequest
+     * Constructor for the MeilisearchHttpRequest
      *
      * @param config Meilisearch configuration
      */
-    public MeiliSearchHttpRequest(Config config) {
+    public MeilisearchHttpRequest(Config config) {
         this.client = new DefaultHttpClient(config);
         this.jsonHandler = config.jsonHandler;
         this.factory = new BasicRequestFactory(jsonHandler);
     }
 
     /**
-     * Constructor for the MeiliSearchHttpRequest
+     * Constructor for the MeilisearchHttpRequest
      *
      * @param client HttpClient for making calls to server
      * @param factory RequestFactory for generating calls to server
      */
-    public MeiliSearchHttpRequest(AbstractHttpClient client, RequestFactory factory) {
+    public MeilisearchHttpRequest(AbstractHttpClient client, RequestFactory factory) {
         this.client = client;
         this.factory = factory;
         this.jsonHandler = new GsonJsonHandler();
diff --git a/src/main/java/com/meilisearch/sdk/Search.java b/src/main/java/com/meilisearch/sdk/Search.java
index f05b6e90..cce15cd3 100644
--- a/src/main/java/com/meilisearch/sdk/Search.java
+++ b/src/main/java/com/meilisearch/sdk/Search.java
@@ -5,7 +5,7 @@
 
 /** Search Object for searching on indexes */
 public class Search {
-    private final MeiliSearchHttpRequest meilisearchHttpRequest;
+    private final MeilisearchHttpRequest meilisearchHttpRequest;
 
     /**
      * Constructor for the Meilisearch Search object
@@ -13,7 +13,7 @@ public class Search {
      * @param config Meilisearch configuration
      */
     protected Search(Config config) {
-        meilisearchHttpRequest = new MeiliSearchHttpRequest(config);
+        meilisearchHttpRequest = new MeilisearchHttpRequest(config);
     }
 
     /**
diff --git a/src/main/java/com/meilisearch/sdk/SettingsHandler.java b/src/main/java/com/meilisearch/sdk/SettingsHandler.java
index 01d5c1cf..f3209a96 100644
--- a/src/main/java/com/meilisearch/sdk/SettingsHandler.java
+++ b/src/main/java/com/meilisearch/sdk/SettingsHandler.java
@@ -12,7 +12,7 @@
  * <p>Refer https://docs.meilisearch.com/reference/api/settings.html
  */
 public class SettingsHandler {
-    private final MeiliSearchHttpRequest meilisearchHttpRequest;
+    private final MeilisearchHttpRequest meilisearchHttpRequest;
 
     /**
      * Constructor for the Meilisearch Settings object
@@ -20,7 +20,7 @@ public class SettingsHandler {
      * @param config Meilisearch configuration
      */
     public SettingsHandler(Config config) {
-        meilisearchHttpRequest = new MeiliSearchHttpRequest(config);
+        meilisearchHttpRequest = new MeilisearchHttpRequest(config);
     }
 
     /**
diff --git a/src/main/java/com/meilisearch/sdk/TasksHandler.java b/src/main/java/com/meilisearch/sdk/TasksHandler.java
index fd23de88..4c3ebe2d 100644
--- a/src/main/java/com/meilisearch/sdk/TasksHandler.java
+++ b/src/main/java/com/meilisearch/sdk/TasksHandler.java
@@ -12,7 +12,7 @@
  * <p>Refer https://docs.meilisearch.com/reference/api/tasks.html
  */
 public class TasksHandler {
-    private final MeiliSearchHttpRequest meilisearchHttpRequest;
+    private final MeilisearchHttpRequest meilisearchHttpRequest;
     public static final String SUCCEEDED = "succeeded";
     public static final String FAILED = "failed";
 
@@ -22,7 +22,7 @@ public class TasksHandler {
      * @param config MeiliSearch configuration
      */
     public TasksHandler(Config config) {
-        this.meilisearchHttpRequest = new MeiliSearchHttpRequest(config);
+        this.meilisearchHttpRequest = new MeilisearchHttpRequest(config);
     }
 
     /**