diff --git a/src/java/org/apache/commons/collections/map/TypedMap.java b/src/java/org/apache/commons/collections/map/TypedMap.java
index 4d34f7380..71a708d5e 100644
--- a/src/java/org/apache/commons/collections/map/TypedMap.java
+++ b/src/java/org/apache/commons/collections/map/TypedMap.java
@@ -17,7 +17,7 @@ package org.apache.commons.collections.map;
 
 import java.util.Map;
 
-import org.apache.commons.collections.PredicateUtils;
+import org.apache.commons.collections.functors.InstanceofPredicate;
 
 /**
  * Decorates another <code>Map</code> to validate that elements added
@@ -30,7 +30,7 @@ import org.apache.commons.collections.PredicateUtils;
  * The returned implementation is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/04/09 14:57:10 $
+ * @version $Revision: 1.6 $ $Date: 2004/05/07 23:17:13 $
  * 
  * @author Stephen Colebourne
  * @author Matthew Hawthorne
@@ -52,8 +52,8 @@ public class TypedMap {
     public static Map decorate(Map map, Class keyType, Class valueType) {
         return new PredicatedMap(
             map,
-            PredicateUtils.instanceofPredicate(keyType),
-            PredicateUtils.instanceofPredicate(valueType)
+            InstanceofPredicate.getInstance(keyType),
+            InstanceofPredicate.getInstance(valueType)
         );
     }
 
diff --git a/src/java/org/apache/commons/collections/map/TypedSortedMap.java b/src/java/org/apache/commons/collections/map/TypedSortedMap.java
index 7869cac47..32d57ead2 100644
--- a/src/java/org/apache/commons/collections/map/TypedSortedMap.java
+++ b/src/java/org/apache/commons/collections/map/TypedSortedMap.java
@@ -17,7 +17,7 @@ package org.apache.commons.collections.map;
 
 import java.util.SortedMap;
 
-import org.apache.commons.collections.PredicateUtils;
+import org.apache.commons.collections.functors.InstanceofPredicate;
 
 /**
  * Decorates another <code>SortedMap</code> to validate that elements added
@@ -30,7 +30,7 @@ import org.apache.commons.collections.PredicateUtils;
  * The returned implementation is Serializable from Commons Collections 3.1.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.5 $ $Date: 2004/04/09 14:57:10 $
+ * @version $Revision: 1.6 $ $Date: 2004/05/07 23:18:26 $
  * 
  * @author Stephen Colebourne
  * @author Matthew Hawthorne
@@ -52,8 +52,8 @@ public class TypedSortedMap {
     public static SortedMap decorate(SortedMap map, Class keyType, Class valueType) {
         return new PredicatedSortedMap(
             map,
-            PredicateUtils.instanceofPredicate(keyType),
-            PredicateUtils.instanceofPredicate(valueType)
+            InstanceofPredicate.getInstance(keyType),
+            InstanceofPredicate.getInstance(valueType)
         );
     }