diff --git a/config/alfresco/authentication-services-context.xml b/config/alfresco/authentication-services-context.xml
index fedc0be251..984c7c59a8 100644
--- a/config/alfresco/authentication-services-context.xml
+++ b/config/alfresco/authentication-services-context.xml
@@ -124,7 +124,7 @@
             <ref bean="ticketComponent" />
         </property>
         <property name="authenticationComponent">
-            <ref bean="authenticationComponentImpl" />
+            <ref bean="authenticationComponent" />
         </property>
     </bean>
 
@@ -147,7 +147,6 @@
         </property>
     </bean>
     
-    <alias name="authenticationComponent" alias="authenticationComponentImpl"/>  <!-- TODO: Remove -->
     <bean id="authenticationComponent" class="org.alfresco.repo.security.authentication.AuthenticationComponentImpl">
         <property name="authenticationDao">
             <ref bean="authenticationDao" />
@@ -166,7 +165,7 @@
     <!-- It should never go to the login screen  so this is not required          -->
     
     <!--
-    <bean id="authenticationComponentImpl" class="org.alfresco.repo.security.authentication.SimpleAcceptOrRejectAllAuthenticationComponentImpl">
+    <bean id="authenticationComponent" class="org.alfresco.repo.security.authentication.SimpleAcceptOrRejectAllAuthenticationComponentImpl">
         <property name="accept">
             <value>true</value>
         </property>    
diff --git a/config/alfresco/authority-services-context.xml b/config/alfresco/authority-services-context.xml
index 5f04a4d073..06bb7fc42c 100644
--- a/config/alfresco/authority-services-context.xml
+++ b/config/alfresco/authority-services-context.xml
@@ -14,7 +14,7 @@
     
     <bean id="authorityService" class="org.alfresco.repo.security.authority.AuthorityServiceImpl">
         <property name="authenticationComponent">
-            <ref bean="authenticationComponentImpl" />
+            <ref bean="authenticationComponent" />
         </property>
         <property name="personService">
             <ref bean="personService" />
diff --git a/config/alfresco/extension/jaas-authentication-context.xml.sample b/config/alfresco/extension/jaas-authentication-context.xml.sample
index 75dfe6b25d..bc99fe1471 100644
--- a/config/alfresco/extension/jaas-authentication-context.xml.sample
+++ b/config/alfresco/extension/jaas-authentication-context.xml.sample
@@ -6,7 +6,7 @@
 
     <!-- Jass authentication - most of the config goes somewhere else       -->
        
-    <bean id="authenticationComponentImpl" 
+    <bean id="authenticationComponent" 
                  class="org.alfresco.repo.security.authentication.jaas.JAASAuthenticationComponent">
         <property name="realm">
             <value>DEFAULT.REALM</value>
diff --git a/config/alfresco/extension/ntlm-authentication-context.xml.sample b/config/alfresco/extension/ntlm-authentication-context.xml.sample
index 25967eb1fa..6bdeade1ce 100644
--- a/config/alfresco/extension/ntlm-authentication-context.xml.sample
+++ b/config/alfresco/extension/ntlm-authentication-context.xml.sample
@@ -17,7 +17,7 @@
     <!--   servers          comma delimted list of server addresses or      -->
     <!--                    names                                           -->
        
-    <bean id="authenticationComponentImpl" class="org.alfresco.repo.security.authentication.ntlm.NTLMAuthenticationComponentImpl">
+    <bean id="authenticationComponent" class="org.alfresco.repo.security.authentication.ntlm.NTLMAuthenticationComponentImpl">
         <property name="useLocalServer">
             <value>true</value>
         </property>
diff --git a/config/alfresco/index-recovery-context.xml b/config/alfresco/index-recovery-context.xml
index ae141b90b7..cfd662fa90 100644
--- a/config/alfresco/index-recovery-context.xml
+++ b/config/alfresco/index-recovery-context.xml
@@ -5,7 +5,7 @@
    
    <bean id="indexRecoveryComponentBase" abstract="true" >
       <property name="authenticationComponent">
-         <ref bean="authenticationComponentImpl" />
+         <ref bean="authenticationComponent" />
       </property>
       <property name="transactionComponent">
          <ref bean="transactionComponent" />
diff --git a/config/alfresco/public-services-security-context.xml b/config/alfresco/public-services-security-context.xml
index 2b8c459ea1..65e75022b6 100644
--- a/config/alfresco/public-services-security-context.xml
+++ b/config/alfresco/public-services-security-context.xml
@@ -57,7 +57,7 @@
             <ref bean="permissionsModelDAO" />
         </property>
         <property name="authenticationComponent">
-            <ref bean="authenticationComponentImpl" />
+            <ref bean="authenticationComponent" />
         </property>
         <property name="authorityService">
             <ref bean="authorityService" />
