diff --git a/sandbox/src/itest-openldap/java/conf/ldap-openldap.properties b/sandbox/src/itest-openldap/java/conf/ldap-openldap.properties
index 492339a0..d0531eac 100644
--- a/sandbox/src/itest-openldap/java/conf/ldap-openldap.properties
+++ b/sandbox/src/itest-openldap/java/conf/ldap-openldap.properties
@@ -1,4 +1,4 @@
 urls=ldap://127.0.0.1
-userName=cn=Directory Manager
+userDn=cn=Directory Manager
 password=netscape
 base=o=ikea.com
diff --git a/sandbox/src/itest-openldap/java/conf/ldapTemplateTestContext-openldap.xml b/sandbox/src/itest-openldap/java/conf/ldapTemplateTestContext-openldap.xml
index b41fdbad..97224bc0 100644
--- a/sandbox/src/itest-openldap/java/conf/ldapTemplateTestContext-openldap.xml
+++ b/sandbox/src/itest-openldap/java/conf/ldapTemplateTestContext-openldap.xml
@@ -11,7 +11,7 @@
 	
 	<bean id="contextSource" class="org.springframework.ldap.support.LdapContextSource" >
 		<property name="urls" value="${urls}" />
-		<property name="userName" value="${userName}" />
+		<property name="userDn" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="dirObjectFactory" value="org.springframework.ldap.support.DefaultDirObjectFactory" />
 	</bean>
diff --git a/sandbox/src/itest/java/conf/apacheDsContext.xml b/sandbox/src/itest/java/conf/apacheDsContext.xml
index 1396161e..52694704 100644
--- a/sandbox/src/itest/java/conf/apacheDsContext.xml
+++ b/sandbox/src/itest/java/conf/apacheDsContext.xml
@@ -17,7 +17,7 @@
 					simple
 				</prop>
 				<prop key="java.naming.security.principal">
-					${userName}
+					${userDn}
 				</prop>
 				<prop key="java.naming.security.credentials">
 					${password}
diff --git a/sandbox/src/itest/java/conf/ldap.properties b/sandbox/src/itest/java/conf/ldap.properties
index c176bae6..8843f1f1 100644
--- a/sandbox/src/itest/java/conf/ldap.properties
+++ b/sandbox/src/itest/java/conf/ldap.properties
@@ -1,4 +1,4 @@
 urls=ldap://127.0.0.1:3900
-userName=uid=admin,ou=system
+userDn=uid=admin,ou=system
 password=secret
 base=dc=jayway,dc=se
diff --git a/sandbox/src/itest/java/conf/ldapTemplateAcegiTestContext.xml b/sandbox/src/itest/java/conf/ldapTemplateAcegiTestContext.xml
index f3668551..0d49b793 100644
--- a/sandbox/src/itest/java/conf/ldapTemplateAcegiTestContext.xml
+++ b/sandbox/src/itest/java/conf/ldapTemplateAcegiTestContext.xml
@@ -30,7 +30,7 @@
 	<bean id="initialDirContextFactory"
 		class="org.acegisecurity.ldap.DefaultInitialDirContextFactory">
 		<constructor-arg value="${urls}/${base}" />
-		<property name="managerDn" value="${userName}" />
+		<property name="managerDn" value="${userDn}" />
 		<property name="managerPassword" value="${password}" />
 	</bean>
 
diff --git a/sandbox/src/itest/java/conf/ldapTemplateBaseSuffixTestContext.xml b/sandbox/src/itest/java/conf/ldapTemplateBaseSuffixTestContext.xml
index 09858bb2..1028244e 100644
--- a/sandbox/src/itest/java/conf/ldapTemplateBaseSuffixTestContext.xml
+++ b/sandbox/src/itest/java/conf/ldapTemplateBaseSuffixTestContext.xml
@@ -12,7 +12,7 @@
 	
 	<bean id="contextSource" class="org.springframework.ldap.support.LdapContextSource" >
 		<property name="urls" value="${urls}" />
-		<property name="userName" value="${userName}" />
+		<property name="userDn" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="dirObjectFactory" value="org.springframework.ldap.support.DefaultDirObjectFactory" />
 		<property name="base" value="${base}" />
diff --git a/sandbox/src/itest/java/conf/ldapTemplateTestContext.xml b/sandbox/src/itest/java/conf/ldapTemplateTestContext.xml
index 0773b2c1..313c86f3 100644
--- a/sandbox/src/itest/java/conf/ldapTemplateTestContext.xml
+++ b/sandbox/src/itest/java/conf/ldapTemplateTestContext.xml
@@ -12,7 +12,7 @@
 	
 	<bean id="contextSource" class="org.springframework.ldap.support.LdapContextSource" >
 		<property name="urls" value="${urls}" />
-		<property name="userName" value="${userName}" />
+		<property name="userDn" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="dirObjectFactory" value="org.springframework.ldap.support.DefaultDirObjectFactory" />
 	</bean>
diff --git a/sandbox/src/itest/java/conf/ldapTemplateTransactionTestContext.xml b/sandbox/src/itest/java/conf/ldapTemplateTransactionTestContext.xml
index ef18d9ad..75d8560c 100644
--- a/sandbox/src/itest/java/conf/ldapTemplateTransactionTestContext.xml
+++ b/sandbox/src/itest/java/conf/ldapTemplateTransactionTestContext.xml
@@ -14,7 +14,7 @@
 	<bean id="contextSourceTarget"
 		class="org.springframework.ldap.support.LdapContextSource">
 		<property name="urls" value="${urls}" />
-		<property name="userName" value="${userName}" />
+		<property name="userDn" value="${userDn}" />
 		<property name="password" value="${password}" />
 		<property name="base" value="${base}" />
 		<property name="pooled" value="false" />