diff --git a/src/java/org/apache/commons/collections/bag/TypedBag.java b/src/java/org/apache/commons/collections/bag/TypedBag.java
index f3960a21a..1d7c9ccf1 100644
--- a/src/java/org/apache/commons/collections/bag/TypedBag.java
+++ b/src/java/org/apache/commons/collections/bag/TypedBag.java
@@ -16,7 +16,7 @@
 package org.apache.commons.collections.bag;
 
 import org.apache.commons.collections.Bag;
-import org.apache.commons.collections.PredicateUtils;
+import org.apache.commons.collections.functors.InstanceofPredicate;
 
 /**
  * Decorates another <code>Bag</code> to validate that elements added
@@ -27,7 +27,7 @@ import org.apache.commons.collections.PredicateUtils;
  * collection, an IllegalArgumentException is thrown.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/02/18 00:56:25 $
+ * @version $Revision: 1.5 $ $Date: 2004/05/07 23:28:38 $
  * 
  * @author Stephen Colebourne
  * @author Matthew Hawthorne
@@ -46,7 +46,7 @@ public class TypedBag {
      * @throws IllegalArgumentException if the bag contains invalid elements
      */
     public static Bag decorate(Bag bag, Class type) {
-        return new PredicatedBag(bag, PredicateUtils.instanceofPredicate(type));
+        return new PredicatedBag(bag, InstanceofPredicate.getInstance(type));
     }
 
     /**
diff --git a/src/java/org/apache/commons/collections/bag/TypedSortedBag.java b/src/java/org/apache/commons/collections/bag/TypedSortedBag.java
index b805b29d0..a0db43e74 100644
--- a/src/java/org/apache/commons/collections/bag/TypedSortedBag.java
+++ b/src/java/org/apache/commons/collections/bag/TypedSortedBag.java
@@ -15,8 +15,8 @@
  */
 package org.apache.commons.collections.bag;
 
-import org.apache.commons.collections.PredicateUtils;
 import org.apache.commons.collections.SortedBag;