diff --git a/source/java/org/alfresco/repo/action/scheduled/FreeMarkerModelLuceneFunctionTest.java b/source/java/org/alfresco/repo/action/scheduled/FreeMarkerModelLuceneFunctionTest.java
index e0e2079781..21cc221101 100644
--- a/source/java/org/alfresco/repo/action/scheduled/FreeMarkerModelLuceneFunctionTest.java
+++ b/source/java/org/alfresco/repo/action/scheduled/FreeMarkerModelLuceneFunctionTest.java
@@ -76,7 +76,7 @@ public class FreeMarkerModelLuceneFunctionTest extends TestCase
     public void setUp() throws Exception
     {
 
-        authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponentImpl");
+        authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");
         serviceRegistry = (ServiceRegistry) ctx.getBean("ServiceRegistry");
 
         this.authenticationComponent.setSystemUserAsCurrentUser();
diff --git a/source/java/org/alfresco/repo/node/index/IndexRemoteTransactionTrackerTest.java b/source/java/org/alfresco/repo/node/index/IndexRemoteTransactionTrackerTest.java
index 06b4a5d453..8161acab05 100644
--- a/source/java/org/alfresco/repo/node/index/IndexRemoteTransactionTrackerTest.java
+++ b/source/java/org/alfresco/repo/node/index/IndexRemoteTransactionTrackerTest.java
@@ -75,7 +75,7 @@ public class IndexRemoteTransactionTrackerTest extends TestCase
         searchService = serviceRegistry.getSearchService();
         nodeService = serviceRegistry.getNodeService();
         fileFolderService = serviceRegistry.getFileFolderService();
-        authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponentImpl");
+        authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");
         contentStore = (ContentStore) ctx.getBean("fileContentStore");
         ftsIndexer = (FullTextSearchIndexer) ctx.getBean("LuceneFullTextSearchIndexer");
 
diff --git a/source/java/org/alfresco/repo/node/index/MissingContentReindexComponentTest.java b/source/java/org/alfresco/repo/node/index/MissingContentReindexComponentTest.java
index d84495dcf1..fb1cbbefde 100644
--- a/source/java/org/alfresco/repo/node/index/MissingContentReindexComponentTest.java
+++ b/source/java/org/alfresco/repo/node/index/MissingContentReindexComponentTest.java
@@ -75,7 +75,7 @@ public class MissingContentReindexComponentTest extends TestCase
         searchService = serviceRegistry.getSearchService();
         nodeService = serviceRegistry.getNodeService();
         fileFolderService = serviceRegistry.getFileFolderService();
-        authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponentImpl");
+        authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");
         contentStore = (ContentStore) ctx.getBean("fileContentStore");
         ftsIndexer = (FullTextSearchIndexer) ctx.getBean("LuceneFullTextSearchIndexer");
 
diff --git a/source/java/org/alfresco/repo/search/SearchServiceTest.java b/source/java/org/alfresco/repo/search/SearchServiceTest.java
index 5d972e4666..1a2cb079b9 100644
--- a/source/java/org/alfresco/repo/search/SearchServiceTest.java
+++ b/source/java/org/alfresco/repo/search/SearchServiceTest.java
@@ -96,7 +96,7 @@ public class SearchServiceTest extends TestCase
     public void setUp() throws Exception
     {
         nodeService = (NodeService) ctx.getBean("dbNodeService");
-        authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponentImpl");
+        authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");
         authenticationService = (AuthenticationService) ctx.getBean("authenticationService");
         authenticationDAO = (MutableAuthenticationDao) ctx.getBean("alfDaoImpl");
         pubSearchService = (SearchService) ctx.getBean("SearchService");
diff --git a/source/java/org/alfresco/repo/security/authentication/AuthenticationTest.java b/source/java/org/alfresco/repo/security/authentication/AuthenticationTest.java
index 35dfadeb15..b915d96884 100644
--- a/source/java/org/alfresco/repo/security/authentication/AuthenticationTest.java
+++ b/source/java/org/alfresco/repo/security/authentication/AuthenticationTest.java
@@ -126,7 +126,7 @@ public class AuthenticationTest extends TestCase
         authenticationService = (AuthenticationService) ctx.getBean("authenticationService");
         pubAuthenticationService = (AuthenticationService) ctx.getBean("AuthenticationService");
         authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");
-        authenticationComponentImpl = (AuthenticationComponent) ctx.getBean("authenticationComponentImpl");
+        authenticationComponentImpl = (AuthenticationComponent) ctx.getBean("authenticationComponent");
         // permissionServiceSPI = (PermissionServiceSPI)
         // ctx.getBean("permissionService");
         ticketsCache = (SimpleCache<String, Ticket>) ctx.getBean("ticketsCache");
diff --git a/source/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java b/source/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java
index 212b570219..e3f001882e 100644
--- a/source/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java
+++ b/source/java/org/alfresco/repo/security/authority/AuthorityServiceTest.java
@@ -69,7 +69,7 @@ public class AuthorityServiceTest extends TestCase
     public void setUp() throws Exception
     {
         authenticationComponent = (AuthenticationComponent) ctx.getBean("authenticationComponent");
-        authenticationComponentImpl = (AuthenticationComponent) ctx.getBean("authenticationComponentImpl");
+        authenticationComponentImpl = (AuthenticationComponent) ctx.getBean("authenticationComponent");
         authenticationService = (AuthenticationService) ctx.getBean("authenticationService");
         authorityService = (AuthorityService) ctx.getBean("authorityService");
         pubAuthorityService = (AuthorityService) ctx.getBean("AuthorityService");