Index: lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java
===================================================================
diff -u -rf8ae5239ffcb6ac62937458e9750b3780528dc9f -r54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405
--- lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java	(.../AdminServiceProxy.java)	(revision f8ae5239ffcb6ac62937458e9750b3780528dc9f)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java	(.../AdminServiceProxy.java)	(revision 54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405)
@@ -48,7 +48,7 @@
 	public static final IUserManagementService getService(ServletContext servletContext){
 		if (manageService == null) {
 			WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext);
-			return (IUserManagementService) ctx.getBean("userManagementServiceTarget");
+			return (IUserManagementService) ctx.getBean("userManagementService");
 		} else {
 			return manageService;
 		}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ToolContentListAction.java
===================================================================
diff -u -r44f9636e4923ab01e51ff46d67b190caf4c93012 -r54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ToolContentListAction.java	(.../ToolContentListAction.java)	(revision 44f9636e4923ab01e51ff46d67b190caf4c93012)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ToolContentListAction.java	(.../ToolContentListAction.java)	(revision 54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405)
@@ -71,7 +71,7 @@
 		}
 		
 		WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
-		ILearningDesignService learningDesignService = (ILearningDesignService)ctx.getBean("learningDesignServiceTarget");
+		ILearningDesignService learningDesignService = (ILearningDesignService)ctx.getBean("learningDesignService");
 		
 		List learningLibraryDTOs = learningDesignService.getAllLearningLibraryDetails();
 		
Index: lams_central/src/java/org/lamsfoundation/lams/security/LDAPAuthenticator.java
===================================================================
diff -u -raa7e502bb28fa1df94980fadea3876a83e842ae4 -r54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405
--- lams_central/src/java/org/lamsfoundation/lams/security/LDAPAuthenticator.java	(.../LDAPAuthenticator.java)	(revision aa7e502bb28fa1df94980fadea3876a83e842ae4)
+++ lams_central/src/java/org/lamsfoundation/lams/security/LDAPAuthenticator.java	(.../LDAPAuthenticator.java)	(revision 54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405)
@@ -64,7 +64,7 @@
 		if (service==null) {
 			WebApplicationContext ctx = WebApplicationContextUtils
 				.getWebApplicationContext(HttpSessionManager.getInstance().getServletContext());
-			service = (UserManagementService) ctx.getBean("userManagementServiceTarget");
+			service = (UserManagementService) ctx.getBean("userManagementService");
 		}
 		return service;
 	}
