diff --git a/repository/src/main/java/org/alfresco/repo/security/permissions/dynamic/ServiceAccountAuthority.java b/repository/src/main/java/org/alfresco/repo/security/permissions/dynamic/ServiceAccountAuthority.java
index 3694876e8b..245667da5e 100644
--- a/repository/src/main/java/org/alfresco/repo/security/permissions/dynamic/ServiceAccountAuthority.java
+++ b/repository/src/main/java/org/alfresco/repo/security/permissions/dynamic/ServiceAccountAuthority.java
@@ -28,7 +28,7 @@ package org.alfresco.repo.security.permissions.dynamic;
 import java.util.Optional;
 import java.util.Set;
 
-import org.alfresco.repo.sa.ServiceAccountRegistry;
+import org.alfresco.repo.serviceaccount.ServiceAccountRegistry;
 import org.alfresco.repo.security.permissions.DynamicAuthority;
 import org.alfresco.repo.security.permissions.PermissionReference;
 import org.alfresco.service.cmr.repository.NodeRef;
diff --git a/repository/src/main/java/org/alfresco/repo/sa/ServiceAccountRegistry.java b/repository/src/main/java/org/alfresco/repo/serviceaccount/ServiceAccountRegistry.java
similarity index 98%
rename from repository/src/main/java/org/alfresco/repo/sa/ServiceAccountRegistry.java
rename to repository/src/main/java/org/alfresco/repo/serviceaccount/ServiceAccountRegistry.java
index 0a1d1f884e..29af0027b0 100644
--- a/repository/src/main/java/org/alfresco/repo/sa/ServiceAccountRegistry.java
+++ b/repository/src/main/java/org/alfresco/repo/serviceaccount/ServiceAccountRegistry.java
@@ -23,7 +23,7 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-package org.alfresco.repo.sa;
+package org.alfresco.repo.serviceaccount;
 
 import java.util.Optional;
 import java.util.Set;
diff --git a/repository/src/main/java/org/alfresco/repo/sa/ServiceAccountRegistryImpl.java b/repository/src/main/java/org/alfresco/repo/serviceaccount/ServiceAccountRegistryImpl.java
similarity index 99%
rename from repository/src/main/java/org/alfresco/repo/sa/ServiceAccountRegistryImpl.java
rename to repository/src/main/java/org/alfresco/repo/serviceaccount/ServiceAccountRegistryImpl.java
index bac4edb742..247e048f54 100644
--- a/repository/src/main/java/org/alfresco/repo/sa/ServiceAccountRegistryImpl.java
+++ b/repository/src/main/java/org/alfresco/repo/serviceaccount/ServiceAccountRegistryImpl.java
@@ -23,7 +23,7 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-package org.alfresco.repo.sa;
+package org.alfresco.repo.serviceaccount;
 
 import java.util.Locale;
 import java.util.Optional;
diff --git a/repository/src/main/resources/alfresco/authority-services-context.xml b/repository/src/main/resources/alfresco/authority-services-context.xml
index 7e535e42e3..97b5eb16b4 100644
--- a/repository/src/main/resources/alfresco/authority-services-context.xml
+++ b/repository/src/main/resources/alfresco/authority-services-context.xml
@@ -143,7 +143,7 @@
         </property>
     </bean>
 
-    <bean id="serviceAccountRegistry" class="org.alfresco.repo.sa.ServiceAccountRegistryImpl">
+    <bean id="serviceAccountRegistry" class="org.alfresco.repo.serviceaccount.ServiceAccountRegistryImpl">
         <property name="globalProperties" ref="global-properties"/>
     </bean>
 
diff --git a/repository/src/test/java/org/alfresco/AllUnitTestsSuite.java b/repository/src/test/java/org/alfresco/AllUnitTestsSuite.java
index cbe6f704a1..8f5dc5b937 100644
--- a/repository/src/test/java/org/alfresco/AllUnitTestsSuite.java
+++ b/repository/src/test/java/org/alfresco/AllUnitTestsSuite.java
@@ -262,7 +262,7 @@ import org.junit.runners.Suite;
 
     org.alfresco.util.schemacomp.SchemaDifferenceHelperUnitTest.class,
     org.alfresco.repo.tagging.TaggingServiceImplUnitTest.class,
