diff --git a/spring-boot/src/main/java/org/baeldung/boot/components/FooComponent.java b/spring-boot/src/main/java/org/baeldung/boot/components/FooService.java
similarity index 94%
rename from spring-boot/src/main/java/org/baeldung/boot/components/FooComponent.java
rename to spring-boot/src/main/java/org/baeldung/boot/components/FooService.java
index d666b11c8c..235fd43299 100644
--- a/spring-boot/src/main/java/org/baeldung/boot/components/FooComponent.java
+++ b/spring-boot/src/main/java/org/baeldung/boot/components/FooService.java
@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 @Component
-public class FooComponent {
+public class FooService {
 
     @Autowired
     private FooRepository fooRepository;
diff --git a/spring-boot/src/main/java/org/baeldung/boot/service/FooService.java b/spring-boot/src/main/java/org/baeldung/boot/service/FooController.java
similarity index 79%
rename from spring-boot/src/main/java/org/baeldung/boot/service/FooService.java
rename to spring-boot/src/main/java/org/baeldung/boot/service/FooController.java
index 6f19a1974c..abd3fccba1 100644
--- a/spring-boot/src/main/java/org/baeldung/boot/service/FooService.java
+++ b/spring-boot/src/main/java/org/baeldung/boot/service/FooController.java
@@ -1,6 +1,6 @@
 package org.baeldung.boot.service;
 
-import org.baeldung.boot.components.FooComponent;
+import org.baeldung.boot.components.FooService;
 import org.baeldung.boot.model.Foo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -11,15 +11,15 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-public class FooService {
+public class FooController {
 
     @Autowired
-    private FooComponent fooComponent;
+    private FooService fooService;
 
     @GetMapping("/{id}")
     public ResponseEntity<?> getFooWithId(@PathVariable Integer id) throws Exception {
 
-        Foo foo = fooComponent.getFooWithId(id);
+        Foo foo = fooService.getFooWithId(id);
 
         return new ResponseEntity<>(foo, HttpStatus.OK);
     }
@@ -27,7 +27,7 @@ public class FooService {
     @GetMapping("/")
     public ResponseEntity<?> getFooWithName(@RequestParam String name) throws Exception {
 
-        Foo foo = fooComponent.getFooWithName(name);
+        Foo foo = fooService.getFooWithName(name);
 
         return new ResponseEntity<>(foo, HttpStatus.OK);
     }
diff --git a/spring-boot/src/test/java/org/baeldung/boot/FooComponentTests.java b/spring-boot/src/test/java/org/baeldung/boot/FooComponentTests.java
index 0a5de7dc7a..72ccc0bfb8 100644
--- a/spring-boot/src/test/java/org/baeldung/boot/FooComponentTests.java
+++ b/spring-boot/src/test/java/org/baeldung/boot/FooComponentTests.java
@@ -1,6 +1,6 @@
 package org.baeldung.boot;
 
-import org.baeldung.boot.components.FooComponent;
+import org.baeldung.boot.components.FooService;
 import org.baeldung.boot.model.Foo;
 import org.junit.Before;
 import org.junit.Test;
@@ -32,7 +32,7 @@ public class FooComponentTests {
     private TestRestTemplate testRestTemplate;
 
     @SpyBean
-    private FooComponent fooComponent;
+    private FooService fooService;
 
     @Before
     public void init() throws Exception {
@@ -40,7 +40,7 @@ public class FooComponentTests {
         foo.setId(5);
         foo.setName("MOCKED_FOO");
 
-        doReturn(foo).when(fooComponent).getFooWithId(anyInt());
+        doReturn(foo).when(fooService).getFooWithId(anyInt());
 
         // doCallRealMethod().when(fooComponent).getFooWithName(anyString());
     }