diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/BuiltinProceduresIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/BuiltinProceduresIT.java
index 8ba30b0619aaf..f0f1e7a028456 100644
--- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/BuiltinProceduresIT.java
+++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/BuiltinProceduresIT.java
@@ -190,7 +190,7 @@ public void failWhenCallingListProceduresInDbmsMode() throws Throwable
     }
 
     @Test
-    public void failWhenCallingNonExistingProcedures() throws Throwable
+    public void failWhenCallingNonExistentProcedures() throws Throwable
     {
         try
         {
diff --git a/community/security/src/main/java/org/neo4j/server/security/auth/UserProcedures.java b/community/security/src/main/java/org/neo4j/server/security/auth/AuthProcedures.java
similarity index 98%
rename from community/security/src/main/java/org/neo4j/server/security/auth/UserProcedures.java
rename to community/security/src/main/java/org/neo4j/server/security/auth/AuthProcedures.java
index f42e93f7c9fa2..f1fab88966f4e 100644
--- a/community/security/src/main/java/org/neo4j/server/security/auth/UserProcedures.java
+++ b/community/security/src/main/java/org/neo4j/server/security/auth/AuthProcedures.java
@@ -29,7 +29,7 @@
 
 import static org.neo4j.procedure.Procedure.Mode.DBMS;
 
-public class UserProcedures
+public class AuthProcedures
 {
     @Context
     public AuthSubject authSubject;
diff --git a/community/security/src/main/java/org/neo4j/server/security/auth/AuthProceduresProvider.java b/community/security/src/main/java/org/neo4j/server/security/auth/AuthProceduresProvider.java
index 7a21e7bbaee71..317eb366ca7e4 100644
--- a/community/security/src/main/java/org/neo4j/server/security/auth/AuthProceduresProvider.java
+++ b/community/security/src/main/java/org/neo4j/server/security/auth/AuthProceduresProvider.java
@@ -37,7 +37,7 @@ public void registerProcedures( Procedures procedures )
     {
         try
         {
-            procedures.register( UserProcedures.class );
+            procedures.register( AuthProcedures.class );
         }
         catch ( KernelException e )
         {
diff --git a/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/EnterpriseEditionModule.java b/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/EnterpriseEditionModule.java
index 46fa2f0b391d2..39351bb727dfb 100644
--- a/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/EnterpriseEditionModule.java
+++ b/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/EnterpriseEditionModule.java
@@ -47,14 +47,4 @@ protected ConstraintSemantics createSchemaRuleVerifier()
     {
         return new EnterpriseConstraintSemantics();
     }
-
-    @Override
-    public void registerProcedures( Procedures procedures )
-    {
-        super.registerProcedures( procedures );
-        for ( EnterpriseProceduresProvider candidate : Service.load( EnterpriseProceduresProvider.class ) )
-        {
-            candidate.registerProcedures( procedures );
-        }
-    }
 }
diff --git a/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/EnterpriseProceduresProvider.java b/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/EnterpriseProceduresProvider.java
deleted file mode 100644
index 3d9ae7d3d2205..0000000000000
--- a/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/EnterpriseProceduresProvider.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2002-2016 "Neo Technology,"
- * Network Engine for Objects in Lund AB [http://neotechnology.com]
- *
- * This file is part of Neo4j.
- *
- * Neo4j is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package org.neo4j.kernel.impl.enterprise;
-
-import org.neo4j.kernel.impl.proc.Procedures;
-
-public interface EnterpriseProceduresProvider
-{
-    void registerProcedures( Procedures procedures );
-}