diff --git a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/DummyGroupDao.java b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/DummyGroupDao.java
index 0aaa70b4..514be4a4 100644
--- a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/DummyGroupDao.java
+++ b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/DummyGroupDao.java
@@ -8,9 +8,9 @@ import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.ldap.NameNotFoundException;
 import org.springframework.ldap.samples.person.domain.Group;
 import org.springframework.ldap.samples.person.domain.SearchCriteria;
-import org.springframework.ldap.support.EntryNotFoundException;
 
 public class DummyGroupDao implements GroupDao {
     private static Map GROUPS;
@@ -54,7 +54,7 @@ public class DummyGroupDao implements GroupDao {
         if (GROUPS.get(name) != null) {
             return (Group) GROUPS.get(name);
         } else {
-            throw new EntryNotFoundException("Could not find group with name '"
+            throw new NameNotFoundException("Could not find group with name '"
                     + name + "'");
         }
     }
diff --git a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/DummyPersonDao.java b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/DummyPersonDao.java
index 08685af8..efb28229 100644
--- a/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/DummyPersonDao.java
+++ b/spring-ldap-person/src/main/java/org/springframework/ldap/samples/person/dao/DummyPersonDao.java
@@ -8,9 +8,9 @@ import java.util.Map;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.ldap.NameNotFoundException;
 import org.springframework.ldap.samples.person.domain.Person;
 import org.springframework.ldap.samples.person.domain.SearchCriteria;
-import org.springframework.ldap.support.EntryNotFoundException;
 
 public class DummyPersonDao implements PersonDao {
     private static Map PERSONS;
@@ -67,7 +67,7 @@ public class DummyPersonDao implements PersonDao {
         if (PERSONS.get(fullname) != null) {
             return (Person) PERSONS.get(fullname);
         } else {
-            throw new EntryNotFoundException(
+            throw new NameNotFoundException(
                     "Could not find person with name '" + fullname + "'");
         }
     }