-    org.alfresco.repo.sa.ServiceAccountRegistryImplTest.class
+    org.alfresco.repo.serviceaccount.ServiceAccountRegistryImplTest.class
 })
 public class AllUnitTestsSuite
 {
diff --git a/repository/src/test/java/org/alfresco/repo/security/permissions/dynamic/ServiceAccountRoleTest.java b/repository/src/test/java/org/alfresco/repo/security/permissions/dynamic/ServiceAccountRoleTest.java
index 7ad2a0f630..66a26b7ae2 100644
--- a/repository/src/test/java/org/alfresco/repo/security/permissions/dynamic/ServiceAccountRoleTest.java
+++ b/repository/src/test/java/org/alfresco/repo/security/permissions/dynamic/ServiceAccountRoleTest.java
@@ -286,7 +286,7 @@ public class ServiceAccountRoleTest
     }
 
     @Test
-    public void normalUserCreateAssociationsAccessShouldBeDenied()
+    public void normalUserAssociationAccessShouldBeDenied()
     {
         assertAccessDenied(NORMAL_USER, PermissionService.READ_ASSOCIATIONS);
         assertAccessDenied(NORMAL_USER, PermissionService.CREATE_ASSOCIATIONS);
@@ -294,7 +294,7 @@ public class ServiceAccountRoleTest
     }
 
     @Test
-    public void editorSaCreateAssociationsAccessShouldBeDenied()
+    public void editorSaAssociationAccessShouldBeDenied()
     {
         assertAccessDenied(EDITOR_SA, PermissionService.READ_ASSOCIATIONS);
         assertAccessDenied(EDITOR_SA, PermissionService.CREATE_ASSOCIATIONS);
@@ -302,7 +302,7 @@ public class ServiceAccountRoleTest
     }
 
     @Test
-    public void collaboratorSaCreateAssociationsAccessShouldBeDenied()
+    public void collaboratorSaAssociationAccessShouldBeDenied()
     {
         assertAccessDenied(COLLABORATOR_SA, PermissionService.READ_ASSOCIATIONS);
         assertAccessDenied(COLLABORATOR_SA, PermissionService.CREATE_ASSOCIATIONS);
@@ -310,7 +310,7 @@ public class ServiceAccountRoleTest
     }
 
     @Test
-    public void adminSaCreateAssociationsAccessShouldBeAllowed()
+    public void adminSaAssociationAccessShouldBeAllowed()
     {
         assertAccessAllowed(ADMIN_SA, PermissionService.READ_ASSOCIATIONS);
         assertAccessAllowed(ADMIN_SA, PermissionService.CREATE_ASSOCIATIONS);
diff --git a/repository/src/test/java/org/alfresco/repo/sa/ServiceAccountRegistryImplTest.java b/repository/src/test/java/org/alfresco/repo/serviceaccount/ServiceAccountRegistryImplTest.java
similarity index 99%
rename from repository/src/test/java/org/alfresco/repo/sa/ServiceAccountRegistryImplTest.java
rename to repository/src/test/java/org/alfresco/repo/serviceaccount/ServiceAccountRegistryImplTest.java
index 05048ad647..351fb77d85 100644
--- a/repository/src/test/java/org/alfresco/repo/sa/ServiceAccountRegistryImplTest.java
+++ b/repository/src/test/java/org/alfresco/repo/serviceaccount/ServiceAccountRegistryImplTest.java
@@ -23,7 +23,7 @@
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  * #L%
  */
-package org.alfresco.repo.sa;
+package org.alfresco.repo.serviceaccount;
 
 import static org.alfresco.service.cmr.security.PermissionService.ADMIN_SVC_AUTHORITY;
 import static org.alfresco.service.cmr.security.PermissionService.COLLABORATOR_SVC_AUTHORITY;