diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/AdministratorOf.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/AdministratorOfFeature.java
similarity index 94%
rename from dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/AdministratorOf.java
rename to dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/AdministratorOfFeature.java
index e6aa72415f..5ce4977b5a 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/AdministratorOf.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/AdministratorOfFeature.java
@@ -30,10 +30,10 @@ import org.springframework.stereotype.Component;
  * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.it)
  */
 @Component
-@AuthorizationFeatureDocumentation(name = AdministratorOf.NAME,
+@AuthorizationFeatureDocumentation(name = AdministratorOfFeature.NAME,
         description = "It can be used for verify that an user has access "
                     + "to the administrative features of the repository or of a specific community and collection")
-public class AdministratorOf implements AuthorizationFeature {
+public class AdministratorOfFeature implements AuthorizationFeature {
 
     public static final String NAME = "administratorOf";
 
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/AdministratorFeatureIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/AdministratorFeatureIT.java
index 156a7316dc..cb326d41c7 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/AdministratorFeatureIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/AdministratorFeatureIT.java
@@ -11,7 +11,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import org.dspace.app.rest.authorization.impl.AdministratorOf;
+import org.dspace.app.rest.authorization.impl.AdministratorOfFeature;
 import org.dspace.app.rest.builder.CollectionBuilder;
 import org.dspace.app.rest.builder.CommunityBuilder;
 import org.dspace.app.rest.builder.EPersonBuilder;
@@ -58,7 +58,7 @@ public class AdministratorFeatureIT extends AbstractControllerIntegrationTest {
     private SiteService siteService;
 
     /** 
-     * this hold a reference to the test feature {@link AdministratorOf}
+     * this hold a reference to the test feature {@link AdministratorOfFeature}
      */
     private AuthorizationFeature administratorFeature;
 
@@ -67,7 +67,7 @@ public class AdministratorFeatureIT extends AbstractControllerIntegrationTest {
     public void setUp() throws Exception {
         super.setUp();
         siteService = ContentServiceFactory.getInstance().getSiteService();
-        administratorFeature = authorizationFeatureService.find(AdministratorOf.NAME);
+        administratorFeature = authorizationFeatureService.find(AdministratorOfFeature.NAME);
     }
 
     @Test
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/EnrollAdministratorIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/EnrollAdministratorIT.java
index 5b43bb2f61..ddc879947f 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/EnrollAdministratorIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/EnrollAdministratorIT.java
@@ -14,7 +14,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import org.dspace.app.rest.authorization.impl.AdministratorOf;
+import org.dspace.app.rest.authorization.impl.AdministratorOfFeature;
 import org.dspace.app.rest.builder.EPersonBuilder;
 import org.dspace.app.rest.converter.ConverterService;
 import org.dspace.app.rest.matcher.AuthorizationMatcher;
@@ -51,7 +51,7 @@ public class EnrollAdministratorIT extends AbstractControllerIntegrationTest {
     private SiteService siteService;
 
     /** 
-     * this hold a reference to the test feature {@link AdministratorOf}
+     * this hold a reference to the test feature {@link AdministratorOfFeature}
      */
     private AuthorizationFeature administratorFeature;
 
@@ -60,7 +60,7 @@ public class EnrollAdministratorIT extends AbstractControllerIntegrationTest {
     public void setUp() throws Exception {
         super.setUp();
         siteService = ContentServiceFactory.getInstance().getSiteService();
-        administratorFeature = authorizationFeatureService.find(AdministratorOf.NAME);
+        administratorFeature = authorizationFeatureService.find(AdministratorOfFeature.NAME);
     }
 
     @Test