diff --git a/src/modules/OpenAI.ChatGpt.Modules.Translator/ChatGPTTranslatorServiceEconomical.cs b/src/modules/OpenAI.ChatGpt.Modules.Translator/EconomicalChatGPTTranslatorService.cs
similarity index 96%
rename from src/modules/OpenAI.ChatGpt.Modules.Translator/ChatGPTTranslatorServiceEconomical.cs
rename to src/modules/OpenAI.ChatGpt.Modules.Translator/EconomicalChatGPTTranslatorService.cs
index 612dc9f..20b25e7 100644
--- a/src/modules/OpenAI.ChatGpt.Modules.Translator/ChatGPTTranslatorServiceEconomical.cs
+++ b/src/modules/OpenAI.ChatGpt.Modules.Translator/EconomicalChatGPTTranslatorService.cs
@@ -7,7 +7,7 @@ namespace OpenAI.ChatGpt.Modules.Translator;
 /// Provides a service for translating text using GPT models with economical batching.
 /// </summary>
 // ReSharper disable once InconsistentNaming
-public class ChatGPTTranslatorServiceEconomical : IAsyncDisposable
+public class EconomicalChatGPTTranslatorService : IAsyncDisposable
 {
     private readonly IChatGPTTranslatorService _chatGptTranslatorService;
     private readonly string _sourceLanguage;
@@ -25,7 +25,7 @@ public class ChatGPTTranslatorServiceEconomical : IAsyncDisposable
     private readonly object _syncLock = new();
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="ChatGPTTranslatorServiceEconomical"/> class.
+    /// Initializes a new instance of the <see cref="EconomicalChatGPTTranslatorService"/> class.
     /// </summary>
     /// <param name="chatGptTranslatorService">The GPT translation service to use.</param>
     /// <param name="sourceLanguage">The source language code.</param>
@@ -36,7 +36,7 @@ public class ChatGPTTranslatorServiceEconomical : IAsyncDisposable
     /// <param name="user">The user ID. (Optional)</param>
     /// <param name="sendRequestAfterInactivity">The timespan for sending requests after inactivity. (Optional)</param>
     /// <param name="maxTokensPerRequest">The maximum tokens per request. (Optional)</param>
-    public ChatGPTTranslatorServiceEconomical(
+    public EconomicalChatGPTTranslatorService(
         IChatGPTTranslatorService chatGptTranslatorService,
         string sourceLanguage,
         string targetLanguage,
diff --git a/tests/OpenAI.ChatGpt.IntegrationTests/ChatGptTranslatorServiceTests.cs b/tests/OpenAI.ChatGpt.IntegrationTests/ChatGptTranslatorServiceTests.cs
index 91b6f6a..6e8897e 100644
--- a/tests/OpenAI.ChatGpt.IntegrationTests/ChatGptTranslatorServiceTests.cs
+++ b/tests/OpenAI.ChatGpt.IntegrationTests/ChatGptTranslatorServiceTests.cs
@@ -92,7 +92,7 @@ public async void Batch_translate()
         };
 
         var translationService = new ChatGPTTranslatorService(_client);
-        var service = new ChatGPTTranslatorServiceEconomical(
+        var service = new EconomicalChatGPTTranslatorService(
             translationService, "English", "Russian", maxTokensPerRequest: 50);
         
         var tasks = words.Select(async word =>
diff --git a/tests/OpenAI.ChatGpt.UnitTests/ChatGptTranslatorServiceTests.cs b/tests/OpenAI.ChatGpt.UnitTests/ChatGptTranslatorServiceTests.cs
index b9ff6b0..2490385 100644
--- a/tests/OpenAI.ChatGpt.UnitTests/ChatGptTranslatorServiceTests.cs
+++ b/tests/OpenAI.ChatGpt.UnitTests/ChatGptTranslatorServiceTests.cs
@@ -74,12 +74,12 @@ public async Task Translating_multiple_texts_should_be_batched_together()
     {
         // Arrange
         var mockTranslatorService = new Mock<IChatGPTTranslatorService>();
-        var batch = new ChatGPTTranslatorServiceEconomical.Batch();
+        var batch = new EconomicalChatGPTTranslatorService.Batch();
         batch.Add("Text 1");
         batch.Add("Text 2");
 
         mockTranslatorService.Setup(m 
-                => m.TranslateObject(It.IsAny<ChatGPTTranslatorServiceEconomical.Batch>(),
+                => m.TranslateObject(It.IsAny<EconomicalChatGPTTranslatorService.Batch>(),
                     true,
                     "en",
                     "fr",
@@ -95,7 +95,7 @@ public async Task Translating_multiple_texts_should_be_batched_together()
             ).ReturnsAsync(batch)
             .Verifiable();
 
-        var service = new ChatGPTTranslatorServiceEconomical(
+        var service = new EconomicalChatGPTTranslatorService(
             mockTranslatorService.Object, "en", "fr", maxTokensPerRequest: 50
         );
 
@@ -106,7 +106,7 @@ public async Task Translating_multiple_texts_should_be_batched_together()
         // Assert
         await Task.WhenAll(result1, result2);
         mockTranslatorService.Verify(m 
-                => m.TranslateObject(It.IsAny<ChatGPTTranslatorServiceEconomical.Batch>(),
+                => m.TranslateObject(It.IsAny<EconomicalChatGPTTranslatorService.Batch>(),
                     true,
                     "en",
                     "fr",
@@ -127,7 +127,7 @@ public async Task Batch_is_processed_after_inactivity_period()
     {
         var mockTranslatorService = new Mock<IChatGPTTranslatorService>();
 
-        var service = new ChatGPTTranslatorServiceEconomical(
+        var service = new EconomicalChatGPTTranslatorService(
             mockTranslatorService.Object,
             "en",
             "fr",
@@ -139,7 +139,7 @@ public async Task Batch_is_processed_after_inactivity_period()
         await Task.Delay(150); // Wait for the inactivity period
 
         mockTranslatorService.Verify(x => 
-            x.TranslateObject(It.IsAny<ChatGPTTranslatorServiceEconomical.Batch>(),
+            x.TranslateObject(It.IsAny<EconomicalChatGPTTranslatorService.Batch>(),
                 true,
                 "en",
                 "fr",