diff --git a/spring-security-rest-custom/src/main/java/org/baeldung/web/controller/SecurityController5.java b/spring-security-rest-custom/src/main/java/org/baeldung/web/controller/GetUserWithCustomInterfaceController.java
similarity index 88%
rename from spring-security-rest-custom/src/main/java/org/baeldung/web/controller/SecurityController5.java
rename to spring-security-rest-custom/src/main/java/org/baeldung/web/controller/GetUserWithCustomInterfaceController.java
index e1a0c35cc6..b8521d6663 100644
--- a/spring-security-rest-custom/src/main/java/org/baeldung/web/controller/SecurityController5.java
+++ b/spring-security-rest-custom/src/main/java/org/baeldung/web/controller/GetUserWithCustomInterfaceController.java
@@ -9,12 +9,12 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 @Controller
-public class SecurityController5 {
+public class GetUserWithCustomInterfaceController {
 
     @Autowired
     private IAuthenticationFacade authenticationFacade;
 
-    public SecurityController5() {
+    public GetUserWithCustomInterfaceController() {
         super();
     }
 
diff --git a/spring-security-rest-custom/src/main/java/org/baeldung/web/controller/SecurityController4.java b/spring-security-rest-custom/src/main/java/org/baeldung/web/controller/GetUserWithHTTPServletRequestController.java
similarity index 86%
rename from spring-security-rest-custom/src/main/java/org/baeldung/web/controller/SecurityController4.java
rename to spring-security-rest-custom/src/main/java/org/baeldung/web/controller/GetUserWithHTTPServletRequestController.java
index 0434cc5fdc..ace5688697 100644
--- a/spring-security-rest-custom/src/main/java/org/baeldung/web/controller/SecurityController4.java
+++ b/spring-security-rest-custom/src/main/java/org/baeldung/web/controller/GetUserWithHTTPServletRequestController.java
@@ -10,9 +10,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 @Controller
-public class SecurityController4 {
+public class GetUserWithHTTPServletRequestController {
 
-    public SecurityController4() {
+    public GetUserWithHTTPServletRequestController() {
         super();
     }
 
diff --git a/spring-security-rest-custom/src/main/java/org/baeldung/web/controller/SecurityController2.java b/spring-security-rest-custom/src/main/java/org/baeldung/web/controller/SecurityController.java
similarity index 88%
rename from spring-security-rest-custom/src/main/java/org/baeldung/web/controller/SecurityController2.java
rename to spring-security-rest-custom/src/main/java/org/baeldung/web/controller/SecurityController.java
index ac02738d0c..7cf57a5275 100644
--- a/spring-security-rest-custom/src/main/java/org/baeldung/web/controller/SecurityController2.java
+++ b/spring-security-rest-custom/src/main/java/org/baeldung/web/controller/SecurityController.java
@@ -8,9 +8,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 @Controller
-public class SecurityController2 {
+public class SecurityController {
 
-    public SecurityController2() {
+    public SecurityController() {
         super();
     }