Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationTypeDAOTest.java
===================================================================
diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r61ad72c7a8db88a670206ddd4bff37c99d4ab035
--- lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationTypeDAOTest.java	(.../OrganisationTypeDAOTest.java)	(revision 34b959260a0f8f8285793a4481a95ca3580eabc5)
+++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationTypeDAOTest.java	(.../OrganisationTypeDAOTest.java)	(revision 61ad72c7a8db88a670206ddd4bff37c99d4ab035)
@@ -56,7 +56,7 @@
 	
 	public void testSaveOrganisationType(){
 		organisationType = new OrganisationType("TEST","for test purpose only", null);
-		organisationTypeDAO.saveOrganisationType(organisationType);
+		organisationTypeDAO.insert(organisationType);
 		assertNotNull(organisationTypeDAO.getOrganisationTypeByName("TEST"));
 	}
 
@@ -75,7 +75,7 @@
 	public void testDeleteOrganisationType()
 	{
 		organisationType = organisationTypeDAO.getOrganisationTypeByName("TEST");
-		organisationTypeDAO.deleteOrganisationType(organisationType);
+		organisationTypeDAO.delete(organisationType);
 		assertNull(organisationTypeDAO.getOrganisationTypeByName("TEST"));
 	}
 
Index: lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAOTest.java
===================================================================
diff -u -r1454b2fd27486dd14b1ccf172b96df61a0b0d355 -r61ad72c7a8db88a670206ddd4bff37c99d4ab035
--- lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAOTest.java	(.../UserDAOTest.java)	(revision 1454b2fd27486dd14b1ccf172b96df61a0b0d355)
+++ lams_common/test/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAOTest.java	(.../UserDAOTest.java)	(revision 61ad72c7a8db88a670206ddd4bff37c99d4ab035)
@@ -84,22 +84,22 @@
 		user.setDisabledFlag(new Boolean(false));
 		user.setCreateDate(new Date());
 		user.setAuthenticationMethod(authenticationMethodDAO.getAuthenticationMethodById(new Integer(2)));
-		userDAO.saveUser(user);
+		userDAO.insert(user);
 		createUserOrganisation(user);
 	}
 	private Integer createUserOrganisation(User user){
 		UserOrganisation userOrganisation = new UserOrganisation();
 		userOrganisation.setUser(user);		
-		userOrganisationDAO.saveUserOrganisation(userOrganisation);	
+		userOrganisationDAO.insert(userOrganisation);	
 		userOrganisation.addUserOrganisationRole(createUserOrganisationRole(userOrganisation));
-		userOrganisationDAO.saveOrUpdateUserOrganisation(userOrganisation);
+		userOrganisationDAO.insertOrUpdate(userOrganisation);
 		return userOrganisation.getUserOrganisationId();
 	}
 	private UserOrganisationRole createUserOrganisationRole(UserOrganisation userOrganisation){
 		UserOrganisationRole userOrganisationRole = new UserOrganisationRole();
 		userOrganisationRole.setUserOrganisation(userOrganisation);
 		userOrganisationRole.setRole(roleDAO.getRoleByName(Role.STAFF));
-		userOrganisationRoleDAO.saveUserOrganisationRole(userOrganisationRole);
+		userOrganisationRoleDAO.insert(userOrganisationRole);
 		return userOrganisationRole;
 	}	
 }