diff --git a/config/alfresco/authentication-services-context.xml b/config/alfresco/authentication-services-context.xml
index 8090e8673a..8694b6d5df 100644
--- a/config/alfresco/authentication-services-context.xml
+++ b/config/alfresco/authentication-services-context.xml
@@ -324,7 +324,7 @@
     <!-- The AuthenticationService exported as an RMI service. -->
 	<bean id="rmiAuthenticationService" class="org.springframework.remoting.rmi.RmiServiceExporter">
 		<property name="service">
-			<ref bean="authenticationService"/>
+			<ref bean="AuthenticationService"/>
 		</property>
 		<property name="serviceInterface">
 			<value>org.alfresco.service.cmr.security.AuthenticationService</value>
diff --git a/source/java/org/alfresco/repo/avm/AVMServiceTest.java b/source/java/org/alfresco/repo/avm/AVMServiceTest.java
index 398bd20d70..73d59f0210 100644
--- a/source/java/org/alfresco/repo/avm/AVMServiceTest.java
+++ b/source/java/org/alfresco/repo/avm/AVMServiceTest.java
@@ -41,7 +41,6 @@ import org.alfresco.repo.avm.actions.SimpleAVMPromoteAction;
 import org.alfresco.repo.avm.actions.SimpleAVMSubmitAction;
 import org.alfresco.repo.avm.util.BulkLoader;
 import org.alfresco.repo.domain.PropertyValue;
-import org.alfresco.repo.security.authentication.AuthenticationComponent;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
 import org.alfresco.repo.transaction.TransactionUtil;
 import org.alfresco.service.cmr.avm.AVMBadArgumentException;
@@ -3229,8 +3228,8 @@ public class AVMServiceTest extends AVMServiceTestBase
         {
             setupBasicTree();
             PermissionService perm = (PermissionService)fContext.getBean("PermissionService");
-            AuthenticationComponent ac = (AuthenticationComponent)fContext.getBean("authenticationComponent");
-            ac.authenticate("admin", "admin".toCharArray());
+            // AuthenticationService ac = (AuthenticationService)fContext.getBean("AuthenticationService");
+            // ac.authenticate("admin", "admin".toCharArray());
             perm.setPermission(AVMNodeConverter.ToNodeRef(-1, "main:/a/b/c/foo"), 
                                PermissionService.ADMINISTRATOR_AUTHORITY,
                                PermissionService.ALL_PERMISSIONS,
@@ -3261,8 +3260,8 @@ public class AVMServiceTest extends AVMServiceTestBase
         {
             setupBasicTree();
             FileFolderService ffs = (FileFolderService)fContext.getBean("FileFolderService");
-            AuthenticationComponent ac = (AuthenticationComponent)fContext.getBean("authenticationComponent");
-            ac.authenticate("admin", "admin".toCharArray());
+            // AuthenticationComponent ac = (AuthenticationComponent)fContext.getBean("authenticationComponent");
+            // ac.authenticate("admin", "admin".toCharArray());
             assertTrue(ffs.create(AVMNodeConverter.ToNodeRef(-1, "main:/a/b/c/"), 
                     "banana", WCMModel.TYPE_AVM_PLAIN_CONTENT) != null);
             assertTrue(ffs.create(AVMNodeConverter.ToNodeRef(-1, "main://"), 
diff --git a/source/java/org/alfresco/repo/avm/AVMServiceTestBase.java b/source/java/org/alfresco/repo/avm/AVMServiceTestBase.java
index ca38eab308..5e273ddd5d 100644
--- a/source/java/org/alfresco/repo/avm/AVMServiceTestBase.java
+++ b/source/java/org/alfresco/repo/avm/AVMServiceTestBase.java
@@ -76,7 +76,7 @@ public class AVMServiceTestBase extends TestCase
             fService = (AVMService)fContext.getBean("AVMService");
             fReaper = (OrphanReaper)fContext.getBean("orphanReaper");
             fSyncService = (AVMSyncService)fContext.getBean("AVMSyncService");
-            AuthenticationService authService = (AuthenticationService)fContext.getBean("authenticationService");
+            AuthenticationService authService = (AuthenticationService)fContext.getBean("AuthenticationService");
             authService.authenticate("admin", "admin".toCharArray());
             CreateStoreTxnListener cstl = (CreateStoreTxnListener)fContext.getBean("createStoreTxnListener");
             cstl.addCallback(