Index: lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java
===================================================================
diff -u -raa7e502bb28fa1df94980fadea3876a83e842ae4 -r54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405
--- lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java	(.../UniversalLoginModule.java)	(revision aa7e502bb28fa1df94980fadea3876a83e842ae4)
+++ lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java	(.../UniversalLoginModule.java)	(revision 54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405)
@@ -107,7 +107,7 @@
 			try {
 				String username = getUsername();
 				WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(HttpSessionManager.getInstance().getServletContext());
-				UserManagementService service = (UserManagementService) ctx.getBean("userManagementServiceTarget");
+				UserManagementService service = (UserManagementService) ctx.getBean("userManagementService");
 				User user = service.getUserByLogin(username);
 
 				log.debug("===> authenticating user: " + username);
Index: lams_central/src/java/org/lamsfoundation/lams/security/WebAuthServlet.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405
--- lams_central/src/java/org/lamsfoundation/lams/security/WebAuthServlet.java	(.../WebAuthServlet.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_central/src/java/org/lamsfoundation/lams/security/WebAuthServlet.java	(.../WebAuthServlet.java)	(revision 54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405)
@@ -63,7 +63,7 @@
 		else
 		{
 			WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(request.getSession().getServletContext()); 
-			UserManagementService service = (UserManagementService)ctx.getBean("userManagementServiceTarget");
+			UserManagementService service = (UserManagementService)ctx.getBean("userManagementService");
 			User webAuthUser = service.getUserByLogin(webAuthUserID);
 				
 			if (webAuthUser != null) 
Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
===================================================================
diff -u -r9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6 -r54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	(.../HomeAction.java)	(revision 9481bb9c6f8c0e4d6fbed6b230a41c77feda64c6)
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	(.../HomeAction.java)	(revision 54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405)
@@ -78,7 +78,7 @@
 	private IUserManagementService getService(){
 		if(service==null){
 			WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
-			service = (IUserManagementService) ctx.getBean("userManagementServiceTarget");
+			service = (IUserManagementService) ctx.getBean("userManagementService");
 		}
 		return service;
 	}
Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
===================================================================
diff -u -rc8d9e121da6a43c58fefb9ccb513be3bb3f17875 -r54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision c8d9e121da6a43c58fefb9ccb513be3bb3f17875)
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision 54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405)
@@ -317,7 +317,7 @@
 	private IUserManagementService getService(){
 		if(service==null){
 			WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
-			service = (IUserManagementService) ctx.getBean("userManagementServiceTarget");
+			service = (IUserManagementService) ctx.getBean("userManagementService");
 		}
 		return service;
 	}
Index: lams_central/src/java/org/lamsfoundation/lams/web/LoginAsAction.java
===================================================================
diff -u -rc19b66107c7e2a0c3398f5ab5433477658fd7780 -r54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405
--- lams_central/src/java/org/lamsfoundation/lams/web/LoginAsAction.java	(.../LoginAsAction.java)	(revision c19b66107c7e2a0c3398f5ab5433477658fd7780)
+++ lams_central/src/java/org/lamsfoundation/lams/web/LoginAsAction.java	(.../LoginAsAction.java)	(revision 54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405)
@@ -63,7 +63,7 @@
             HttpServletResponse response) throws Exception {
 		
 		WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
-		IUserManagementService service = (IUserManagementService) ctx.getBean("userManagementServiceTarget");
+		IUserManagementService service = (IUserManagementService) ctx.getBean("userManagementService");
 		MessageService messageService = (MessageService)ctx.getBean("centralMessageService");
 		String login = WebUtil.readStrParam(request, "login", false);
 		
Index: lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java
===================================================================
diff -u -r1125429dcf0682dda1af205394643f047764ba88 -r54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405
--- lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java	(.../PasswordChangeAction.java)	(revision 1125429dcf0682dda1af205394643f047764ba88)
+++ lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java	(.../PasswordChangeAction.java)	(revision 54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405)
@@ -102,7 +102,7 @@
 	    	    {
 					//WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(request.getSession(true).getServletContext());
 					WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(getServlet().getServletContext());
-					UserManagementService service = (UserManagementService)ctx.getBean("userManagementServiceTarget");
+					UserManagementService service = (UserManagementService)ctx.getBean("userManagementService");
 					
 					User user = service.getUserByLogin(login);
 					if(!user.getPassword().equals(HashUtil.sha1(oldPassword)))
Index: lams_central/src/java/org/lamsfoundation/lams/web/PortraitAction.java
===================================================================
diff -u -re55d23b8e9a54ee0cfed58cb167510e8d2551fe4 -r54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405
--- lams_central/src/java/org/lamsfoundation/lams/web/PortraitAction.java	(.../PortraitAction.java)	(revision e55d23b8e9a54ee0cfed58cb167510e8d2551fe4)
+++ lams_central/src/java/org/lamsfoundation/lams/web/PortraitAction.java	(.../PortraitAction.java)	(revision 54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405)
@@ -68,7 +68,7 @@
 	private IUserManagementService getService(){
 		if(service==null){
 			WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
-			service = (IUserManagementService) ctx.getBean("userManagementServiceTarget");
+			service = (IUserManagementService) ctx.getBean("userManagementService");
 		}
 		return service;
 	}
Index: lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java
===================================================================
diff -u -re55d23b8e9a54ee0cfed58cb167510e8d2551fe4 -r54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405
--- lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java	(.../PortraitSaveAction.java)	(revision e55d23b8e9a54ee0cfed58cb167510e8d2551fe4)
+++ lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java	(.../PortraitSaveAction.java)	(revision 54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405)
@@ -133,7 +133,7 @@
 	private IUserManagementService getService(){
 		if(service==null){
 			WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
-			service = (IUserManagementService) ctx.getBean("userManagementServiceTarget");
+			service = (IUserManagementService) ctx.getBean("userManagementService");
 		}
 		return service;
 	}
Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java
===================================================================
diff -u -re55d23b8e9a54ee0cfed58cb167510e8d2551fe4 -r54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405
--- lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java	(.../ProfileAction.java)	(revision e55d23b8e9a54ee0cfed58cb167510e8d2551fe4)
+++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java	(.../ProfileAction.java)	(revision 54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405)
@@ -104,7 +104,7 @@
 	private IUserManagementService getService(){
 		if(service==null){
 			WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
-			service = (IUserManagementService) ctx.getBean("userManagementServiceTarget");
+			service = (IUserManagementService) ctx.getBean("userManagementService");
 			locales = getService().findAll(SupportedLocale.class);
 			Collections.sort(locales);
 		}
Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java
===================================================================
diff -u -r76a9b4c94f060a09a53527be9a2a06875f53afe3 -r54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405
--- lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java	(.../ProfileSaveAction.java)	(revision 76a9b4c94f060a09a53527be9a2a06875f53afe3)
+++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java	(.../ProfileSaveAction.java)	(revision 54f5e17d1a5e8baae23bb9332f83ad8d8e5ac405)
@@ -128,7 +128,7 @@
 	private IUserManagementService getService(){
 		if(service==null){
 			WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
-			service = (IUserManagementService) ctx.getBean("userManagementServiceTarget");
+			service = (IUserManagementService) ctx.getBean("userManagementService");
 		}
 		return service;
 	}