diff --git a/autovalue/src/main/java/com/baeldung/autoservice/BingTranslateServiceProvider.java b/autovalue/src/main/java/com/baeldung/autoservice/BingTranslationServiceProvider.java
similarity index 65%
rename from autovalue/src/main/java/com/baeldung/autoservice/BingTranslateServiceProvider.java
rename to autovalue/src/main/java/com/baeldung/autoservice/BingTranslationServiceProvider.java
index 00f21a943e..74666b2f7d 100644
--- a/autovalue/src/main/java/com/baeldung/autoservice/BingTranslateServiceProvider.java
+++ b/autovalue/src/main/java/com/baeldung/autoservice/BingTranslationServiceProvider.java
@@ -4,8 +4,8 @@ import com.google.auto.service.AutoService;
 
 import java.util.Locale;
 
-@AutoService(TranslateService.class)
-public class BingTranslateServiceProvider implements TranslateService {
+@AutoService(TranslationService.class)
+public class BingTranslationServiceProvider implements TranslationService {
 
     public String translate(String message, Locale from, Locale to) {
         return "translated by Bing";
diff --git a/autovalue/src/main/java/com/baeldung/autoservice/GoogleTranslateServiceProvider.java b/autovalue/src/main/java/com/baeldung/autoservice/GoogleTranslationServiceProvider.java
similarity index 65%
rename from autovalue/src/main/java/com/baeldung/autoservice/GoogleTranslateServiceProvider.java
rename to autovalue/src/main/java/com/baeldung/autoservice/GoogleTranslationServiceProvider.java
index 786d9bd443..68889472bf 100644
--- a/autovalue/src/main/java/com/baeldung/autoservice/GoogleTranslateServiceProvider.java
+++ b/autovalue/src/main/java/com/baeldung/autoservice/GoogleTranslationServiceProvider.java
@@ -4,8 +4,8 @@ import com.google.auto.service.AutoService;
 
 import java.util.Locale;
 
-@AutoService(TranslateService.class)
-public class GoogleTranslateServiceProvider implements TranslateService {
+@AutoService(TranslationService.class)
+public class GoogleTranslationServiceProvider implements TranslationService {
 
     public String translate(String message, Locale from, Locale to) {
         return "translated by Google";
diff --git a/autovalue/src/main/java/com/baeldung/autoservice/TranslateService.java b/autovalue/src/main/java/com/baeldung/autoservice/TranslationService.java
similarity index 76%
rename from autovalue/src/main/java/com/baeldung/autoservice/TranslateService.java
rename to autovalue/src/main/java/com/baeldung/autoservice/TranslationService.java
index 6d68f6aca3..cfcff4015c 100644
--- a/autovalue/src/main/java/com/baeldung/autoservice/TranslateService.java
+++ b/autovalue/src/main/java/com/baeldung/autoservice/TranslationService.java
@@ -2,7 +2,7 @@ package com.baeldung.autoservice;
 
 import java.util.Locale;
 
-public interface TranslateService {
+public interface TranslationService {
 
     String translate(String message, Locale from, Locale to);
 }
diff --git a/autovalue/src/test/java/com/baeldung/autoservice/TranslationServiceUnitTest.java b/autovalue/src/test/java/com/baeldung/autoservice/TranslationServiceUnitTest.java
new file mode 100644
index 0000000000..f167dad6bd
--- /dev/null
+++ b/autovalue/src/test/java/com/baeldung/autoservice/TranslationServiceUnitTest.java
@@ -0,0 +1,34 @@
+package com.baeldung.autoservice;
+
+import com.baeldung.autoservice.TranslationService;
+import org.junit.Test;
+
+import java.util.ServiceLoader;
+import java.util.stream.StreamSupport;
+
+import static org.junit.Assert.assertEquals;
+
+public class TranslationServiceUnitTest {
+
+    @Test
+    public void whenServiceLoaderLoads_thenLoadsAllProviders() {
+
+      ServiceLoader<TranslationService> loader = ServiceLoader.load(TranslationService.class);
+      long count = StreamSupport.stream(loader.spliterator(), false).count();
+      assertEquals(2, count);
+    }
+
+    @Test
+    public void whenServiceLoaderLoadsGoogleService_thenGoogleIsLoaded() {
+
+      ServiceLoader<TranslationService> loader = ServiceLoader.load(TranslationService.class);
+
+      TranslationService googleService = StreamSupport.stream(loader.spliterator(), false)
+        .filter(p -> p.getClass().getSimpleName().equals("GoogleTranslationServiceProvider"))
+        .findFirst()
+        .get();
+
+      assertEquals("translated by Google", googleService.translate("message", null, null));
+
+    }
+}
\ No newline at end of file