+import org.apache.commons.collections.functors.InstanceofPredicate;
 
 /**
  * Decorates another <code>SortedBag</code> to validate that elements added
@@ -27,7 +27,7 @@ import org.apache.commons.collections.SortedBag;
  * collection, an IllegalArgumentException is thrown.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.4 $ $Date: 2004/02/18 00:56:25 $
+ * @version $Revision: 1.5 $ $Date: 2004/05/07 23:28:38 $
  * 
  * @author Stephen Colebourne
  * @author Matthew Hawthorne
@@ -46,7 +46,7 @@ public class TypedSortedBag {
      * @throws IllegalArgumentException if the bag contains invalid elements
      */
     public static SortedBag decorate(SortedBag bag, Class type) {
-        return new PredicatedSortedBag(bag, PredicateUtils.instanceofPredicate(type));
+        return new PredicatedSortedBag(bag, InstanceofPredicate.getInstance(type));
     }
 
     /**
diff --git a/src/java/org/apache/commons/collections/buffer/TypedBuffer.java b/src/java/org/apache/commons/collections/buffer/TypedBuffer.java
index aec1b5616..7968cc1e2 100644
--- a/src/java/org/apache/commons/collections/buffer/TypedBuffer.java
+++ b/src/java/org/apache/commons/collections/buffer/TypedBuffer.java
@@ -16,7 +16,7 @@
 package org.apache.commons.collections.buffer;
 
 import org.apache.commons.collections.Buffer;
-import org.apache.commons.collections.PredicateUtils;
+import org.apache.commons.collections.functors.InstanceofPredicate;
 
 /**
  * Decorates another <code>Buffer</code> to validate that elements added
@@ -27,7 +27,7 @@ import org.apache.commons.collections.PredicateUtils;
  * collection, an IllegalArgumentException is thrown.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.3 $ $Date: 2004/02/18 00:58:18 $
+ * @version $Revision: 1.4 $ $Date: 2004/05/07 23:28:38 $
  * 
  * @author Stephen Colebourne
  * @author Matthew Hawthorne
@@ -46,7 +46,7 @@ public class TypedBuffer {
      * @throws IllegalArgumentException if the buffer contains invalid elements
      */
     public static Buffer decorate(Buffer buffer, Class type) {
-        return new PredicatedBuffer(buffer, PredicateUtils.instanceofPredicate(type));
+        return new PredicatedBuffer(buffer, InstanceofPredicate.getInstance(type));
     }
     
     /**
diff --git a/src/java/org/apache/commons/collections/collection/TypedCollection.java b/src/java/org/apache/commons/collections/collection/TypedCollection.java
index 9beb9666e..9ae442823 100644
--- a/src/java/org/apache/commons/collections/collection/TypedCollection.java
+++ b/src/java/org/apache/commons/collections/collection/TypedCollection.java
@@ -17,7 +17,7 @@ package org.apache.commons.collections.collection;
 
 import java.util.Collection;
 
-import org.apache.commons.collections.PredicateUtils;
+import org.apache.commons.collections.functors.InstanceofPredicate;
 
 /**
  * Decorates a <code>Collection</code> to validate that elements added are of a specific type.
@@ -27,7 +27,7 @@ import org.apache.commons.collections.PredicateUtils;
  * collection, an IllegalArgumentException is thrown.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.3 $ $Date: 2004/02/18 00:58:53 $
+ * @version $Revision: 1.4 $ $Date: 2004/05/07 23:28:38 $
  * 
  * @author Stephen Colebourne
  * @author Matthew Hawthorne
@@ -46,7 +46,7 @@ public class TypedCollection {
      * @throws IllegalArgumentException if the collection contains invalid elements
      */
     public static Collection decorate(Collection coll, Class type) {
-        return new PredicatedCollection(coll, PredicateUtils.instanceofPredicate(type));
+        return new PredicatedCollection(coll, InstanceofPredicate.getInstance(type));
     }
     
     /**
diff --git a/src/java/org/apache/commons/collections/list/TypedList.java b/src/java/org/apache/commons/collections/list/TypedList.java
index c67929447..b32915553 100644
--- a/src/java/org/apache/commons/collections/list/TypedList.java
+++ b/src/java/org/apache/commons/collections/list/TypedList.java
@@ -17,7 +17,7 @@ package org.apache.commons.collections.list;
 
 import java.util.List;
 
-import org.apache.commons.collections.PredicateUtils;
+import org.apache.commons.collections.functors.InstanceofPredicate;
 
 /**
  * Decorates another <code>List</code> to validate that elements
@@ -28,7 +28,7 @@ import org.apache.commons.collections.PredicateUtils;
  * collection, an IllegalArgumentException is thrown.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.3 $ $Date: 2004/02/18 01:12:26 $
+ * @version $Revision: 1.4 $ $Date: 2004/05/07 23:28:38 $
  * 
  * @author Stephen Colebourne
  * @author Matthew Hawthorne
@@ -47,7 +47,7 @@ public class TypedList {
      * @throws IllegalArgumentException if the list contains invalid elements
      */
     public static List decorate(List list, Class type) {
-        return new PredicatedList(list, PredicateUtils.instanceofPredicate(type));
+        return new PredicatedList(list, InstanceofPredicate.getInstance(type));
     }
     
     /**
diff --git a/src/java/org/apache/commons/collections/set/TypedSet.java b/src/java/org/apache/commons/collections/set/TypedSet.java
index a9d1f4fa1..7d1cf4085 100644
--- a/src/java/org/apache/commons/collections/set/TypedSet.java
+++ b/src/java/org/apache/commons/collections/set/TypedSet.java
@@ -17,7 +17,7 @@ package org.apache.commons.collections.set;
 
 import java.util.Set;
 
-import org.apache.commons.collections.PredicateUtils;
+import org.apache.commons.collections.functors.InstanceofPredicate;
 
 /**
  * Decorates another <code>Set</code> to validate that elements
@@ -28,7 +28,7 @@ import org.apache.commons.collections.PredicateUtils;
  * collection, an IllegalArgumentException is thrown.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.3 $ $Date: 2004/02/18 01:14:27 $
+ * @version $Revision: 1.4 $ $Date: 2004/05/07 23:28:38 $
  * 
  * @author Stephen Colebourne
  * @author Matthew Hawthorne
@@ -47,7 +47,7 @@ public class TypedSet {
      * @throws IllegalArgumentException if the set contains invalid elements
      */
     public static Set decorate(Set set, Class type) {
-        return new PredicatedSet(set, PredicateUtils.instanceofPredicate(type));
+        return new PredicatedSet(set, InstanceofPredicate.getInstance(type));
     }
     
     /**
diff --git a/src/java/org/apache/commons/collections/set/TypedSortedSet.java b/src/java/org/apache/commons/collections/set/TypedSortedSet.java
index 894faf173..5314eb373 100644
--- a/src/java/org/apache/commons/collections/set/TypedSortedSet.java
+++ b/src/java/org/apache/commons/collections/set/TypedSortedSet.java
@@ -17,7 +17,7 @@ package org.apache.commons.collections.set;
 
 import java.util.SortedSet;
 
-import org.apache.commons.collections.PredicateUtils;
+import org.apache.commons.collections.functors.InstanceofPredicate;
 
 /**
  * Decorates another <code>SortedSet</code> to validate that elements
@@ -28,7 +28,7 @@ import org.apache.commons.collections.PredicateUtils;
  * collection, an IllegalArgumentException is thrown.
  *
  * @since Commons Collections 3.0
- * @version $Revision: 1.3 $ $Date: 2004/02/18 01:14:27 $
+ * @version $Revision: 1.4 $ $Date: 2004/05/07 23:28:38 $
  * 
  * @author Stephen Colebourne
  * @author Matthew Hawthorne
@@ -47,7 +47,7 @@ public class TypedSortedSet {
      * @throws IllegalArgumentException if the set contains invalid elements
      */
     public static SortedSet decorate(SortedSet set, Class type) {
-        return new PredicatedSortedSet(set, PredicateUtils.instanceofPredicate(type));
+        return new PredicatedSortedSet(set, InstanceofPredicate.getInstance(type));
     }
     
     /**