From 5a2fc907469754e2c2a4ef2a9cad3df6ad94dd21 Mon Sep 17 00:00:00 2001
From: Matthew Jason Benson <mbenson@apache.org>
Date: Wed, 20 Jul 2011 14:44:46 +0000
Subject: [PATCH] [COLLECTIONS-251] improving static factory methods for static
 importability, conistency

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/collections/trunk@1148801 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/commons/collections/BagUtils.java  |  28 ++---
 .../commons/collections/BufferUtils.java      |  20 +--
 .../commons/collections/ClosureUtils.java     |  32 ++---
 .../commons/collections/CollectionUtils.java  |  16 +--
 .../commons/collections/ComparatorUtils.java  |   4 +-
 .../commons/collections/FactoryUtils.java     |  12 +-
 .../commons/collections/IteratorUtils.java    |  16 +--
 .../apache/commons/collections/ListUtils.java |  12 +-
 .../apache/commons/collections/MapUtils.java  |  36 +++---
 .../commons/collections/PredicateUtils.java   | 118 ++++++++++++++----
 .../apache/commons/collections/SetUtils.java  |  20 +--
 .../commons/collections/TransformerUtils.java |  45 +++----
 .../collections/bag/AbstractMapBag.java       |   2 +-
 .../collections/bag/PredicatedBag.java        |   2 +-
 .../collections/bag/PredicatedSortedBag.java  |   2 +-
 .../collections/bag/SynchronizedBag.java      |   2 +-
 .../bag/SynchronizedSortedBag.java            |   2 +-
 .../collections/bag/TransformedBag.java       |  12 +-
 .../collections/bag/TransformedSortedBag.java |   8 +-
 .../collections/bag/UnmodifiableBag.java      |   7 +-
 .../bag/UnmodifiableSortedBag.java            |   6 +-
 .../collections/bidimap/TreeBidiMap.java      |   4 +-
 .../bidimap/UnmodifiableBidiMap.java          |  10 +-
 .../bidimap/UnmodifiableOrderedBidiMap.java   |  10 +-
 .../bidimap/UnmodifiableSortedBidiMap.java    |  16 +--
 .../collections/buffer/BlockingBuffer.java    |   4 +-
 .../collections/buffer/BoundedBuffer.java     |   4 +-
 .../collections/buffer/PredicatedBuffer.java  |   2 +-
 .../collections/buffer/PriorityBuffer.java    |   2 +-
 .../buffer/SynchronizedBuffer.java            |   2 +-
 .../collections/buffer/TransformedBuffer.java |   8 +-
 .../buffer/UnmodifiableBuffer.java            |   4 +-
 .../collection/CompositeCollection.java       |   4 +-
 .../collection/PredicatedCollection.java      |   2 +-
 .../collection/SynchronizedCollection.java    |   2 +-
 .../collection/TransformedCollection.java     |   8 +-
 .../UnmodifiableBoundedCollection.java        |   8 +-
 .../collection/UnmodifiableCollection.java    |   4 +-
 .../comparators/BooleanComparator.java        |   4 +-
 .../comparators/ComparableComparator.java     |   4 +-
 .../collections/functors/AndPredicate.java    |   2 +-
 .../collections/functors/AnyPredicate.java    |   4 +-
 .../collections/functors/ChainedClosure.java  |  25 +---
 .../functors/ChainedTransformer.java          |  25 +---
 .../functors/CloneTransformer.java            |   4 +-
 .../functors/ClosureTransformer.java          |   2 +-
 .../functors/ComparatorPredicate.java         |   6 +-
 .../collections/functors/ConstantFactory.java |   2 +-
 .../functors/ConstantTransformer.java         |   6 +-
 .../collections/functors/DefaultEquator.java  |   2 +-
 .../collections/functors/EqualPredicate.java  |   2 +-
 .../functors/ExceptionClosure.java            |   2 +-
 .../functors/ExceptionFactory.java            |   2 +-
 .../functors/ExceptionPredicate.java          |   2 +-
 .../functors/ExceptionTransformer.java        |   2 +-
 .../functors/FactoryTransformer.java          |   2 +-
 .../collections/functors/FalsePredicate.java  |   2 +-
 .../collections/functors/ForClosure.java      |   4 +-
 .../functors/IdentityPredicate.java           |   2 +-
 .../collections/functors/IfClosure.java       |   6 +-
 .../functors/InstanceofPredicate.java         |   2 +-
 .../functors/InstantiateFactory.java          |   2 +-
 .../functors/InstantiateTransformer.java      |   4 +-
 .../functors/InvokerTransformer.java          |   4 +-
 .../collections/functors/MapTransformer.java  |   4 +-
 .../collections/functors/NOPClosure.java      |   2 +-
 .../collections/functors/NOPTransformer.java  |   2 +-
 .../collections/functors/NonePredicate.java   |   4 +-
 .../functors/NotNullPredicate.java            |   2 +-
 .../collections/functors/NotPredicate.java    |   2 +-
 .../functors/NullIsExceptionPredicate.java    |   2 +-
 .../functors/NullIsFalsePredicate.java        |   2 +-
 .../functors/NullIsTruePredicate.java         |   2 +-
 .../collections/functors/OnePredicate.java    |   4 +-
 .../collections/functors/OrPredicate.java     |   2 +-
 .../functors/PredicateTransformer.java        |   2 +-
 .../functors/PrototypeFactory.java            |   4 +-
 .../functors/StringValueTransformer.java      |   2 +-
 .../collections/functors/SwitchClosure.java   |  10 +-
 .../functors/SwitchTransformer.java           |  12 +-
 .../functors/TransformedPredicate.java        |   2 +-
 .../functors/TransformerClosure.java          |   4 +-
 .../functors/TransformerPredicate.java        |   2 +-
 .../collections/functors/UniquePredicate.java |   2 +-
 .../collections/functors/WhileClosure.java    |   2 +-
 .../iterators/CollatingIterator.java          |   2 +-
 .../collections/iterators/EmptyIterator.java  |   4 +-
 .../iterators/EmptyListIterator.java          |   4 +-
 .../iterators/EmptyMapIterator.java           |   2 +-
 .../iterators/EmptyOrderedIterator.java       |   2 +-
 .../iterators/EmptyOrderedMapIterator.java    |   2 +-
 .../collections/iterators/IteratorChain.java  |   6 +-
 .../iterators/ObjectArrayIterator.java        |   2 +-
 .../iterators/ObjectArrayListIterator.java    |   2 +-
 .../iterators/UniqueFilterIterator.java       |   2 +-
 .../iterators/UnmodifiableIterator.java       |   2 +-
 .../iterators/UnmodifiableListIterator.java   |   2 +-
 .../iterators/UnmodifiableMapIterator.java    |   2 +-
 .../UnmodifiableOrderedMapIterator.java       |   2 +-
 .../collections/list/FixedSizeList.java       |   4 +-
 .../commons/collections/list/GrowthList.java  |   2 +-
 .../commons/collections/list/LazyList.java    |   2 +-
 .../collections/list/PredicatedList.java      |   2 +-
 .../collections/list/SetUniqueList.java       |   4 +-
 .../collections/list/SynchronizedList.java    |   2 +-
 .../collections/list/TransformedList.java     |   8 +-
 .../collections/list/UnmodifiableList.java    |   8 +-
 .../collections/map/AbstractHashedMap.java    |   8 +-
 .../collections/map/AbstractLinkedMap.java    |   8 +-
 .../commons/collections/map/CompositeMap.java |   2 +-
 .../commons/collections/map/DefaultedMap.java |  12 +-
 .../commons/collections/map/FixedSizeMap.java |   8 +-
 .../collections/map/FixedSizeSortedMap.java   |   8 +-
 .../commons/collections/map/Flat3Map.java     |   8 +-
 .../commons/collections/map/LazyMap.java      |   6 +-
 .../collections/map/LazySortedMap.java        |   5 +-
 .../commons/collections/map/LinkedMap.java    |   8 +-
 .../collections/map/ListOrderedMap.java       |   4 +-
 .../commons/collections/map/MultiKeyMap.java  |   4 +-
 .../collections/map/MultiValueMap.java        |  16 +--
 .../collections/map/PredicatedMap.java        |   2 +-
 .../collections/map/PredicatedSortedMap.java  |   2 +-
 .../collections/map/TransformedMap.java       |   8 +-
 .../collections/map/TransformedSortedMap.java |   8 +-
 .../collections/map/UnmodifiableEntrySet.java |   2 +-
 .../collections/map/UnmodifiableMap.java      |  12 +-
 .../map/UnmodifiableOrderedMap.java           |  10 +-
 .../map/UnmodifiableSortedMap.java            |   8 +-
 .../commons/collections/set/CompositeSet.java |   2 +-
 .../collections/set/ListOrderedSet.java       |   8 +-
 .../commons/collections/set/MapBackedSet.java |   6 +-
 .../collections/set/PredicatedSet.java        |   2 +-
 .../collections/set/PredicatedSortedSet.java  |   2 +-
 .../collections/set/SynchronizedSet.java      |   2 +-
 .../set/SynchronizedSortedSet.java            |   2 +-
 .../collections/set/TransformedSet.java       |   8 +-
 .../collections/set/TransformedSortedSet.java |   8 +-
 .../collections/set/UnmodifiableSet.java      |   4 +-
 .../set/UnmodifiableSortedSet.java            |   4 +-
 .../AbstractIterableGetMapDecorator.java      |   3 +-
 .../collections/splitmap/SplitMapUtils.java   |  15 ++-
 .../collections/splitmap/TransformedMap.java  |   9 +-
 .../commons/collections/TestBagUtils.java     |  12 +-
 .../collections/TestCollectionUtils.java      |   8 +-
 .../collections/bag/TestPredicatedBag.java    |   2 +-
 .../bag/TestPredicatedSortedBag.java          |   2 +-
 .../collections/bag/TestTransformedBag.java   |   6 +-
 .../bag/TestTransformedSortedBag.java         |   6 +-
 .../bidimap/TestDualTreeBidiMap2.java         |   8 +-
 .../bidimap/TestUnmodifiableBidiMap.java      |   4 +-
 .../TestUnmodifiableOrderedBidiMap.java       |   4 +-
 .../TestUnmodifiableSortedBidiMap.java        |   4 +-
 .../buffer/TestBlockingBuffer.java            |  10 +-
 .../collections/buffer/TestBoundedBuffer.java |  16 +--
 .../buffer/TestPredicatedBuffer.java          |   2 +-
 .../buffer/TestSynchronizedBuffer.java        |   4 +-
 .../buffer/TestTransformedBuffer.java         |   4 +-
 .../buffer/TestUnmodifiableBuffer.java        |   4 +-
 .../collection/TestPredicatedCollection.java  |   2 +-
 .../TestSynchronizedCollection.java           |   2 +-
 .../collection/TestTransformedCollection.java |   8 +-
 .../TestUnmodifiableCollection.java           |   4 +-
 .../comparators/TestBooleanComparator.java    |   8 +-
 .../functors/TestComparatorPredicate.java     |  12 +-
 .../iterators/TestFilterIterator.java         |   2 +-
 .../iterators/TestUnmodifiableIterator.java   |  10 +-
 .../TestUnmodifiableListIterator.java         |  10 +-
 .../TestUnmodifiableMapIterator.java          |  10 +-
 .../TestUnmodifiableOrderedMapIterator.java   |  14 +--
 .../collections/list/TestFixedSizeList.java   |   4 +-
 .../collections/list/TestGrowthList.java      |   2 +-
 .../collections/list/TestPredicatedList.java  |   2 +-
 .../collections/list/TestSetUniqueList.java   |  10 +-
 .../list/TestSynchronizedList.java            |   2 +-
 .../collections/list/TestTransformedList.java |   8 +-
 .../collections/map/TestDefaultedMap.java     |   8 +-
 .../collections/map/TestFixedSizeMap.java     |   4 +-
 .../map/TestFixedSizeSortedMap.java           |   4 +-
 .../commons/collections/map/TestLazyMap.java  |  10 +-
 .../collections/map/TestLazySortedMap.java    |  16 +--
 .../collections/map/TestListOrderedMap.java   |   2 +-
 .../collections/map/TestMultiKeyMap.java      |   2 +-
 .../collections/map/TestMultiValueMap.java    |   6 +-
 .../collections/map/TestPredicatedMap.java    |   2 +-
 .../map/TestPredicatedSortedMap.java          |   2 +-
 .../collections/map/TestSingletonMap.java     |   2 +-
 .../collections/map/TestTransformedMap.java   |  10 +-
 .../map/TestTransformedSortedMap.java         |  10 +-
 .../collections/map/TestUnmodifiableMap.java  |   8 +-
 .../map/TestUnmodifiableOrderedMap.java       |  10 +-
 .../map/TestUnmodifiableSortedMap.java        |   8 +-
 .../collections/set/TestListOrderedSet.java   |  12 +-
 .../collections/set/TestMapBackedSet.java     |   2 +-
 .../collections/set/TestMapBackedSet2.java    |   2 +-
 .../collections/set/TestPredicatedSet.java    |   2 +-
 .../set/TestPredicatedSortedSet.java          |   6 +-
 .../collections/set/TestSynchronizedSet.java  |   2 +-
 .../set/TestSynchronizedSortedSet.java        |   2 +-
 .../collections/set/TestTransformedSet.java   |   8 +-
 .../set/TestTransformedSortedSet.java         |   8 +-
 .../collections/set/TestUnmodifiableSet.java  |   4 +-
 .../set/TestUnmodifiableSortedSet.java        |   4 +-
 .../splitmap/TestSplitMapUtils.java           |   2 +-
 .../splitmap/TestTransformedMap.java          |  22 ++--
 204 files changed, 705 insertions(+), 663 deletions(-)

diff --git a/src/java/org/apache/commons/collections/BagUtils.java b/src/java/org/apache/commons/collections/BagUtils.java
index 839c2eade..ba93d020f 100644
--- a/src/java/org/apache/commons/collections/BagUtils.java
+++ b/src/java/org/apache/commons/collections/BagUtils.java
@@ -45,12 +45,12 @@ public class BagUtils {
     /**
      * An empty unmodifiable bag.
      */
-    public static final Bag<Object> EMPTY_BAG = UnmodifiableBag.decorate(new HashBag<Object>());
+    public static final Bag<Object> EMPTY_BAG = UnmodifiableBag.unmodifiableBag(new HashBag<Object>());
 
     /**
      * An empty unmodifiable sorted bag.
      */
-    public static final Bag<Object> EMPTY_SORTED_BAG = UnmodifiableSortedBag.decorate(new TreeBag<Object>());
+    public static final Bag<Object> EMPTY_SORTED_BAG = UnmodifiableSortedBag.unmodifiableSortedBag(new TreeBag<Object>());
 
     /**
      * Instantiation of BagUtils is not intended or required. However, some
@@ -86,7 +86,7 @@ public class BagUtils {
      * @throws IllegalArgumentException if the Bag is null
      */
     public static <E> Bag<E> synchronizedBag(Bag<E> bag) {
-        return SynchronizedBag.decorate(bag);
+        return SynchronizedBag.synchronizedBag(bag);
     }
 
     /**
@@ -99,7 +99,7 @@ public class BagUtils {
      * @throws IllegalArgumentException if the Bag is null
      */
     public static <E> Bag<E> unmodifiableBag(Bag<E> bag) {
-        return UnmodifiableBag.decorate(bag);
+        return UnmodifiableBag.unmodifiableBag(bag);
     }
 
     /**
@@ -117,7 +117,7 @@ public class BagUtils {
      * @throws IllegalArgumentException if the Bag or Predicate is null
      */
     public static <E> Bag<E> predicatedBag(Bag<E> bag, Predicate<? super E> predicate) {
-        return PredicatedBag.decorate(bag, predicate);
+        return PredicatedBag.predicatedBag(bag, predicate);
     }
 
     /**
@@ -128,15 +128,15 @@ public class BagUtils {
      * as it is a backdoor for adding untransformed objects.
      * <p>
      * Existing entries in the specified bag will not be transformed.
-     * If you want that behaviour, see {@link TransformedBag#decorateTransform}.
+     * If you want that behaviour, see {@link TransformedBag#transformedBag(Bag, Transformer)}.
      * 
      * @param bag the bag to predicate, must not be null
      * @param transformer the transformer for the bag, must not be null
      * @return a transformed bag backed by the given bag
      * @throws IllegalArgumentException if the Bag or Transformer is null
      */
-    public static <E> Bag<E> transformedBag(Bag<E> bag, Transformer<? super E, ? extends E> transformer) {
-        return TransformedBag.decorate(bag, transformer);
+    public static <E> Bag<E> transformingBag(Bag<E> bag, Transformer<? super E, ? extends E> transformer) {
+        return TransformedBag.transformingBag(bag, transformer);
     }
 
     //-----------------------------------------------------------------------
@@ -166,7 +166,7 @@ public class BagUtils {
      * @throws IllegalArgumentException if the SortedBag is null
      */
     public static <E> SortedBag<E> synchronizedSortedBag(SortedBag<E> bag) {
-        return SynchronizedSortedBag.decorate(bag);
+        return SynchronizedSortedBag.synchronizedSortedBag(bag);
     }
 
     /**
@@ -180,7 +180,7 @@ public class BagUtils {
      * @throws IllegalArgumentException if the SortedBag is null
      */
     public static <E> SortedBag<E> unmodifiableSortedBag(SortedBag<E> bag) {
-        return UnmodifiableSortedBag.decorate(bag);
+        return UnmodifiableSortedBag.unmodifiableSortedBag(bag);
     }
 
     /**
@@ -200,7 +200,7 @@ public class BagUtils {
      */
     public static <E> SortedBag<E> predicatedSortedBag(SortedBag<E> bag,
             Predicate<? super E> predicate) {
-        return PredicatedSortedBag.decorate(bag, predicate);
+        return PredicatedSortedBag.predicatedSortedBag(bag, predicate);
     }
 
     /**
@@ -211,15 +211,15 @@ public class BagUtils {
      * as it is a backdoor for adding untransformed objects.
      * <p>
      * Existing entries in the specified bag will not be transformed.
-     * If you want that behaviour, see {@link TransformedSortedBag#decorateTransform}.
+     * If you want that behaviour, see {@link TransformedSortedBag#transformedSortedBag(SortedBag, Transformer)}.
      * 
      * @param bag the bag to predicate, must not be null
      * @param transformer the transformer for the bag, must not be null
      * @return a transformed bag backed by the given bag
      * @throws IllegalArgumentException if the Bag or Transformer is null
      */
-    public static <E> SortedBag<E> transformedSortedBag(SortedBag<E> bag, Transformer<? super E, ? extends E> transformer) {
-        return TransformedSortedBag.decorate(bag, transformer);
+    public static <E> SortedBag<E> transformingSortedBag(SortedBag<E> bag, Transformer<? super E, ? extends E> transformer) {
+        return TransformedSortedBag.transformingSortedBag(bag, transformer);
     }
 
     /**
diff --git a/src/java/org/apache/commons/collections/BufferUtils.java b/src/java/org/apache/commons/collections/BufferUtils.java
index 3edf6f5e0..82f1332fd 100644
--- a/src/java/org/apache/commons/collections/BufferUtils.java
+++ b/src/java/org/apache/commons/collections/BufferUtils.java
@@ -37,7 +37,7 @@ public class BufferUtils {
     /**
      * An empty unmodifiable buffer.
      */
-    public static final Buffer<Object> EMPTY_BUFFER = UnmodifiableBuffer.decorate(new ArrayStack<Object>(1));
+    public static final Buffer<Object> EMPTY_BUFFER = UnmodifiableBuffer.unmodifiableBuffer(new ArrayStack<Object>(1));
 
     /**
      * <code>BufferUtils</code> should not normally be instantiated.
@@ -67,7 +67,7 @@ public class BufferUtils {
      * @throws IllegalArgumentException  if the Buffer is null
      */
     public static <E> Buffer<E> synchronizedBuffer(Buffer<E> buffer) {
-        return SynchronizedBuffer.decorate(buffer);
+        return SynchronizedBuffer.synchronizedBuffer(buffer);
     }
 
     /**
@@ -83,7 +83,7 @@ public class BufferUtils {
      * @throws IllegalArgumentException  if the Buffer is null
      */
     public static <E> Buffer<E> blockingBuffer(Buffer<E> buffer) {
-        return BlockingBuffer.decorate(buffer);
+        return BlockingBuffer.blockingBuffer(buffer);
     }
 
     /**
@@ -101,7 +101,7 @@ public class BufferUtils {
      * @since Commons Collections 3.2
      */
     public static <E> Buffer<E> blockingBuffer(Buffer<E> buffer, long timeoutMillis) {
-        return BlockingBuffer.decorate(buffer, timeoutMillis);
+        return BlockingBuffer.blockingBuffer(buffer, timeoutMillis);
     }
 
     /**
@@ -118,7 +118,7 @@ public class BufferUtils {
      * @since Commons Collections 3.2
      */
     public static <E> Buffer<E> boundedBuffer(Buffer<E> buffer, int maximumSize) {
-        return BoundedBuffer.decorate(buffer, maximumSize);
+        return BoundedBuffer.boundedBuffer(buffer, maximumSize);
     }
 
     /**
@@ -136,7 +136,7 @@ public class BufferUtils {
      * @since Commons Collections 3.2
      */
     public static <E> Buffer<E> boundedBuffer(Buffer<E> buffer, int maximumSize, long timeoutMillis) {
-        return BoundedBuffer.decorate(buffer, maximumSize, timeoutMillis);
+        return BoundedBuffer.boundedBuffer(buffer, maximumSize, timeoutMillis);
     }
 
     /**
@@ -147,7 +147,7 @@ public class BufferUtils {
      * @throws IllegalArgumentException  if the Buffer is null
      */
     public static <E> Buffer<E> unmodifiableBuffer(Buffer<E> buffer) {
-        return UnmodifiableBuffer.decorate(buffer);
+        return UnmodifiableBuffer.unmodifiableBuffer(buffer);
     }
 
     /**
@@ -164,7 +164,7 @@ public class BufferUtils {
      * @throws IllegalArgumentException  if the Buffer or Predicate is null
      */
     public static <E> Buffer<E> predicatedBuffer(Buffer<E> buffer, Predicate<? super E> predicate) {
-        return PredicatedBuffer.decorate(buffer, predicate);
+        return PredicatedBuffer.predicatedBuffer(buffer, predicate);
     }
 
     /**
@@ -182,8 +182,8 @@ public class BufferUtils {
      * @return a transformed buffer backed by the given buffer
      * @throws IllegalArgumentException  if the Buffer or Transformer is null
      */
-    public static <E> Buffer<E> transformedBuffer(Buffer<E> buffer, Transformer<? super E, ? extends E> transformer) {
-        return TransformedBuffer.decorate(buffer, transformer);
+    public static <E> Buffer<E> transformingBuffer(Buffer<E> buffer, Transformer<? super E, ? extends E> transformer) {
+        return TransformedBuffer.transformingBuffer(buffer, transformer);
     }
 
     /**
diff --git a/src/java/org/apache/commons/collections/ClosureUtils.java b/src/java/org/apache/commons/collections/ClosureUtils.java
index 0b8aba183..08db91d2d 100644
--- a/src/java/org/apache/commons/collections/ClosureUtils.java
+++ b/src/java/org/apache/commons/collections/ClosureUtils.java
@@ -71,7 +71,7 @@ public class ClosureUtils {
      * @return the closure
      */
     public static <E> Closure<E> exceptionClosure() {
-        return ExceptionClosure.<E>getInstance();
+        return ExceptionClosure.<E>exceptionClosure();
     }
 
     /**
@@ -83,7 +83,7 @@ public class ClosureUtils {
      * @return the closure
      */
     public static <E> Closure<E> nopClosure() {
-        return NOPClosure.<E>getInstance();
+        return NOPClosure.<E>nopClosure();
     }
 
     /**
@@ -97,7 +97,7 @@ public class ClosureUtils {
      * @return the closure
      */
     public static <E> Closure<E> asClosure(Transformer<? super E, ?> transformer) {
-        return TransformerClosure.getInstance(transformer);
+        return TransformerClosure.transformerClosure(transformer);
     }
 
     /**
@@ -112,7 +112,7 @@ public class ClosureUtils {
      * @return the <code>for</code> closure
      */
     public static <E> Closure<E> forClosure(int count, Closure<? super E> closure) {
-        return ForClosure.getInstance(count, closure);
+        return ForClosure.forClosure(count, closure);
     }
 
     /**
@@ -127,7 +127,7 @@ public class ClosureUtils {
      * @throws IllegalArgumentException if either argument is null
      */
     public static <E> Closure<E> whileClosure(Predicate<? super E> predicate, Closure<? super E> closure) {
-        return WhileClosure.<E>getInstance(predicate, closure, false);
+        return WhileClosure.<E>whileClosure(predicate, closure, false);
     }
 
     /**
@@ -142,7 +142,7 @@ public class ClosureUtils {
      * @throws IllegalArgumentException if either argument is null
      */
     public static <E> Closure<E> doWhileClosure(Closure<? super E> closure, Predicate<? super E> predicate) {
-        return WhileClosure.<E>getInstance(predicate, closure, true);
+        return WhileClosure.<E>whileClosure(predicate, closure, true);
     }
 
     /**
@@ -158,7 +158,7 @@ public class ClosureUtils {
      */
     public static <E> Closure<E> invokerClosure(String methodName) {
         // reuse transformer as it has caching - this is lazy really, should have inner class here
-        return asClosure(InvokerTransformer.<E, Object>getInstance(methodName));
+        return asClosure(InvokerTransformer.<E, Object>invokerTransformer(methodName));
     }
 
     /**
@@ -177,7 +177,7 @@ public class ClosureUtils {
      */
     public static <E> Closure<E> invokerClosure(String methodName, Class<?>[] paramTypes, Object[] args) {
         // reuse transformer as it has caching - this is lazy really, should have inner class here
-        return asClosure(InvokerTransformer.<E, Object>getInstance(methodName, paramTypes, args));
+        return asClosure(InvokerTransformer.<E, Object>invokerTransformer(methodName, paramTypes, args));
     }
 
     /**
@@ -192,7 +192,7 @@ public class ClosureUtils {
      * @throws IllegalArgumentException if either closure is null
      */
     public static <E> Closure<E> chainedClosure(Closure<? super E> closure1, Closure<? super E> closure2) {
-        return ChainedClosure.<E>getInstance(closure1, closure2);
+        return ChainedClosure.<E>chainedClosure(closure1, closure2);
     }
 
     /**
@@ -207,7 +207,7 @@ public class ClosureUtils {
      * @throws IllegalArgumentException if any closure in the array is null
      */
     public static <E> Closure<E> chainedClosure(Closure<? super E>[] closures) {
-        return ChainedClosure.getInstance(closures);
+        return ChainedClosure.chainedClosure(closures);
     }
 
     /**
@@ -224,7 +224,7 @@ public class ClosureUtils {
      * @throws IllegalArgumentException if any closure in the collection is null
      */
     public static <E> Closure<E> chainedClosure(Collection<Closure<E>> closures) {
-        return ChainedClosure.getInstance(closures);
+        return ChainedClosure.chainedClosure(closures);
     }
 
     /**
@@ -241,7 +241,7 @@ public class ClosureUtils {
      * @since Commons Collections 3.2
      */
     public static <E> Closure<E> ifClosure(Predicate<? super E> predicate, Closure<? super E> trueClosure) {
-        return IfClosure.<E>getInstance(predicate, trueClosure);
+        return IfClosure.<E>ifClosure(predicate, trueClosure);
     }
 
     /**
@@ -258,7 +258,7 @@ public class ClosureUtils {
      * @throws IllegalArgumentException if either closure is null
      */
     public static <E> Closure<E> ifClosure(Predicate<? super E> predicate, Closure<? super E> trueClosure, Closure<? super E> falseClosure) {
-        return IfClosure.<E>getInstance(predicate, trueClosure, falseClosure);
+        return IfClosure.<E>ifClosure(predicate, trueClosure, falseClosure);
     }
 
     /**
@@ -279,7 +279,7 @@ public class ClosureUtils {
      * @throws IllegalArgumentException if the arrays are different sizes
      */
     public static <E> Closure<E> switchClosure(Predicate<? super E>[] predicates, Closure<? super E>[] closures) {
-        return SwitchClosure.<E>getInstance(predicates, closures, null);
+        return SwitchClosure.<E>switchClosure(predicates, closures, null);
     }
 
     /**
@@ -302,7 +302,7 @@ public class ClosureUtils {
      * @throws IllegalArgumentException if the arrays are different sizes
      */
     public static <E> Closure<E> switchClosure(Predicate<? super E>[] predicates, Closure<? super E>[] closures, Closure<? super E> defaultClosure) {
-        return SwitchClosure.<E>getInstance(predicates, closures, defaultClosure);
+        return SwitchClosure.<E>switchClosure(predicates, closures, defaultClosure);
     }
     
     /**
@@ -326,7 +326,7 @@ public class ClosureUtils {
      * @throws ClassCastException  if the map elements are of the wrong type
      */
     public static <E> Closure<E> switchClosure(Map<Predicate<E>, Closure<E>> predicatesAndClosures) {
-        return SwitchClosure.getInstance(predicatesAndClosures);
+        return SwitchClosure.switchClosure(predicatesAndClosures);
     }
 
     /**
diff --git a/src/java/org/apache/commons/collections/CollectionUtils.java b/src/java/org/apache/commons/collections/CollectionUtils.java
index 08d770fee..d33c71177 100644
--- a/src/java/org/apache/commons/collections/CollectionUtils.java
+++ b/src/java/org/apache/commons/collections/CollectionUtils.java
@@ -128,7 +128,7 @@ public class CollectionUtils {
      * this purpose. However they could be cast to Set or List which might be
      * undesirable. This implementation only implements Collection.
      */
-    public static final Collection EMPTY_COLLECTION = UnmodifiableCollection.decorate(new ArrayList<Object>());
+    public static final Collection EMPTY_COLLECTION = UnmodifiableCollection.unmodifiableCollection(new ArrayList<Object>());
 
     /**
      * <code>CollectionUtils</code> should not normally be instantiated.
@@ -1167,7 +1167,7 @@ public class CollectionUtils {
             return ((BoundedCollection<?>) coll).isFull();
         }
         try {
-            BoundedCollection<?> bcoll = UnmodifiableBoundedCollection.decorateUsing((Collection<Object>) coll);
+            BoundedCollection<?> bcoll = UnmodifiableBoundedCollection.unmodifiableBoundedCollection((Collection<Object>) coll);
             return bcoll.isFull();
         } catch (IllegalArgumentException ex) {
             return false;
@@ -1198,7 +1198,7 @@ public class CollectionUtils {
             return ((BoundedCollection<?>) coll).maxSize();
         }
         try {
-            BoundedCollection<?> bcoll = UnmodifiableBoundedCollection.decorateUsing((Collection<Object>) coll);
+            BoundedCollection<?> bcoll = UnmodifiableBoundedCollection.unmodifiableBoundedCollection((Collection<Object>) coll);
             return bcoll.maxSize();
         } catch (IllegalArgumentException ex) {
             return -1;
@@ -1269,7 +1269,7 @@ public class CollectionUtils {
      * @throws IllegalArgumentException  if the collection is null
      */
     public static <C> Collection<C> synchronizedCollection(Collection<C> collection) {
-        return SynchronizedCollection.decorate(collection);
+        return SynchronizedCollection.synchronizedCollection(collection);
     }
 
     /**
@@ -1282,7 +1282,7 @@ public class CollectionUtils {
      * @throws IllegalArgumentException  if the collection is null
      */
     public static <C> Collection<C> unmodifiableCollection(Collection<C> collection) {
-        return UnmodifiableCollection.decorate(collection);
+        return UnmodifiableCollection.unmodifiableCollection(collection);
     }
 
     /**
@@ -1300,7 +1300,7 @@ public class CollectionUtils {
      * @throws IllegalArgumentException  if the Collection is null
      */
     public static <C> Collection<C> predicatedCollection(Collection<C> collection, Predicate<? super C> predicate) {
-        return PredicatedCollection.decorate(collection, predicate);
+        return PredicatedCollection.predicatedCollection(collection, predicate);
     }
 
     /**
@@ -1318,8 +1318,8 @@ public class CollectionUtils {
      * @return a transformed collection backed by the given collection
      * @throws IllegalArgumentException  if the Collection or Transformer is null
      */
-    public static <E> Collection<E> transformedCollection(Collection<E> collection, Transformer<? super E, ? extends E> transformer) {
-        return TransformedCollection.decorate(collection, transformer);
+    public static <E> Collection<E> transformingCollection(Collection<E> collection, Transformer<? super E, ? extends E> transformer) {
+        return TransformedCollection.transformingCollection(collection, transformer);
     }
 
     /**
diff --git a/src/java/org/apache/commons/collections/ComparatorUtils.java b/src/java/org/apache/commons/collections/ComparatorUtils.java
index e04ae1248..3f058a7c8 100644
--- a/src/java/org/apache/commons/collections/ComparatorUtils.java
+++ b/src/java/org/apache/commons/collections/ComparatorUtils.java
@@ -55,7 +55,7 @@ public class ComparatorUtils {
      * @see ComparableComparator#getInstance
      */
     @SuppressWarnings("unchecked")
-    public static final Comparator NATURAL_COMPARATOR = ComparableComparator.<Comparable>getInstance();
+    public static final Comparator NATURAL_COMPARATOR = ComparableComparator.<Comparable>comparableComparator();
 
     /**
      * Gets a comparator that uses the natural order of the objects.
@@ -145,7 +145,7 @@ public class ComparatorUtils {
      * @return  a comparator that sorts booleans
      */
     public static Comparator<Boolean> booleanComparator(boolean trueFirst) {
-        return BooleanComparator.getBooleanComparator(trueFirst);
+        return BooleanComparator.booleanComparator(trueFirst);
     }
     
     /**
diff --git a/src/java/org/apache/commons/collections/FactoryUtils.java b/src/java/org/apache/commons/collections/FactoryUtils.java
index 85382f2fa..f80271c45 100644
--- a/src/java/org/apache/commons/collections/FactoryUtils.java
+++ b/src/java/org/apache/commons/collections/FactoryUtils.java
@@ -56,7 +56,7 @@ public class FactoryUtils {
      * @return the factory
      */
     public static <T> Factory<T> exceptionFactory() {
-        return ExceptionFactory.<T>getInstance();
+        return ExceptionFactory.<T>exceptionFactory();
     }
 
     /**
@@ -68,7 +68,7 @@ public class FactoryUtils {
      * @return the factory
      */
     public static <T> Factory<T> nullFactory() {
-        return ConstantFactory.<T>getInstance(null);
+        return ConstantFactory.<T>constantFactory(null);
     }
 
     /**
@@ -83,7 +83,7 @@ public class FactoryUtils {
      * @return the <code>constant</code> factory.
      */
     public static <T> Factory<T> constantFactory(T constantToReturn) {
-        return ConstantFactory.getInstance(constantToReturn);
+        return ConstantFactory.constantFactory(constantToReturn);
     }
 
     /**
@@ -104,7 +104,7 @@ public class FactoryUtils {
      * @throws IllegalArgumentException if the prototype cannot be cloned
      */
     public static <T> Factory<T> prototypeFactory(T  prototype) {
-        return PrototypeFactory.<T>getInstance(prototype);
+        return PrototypeFactory.<T>prototypeFactory(prototype);
     }
 
     /**
@@ -118,7 +118,7 @@ public class FactoryUtils {
      * @throws IllegalArgumentException if the classToInstantiate is null
      */
     public static <T> Factory<T> instantiateFactory(Class<T> classToInstantiate) {
-        return InstantiateFactory.getInstance(classToInstantiate, null, null);
+        return InstantiateFactory.instantiateFactory(classToInstantiate, null, null);
     }
 
     /**
@@ -136,7 +136,7 @@ public class FactoryUtils {
      * @throws IllegalArgumentException if the constructor doesn't exist
      */
     public static <T> Factory<T> instantiateFactory(Class<T> classToInstantiate, Class<?>[] paramTypes, Object[] args) {
-        return InstantiateFactory.getInstance(classToInstantiate, paramTypes, args);
+        return InstantiateFactory.instantiateFactory(classToInstantiate, paramTypes, args);
     }
 
 }
diff --git a/src/java/org/apache/commons/collections/IteratorUtils.java b/src/java/org/apache/commons/collections/IteratorUtils.java
index 81da617a5..592d4a2f5 100644
--- a/src/java/org/apache/commons/collections/IteratorUtils.java
+++ b/src/java/org/apache/commons/collections/IteratorUtils.java
@@ -127,7 +127,7 @@ public class IteratorUtils {
      * @return  an iterator over nothing
      */
     public static <E> ResettableIterator<E> emptyIterator() {
-        return EmptyIterator.<E>getResettableInstance();
+        return EmptyIterator.<E>resettableEmptyIterator();
     }
 
     /**
@@ -142,7 +142,7 @@ public class IteratorUtils {
      * @return  a list iterator over nothing
      */
     public static <E> ResettableListIterator<E> emptyListIterator() {
-        return EmptyListIterator.<E>getResettableInstance();
+        return EmptyListIterator.<E>resettableEmptyListIterator();
     }
 
     /**
@@ -154,7 +154,7 @@ public class IteratorUtils {
      * @return  an ordered iterator over nothing
      */
     public static <E> OrderedIterator<E> emptyOrderedIterator() {
-        return EmptyOrderedIterator.<E>getInstance();
+        return EmptyOrderedIterator.<E>emptyOrderedIterator();
     }
 
     /**
@@ -166,7 +166,7 @@ public class IteratorUtils {
      * @return  a map iterator over nothing
      */
     public static <K, V> MapIterator<K, V> emptyMapIterator() {
-        return EmptyMapIterator.<K, V>getInstance();
+        return EmptyMapIterator.<K, V>emptyMapIterator();
     }
 
     /**
@@ -178,7 +178,7 @@ public class IteratorUtils {
      * @return  a map iterator over nothing
      */
     public static <K, V> OrderedMapIterator<K, V> emptyOrderedMapIterator() {
-        return EmptyOrderedMapIterator.<K, V>getInstance();
+        return EmptyOrderedMapIterator.<K, V>emptyOrderedMapIterator();
     }
 
     // Singleton
@@ -417,7 +417,7 @@ public class IteratorUtils {
      * @return an immutable version of the iterator
      */
     public static <E> Iterator<E> unmodifiableIterator(Iterator<E> iterator) {
-        return UnmodifiableIterator.decorate(iterator);
+        return UnmodifiableIterator.unmodifiableIterator(iterator);
     }
 
     /**
@@ -430,7 +430,7 @@ public class IteratorUtils {
      * @return an immutable version of the iterator
      */
     public static <E> ListIterator<E> unmodifiableListIterator(ListIterator<E> listIterator) {
-        return UnmodifiableListIterator.decorate(listIterator);
+        return UnmodifiableListIterator.umodifiableListIterator(listIterator);
     }
 
     /**
@@ -442,7 +442,7 @@ public class IteratorUtils {
      * @return an immutable version of the iterator
      */
     public static <K, V> MapIterator<K, V> unmodifiableMapIterator(MapIterator<K, V> mapIterator) {
-        return UnmodifiableMapIterator.decorate(mapIterator);
+        return UnmodifiableMapIterator.unmodifiableMapIterator(mapIterator);
     }
 
     // Chained
diff --git a/src/java/org/apache/commons/collections/ListUtils.java b/src/java/org/apache/commons/collections/ListUtils.java
index 0ad4e2e44..ec515ef2e 100644
--- a/src/java/org/apache/commons/collections/ListUtils.java
+++ b/src/java/org/apache/commons/collections/ListUtils.java
@@ -299,7 +299,7 @@ public class ListUtils {
      * @throws IllegalArgumentException  if the list is null
      */
     public static <E> List<E> synchronizedList(List<E> list) {
-        return SynchronizedList.decorate(list);
+        return SynchronizedList.synchronizedList(list);
     }
 
     /**
@@ -312,7 +312,7 @@ public class ListUtils {
      * @throws IllegalArgumentException  if the list is null
      */
     public static <E> List<E> unmodifiableList(List<E> list) {
-        return UnmodifiableList.decorate(list);
+        return UnmodifiableList.unmodifiableList(list);
     }
 
     /**
@@ -329,7 +329,7 @@ public class ListUtils {
      * @throws IllegalArgumentException  if the List or Predicate is null
      */
     public static <E> List<E> predicatedList(List<E> list, Predicate<E> predicate) {
-        return PredicatedList.decorate(list, predicate);
+        return PredicatedList.predicatedList(list, predicate);
     }
 
     /**
@@ -352,7 +352,7 @@ public class ListUtils {
      * @throws IllegalArgumentException  if the List or Transformer is null
      */
     public static <E> List<E> transformedList(List<E> list, Transformer<? super E, ? extends E> transformer) {
-        return TransformedList.decorate(list, transformer);
+        return TransformedList.transformingList(list, transformer);
     }
     
     /**
@@ -385,7 +385,7 @@ public class ListUtils {
      * @throws IllegalArgumentException  if the List or Factory is null
      */
     public static <E> List<E> lazyList(List<E> list, Factory<? extends E> factory) {
-        return LazyList.decorate(list, factory);
+        return LazyList.lazyList(list, factory);
     }
 
     /**
@@ -399,7 +399,7 @@ public class ListUtils {
      * @throws IllegalArgumentException  if the List is null
      */
     public static <E> List<E> fixedSizeList(List<E> list) {
-        return FixedSizeList.decorate(list);
+        return FixedSizeList.fixedSizeList(list);
     }
 
     /**
diff --git a/src/java/org/apache/commons/collections/MapUtils.java b/src/java/org/apache/commons/collections/MapUtils.java
index 238c68c62..42ee72650 100644
--- a/src/java/org/apache/commons/collections/MapUtils.java
+++ b/src/java/org/apache/commons/collections/MapUtils.java
@@ -92,13 +92,13 @@ public class MapUtils {
      * An empty unmodifiable map.
      * This was not provided in JDK1.2.
      */
-    public static final Map<Object, Object> EMPTY_MAP = UnmodifiableMap.decorate(new HashMap<Object, Object>(1));
+    public static final Map<Object, Object> EMPTY_MAP = UnmodifiableMap.unmodifiableMap(new HashMap<Object, Object>(1));
 
     /**
      * An empty unmodifiable sorted map.
      * This is not provided in the JDK.
      */
-    public static final SortedMap<Object, Object> EMPTY_SORTED_MAP = UnmodifiableSortedMap.decorate(new TreeMap<Object, Object>());
+    public static final SortedMap<Object, Object> EMPTY_SORTED_MAP = UnmodifiableSortedMap.unmodifiableSortedMap(new TreeMap<Object, Object>());
 
     /**
      * String used to indent the verbose and debug Map prints.
@@ -1239,7 +1239,7 @@ public class MapUtils {
      * @throws IllegalArgumentException  if the map is null
      */
     public static <K, V> Map<K, V> unmodifiableMap(Map<K, V> map) {
-        return UnmodifiableMap.decorate(map);
+        return UnmodifiableMap.unmodifiableMap(map);
     }
 
     /**
@@ -1258,7 +1258,7 @@ public class MapUtils {
      * @throws IllegalArgumentException  if the Map is null
      */
     public static <K, V> IterableMap<K, V> predicatedMap(Map<K, V> map, Predicate<? super K> keyPred, Predicate<? super V> valuePred) {
-        return PredicatedMap.decorate(map, keyPred, valuePred);
+        return PredicatedMap.predicatedMap(map, keyPred, valuePred);
     }
 
     /**
@@ -1285,7 +1285,7 @@ public class MapUtils {
     public static <K, V> IterableMap<K, V> transformedMap(Map<K, V> map,
             Transformer<? super K, ? extends K> keyTransformer,
             Transformer<? super V, ? extends V> valueTransformer) {
-        return TransformedMap.decorate(map, keyTransformer, valueTransformer);
+        return TransformedMap.transformingMap(map, keyTransformer, valueTransformer);
     }
 
     /**
@@ -1299,7 +1299,7 @@ public class MapUtils {
      * @throws IllegalArgumentException  if the Map is null
      */
     public static <K, V> IterableMap<K, V> fixedSizeMap(Map<K, V> map) {
-        return FixedSizeMap.decorate(map);
+        return FixedSizeMap.fixedSizeMap(map);
     }
 
     /**
@@ -1331,7 +1331,7 @@ public class MapUtils {
      * @throws IllegalArgumentException  if the Map or Factory is null
      */
     public static <K, V> IterableMap<K, V> lazyMap(Map<K, V> map, Factory<? extends V> factory) {
-        return LazyMap.getLazyMap(map, factory);
+        return LazyMap.lazyMap(map, factory);
     }
 
     /**
@@ -1370,7 +1370,7 @@ public class MapUtils {
      * @throws IllegalArgumentException  if the Map or Transformer is null
      */
     public static <K, V> IterableMap<K, V> lazyMap(Map<K, V> map, Transformer<? super K, ? extends V> transformerFactory) {
-        return LazyMap.getLazyMap(map, transformerFactory);
+        return LazyMap.lazyMap(map, transformerFactory);
     }
 
     /**
@@ -1385,7 +1385,7 @@ public class MapUtils {
      * @throws IllegalArgumentException  if the Map is null
      */
     public static <K, V> OrderedMap<K, V> orderedMap(Map<K, V> map) {
-        return ListOrderedMap.decorate(map);
+        return ListOrderedMap.listOrderedMap(map);
     }
 
     /**
@@ -1398,7 +1398,7 @@ public class MapUtils {
      * @since Commons Collections 3.2
      */
     public static <K, V> MultiValueMap<K, V> multiValueMap(Map<K, ? super Collection<V>> map) {
-        return MultiValueMap.<K, V>decorate(map);
+        return MultiValueMap.<K, V>multiValueMap(map);
     }
 
     /**
@@ -1413,7 +1413,7 @@ public class MapUtils {
      * @since Commons Collections 3.2
      */
     public static <K, V, C extends Collection<V>> MultiValueMap<K, V> multiValueMap(Map<K, C> map, Class<C> collectionClass) {
-        return MultiValueMap.decorate(map, collectionClass);
+        return MultiValueMap.multiValueMap(map, collectionClass);
     }
 
     /**
@@ -1428,7 +1428,7 @@ public class MapUtils {
      * @since Commons Collections 3.2
      */
     public static <K, V, C extends Collection<V>> MultiValueMap<K, V> multiValueMap(Map<K, C> map, Factory<C> collectionFactory) {
-        return MultiValueMap.decorate(map, collectionFactory);
+        return MultiValueMap.multiValueMap(map, collectionFactory);
     }
 
     // SortedMap decorators
@@ -1470,7 +1470,7 @@ public class MapUtils {
      * @throws IllegalArgumentException  if the map is null
      */
     public static <K, V> SortedMap<K, V> unmodifiableSortedMap(SortedMap<K, V> map) {
-        return UnmodifiableSortedMap.decorate(map);
+        return UnmodifiableSortedMap.unmodifiableSortedMap(map);
     }
 
     /**
@@ -1490,7 +1490,7 @@ public class MapUtils {
      */
     public static <K, V> SortedMap<K, V> predicatedSortedMap(SortedMap<K, V> map,
             Predicate<? super K> keyPred, Predicate<? super V> valuePred) {
-        return PredicatedSortedMap.decorate(map, keyPred, valuePred);
+        return PredicatedSortedMap.predicatedSortedMap(map, keyPred, valuePred);
     }
 
     /**
@@ -1517,7 +1517,7 @@ public class MapUtils {
     public static <K, V> SortedMap<K, V> transformedSortedMap(SortedMap<K, V> map,
             Transformer<? super K, ? extends K> keyTransformer,
             Transformer<? super V, ? extends V> valueTransformer) {
-        return TransformedSortedMap.decorate(map, keyTransformer, valueTransformer);
+        return TransformedSortedMap.transformingSortedMap(map, keyTransformer, valueTransformer);
     }
 
     /**
@@ -1531,7 +1531,7 @@ public class MapUtils {
      * @throws IllegalArgumentException  if the SortedMap is null
      */
     public static <K, V> SortedMap<K, V> fixedSizeSortedMap(SortedMap<K, V> map) {
-        return FixedSizeSortedMap.decorate(map);
+        return FixedSizeSortedMap.fixedSizeSortedMap(map);
     }
 
     /**
@@ -1565,7 +1565,7 @@ public class MapUtils {
      */
     public static <K, V> SortedMap<K, V> lazySortedMap(SortedMap<K, V> map,
             Factory<? extends V> factory) {
-        return LazySortedMap.getLazySortedMap(map, factory);
+        return LazySortedMap.lazySortedMap(map, factory);
     }
 
     /**
@@ -1605,7 +1605,7 @@ public class MapUtils {
      */
     public static <K, V> SortedMap<K, V> lazySortedMap(SortedMap<K, V> map,
             Transformer<? super K, ? extends V> transformerFactory) {
-        return LazySortedMap.getLazySortedMap(map, transformerFactory);
+        return LazySortedMap.lazySortedMap(map, transformerFactory);
     }
 
     /**
diff --git a/src/java/org/apache/commons/collections/PredicateUtils.java b/src/java/org/apache/commons/collections/PredicateUtils.java
index 7ef71ea0e..4abda33b1 100644
--- a/src/java/org/apache/commons/collections/PredicateUtils.java
+++ b/src/java/org/apache/commons/collections/PredicateUtils.java
@@ -21,7 +21,9 @@ import java.util.Collection;
 import org.apache.commons.collections.functors.AllPredicate;
 import org.apache.commons.collections.functors.AndPredicate;
 import org.apache.commons.collections.functors.AnyPredicate;
+import org.apache.commons.collections.functors.EqualPredicate;
 import org.apache.commons.collections.functors.ExceptionPredicate;
+import org.apache.commons.collections.functors.FalsePredicate;
 import org.apache.commons.collections.functors.IdentityPredicate;
 import org.apache.commons.collections.functors.InstanceofPredicate;
 import org.apache.commons.collections.functors.InvokerTransformer;
@@ -31,10 +33,12 @@ import org.apache.commons.collections.functors.NotPredicate;
 import org.apache.commons.collections.functors.NullIsExceptionPredicate;
 import org.apache.commons.collections.functors.NullIsFalsePredicate;
 import org.apache.commons.collections.functors.NullIsTruePredicate;
+import org.apache.commons.collections.functors.NullPredicate;
 import org.apache.commons.collections.functors.OnePredicate;
 import org.apache.commons.collections.functors.OrPredicate;
 import org.apache.commons.collections.functors.TransformedPredicate;
 import org.apache.commons.collections.functors.TransformerPredicate;
+import org.apache.commons.collections.functors.TruePredicate;
 import org.apache.commons.collections.functors.UniquePredicate;
 
 /**
@@ -89,7 +93,46 @@ public class PredicateUtils {
      * @return the predicate
      */
     public static <T> Predicate<T> exceptionPredicate() {
-        return ExceptionPredicate.<T>getInstance();
+        return ExceptionPredicate.<T>exceptionPredicate();
+    }
+
+    /**
+     * Gets a Predicate that always returns true.
+     *
+     * @see org.apache.commons.collections.functors.TruePredicate
+     *
+     * @return the predicate
+     * @deprecated use {@link TruePredicate#truePredicate()} instead.
+     */
+    @Deprecated
+    public static <T> Predicate<T> truePredicate() {
+        return TruePredicate.truePredicate();
+    }
+
+    /**
+     * Gets a Predicate that always returns false.
+     *
+     * @see org.apache.commons.collections.functors.FalsePredicate
+     *
+     * @return the predicate
+     * @deprecated use {@link FalsePredicate#falsePredicate()} instead.
+     */
+    @Deprecated
+    public static <T> Predicate<T> falsePredicate() {
+        return FalsePredicate.<T> falsePredicate();
+    }
+
+    /**
+     * Gets a Predicate that checks if the input object passed in is null.
+     *
+     * @see org.apache.commons.collections.functors.NullPredicate
+     *
+     * @return the predicate
+     * @deprecated use {@link NullPredicate#nullPredicate()} instead
+     */
+    @Deprecated
+    public static <T> Predicate<T> nullPredicate() {
+        return NullPredicate.nullPredicate();
     }
 
     /**
@@ -100,7 +143,22 @@ public class PredicateUtils {
      * @return the predicate
      */
     public static <T> Predicate<T> notNullPredicate() {
-        return NotNullPredicate.<T>getInstance();
+        return NotNullPredicate.<T>notNullPredicate();
+    }
+
+    /**
+     * Creates a Predicate that checks if the input object is equal to the
+     * specified object using equals().
+     *
+     * @see org.apache.commons.collections.functors.EqualPredicate
+     *
+     * @param value  the value to compare against
+     * @return the predicate
+     * @deprecated use {@link EqualPredicate#equalPredicate(Object)} instead.
+     */
+    @Deprecated
+    public static <T> Predicate<T> equalPredicate(T value) {
+        return EqualPredicate.equalPredicate(value);
     }
 
     /**
@@ -113,7 +171,7 @@ public class PredicateUtils {
      * @return the predicate
      */
     public static <T> Predicate<T> identityPredicate(T value) {
-        return IdentityPredicate.<T>getInstance(value);
+        return IdentityPredicate.<T>identityPredicate(value);
     }
 
     /**
@@ -128,7 +186,7 @@ public class PredicateUtils {
      * @throws IllegalArgumentException if the class is null
      */
     public static Predicate<Object> instanceofPredicate(Class<?> type) {
-        return InstanceofPredicate.getInstance(type);
+        return InstanceofPredicate.instanceOfPredicate(type);
     }
 
     /**
@@ -144,7 +202,7 @@ public class PredicateUtils {
      */
     public static <T> Predicate<T> uniquePredicate() {
         // must return new instance each time
-        return UniquePredicate.<T>getInstance();
+        return UniquePredicate.<T>uniquePredicate();
     }
 
     /**
@@ -166,7 +224,7 @@ public class PredicateUtils {
      */
     public static <T> Predicate<T> invokerPredicate(String methodName){
         // reuse transformer as it has caching - this is lazy really, should have inner class here
-        return asPredicate(InvokerTransformer.<Object, Boolean>getInstance(methodName));
+        return asPredicate(InvokerTransformer.<Object, Boolean>invokerTransformer(methodName));
     }
 
     /**
@@ -191,7 +249,7 @@ public class PredicateUtils {
      */
     public static <T> Predicate<T> invokerPredicate(String methodName, Class<?>[] paramTypes, Object[] args){
         // reuse transformer as it has caching - this is lazy really, should have inner class here
-        return asPredicate(InvokerTransformer.<Object, Boolean>getInstance(methodName, paramTypes, args));
+        return asPredicate(InvokerTransformer.<Object, Boolean>invokerTransformer(methodName, paramTypes, args));
     }
 
     // Boolean combinations
@@ -209,7 +267,25 @@ public class PredicateUtils {
      * @throws IllegalArgumentException if either predicate is null
      */
     public static <T> Predicate<T> andPredicate(Predicate<? super T> predicate1, Predicate<? super T> predicate2) {
-        return AndPredicate.<T>getInstance(predicate1, predicate2);
+        return AndPredicate.<T>andPredicate(predicate1, predicate2);
+    }
+
+    /**
+     * Create a new Predicate that returns true only if all of the specified
+     * predicates are true.
+     * If the array of predicates is empty, then this predicate returns true.
+     *
+     * @see org.apache.commons.collections.functors.AllPredicate
+     *
+     * @param predicates  an array of predicates to check, may not be null
+     * @return the <code>all</code> predicate
+     * @throws IllegalArgumentException if the predicates array is null
+     * @throws IllegalArgumentException if any predicate in the array is null
+     * @deprecated use {@link AllPredicate#allPredicate(Predicate...)} instead.
+     */
+    @Deprecated
+    public static <T> Predicate<T> allPredicate(Predicate<? super T>[] predicates) {
+        return AllPredicate.allPredicate(predicates);
     }
 
     /**
@@ -240,7 +316,7 @@ public class PredicateUtils {
      * @throws IllegalArgumentException if either predicate is null
      */
     public static <T> Predicate<T> orPredicate(Predicate<? super T> predicate1, Predicate<? super T> predicate2) {
-        return OrPredicate.<T>getInstance(predicate1, predicate2);
+        return OrPredicate.<T>orPredicate(predicate1, predicate2);
     }
 
     /**
@@ -256,7 +332,7 @@ public class PredicateUtils {
      * @throws IllegalArgumentException if any predicate in the array is null
      */
     public static <T> Predicate<T> anyPredicate(Predicate<? super T>[] predicates) {
-        return AnyPredicate.getInstance(predicates);
+        return AnyPredicate.anyPredicate(predicates);
     }
 
     /**
@@ -272,7 +348,7 @@ public class PredicateUtils {
      * @throws IllegalArgumentException if any predicate in the collection is null
      */
     public static <T> Predicate<T> anyPredicate(Collection<? extends Predicate<T>> predicates) {
-        return AnyPredicate.getInstance(predicates);
+        return AnyPredicate.anyPredicate(predicates);
     }
 
     /**
@@ -304,7 +380,7 @@ public class PredicateUtils {
      * @throws IllegalArgumentException if any predicate in the array is null
      */
     public static <T> Predicate<T> onePredicate(Predicate<? super T>[] predicates) {
-        return OnePredicate.getInstance(predicates);
+        return OnePredicate.onePredicate(predicates);
     }
 
     /**
@@ -320,7 +396,7 @@ public class PredicateUtils {
      * @throws IllegalArgumentException if any predicate in the collection is null
      */
     public static <T> Predicate<T> onePredicate(Collection<Predicate<T>> predicates) {
-        return OnePredicate.getInstance(predicates);
+        return OnePredicate.onePredicate(predicates);
     }
 
     /**
@@ -352,7 +428,7 @@ public class PredicateUtils {
      * @throws IllegalArgumentException if any predicate in the array is null
      */
     public static <T> Predicate<T> nonePredicate(Predicate<? super T>[] predicates) {
-        return NonePredicate.getInstance(predicates);
+        return NonePredicate.nonePredicate(predicates);
     }
 
     /**
@@ -368,7 +444,7 @@ public class PredicateUtils {
      * @throws IllegalArgumentException if any predicate in the collection is null
      */
     public static <T> Predicate<T> nonePredicate(Collection<? extends Predicate<T>> predicates) {
-        return NonePredicate.getInstance(predicates);
+        return NonePredicate.nonePredicate(predicates);
     }
 
     /**
@@ -382,7 +458,7 @@ public class PredicateUtils {
      * @throws IllegalArgumentException if the predicate is null
      */
     public static <T> Predicate<T> notPredicate(Predicate<? super T> predicate) {
-        return NotPredicate.getInstance(predicate);
+        return NotPredicate.notPredicate(predicate);
     }
 
     // Adaptors
@@ -400,7 +476,7 @@ public class PredicateUtils {
      * @throws IllegalArgumentException if the transformer is null
      */
     public static <T> Predicate<T> asPredicate(Transformer<? super T, Boolean> transformer) {
-        return TransformerPredicate.getInstance(transformer);
+        return TransformerPredicate.transformerPredicate(transformer);
     }
 
     // Null handlers
@@ -418,7 +494,7 @@ public class PredicateUtils {
      * @throws IllegalArgumentException if the predicate is null.
      */
     public static <T> Predicate<T> nullIsExceptionPredicate(Predicate<? super T> predicate){
-        return NullIsExceptionPredicate.getInstance(predicate);
+        return NullIsExceptionPredicate.nullIsExceptionPredicate(predicate);
     }
 
     /**
@@ -433,7 +509,7 @@ public class PredicateUtils {
      * @throws IllegalArgumentException if the predicate is null.
      */
     public static <T> Predicate<T> nullIsFalsePredicate(Predicate<? super T> predicate){
-        return NullIsFalsePredicate.getInstance(predicate);
+        return NullIsFalsePredicate.nullIsFalsePredicate(predicate);
     }
 
     /**
@@ -448,7 +524,7 @@ public class PredicateUtils {
      * @throws IllegalArgumentException if the predicate is null.
      */
     public static <T> Predicate<T> nullIsTruePredicate(Predicate<? super T> predicate){
-        return NullIsTruePredicate.getInstance(predicate);
+        return NullIsTruePredicate.nullIsTruePredicate(predicate);
     }
 
     // Transformed
@@ -467,7 +543,7 @@ public class PredicateUtils {
      */
     public static <T> Predicate<T> transformedPredicate(
             Transformer<? super T, ? extends T> transformer, Predicate<? super T> predicate) {
-        return TransformedPredicate.<T>getInstance(transformer, predicate);
+        return TransformedPredicate.<T>transformedPredicate(transformer, predicate);
     }
 
 }
diff --git a/src/java/org/apache/commons/collections/SetUtils.java b/src/java/org/apache/commons/collections/SetUtils.java
index f0cf5b39e..4ff60ecd2 100644
--- a/src/java/org/apache/commons/collections/SetUtils.java
+++ b/src/java/org/apache/commons/collections/SetUtils.java
@@ -66,7 +66,7 @@ public class SetUtils {
      * An empty unmodifiable sorted set.
      * This is not provided in the JDK.
      */
-    public static final SortedSet<?> EMPTY_SORTED_SET = UnmodifiableSortedSet.decorate(new TreeSet<Object>());
+    public static final SortedSet<?> EMPTY_SORTED_SET = UnmodifiableSortedSet.unmodifiableSortedSet(new TreeSet<Object>());
 
     /**
      * Get a typed empty unmodifiable sorted set.
@@ -174,7 +174,7 @@ public class SetUtils {
      * @throws IllegalArgumentException  if the set is null
      */
     public static <T> Set<T> synchronizedSet(Set<T> set) {
-        return SynchronizedSet.decorate(set);
+        return SynchronizedSet.synchronizedSet(set);
     }
 
     /**
@@ -187,7 +187,7 @@ public class SetUtils {
      * @throws IllegalArgumentException  if the set is null
      */
     public static <E> Set<E> unmodifiableSet(Set<E> set) {
-        return UnmodifiableSet.decorate(set);
+        return UnmodifiableSet.unmodifiableSet(set);
     }
 
     /**
@@ -204,7 +204,7 @@ public class SetUtils {
      * @throws IllegalArgumentException  if the Set or Predicate is null
      */
     public static <T> Set<T> predicatedSet(Set<T> set, Predicate<? super T> predicate) {
-        return PredicatedSet.decorate(set, predicate);
+        return PredicatedSet.predicatedSet(set, predicate);
     }
 
     /**
@@ -223,7 +223,7 @@ public class SetUtils {
      * @throws IllegalArgumentException  if the Set or Transformer is null
      */
     public static <E> Set<E> transformedSet(Set<E> set, Transformer<? super E, ? extends E> transformer) {
-        return TransformedSet.decorate(set, transformer);
+        return TransformedSet.transformingSet(set, transformer);
     }
     
     /**
@@ -238,7 +238,7 @@ public class SetUtils {
      * @throws IllegalArgumentException  if the Set is null
      */
     public static <E> Set<E> orderedSet(Set<E> set) {
-        return ListOrderedSet.decorate(set);
+        return ListOrderedSet.listOrderedSet(set);
     }
     
     //-----------------------------------------------------------------------
@@ -265,7 +265,7 @@ public class SetUtils {
      * @throws IllegalArgumentException  if the set is null
      */
     public static <T> SortedSet<T> synchronizedSortedSet(SortedSet<T> set) {
-        return SynchronizedSortedSet.decorate(set);
+        return SynchronizedSortedSet.synchronizedSortedSet(set);
     }
 
     /**
@@ -278,7 +278,7 @@ public class SetUtils {
      * @throws IllegalArgumentException  if the set is null
      */
     public static <T> SortedSet<T> unmodifiableSortedSet(SortedSet<T> set) {
-        return UnmodifiableSortedSet.decorate(set);
+        return UnmodifiableSortedSet.unmodifiableSortedSet(set);
     }
 
     /**
@@ -295,7 +295,7 @@ public class SetUtils {
      * @throws IllegalArgumentException  if the Set or Predicate is null
      */
     public static <T> SortedSet<T> predicatedSortedSet(SortedSet<T> set, Predicate<? super T> predicate) {
-        return PredicatedSortedSet.decorate(set, predicate);
+        return PredicatedSortedSet.predicatedSortedSet(set, predicate);
     }
 
     /**
@@ -314,7 +314,7 @@ public class SetUtils {
      * @throws IllegalArgumentException  if the Set or Transformer is null
      */
     public static <E> SortedSet<E> transformedSortedSet(SortedSet<E> set, Transformer<? super E, ? extends E> transformer) {
-        return TransformedSortedSet.decorate(set, transformer);
+        return TransformedSortedSet.transformingSortedSet(set, transformer);
     }
     
 }
diff --git a/src/java/org/apache/commons/collections/TransformerUtils.java b/src/java/org/apache/commons/collections/TransformerUtils.java
index 9ba91f190..59866f065 100644
--- a/src/java/org/apache/commons/collections/TransformerUtils.java
+++ b/src/java/org/apache/commons/collections/TransformerUtils.java
@@ -80,7 +80,7 @@ public class TransformerUtils {
      * @return the transformer
      */
     public static <I, O> Transformer<I, O> exceptionTransformer() {
-        return ExceptionTransformer.<I, O>getInstance();
+        return ExceptionTransformer.<I, O>exceptionTransformer();
     }
 
     /**
@@ -91,7 +91,7 @@ public class TransformerUtils {
      * @return the transformer
      */
     public static <I, O> Transformer<I, O> nullTransformer() {
-        return ConstantTransformer.<I, O>getNullInstance();
+        return ConstantTransformer.<I, O>nullTransformer();
     }
 
     /**
@@ -104,7 +104,7 @@ public class TransformerUtils {
      * @return the transformer
      */
     public static <T> Transformer<T, T> nopTransformer() {
-        return NOPTransformer.<T>getInstance();
+        return NOPTransformer.<T>nopTransformer();
     }
 
     /**
@@ -122,7 +122,7 @@ public class TransformerUtils {
      * @return the transformer
      */
     public static <T> Transformer<T, T> cloneTransformer() {
-        return CloneTransformer.<T>getInstance();
+        return CloneTransformer.<T>cloneTransformer();
     }
 
     /**
@@ -135,7 +135,7 @@ public class TransformerUtils {
      * @return the transformer.
      */
     public static <I, O> Transformer<I, O> constantTransformer(O constantToReturn) {
-        return ConstantTransformer.getInstance(constantToReturn);
+        return ConstantTransformer.constantTransformer(constantToReturn);
     }
 
     /**
@@ -149,7 +149,7 @@ public class TransformerUtils {
      * @throws IllegalArgumentException if the closure is null
      */
     public static <T> Transformer<T, T> asTransformer(Closure<? super T> closure) {
-        return ClosureTransformer.getInstance(closure);
+        return ClosureTransformer.closureTransformer(closure);
     }
 
     /**
@@ -163,7 +163,7 @@ public class TransformerUtils {
      * @throws IllegalArgumentException if the predicate is null
      */
     public static <T> Transformer<T, Boolean> asTransformer(Predicate<? super T> predicate) {
-        return PredicateTransformer.getInstance(predicate);
+        return PredicateTransformer.predicateTransformer(predicate);
     }
 
     /**
@@ -177,7 +177,7 @@ public class TransformerUtils {
      * @throws IllegalArgumentException if the factory is null
      */
     public static <I, O> Transformer<I, O> asTransformer(Factory<? extends O> factory) {
-        return FactoryTransformer.getInstance(factory);
+        return FactoryTransformer.factoryTransformer(factory);
     }
 
     /**
@@ -191,10 +191,11 @@ public class TransformerUtils {
      * @return the transformer
      * @throws IllegalArgumentException if either transformer is null
      */
-    public static <T> Transformer<T, T> chainedTransformer(
+    @SuppressWarnings("unchecked")
+	public static <T> Transformer<T, T> chainedTransformer(
             Transformer<? super T, ? extends T> transformer1,
             Transformer<? super T, ? extends T> transformer2) {
-        return ChainedTransformer.<T>getInstance(transformer1, transformer2);
+        return ChainedTransformer.<T> chainedTransformer(transformer1, transformer2);
     }
 
     /**
@@ -209,7 +210,7 @@ public class TransformerUtils {
      * @throws IllegalArgumentException if any transformer in the array is null
      */
     public static <T> Transformer<T, T> chainedTransformer(Transformer<? super T, ? extends T>[] transformers) {
-        return ChainedTransformer.getInstance(transformers);
+        return ChainedTransformer.chainedTransformer(transformers);
     }
 
     /**
@@ -226,7 +227,7 @@ public class TransformerUtils {
      */
     public static <T> Transformer<T, T> chainedTransformer(
             Collection<? extends Transformer<T, T>> transformers) {
-        return ChainedTransformer.getInstance(transformers);
+        return ChainedTransformer.chainedTransformer(transformers);
     }
 
     /**
@@ -246,7 +247,7 @@ public class TransformerUtils {
     public static <I, O> Transformer<I, O> switchTransformer(Predicate<? super I> predicate,
             Transformer<? super I, ? extends O> trueTransformer,
             Transformer<? super I, ? extends O> falseTransformer) {
-        return SwitchTransformer.getInstance(new Predicate[] { predicate },
+        return SwitchTransformer.switchTransformer(new Predicate[] { predicate },
                 new Transformer[] { trueTransformer }, falseTransformer);
     }
 
@@ -268,7 +269,7 @@ public class TransformerUtils {
      */
     public static <I, O> Transformer<I, O> switchTransformer(Predicate<? super I>[] predicates,
             Transformer<? super I, ? extends O>[] transformers) {
-        return SwitchTransformer.<I, O>getInstance(predicates, transformers, null);
+        return SwitchTransformer.<I, O>switchTransformer(predicates, transformers, null);
     }
 
     /**
@@ -292,7 +293,7 @@ public class TransformerUtils {
     public static <I, O> Transformer<I, O> switchTransformer(Predicate<? super I>[] predicates,
             Transformer<? super I, ? extends O>[] transformers,
             Transformer<? super I, ? extends O> defaultTransformer) {
-        return SwitchTransformer.<I, O>getInstance(predicates, transformers, defaultTransformer);
+        return SwitchTransformer.<I, O>switchTransformer(predicates, transformers, defaultTransformer);
     }
 
     /**
@@ -318,7 +319,7 @@ public class TransformerUtils {
      */
     public static <I, O> Transformer<I, O> switchTransformer(
             Map<Predicate<I>, Transformer<I, O>> predicatesAndTransformers) {
-        return SwitchTransformer.<I, O>getInstance(predicatesAndTransformers);
+        return SwitchTransformer.<I, O>switchTransformer(predicatesAndTransformers);
     }
 
     /**
@@ -365,7 +366,7 @@ public class TransformerUtils {
      * @return the transformer
      */
     public static <T> Transformer<Class<? extends T>, T> instantiateTransformer() {
-        return InstantiateTransformer.<T>getInstance();
+        return InstantiateTransformer.<T>instantiateTransformer();
     }
 
     /** 
@@ -382,7 +383,7 @@ public class TransformerUtils {
      */
     public static <T> Transformer<Class<? extends T>, T> instantiateTransformer(
             Class<?>[] paramTypes, Object[] args) {
-        return InstantiateTransformer.<T>getInstance(paramTypes, args);
+        return InstantiateTransformer.<T>instantiateTransformer(paramTypes, args);
     }
 
     /** 
@@ -396,7 +397,7 @@ public class TransformerUtils {
      * @throws IllegalArgumentException if the map is null
      */
     public static <I, O> Transformer<I, O> mapTransformer(Map<? super I, ? extends O> map) {
-        return MapTransformer.getInstance(map);
+        return MapTransformer.mapTransformer(map);
     }
 
     /**
@@ -415,7 +416,7 @@ public class TransformerUtils {
      * @throws IllegalArgumentException if the methodName is null.
      */
     public static <I, O> Transformer<I, O> invokerTransformer(String methodName){
-        return InvokerTransformer.<I, O>getInstance(methodName, null, null);
+        return InvokerTransformer.<I, O>invokerTransformer(methodName, null, null);
     }
 
     /**
@@ -433,7 +434,7 @@ public class TransformerUtils {
      * @throws IllegalArgumentException if the paramTypes and args don't match
      */
     public static <I, O> Transformer<I, O> invokerTransformer(String methodName, Class<?>[] paramTypes, Object[] args){
-        return InvokerTransformer.<I, O>getInstance(methodName, paramTypes, args);
+        return InvokerTransformer.<I, O>invokerTransformer(methodName, paramTypes, args);
     }
 
     /**
@@ -446,7 +447,7 @@ public class TransformerUtils {
      * @return the transformer
      */
     public static <T> Transformer<T, String> stringValueTransformer() {
-        return StringValueTransformer.<T>getInstance();
+        return StringValueTransformer.<T>stringValueTransformer();
     }
     
 }
diff --git a/src/java/org/apache/commons/collections/bag/AbstractMapBag.java b/src/java/org/apache/commons/collections/bag/AbstractMapBag.java
index e63ac9963..f568f266c 100644
--- a/src/java/org/apache/commons/collections/bag/AbstractMapBag.java
+++ b/src/java/org/apache/commons/collections/bag/AbstractMapBag.java
@@ -482,7 +482,7 @@ public abstract class AbstractMapBag<E> implements Bag<E> {
      */
     public Set<E> uniqueSet() {
         if (uniqueSet == null) {
-            uniqueSet = UnmodifiableSet.<E> decorate(map.keySet());
+            uniqueSet = UnmodifiableSet.<E> unmodifiableSet(map.keySet());
         }
         return uniqueSet;
     }
diff --git a/src/java/org/apache/commons/collections/bag/PredicatedBag.java b/src/java/org/apache/commons/collections/bag/PredicatedBag.java
index e1e1def29..097fa0489 100644
--- a/src/java/org/apache/commons/collections/bag/PredicatedBag.java
+++ b/src/java/org/apache/commons/collections/bag/PredicatedBag.java
@@ -59,7 +59,7 @@ public class PredicatedBag<E>
      * @throws IllegalArgumentException if bag or predicate is null
      * @throws IllegalArgumentException if the bag contains invalid elements
      */
-    public static <T> Bag<T> decorate(Bag<T> bag, Predicate<? super T> predicate) {
+    public static <T> Bag<T> predicatedBag(Bag<T> bag, Predicate<? super T> predicate) {
         return new PredicatedBag<T>(bag, predicate);
     }
 
diff --git a/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java b/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java
index c609e75f4..9600218f2 100644
--- a/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java
+++ b/src/java/org/apache/commons/collections/bag/PredicatedSortedBag.java
@@ -58,7 +58,7 @@ public class PredicatedSortedBag<E>
      * @throws IllegalArgumentException if bag or predicate is null
      * @throws IllegalArgumentException if the bag contains invalid elements
      */
-    public static <T> SortedBag<T> decorate(SortedBag<T> bag, Predicate<? super T> predicate) {
+    public static <T> SortedBag<T> predicatedSortedBag(SortedBag<T> bag, Predicate<? super T> predicate) {
         return new PredicatedSortedBag<T>(bag, predicate);
     }
 
diff --git a/src/java/org/apache/commons/collections/bag/SynchronizedBag.java b/src/java/org/apache/commons/collections/bag/SynchronizedBag.java
index 1df1cf588..6454220c1 100644
--- a/src/java/org/apache/commons/collections/bag/SynchronizedBag.java
+++ b/src/java/org/apache/commons/collections/bag/SynchronizedBag.java
@@ -49,7 +49,7 @@ public class SynchronizedBag<E>
      * @return a new synchronized Bag
      * @throws IllegalArgumentException if bag is null
      */
-    public static <T> Bag<T> decorate(Bag<T> bag) {
+    public static <T> Bag<T> synchronizedBag(Bag<T> bag) {
         return new SynchronizedBag<T>(bag);
     }
     
diff --git a/src/java/org/apache/commons/collections/bag/SynchronizedSortedBag.java b/src/java/org/apache/commons/collections/bag/SynchronizedSortedBag.java
index 394050fad..464131d46 100644
--- a/src/java/org/apache/commons/collections/bag/SynchronizedSortedBag.java
+++ b/src/java/org/apache/commons/collections/bag/SynchronizedSortedBag.java
@@ -48,7 +48,7 @@ public class SynchronizedSortedBag<E>
      * @return a new synchronized SortedBag
      * @throws IllegalArgumentException if bag is null
      */
-    public static <E> SortedBag<E> decorate(SortedBag<E> bag) {
+    public static <E> SortedBag<E> synchronizedSortedBag(SortedBag<E> bag) {
         return new SynchronizedSortedBag<E>(bag);
     }
     
diff --git a/src/java/org/apache/commons/collections/bag/TransformedBag.java b/src/java/org/apache/commons/collections/bag/TransformedBag.java
index 6ee203d10..85ec0348f 100644
--- a/src/java/org/apache/commons/collections/bag/TransformedBag.java
+++ b/src/java/org/apache/commons/collections/bag/TransformedBag.java
@@ -49,14 +49,14 @@ public class TransformedBag<E>
      * <p>
      * If there are any elements already in the bag being decorated, they
      * are NOT transformed.
-     * Constrast this with {@link #decorateTransform}.
+     * Contrast this with {@link #transformedBag(Bag, Transformer)}.
      * 
      * @param bag  the bag to decorate, must not be null
      * @param transformer  the transformer to use for conversion, must not be null
      * @return a new transformed Bag
      * @throws IllegalArgumentException if bag or transformer is null
      */
-    public static <E> Bag<E> decorate(Bag<E> bag, Transformer<? super E, ? extends E> transformer) {
+    public static <E> Bag<E> transformingBag(Bag<E> bag, Transformer<? super E, ? extends E> transformer) {
         return new TransformedBag<E>(bag, transformer);
     }
     
@@ -66,7 +66,7 @@ public class TransformedBag<E>
      * <p>
      * If there are any elements already in the bag being decorated, they
      * will be transformed by this method.
-     * Constrast this with {@link #decorate}.
+     * Contrast this with {@link #transformingBag(Bag, Transformer)}.
      * 
      * @param bag  the bag to decorate, must not be null
      * @param transformer  the transformer to use for conversion, must not be null
@@ -74,13 +74,13 @@ public class TransformedBag<E>
      * @throws IllegalArgumentException if bag or transformer is null
      * @since Commons Collections 3.3
      */
-    public static <E> Bag<E> decorateTransform(Bag<E> bag, Transformer<? super E, ? extends E> transformer) {
+    public static <E> Bag<E> transformedBag(Bag<E> bag, Transformer<? super E, ? extends E> transformer) {
         TransformedBag<E> decorated = new TransformedBag<E>(bag, transformer);
         if (transformer != null && bag != null && bag.size() > 0) {
             @SuppressWarnings("unchecked") // Bag is of type E
             E[] values = (E[]) bag.toArray();
             bag.clear();
-            for(int i=0; i<values.length; i++) {
+			for (int i = 0; i < values.length; i++) {
                 decorated.decorated().add(transformer.transform(values[i]));
             }
         }
@@ -127,7 +127,7 @@ public class TransformedBag<E>
 
     public Set<E> uniqueSet() {
         Set<E> set = getBag().uniqueSet();
-        return TransformedSet.<E>decorate(set, transformer);
+        return TransformedSet.<E>transformingSet(set, transformer);
     }
 
 }
diff --git a/src/java/org/apache/commons/collections/bag/TransformedSortedBag.java b/src/java/org/apache/commons/collections/bag/TransformedSortedBag.java
index 8d5492994..0b47e17f9 100644
--- a/src/java/org/apache/commons/collections/bag/TransformedSortedBag.java
+++ b/src/java/org/apache/commons/collections/bag/TransformedSortedBag.java
@@ -47,14 +47,14 @@ public class TransformedSortedBag<E>
      * <p>
      * If there are any elements already in the bag being decorated, they
      * are NOT transformed.
-     * Constrast this with {@link #decorateTransform}.
+     * Contrast this with {@link #transformedSortedBag(SortedBag, Transformer)}.
      * 
      * @param bag  the bag to decorate, must not be null
      * @param transformer  the transformer to use for conversion, must not be null
      * @return a new transformed SortedBag
      * @throws IllegalArgumentException if bag or transformer is null
      */
-    public static <E> SortedBag<E> decorate(SortedBag<E> bag, Transformer<? super E, ? extends E> transformer) {
+    public static <E> SortedBag<E> transformingSortedBag(SortedBag<E> bag, Transformer<? super E, ? extends E> transformer) {
         return new TransformedSortedBag<E>(bag, transformer);
     }
     
@@ -64,7 +64,7 @@ public class TransformedSortedBag<E>
      * <p>
      * If there are any elements already in the bag being decorated, they
      * will be transformed by this method.
-     * Constrast this with {@link #decorate}.
+     * Contrast this with {@link #transformingSortedBag(SortedBag, Transformer)}.
      * 
      * @param bag  the bag to decorate, must not be null
      * @param transformer  the transformer to use for conversion, must not be null
@@ -72,7 +72,7 @@ public class TransformedSortedBag<E>
      * @throws IllegalArgumentException if bag or transformer is null
      * @since Commons Collections 3.3
      */
-    public static <E> SortedBag<E>  decorateTransform(SortedBag<E> bag, Transformer<? super E, ? extends E> transformer) {
+    public static <E> SortedBag<E> transformedSortedBag(SortedBag<E> bag, Transformer<? super E, ? extends E> transformer) {
         TransformedSortedBag<E>  decorated = new TransformedSortedBag<E>(bag, transformer);
         if (transformer != null && bag != null && bag.size() > 0) {
             @SuppressWarnings("unchecked") // bag is type E
diff --git a/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java b/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java
index 60de96175..06b7d577f 100644
--- a/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java
+++ b/src/java/org/apache/commons/collections/bag/UnmodifiableBag.java
@@ -56,7 +56,7 @@ public final class UnmodifiableBag<E>
      * @return an unmodifiable Bag
      * @throws IllegalArgumentException if bag is null
      */
-    public static <E> Bag<E> decorate(Bag<E> bag) {
+    public static <E> Bag<E> unmodifiableBag(Bag<E> bag) {
         if (bag instanceof Unmodifiable) {
             return bag;
         }
@@ -102,7 +102,8 @@ public final class UnmodifiableBag<E>
     //-----------------------------------------------------------------------
     @Override
     public Iterator<E> iterator() {
-        return UnmodifiableIterator.<E>decorate(decorated().iterator());
+		return UnmodifiableIterator.<E> unmodifiableIterator(decorated()
+				.iterator());
     }
 
     @Override
@@ -149,7 +150,7 @@ public final class UnmodifiableBag<E>
     @Override
     public Set<E> uniqueSet() {
         Set<E> set = decorated().uniqueSet();
-        return UnmodifiableSet.<E>decorate(set);
+		return UnmodifiableSet.<E> unmodifiableSet(set);
     }
 
 }
diff --git a/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java b/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java
index 1c812bbcc..35c4a8d7a 100644
--- a/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java
+++ b/src/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java
@@ -56,7 +56,7 @@ public final class UnmodifiableSortedBag<E>
      * @return an unmodifiable SortedBag
      * @throws IllegalArgumentException if bag is null
      */
-    public static <E> SortedBag<E> decorate(SortedBag<E> bag) {
+    public static <E> SortedBag<E> unmodifiableSortedBag(SortedBag<E> bag) {
         if (bag instanceof Unmodifiable) {
             return bag;
         }
@@ -102,7 +102,7 @@ public final class UnmodifiableSortedBag<E>
     //-----------------------------------------------------------------------
     @Override
     public Iterator<E> iterator() {
-        return UnmodifiableIterator.decorate(decorated().iterator());
+        return UnmodifiableIterator.unmodifiableIterator(decorated().iterator());
     }
 
     @Override
@@ -149,7 +149,7 @@ public final class UnmodifiableSortedBag<E>
     @Override
     public Set<E> uniqueSet() {
         Set<E> set = decorated().uniqueSet();
-        return UnmodifiableSet.decorate(set);
+        return UnmodifiableSet.unmodifiableSet(set);
     }
 
 }
diff --git a/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java b/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
index f583f50e4..82c1bd9c2 100644
--- a/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
+++ b/src/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
@@ -422,7 +422,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>> imple
      */
     public OrderedMapIterator<K, V> mapIterator() {
         if (isEmpty()) {
-            return EmptyOrderedMapIterator.<K, V>getInstance();
+            return EmptyOrderedMapIterator.<K, V>emptyOrderedMapIterator();
         }
         return new ViewMapIterator(KEY);
     }
@@ -2110,7 +2110,7 @@ public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>> imple
 
         public OrderedMapIterator<V, K> mapIterator() {
             if (isEmpty()) {
-                return EmptyOrderedMapIterator.<V, K>getInstance();
+                return EmptyOrderedMapIterator.<V, K>emptyOrderedMapIterator();
             }
             return new InverseViewMapIterator(VALUE);
         }
diff --git a/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java b/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java
index f64086a8b..274a9aaba 100644
--- a/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java
+++ b/src/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java
@@ -53,7 +53,7 @@ public final class UnmodifiableBidiMap<K, V>
      * @return an unmodifiable BidiMap
      * @throws IllegalArgumentException if map is null
      */
-    public static <K, V> BidiMap<K, V> decorate(BidiMap<K, V> map) {
+    public static <K, V> BidiMap<K, V> unmodifiableBidiMap(BidiMap<K, V> map) {
         if (map instanceof Unmodifiable) {
             return map;
         }
@@ -95,19 +95,19 @@ public final class UnmodifiableBidiMap<K, V>
     @Override
     public Set<Map.Entry<K, V>> entrySet() {
         Set<Map.Entry<K, V>> set = super.entrySet();
-        return UnmodifiableEntrySet.decorate(set);
+        return UnmodifiableEntrySet.unmodifiableEntrySet(set);
     }
 
     @Override
     public Set<K> keySet() {
         Set<K> set = super.keySet();
-        return UnmodifiableSet.decorate(set);
+        return UnmodifiableSet.unmodifiableSet(set);
     }
 
     @Override
     public Collection<V> values() {
         Collection<V> coll = super.values();
-        return UnmodifiableCollection.decorate(coll);
+        return UnmodifiableCollection.unmodifiableCollection(coll);
     }
 
     //-----------------------------------------------------------------------
@@ -119,7 +119,7 @@ public final class UnmodifiableBidiMap<K, V>
     @Override
     public MapIterator<K, V> mapIterator() {
         MapIterator<K, V> it = decorated().mapIterator();
-        return UnmodifiableMapIterator.decorate(it);
+        return UnmodifiableMapIterator.unmodifiableMapIterator(it);
     }
 
     @Override
diff --git a/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java b/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java
index 6b8f0b3b1..691481ce9 100644
--- a/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java
+++ b/src/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java
@@ -53,7 +53,7 @@ public final class UnmodifiableOrderedBidiMap<K, V>
      * @return an unmodifiable OrderedBidiMap
      * @throws IllegalArgumentException if map is null
      */
-    public static <K, V> OrderedBidiMap<K, V> decorate(OrderedBidiMap<K, V> map) {
+    public static <K, V> OrderedBidiMap<K, V> unmodifiableOrderedBidiMap(OrderedBidiMap<K, V> map) {
         if (map instanceof Unmodifiable) {
             return map;
         }
@@ -95,19 +95,19 @@ public final class UnmodifiableOrderedBidiMap<K, V>
     @Override
     public Set<Map.Entry<K, V>> entrySet() {
         Set<Map.Entry<K, V>> set = super.entrySet();
-        return UnmodifiableEntrySet.decorate(set);
+        return UnmodifiableEntrySet.unmodifiableEntrySet(set);
     }
 
     @Override
     public Set<K> keySet() {
         Set<K> set = super.keySet();
-        return UnmodifiableSet.decorate(set);
+        return UnmodifiableSet.unmodifiableSet(set);
     }
 
     @Override
     public Collection<V> values() {
         Collection<V> coll = super.values();
-        return UnmodifiableCollection.decorate(coll);
+        return UnmodifiableCollection.unmodifiableCollection(coll);
     }
 
     //-----------------------------------------------------------------------
@@ -125,7 +125,7 @@ public final class UnmodifiableOrderedBidiMap<K, V>
     @Override
     public OrderedMapIterator<K, V> mapIterator() {
         OrderedMapIterator<K, V> it = decorated().mapIterator();
-        return UnmodifiableOrderedMapIterator.decorate(it);
+        return UnmodifiableOrderedMapIterator.unmodifiableOrderedMapIterator(it);
     }
 
     public OrderedBidiMap<V, K> inverseOrderedBidiMap() {
diff --git a/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java b/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java
index 79276be75..14b785fef 100644
--- a/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java
+++ b/src/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java
@@ -55,7 +55,7 @@ public final class UnmodifiableSortedBidiMap<K, V>
      * @return an unmodifiable SortedBidiMap
      * @throws IllegalArgumentException if map is null
      */
-    public static <K, V> SortedBidiMap<K, V> decorate(SortedBidiMap<K, V> map) {
+    public static <K, V> SortedBidiMap<K, V> unmodifiableSortedBidiMap(SortedBidiMap<K, V> map) {
         if (map instanceof Unmodifiable) {
             return map;
         }
@@ -97,19 +97,19 @@ public final class UnmodifiableSortedBidiMap<K, V>
     @Override
     public Set<Map.Entry<K, V>> entrySet() {
         Set<Map.Entry<K, V>> set = super.entrySet();
-        return UnmodifiableEntrySet.decorate(set);
+        return UnmodifiableEntrySet.unmodifiableEntrySet(set);
     }
 
     @Override
     public Set<K> keySet() {
         Set<K> set = super.keySet();
-        return UnmodifiableSet.decorate(set);
+        return UnmodifiableSet.unmodifiableSet(set);
     }
 
     @Override
     public Collection<V> values() {
         Collection<V> coll = super.values();
-        return UnmodifiableCollection.decorate(coll);
+        return UnmodifiableCollection.unmodifiableCollection(coll);
     }
 
     //-----------------------------------------------------------------------
@@ -122,7 +122,7 @@ public final class UnmodifiableSortedBidiMap<K, V>
     @Override
     public OrderedMapIterator<K, V> mapIterator() {
         OrderedMapIterator<K, V> it = decorated().mapIterator();
-        return UnmodifiableOrderedMapIterator.decorate(it);
+        return UnmodifiableOrderedMapIterator.unmodifiableOrderedMapIterator(it);
     }
 
     //-----------------------------------------------------------------------
@@ -138,19 +138,19 @@ public final class UnmodifiableSortedBidiMap<K, V>
     @Override
     public SortedMap<K, V> subMap(K fromKey, K toKey) {
         SortedMap<K, V> sm = decorated().subMap(fromKey, toKey);
-        return UnmodifiableSortedMap.decorate(sm);
+        return UnmodifiableSortedMap.unmodifiableSortedMap(sm);
     }
 
     @Override
     public SortedMap<K, V> headMap(K toKey) {
         SortedMap<K, V> sm = decorated().headMap(toKey);
-        return UnmodifiableSortedMap.decorate(sm);
+        return UnmodifiableSortedMap.unmodifiableSortedMap(sm);
     }
 
     @Override
     public SortedMap<K, V> tailMap(K fromKey) {
         SortedMap<K, V> sm = decorated().tailMap(fromKey);
-        return UnmodifiableSortedMap.decorate(sm);
+        return UnmodifiableSortedMap.unmodifiableSortedMap(sm);
     }
 
 }
diff --git a/src/java/org/apache/commons/collections/buffer/BlockingBuffer.java b/src/java/org/apache/commons/collections/buffer/BlockingBuffer.java
index 6381c4c28..4fffca3eb 100644
--- a/src/java/org/apache/commons/collections/buffer/BlockingBuffer.java
+++ b/src/java/org/apache/commons/collections/buffer/BlockingBuffer.java
@@ -64,7 +64,7 @@ public class BlockingBuffer<E> extends SynchronizedBuffer<E> {
      * @return a new blocking Buffer
      * @throws IllegalArgumentException if buffer is null
      */
-    public static <T> Buffer<T> decorate(Buffer<T> buffer) {
+    public static <T> Buffer<T> blockingBuffer(Buffer<T> buffer) {
         return new BlockingBuffer<T>(buffer);
     }
 
@@ -77,7 +77,7 @@ public class BlockingBuffer<E> extends SynchronizedBuffer<E> {
      * @throws IllegalArgumentException if the buffer is null
      * @since Commons Collections 3.2
      */
-    public static <T> Buffer<T> decorate(Buffer<T> buffer, long timeoutMillis) {
+    public static <T> Buffer<T> blockingBuffer(Buffer<T> buffer, long timeoutMillis) {
         return new BlockingBuffer<T>(buffer, timeoutMillis);
     }
 
diff --git a/src/java/org/apache/commons/collections/buffer/BoundedBuffer.java b/src/java/org/apache/commons/collections/buffer/BoundedBuffer.java
index 92c1955b4..304e0f19c 100644
--- a/src/java/org/apache/commons/collections/buffer/BoundedBuffer.java
+++ b/src/java/org/apache/commons/collections/buffer/BoundedBuffer.java
@@ -67,7 +67,7 @@ public class BoundedBuffer<E> extends SynchronizedBuffer<E> implements BoundedCo
      * @throws IllegalArgumentException if the buffer is null
      * @throws IllegalArgumentException if the maximum size is zero or less
      */
-    public static <E> BoundedBuffer<E> decorate(Buffer<E> buffer, int maximumSize) {
+    public static <E> BoundedBuffer<E> boundedBuffer(Buffer<E> buffer, int maximumSize) {
         return new BoundedBuffer<E>(buffer, maximumSize, 0L);
     }
 
@@ -82,7 +82,7 @@ public class BoundedBuffer<E> extends SynchronizedBuffer<E> implements BoundedCo
      * @throws IllegalArgumentException if the buffer is null
      * @throws IllegalArgumentException if the maximum size is zero or less
      */
-    public static <E> BoundedBuffer<E> decorate(Buffer<E> buffer, int maximumSize, long timeout) {
+    public static <E> BoundedBuffer<E> boundedBuffer(Buffer<E> buffer, int maximumSize, long timeout) {
         return new BoundedBuffer<E>(buffer, maximumSize, timeout);
     }
 
diff --git a/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java b/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java
index a8172c7ff..9b8ec7fb2 100644
--- a/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java
+++ b/src/java/org/apache/commons/collections/buffer/PredicatedBuffer.java
@@ -56,7 +56,7 @@ public class PredicatedBuffer<E> extends PredicatedCollection<E> implements Buff
      * @throws IllegalArgumentException if buffer or predicate is null
      * @throws IllegalArgumentException if the buffer contains invalid elements
      */
-    public static <T> Buffer<T> decorate(Buffer<T> buffer, Predicate<? super T> predicate) {
+    public static <T> Buffer<T> predicatedBuffer(Buffer<T> buffer, Predicate<? super T> predicate) {
         return new PredicatedBuffer<T>(buffer, predicate);
     }
     
diff --git a/src/java/org/apache/commons/collections/buffer/PriorityBuffer.java b/src/java/org/apache/commons/collections/buffer/PriorityBuffer.java
index d0a14bffd..a01829cd0 100644
--- a/src/java/org/apache/commons/collections/buffer/PriorityBuffer.java
+++ b/src/java/org/apache/commons/collections/buffer/PriorityBuffer.java
@@ -45,7 +45,7 @@ import org.apache.commons.collections.comparators.ComparableComparator;
  * <p>
  * Note that this implementation is not synchronized.  Use 
  * {@link org.apache.commons.collections.BufferUtils#synchronizedBuffer(Buffer)} or
- * {@link org.apache.commons.collections.buffer.SynchronizedBuffer#decorate(Buffer)}
+ * {@link org.apache.commons.collections.buffer.SynchronizedBuffer#synchronizedBuffer(Buffer)}
  * to provide synchronized access to a <code>PriorityBuffer</code>:
  * <pre>
  * Buffer heap = SynchronizedBuffer.decorate(new PriorityBuffer());
diff --git a/src/java/org/apache/commons/collections/buffer/SynchronizedBuffer.java b/src/java/org/apache/commons/collections/buffer/SynchronizedBuffer.java
index 19befed11..edb43b1b7 100644
--- a/src/java/org/apache/commons/collections/buffer/SynchronizedBuffer.java
+++ b/src/java/org/apache/commons/collections/buffer/SynchronizedBuffer.java
@@ -48,7 +48,7 @@ public class SynchronizedBuffer<E>
      * @return a new synchronized Buffer
      * @throws IllegalArgumentException if buffer is null
      */
-    public static <T> Buffer<T> decorate(Buffer<T> buffer) {
+    public static <T> Buffer<T> synchronizedBuffer(Buffer<T> buffer) {
         return new SynchronizedBuffer<T>(buffer);
     }
 
diff --git a/src/java/org/apache/commons/collections/buffer/TransformedBuffer.java b/src/java/org/apache/commons/collections/buffer/TransformedBuffer.java
index b890c16f4..dc617c770 100644
--- a/src/java/org/apache/commons/collections/buffer/TransformedBuffer.java
+++ b/src/java/org/apache/commons/collections/buffer/TransformedBuffer.java
@@ -45,14 +45,14 @@ public class TransformedBuffer<E> extends TransformedCollection<E> implements Bu
      * <p>
      * If there are any elements already in the buffer being decorated, they
      * are NOT transformed.
-     * Constrast this with {@link #decorateTransform}.
+     * Contrast this with {@link #transformedBuffer(Buffer, Transformer)}.
      * 
      * @param buffer  the buffer to decorate, must not be null
      * @param transformer  the transformer to use for conversion, must not be null
      * @return a new transformed Buffer
      * @throws IllegalArgumentException if buffer or transformer is null
      */
-    public static <E> Buffer<E> decorate(Buffer<E> buffer, Transformer<? super E, ? extends E> transformer) {
+    public static <E> Buffer<E> transformingBuffer(Buffer<E> buffer, Transformer<? super E, ? extends E> transformer) {
         return new TransformedBuffer<E>(buffer, transformer);
     }
     
@@ -62,7 +62,7 @@ public class TransformedBuffer<E> extends TransformedCollection<E> implements Bu
      * <p>
      * If there are any elements already in the buffer being decorated, they
      * will be transformed by this method.
-     * Constrast this with {@link #decorate}.
+     * Contrast this with {@link #transformingBuffer(Buffer, Transformer)}.
      * 
      * @param buffer  the buffer to decorate, must not be null
      * @param transformer  the transformer to use for conversion, must not be null
@@ -70,7 +70,7 @@ public class TransformedBuffer<E> extends TransformedCollection<E> implements Bu
      * @throws IllegalArgumentException if buffer or transformer is null
      * @since Commons Collections 3.3
      */
-    public static <E> Buffer<E> decorateTransform(Buffer<E> buffer, Transformer<? super E, ? extends E> transformer) {
+    public static <E> Buffer<E> transformedBuffer(Buffer<E> buffer, Transformer<? super E, ? extends E> transformer) {
         TransformedBuffer<E> decorated = new TransformedBuffer<E>(buffer, transformer); // throws IAE if buffer or transformer is null
         if (buffer.size() > 0) {
             @SuppressWarnings("unchecked") // buffer is type <E>
diff --git a/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java b/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java
index b843a8429..3214d477c 100644
--- a/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java
+++ b/src/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java
@@ -55,7 +55,7 @@ public final class UnmodifiableBuffer<E>
      * @return an unmodifiable Buffer
      * @throws IllegalArgumentException if buffer is null
      */
-    public static <E> Buffer<E> decorate(Buffer<E> buffer) {
+    public static <E> Buffer<E> unmodifiableBuffer(Buffer<E> buffer) {
         if (buffer instanceof Unmodifiable) {
             return buffer;
         }
@@ -101,7 +101,7 @@ public final class UnmodifiableBuffer<E>
     //-----------------------------------------------------------------------
     @Override
     public Iterator<E> iterator() {
-        return UnmodifiableIterator.decorate(decorated().iterator());
+        return UnmodifiableIterator.unmodifiableIterator(decorated().iterator());
     }
 
     @Override
diff --git a/src/java/org/apache/commons/collections/collection/CompositeCollection.java b/src/java/org/apache/commons/collections/collection/CompositeCollection.java
index b119f9422..963e12cba 100644
--- a/src/java/org/apache/commons/collections/collection/CompositeCollection.java
+++ b/src/java/org/apache/commons/collections/collection/CompositeCollection.java
@@ -163,7 +163,7 @@ public class CompositeCollection<E> implements Collection<E>, Serializable {
      */
     public Iterator<E> iterator() {
         if (all.isEmpty()) {
-            return EmptyIterator.<E>getInstance();
+            return EmptyIterator.<E>emptyIterator();
         }
         IteratorChain<E> chain = new IteratorChain<E>();
         for (Collection<? extends E> item : all) {
@@ -419,7 +419,7 @@ public class CompositeCollection<E> implements Collection<E>, Serializable {
      * @return Unmodifiable list of all collections in this composite.
      */
     public List<? extends Collection<E>> getCollections() {
-        return UnmodifiableList.decorate(all);
+        return UnmodifiableList.unmodifiableList(all);
     }
 
     /**
diff --git a/src/java/org/apache/commons/collections/collection/PredicatedCollection.java b/src/java/org/apache/commons/collections/collection/PredicatedCollection.java
index 43311dfea..67a2acd02 100644
--- a/src/java/org/apache/commons/collections/collection/PredicatedCollection.java
+++ b/src/java/org/apache/commons/collections/collection/PredicatedCollection.java
@@ -61,7 +61,7 @@ public class PredicatedCollection<E> extends AbstractCollectionDecorator<E> {
      * @throws IllegalArgumentException if collection or predicate is null
      * @throws IllegalArgumentException if the collection contains invalid elements
      */
-    public static <T> Collection<T> decorate(Collection<T> coll, Predicate<? super T> predicate) {
+    public static <T> Collection<T> predicatedCollection(Collection<T> coll, Predicate<? super T> predicate) {
         return new PredicatedCollection<T>(coll, predicate);
     }
 
diff --git a/src/java/org/apache/commons/collections/collection/SynchronizedCollection.java b/src/java/org/apache/commons/collections/collection/SynchronizedCollection.java
index b31392f8a..0e7c18248 100644
--- a/src/java/org/apache/commons/collections/collection/SynchronizedCollection.java
+++ b/src/java/org/apache/commons/collections/collection/SynchronizedCollection.java
@@ -58,7 +58,7 @@ public class SynchronizedCollection<E> implements Collection<E>, Serializable {
      * @return a new synchronized collection
      * @throws IllegalArgumentException if collection is null
      */
-    public static <T> Collection<T> decorate(Collection<T> coll) {
+    public static <T> Collection<T> synchronizedCollection(Collection<T> coll) {
         return new SynchronizedCollection<T>(coll);
     }
 
diff --git a/src/java/org/apache/commons/collections/collection/TransformedCollection.java b/src/java/org/apache/commons/collections/collection/TransformedCollection.java
index 5f444807b..157a2693b 100644
--- a/src/java/org/apache/commons/collections/collection/TransformedCollection.java
+++ b/src/java/org/apache/commons/collections/collection/TransformedCollection.java
@@ -51,14 +51,14 @@ public class TransformedCollection<E> extends AbstractCollectionDecorator<E> {
      * <p>
      * If there are any elements already in the collection being decorated, they
      * are NOT transformed.
-     * Constrast this with {@link #decorateTransform}.
+     * Contrast this with {@link #transformedCollection(Collection, Transformer)}.
      * 
      * @param coll  the collection to decorate, must not be null
      * @param transformer  the transformer to use for conversion, must not be null
      * @return a new transformed collection
      * @throws IllegalArgumentException if collection or transformer is null
      */
-    public static <E> Collection<E> decorate(Collection<E> coll, Transformer<? super E, ? extends E> transformer) {
+    public static <E> Collection<E> transformingCollection(Collection<E> coll, Transformer<? super E, ? extends E> transformer) {
         return new TransformedCollection<E>(coll, transformer);
     }
 
@@ -68,7 +68,7 @@ public class TransformedCollection<E> extends AbstractCollectionDecorator<E> {
      * <p>
      * If there are any elements already in the collection being decorated, they
      * will be transformed by this method.
-     * Constrast this with {@link #decorate}.
+     * Contrast this with {@link #transformingCollection(Collection, Transformer)}.
      * 
      * @param collection  the collection to decorate, must not be null
      * @param transformer  the transformer to use for conversion, must not be null
@@ -76,7 +76,7 @@ public class TransformedCollection<E> extends AbstractCollectionDecorator<E> {
      * @throws IllegalArgumentException if collection or transformer is null
      * @since Commons Collections 3.3
      */
-    public static <E> Collection<E> decorateTransform(Collection<E> collection, Transformer<? super E, ? extends E> transformer) {
+    public static <E> Collection<E> transformedCollection(Collection<E> collection, Transformer<? super E, ? extends E> transformer) {
         TransformedCollection<E> decorated = new TransformedCollection<E>(collection, transformer);
         // null collection & transformer are disallowed by the constructor call above 
         if (collection.size() > 0) {
diff --git a/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java b/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java
index 7b2579cb6..ed0f96a48 100644
--- a/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java
+++ b/src/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java
@@ -54,8 +54,8 @@ public final class UnmodifiableBoundedCollection<E> extends AbstractCollectionDe
      * @return a new unmodifiable bounded collection
      * @throws IllegalArgumentException if bag is null
      */
-    public static <E> BoundedCollection<E> decorate(BoundedCollection<E> coll) {
-        return new UnmodifiableBoundedCollection<E>(coll);
+    public static <E> BoundedCollection<E> unmodifiableBoundedCollection(BoundedCollection<E> coll) {
+        return unmodifiableBoundedCollection(coll);
     }
 
     /**
@@ -69,7 +69,7 @@ public final class UnmodifiableBoundedCollection<E> extends AbstractCollectionDe
      * @throws IllegalArgumentException if bag is null
      */
     @SuppressWarnings("unchecked")
-    public static <E> BoundedCollection<E> decorateUsing(Collection<? super E> coll) {
+	public static <E> BoundedCollection<E> unmodifiableBoundedCollection(Collection<? extends E> coll) {
         if (coll == null) {
             throw new IllegalArgumentException("The collection must not be null");
         }
@@ -105,7 +105,7 @@ public final class UnmodifiableBoundedCollection<E> extends AbstractCollectionDe
     //-----------------------------------------------------------------------
     @Override
     public Iterator<E> iterator() {
-        return UnmodifiableIterator.decorate(decorated().iterator());
+        return UnmodifiableIterator.unmodifiableIterator(decorated().iterator());
     }
 
     @Override
diff --git a/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java b/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java
index 29aff0adf..fb59522c7 100644
--- a/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java
+++ b/src/java/org/apache/commons/collections/collection/UnmodifiableCollection.java
@@ -52,7 +52,7 @@ public final class UnmodifiableCollection<E>
      * @return an unmodifiable collection
      * @throws IllegalArgumentException if collection is null
      */
-    public static <T> Collection<T> decorate(Collection<T> coll) {
+    public static <T> Collection<T> unmodifiableCollection(Collection<T> coll) {
         if (coll instanceof Unmodifiable) {
             return coll;
         }
@@ -73,7 +73,7 @@ public final class UnmodifiableCollection<E>
     //-----------------------------------------------------------------------
     @Override
     public Iterator<E> iterator() {
-        return UnmodifiableIterator.decorate(decorated().iterator());
+        return UnmodifiableIterator.unmodifiableIterator(decorated().iterator());
     }
 
     @Override
diff --git a/src/java/org/apache/commons/collections/comparators/BooleanComparator.java b/src/java/org/apache/commons/collections/comparators/BooleanComparator.java
index 8930c5647..082ce5748 100644
--- a/src/java/org/apache/commons/collections/comparators/BooleanComparator.java
+++ b/src/java/org/apache/commons/collections/comparators/BooleanComparator.java
@@ -25,7 +25,7 @@ import java.util.Comparator;
  * <p>
  * @see #getTrueFirstComparator()
  * @see #getFalseFirstComparator()
- * @see #getBooleanComparator(boolean)
+ * @see #booleanComparator(boolean)
  *
  * @since Commons Collections 3.0
  * @version $Revision$ $Date$
@@ -94,7 +94,7 @@ public final class BooleanComparator implements Comparator<Boolean>, Serializabl
      * <code>true</code> <code>Boolean</code>s before <code>false</code>
      * @return a singleton BooleanComparator instance
      */
-    public static BooleanComparator getBooleanComparator(boolean trueFirst) {
+    public static BooleanComparator booleanComparator(boolean trueFirst) {
         return trueFirst ? TRUE_FIRST : FALSE_FIRST;
     }
 
diff --git a/src/java/org/apache/commons/collections/comparators/ComparableComparator.java b/src/java/org/apache/commons/collections/comparators/ComparableComparator.java
index 693ba3780..411ce1354 100644
--- a/src/java/org/apache/commons/collections/comparators/ComparableComparator.java
+++ b/src/java/org/apache/commons/collections/comparators/ComparableComparator.java
@@ -60,7 +60,7 @@ public class ComparableComparator<E extends Comparable<? super E>> implements Co
      * @return the singleton ComparableComparator
      */
     @SuppressWarnings("unchecked")
-    public static <E extends Comparable<? super E>> ComparableComparator<E> getInstance() {
+    public static <E extends Comparable<? super E>> ComparableComparator<E> comparableComparator() {
         return (ComparableComparator<E>) INSTANCE;
     }
 
@@ -68,7 +68,7 @@ public class ComparableComparator<E extends Comparable<? super E>> implements Co
     /**
      * Constructor whose use should be avoided.
      * <p>
-     * Please use the {@link #getInstance()} method whenever possible.
+     * Please use the {@link #comparableComparator()} method whenever possible.
      */
     public ComparableComparator() {
         super();
diff --git a/src/java/org/apache/commons/collections/functors/AndPredicate.java b/src/java/org/apache/commons/collections/functors/AndPredicate.java
index a30fcd083..596200fad 100644
--- a/src/java/org/apache/commons/collections/functors/AndPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/AndPredicate.java
@@ -46,7 +46,7 @@ public final class AndPredicate<T> implements Predicate<T>, PredicateDecorator<T
      * @return the <code>and</code> predicate
      * @throws IllegalArgumentException if either predicate is null
      */
-    public static <T> Predicate<T> getInstance(Predicate<? super T> predicate1, Predicate<? super T> predicate2) {
+    public static <T> Predicate<T> andPredicate(Predicate<? super T> predicate1, Predicate<? super T> predicate2) {
         if (predicate1 == null || predicate2 == null) {
             throw new IllegalArgumentException("Predicate must not be null");
         }
diff --git a/src/java/org/apache/commons/collections/functors/AnyPredicate.java b/src/java/org/apache/commons/collections/functors/AnyPredicate.java
index 430d6d367..86e9f1170 100644
--- a/src/java/org/apache/commons/collections/functors/AnyPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/AnyPredicate.java
@@ -55,7 +55,7 @@ public final class AnyPredicate<T> implements Predicate<T>, PredicateDecorator<T
      * @throws IllegalArgumentException if any predicate in the array is null
      */
     @SuppressWarnings("unchecked")
-    public static <T> Predicate<T> getInstance(Predicate<? super T>[] predicates) {
+    public static <T> Predicate<T> anyPredicate(Predicate<? super T>... predicates) {
         FunctorUtils.validate(predicates);
         if (predicates.length == 0) {
             return FalsePredicate.<T>falsePredicate();
@@ -78,7 +78,7 @@ public final class AnyPredicate<T> implements Predicate<T>, PredicateDecorator<T
      * @throws IllegalArgumentException if any predicate in the array is null
      */
     @SuppressWarnings("unchecked")
-    public static <T> Predicate<T> getInstance(Collection<? extends Predicate<T>> predicates) {
+    public static <T> Predicate<T> anyPredicate(Collection<? extends Predicate<T>> predicates) {
         Predicate<? super T>[] preds = FunctorUtils.validate(predicates);
         if (preds.length == 0) {
             return FalsePredicate.<T>falsePredicate();
diff --git a/src/java/org/apache/commons/collections/functors/ChainedClosure.java b/src/java/org/apache/commons/collections/functors/ChainedClosure.java
index 4d5e9286b..830769604 100644
--- a/src/java/org/apache/commons/collections/functors/ChainedClosure.java
+++ b/src/java/org/apache/commons/collections/functors/ChainedClosure.java
@@ -45,10 +45,10 @@ public class ChainedClosure<E> implements Closure<E>, Serializable {
      * @throws IllegalArgumentException if the closures array is null
      * @throws IllegalArgumentException if any closure in the array is null
      */
-    public static <E> Closure<E> getInstance(Closure<? super E>[] closures) {
+    public static <E> Closure<E> chainedClosure(Closure<? super E>... closures) {
         FunctorUtils.validate(closures);
         if (closures.length == 0) {
-            return NOPClosure.<E>getInstance();
+            return NOPClosure.<E>nopClosure();
         }
         closures = FunctorUtils.copy(closures);
         return new ChainedClosure<E>(closures);
@@ -65,12 +65,12 @@ public class ChainedClosure<E> implements Closure<E>, Serializable {
      * @throws IllegalArgumentException if any closure in the collection is null
      */
     @SuppressWarnings("unchecked")
-    public static <E> Closure<E> getInstance(Collection<Closure<E>> closures) {
+    public static <E> Closure<E> chainedClosure(Collection<Closure<E>> closures) {
         if (closures == null) {
             throw new IllegalArgumentException("Closure collection must not be null");
         }
         if (closures.size() == 0) {
-            return NOPClosure.<E>getInstance();
+            return NOPClosure.<E>nopClosure();
         }
         // convert to array like this to guarantee iterator() ordering
         Closure<? super E>[] cmds = new Closure[closures.size()];
@@ -82,23 +82,6 @@ public class ChainedClosure<E> implements Closure<E>, Serializable {
         return new ChainedClosure<E>(cmds);
     }
 
-    /**
-     * Factory method that performs validation.
-     * 
-     * @param closure1  the first closure, not null
-     * @param closure2  the second closure, not null
-     * @return the <code>chained</code> closure
-     * @throws IllegalArgumentException if either closure is null
-     */
-    @SuppressWarnings("unchecked")
-    public static <E> Closure<E> getInstance(Closure<? super E> closure1, Closure<? super E> closure2) {
-        if (closure1 == null || closure2 == null) {
-            throw new IllegalArgumentException("Closures must not be null");
-        }
-        Closure<E>[] closures = new Closure[] { closure1, closure2 };
-        return new ChainedClosure<E>(closures);
-    }
-
     /**
      * Constructor that performs no validation.
      * Use <code>getInstance</code> if you want that.
diff --git a/src/java/org/apache/commons/collections/functors/ChainedTransformer.java b/src/java/org/apache/commons/collections/functors/ChainedTransformer.java
index 35c92965e..df4ecc8ed 100644
--- a/src/java/org/apache/commons/collections/functors/ChainedTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/ChainedTransformer.java
@@ -48,10 +48,10 @@ public class ChainedTransformer<T> implements Transformer<T, T>, Serializable {
      * @throws IllegalArgumentException if the transformers array is null
      * @throws IllegalArgumentException if any transformer in the array is null
      */
-    public static <T> Transformer<T, T> getInstance(Transformer<? super T, ? extends T>[] transformers) {
+    public static <T> Transformer<T, T> chainedTransformer(Transformer<? super T, ? extends T>... transformers) {
         FunctorUtils.validate(transformers);
         if (transformers.length == 0) {
-            return NOPTransformer.<T>getInstance();
+            return NOPTransformer.<T>nopTransformer();
         }
         transformers = FunctorUtils.copy(transformers);
         return new ChainedTransformer<T>(transformers);
@@ -68,12 +68,12 @@ public class ChainedTransformer<T> implements Transformer<T, T>, Serializable {
      * @throws IllegalArgumentException if any transformer in the collection is null
      */
     @SuppressWarnings("unchecked")
-    public static <T> Transformer<T, T> getInstance(Collection<? extends Transformer<T, T>> transformers) {
+    public static <T> Transformer<T, T> chainedTransformer(Collection<? extends Transformer<T, T>> transformers) {
         if (transformers == null) {
             throw new IllegalArgumentException("Transformer collection must not be null");
         }
         if (transformers.size() == 0) {
-            return NOPTransformer.<T>getInstance();
+            return NOPTransformer.<T>nopTransformer();
         }
         // convert to array like this to guarantee iterator() ordering
         Transformer<T, T>[] cmds = transformers.toArray(new Transformer[transformers.size()]);
@@ -81,23 +81,6 @@ public class ChainedTransformer<T> implements Transformer<T, T>, Serializable {
         return new ChainedTransformer<T>(cmds);
     }
 
-    /**
-     * Factory method that performs validation.
-     * 
-     * @param transformer1  the first transformer, not null
-     * @param transformer2  the second transformer, not null
-     * @return the <code>chained</code> transformer
-     * @throws IllegalArgumentException if either transformer is null
-     */
-    @SuppressWarnings("unchecked")
-    public static <T> Transformer<T, T> getInstance(Transformer<? super T, ? extends T> transformer1, Transformer<? super T, ? extends T> transformer2) {
-        if (transformer1 == null || transformer2 == null) {
-            throw new IllegalArgumentException("Transformers must not be null");
-        }
-        Transformer<? super T, ? extends T>[] transformers = new Transformer[] { transformer1, transformer2 };
-        return new ChainedTransformer<T>(transformers);
-    }
-
     /**
      * Constructor that performs no validation.
      * Use <code>getInstance</code> if you want that.
diff --git a/src/java/org/apache/commons/collections/functors/CloneTransformer.java b/src/java/org/apache/commons/collections/functors/CloneTransformer.java
index 5841b31ee..0b6e761f6 100644
--- a/src/java/org/apache/commons/collections/functors/CloneTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/CloneTransformer.java
@@ -45,7 +45,7 @@ public class CloneTransformer<T> implements Transformer<T, T>, Serializable {
      * @since Commons Collections 3.1
      */
     @SuppressWarnings("unchecked")
-    public static <T> Transformer<T, T> getInstance() {
+    public static <T> Transformer<T, T> cloneTransformer() {
         return (Transformer<T, T>) INSTANCE;
     }
 
@@ -66,7 +66,7 @@ public class CloneTransformer<T> implements Transformer<T, T>, Serializable {
         if (input == null) {
             return null;
         }
-        return PrototypeFactory.getInstance(input).create();
+        return PrototypeFactory.prototypeFactory(input).create();
     }
 
     private Object readResolve() {
diff --git a/src/java/org/apache/commons/collections/functors/ClosureTransformer.java b/src/java/org/apache/commons/collections/functors/ClosureTransformer.java
index e54ce639f..1c7cac567 100644
--- a/src/java/org/apache/commons/collections/functors/ClosureTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/ClosureTransformer.java
@@ -45,7 +45,7 @@ public class ClosureTransformer<T> implements Transformer<T, T>, Serializable {
      * @return the <code>closure</code> transformer
      * @throws IllegalArgumentException if the closure is null
      */
-    public static <T> Transformer<T, T> getInstance(Closure<? super T> closure) {
+    public static <T> Transformer<T, T> closureTransformer(Closure<? super T> closure) {
         if (closure == null) {
             throw new IllegalArgumentException("Closure must not be null");
         }
diff --git a/src/java/org/apache/commons/collections/functors/ComparatorPredicate.java b/src/java/org/apache/commons/collections/functors/ComparatorPredicate.java
index 3ed309c09..ece50f44d 100644
--- a/src/java/org/apache/commons/collections/functors/ComparatorPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/ComparatorPredicate.java
@@ -105,8 +105,8 @@ public class ComparatorPredicate<T> implements Predicate<T>, Serializable {
      * @return the predicate
      * @throws IllegalArgumentException if comparator is null
      */
-    public static <T> Predicate<T> getInstance(T object, Comparator<T> comparator) {
-        return getInstance(object, comparator, Criterion.EQUAL);
+    public static <T> Predicate<T> comparatorPredicate(T object, Comparator<T> comparator) {
+        return comparatorPredicate(object, comparator, Criterion.EQUAL);
     }
 
     /**
@@ -118,7 +118,7 @@ public class ComparatorPredicate<T> implements Predicate<T>, Serializable {
      * @return the predicate
      * @throws IllegalArgumentException if comparator is null of criterion is invalid
      */
-    public static <T> Predicate<T> getInstance(T object, Comparator<T> comparator, Criterion criterion) {
+    public static <T> Predicate<T> comparatorPredicate(T object, Comparator<T> comparator, Criterion criterion) {
         if (comparator == null) {
             throw new IllegalArgumentException("Comparator must not be null.");
         }
diff --git a/src/java/org/apache/commons/collections/functors/ConstantFactory.java b/src/java/org/apache/commons/collections/functors/ConstantFactory.java
index bf4a7ac68..7526042f1 100644
--- a/src/java/org/apache/commons/collections/functors/ConstantFactory.java
+++ b/src/java/org/apache/commons/collections/functors/ConstantFactory.java
@@ -50,7 +50,7 @@ public class ConstantFactory<T> implements Factory<T>, Serializable {
      * @return the <code>constant</code> factory.
      */
     @SuppressWarnings("unchecked")
-    public static <T> Factory<T> getInstance(T constantToReturn) {
+    public static <T> Factory<T> constantFactory(T constantToReturn) {
         if (constantToReturn == null) {
             return (Factory<T>) NULL_INSTANCE;
         }
diff --git a/src/java/org/apache/commons/collections/functors/ConstantTransformer.java b/src/java/org/apache/commons/collections/functors/ConstantTransformer.java
index d660b41ac..594923cf0 100644
--- a/src/java/org/apache/commons/collections/functors/ConstantTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/ConstantTransformer.java
@@ -50,7 +50,7 @@ public class ConstantTransformer<I, O> implements Transformer<I, O>, Serializabl
      * @return Transformer<I, O> that always returns null.
      */
     @SuppressWarnings("unchecked")
-    public static <I, O> Transformer<I, O> getNullInstance() {
+    public static <I, O> Transformer<I, O> nullTransformer() {
         return (Transformer<I, O>) NULL_INSTANCE;
     }
 
@@ -60,9 +60,9 @@ public class ConstantTransformer<I, O> implements Transformer<I, O>, Serializabl
      * @param constantToReturn  the constant object to return each time in the factory
      * @return the <code>constant</code> factory.
      */
-    public static <I, O> Transformer<I, O> getInstance(O constantToReturn) {
+    public static <I, O> Transformer<I, O> constantTransformer(O constantToReturn) {
         if (constantToReturn == null) {
-            return getNullInstance();
+            return nullTransformer();
         }
         return new ConstantTransformer<I, O>(constantToReturn);
     }
diff --git a/src/java/org/apache/commons/collections/functors/DefaultEquator.java b/src/java/org/apache/commons/collections/functors/DefaultEquator.java
index f90695752..4f7b4d2ab 100644
--- a/src/java/org/apache/commons/collections/functors/DefaultEquator.java
+++ b/src/java/org/apache/commons/collections/functors/DefaultEquator.java
@@ -60,7 +60,7 @@ public class DefaultEquator<T> implements Equator<T> {
 	 * @return {@link DefaultEquator#INSTANCE}
 	 */
 	@SuppressWarnings("unchecked")
-	public static <T> DefaultEquator<T> instance() {
+	public static <T> DefaultEquator<T> defaultEquator() {
 		return (DefaultEquator<T>) DefaultEquator.INSTANCE;
 	}
 }
diff --git a/src/java/org/apache/commons/collections/functors/EqualPredicate.java b/src/java/org/apache/commons/collections/functors/EqualPredicate.java
index e609be7cc..67e36adcb 100644
--- a/src/java/org/apache/commons/collections/functors/EqualPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/EqualPredicate.java
@@ -38,7 +38,7 @@ public final class EqualPredicate<T> implements Predicate<T>, Serializable {
 
     /** The value to compare to */
     private final Object iValue;
-    
+
     /**
      * Factory to create the identity predicate.
      * 
diff --git a/src/java/org/apache/commons/collections/functors/ExceptionClosure.java b/src/java/org/apache/commons/collections/functors/ExceptionClosure.java
index 516111e3c..e4c3f5e71 100644
--- a/src/java/org/apache/commons/collections/functors/ExceptionClosure.java
+++ b/src/java/org/apache/commons/collections/functors/ExceptionClosure.java
@@ -44,7 +44,7 @@ public final class ExceptionClosure<E> implements Closure<E>, Serializable {
      * @since Commons Collections 3.1
      */
     @SuppressWarnings("unchecked")
-    public static <E> Closure<E> getInstance() {
+    public static <E> Closure<E> exceptionClosure() {
         return (Closure<E>) INSTANCE;
     }
 
diff --git a/src/java/org/apache/commons/collections/functors/ExceptionFactory.java b/src/java/org/apache/commons/collections/functors/ExceptionFactory.java
index 7c1b00d26..cdab42025 100644
--- a/src/java/org/apache/commons/collections/functors/ExceptionFactory.java
+++ b/src/java/org/apache/commons/collections/functors/ExceptionFactory.java
@@ -44,7 +44,7 @@ public final class ExceptionFactory<T> implements Factory<T>, Serializable {
      * @since Commons Collections 3.1
      */
     @SuppressWarnings("unchecked")
-    public static <T> Factory<T> getInstance() {
+    public static <T> Factory<T> exceptionFactory() {
         return (Factory<T>) INSTANCE;
     }
 
diff --git a/src/java/org/apache/commons/collections/functors/ExceptionPredicate.java b/src/java/org/apache/commons/collections/functors/ExceptionPredicate.java
index c8c36797f..e206fc59d 100644
--- a/src/java/org/apache/commons/collections/functors/ExceptionPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/ExceptionPredicate.java
@@ -44,7 +44,7 @@ public final class ExceptionPredicate<T> implements Predicate<T>, Serializable {
      * @since Commons Collections 3.1
      */
     @SuppressWarnings("unchecked")
-    public static <T> Predicate<T> getInstance() {
+    public static <T> Predicate<T> exceptionPredicate() {
         return (Predicate<T>) INSTANCE;
     }
 
diff --git a/src/java/org/apache/commons/collections/functors/ExceptionTransformer.java b/src/java/org/apache/commons/collections/functors/ExceptionTransformer.java
index 308fc2a54..3c27dc9db 100644
--- a/src/java/org/apache/commons/collections/functors/ExceptionTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/ExceptionTransformer.java
@@ -44,7 +44,7 @@ public final class ExceptionTransformer<I, O> implements Transformer<I, O>, Seri
      * @since Commons Collections 3.1
      */
     @SuppressWarnings("unchecked")
-    public static <I, O> Transformer<I, O> getInstance() {
+    public static <I, O> Transformer<I, O> exceptionTransformer() {
         return (Transformer<I, O>) INSTANCE;
     }
 
diff --git a/src/java/org/apache/commons/collections/functors/FactoryTransformer.java b/src/java/org/apache/commons/collections/functors/FactoryTransformer.java
index 0988d850c..d53cee4e2 100644
--- a/src/java/org/apache/commons/collections/functors/FactoryTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/FactoryTransformer.java
@@ -44,7 +44,7 @@ public class FactoryTransformer<I, O> implements Transformer<I, O>, Serializable
      * @return the <code>factory</code> transformer
      * @throws IllegalArgumentException if the factory is null
      */
-    public static <I, O> Transformer<I, O> getInstance(Factory<? extends O> factory) {
+    public static <I, O> Transformer<I, O> factoryTransformer(Factory<? extends O> factory) {
         if (factory == null) {
             throw new IllegalArgumentException("Factory must not be null");
         }
diff --git a/src/java/org/apache/commons/collections/functors/FalsePredicate.java b/src/java/org/apache/commons/collections/functors/FalsePredicate.java
index e67008e66..07ff39b83 100644
--- a/src/java/org/apache/commons/collections/functors/FalsePredicate.java
+++ b/src/java/org/apache/commons/collections/functors/FalsePredicate.java
@@ -40,7 +40,7 @@ public final class FalsePredicate<T> implements Predicate<T>, Serializable {
      * Get a typed instance.
      *
      * @return the singleton instance
-     * @since Commons Collections 5
+     * @since Commons Collections 4.0
      */
     @SuppressWarnings("unchecked")
     public static <T> Predicate<T> falsePredicate() {
diff --git a/src/java/org/apache/commons/collections/functors/ForClosure.java b/src/java/org/apache/commons/collections/functors/ForClosure.java
index f9abcbacb..9d85c3d92 100644
--- a/src/java/org/apache/commons/collections/functors/ForClosure.java
+++ b/src/java/org/apache/commons/collections/functors/ForClosure.java
@@ -49,9 +49,9 @@ public class ForClosure<E> implements Closure<E>, Serializable {
      * @return the <code>for</code> closure
      */
     @SuppressWarnings("unchecked")
-    public static <E> Closure<E> getInstance(int count, Closure<? super E> closure) {
+    public static <E> Closure<E> forClosure(int count, Closure<? super E> closure) {
         if (count <= 0 || closure == null) {
-            return NOPClosure.<E>getInstance();
+            return NOPClosure.<E>nopClosure();
         }
         if (count == 1) {
             return (Closure<E>) closure;
diff --git a/src/java/org/apache/commons/collections/functors/IdentityPredicate.java b/src/java/org/apache/commons/collections/functors/IdentityPredicate.java
index 5768259ab..5f33d8cae 100644
--- a/src/java/org/apache/commons/collections/functors/IdentityPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/IdentityPredicate.java
@@ -44,7 +44,7 @@ public final class IdentityPredicate<T> implements Predicate<T>, Serializable {
      * @return the predicate
      * @throws IllegalArgumentException if the predicate is null
      */
-    public static <T> Predicate<T> getInstance(T object) {
+    public static <T> Predicate<T> identityPredicate(T object) {
         if (object == null) {
             return NullPredicate.<T>nullPredicate();
         }
diff --git a/src/java/org/apache/commons/collections/functors/IfClosure.java b/src/java/org/apache/commons/collections/functors/IfClosure.java
index 733af1341..e8605aa84 100644
--- a/src/java/org/apache/commons/collections/functors/IfClosure.java
+++ b/src/java/org/apache/commons/collections/functors/IfClosure.java
@@ -55,8 +55,8 @@ public class IfClosure<E> implements Closure<E>, Serializable {
      * @throws IllegalArgumentException if either argument is null
      * @since Commons Collections 3.2
      */
-    public static <E> Closure<E> getInstance(Predicate<? super E> predicate, Closure<? super E> trueClosure) {
-        return IfClosure.<E>getInstance(predicate, trueClosure, NOPClosure.<E>getInstance());
+    public static <E> Closure<E> ifClosure(Predicate<? super E> predicate, Closure<? super E> trueClosure) {
+        return IfClosure.<E>ifClosure(predicate, trueClosure, NOPClosure.<E>nopClosure());
     }
 
     /**
@@ -68,7 +68,7 @@ public class IfClosure<E> implements Closure<E>, Serializable {
      * @return the <code>if</code> closure
      * @throws IllegalArgumentException if any argument is null
      */
-    public static <E> Closure<E> getInstance(Predicate<? super E> predicate, Closure<? super E> trueClosure, Closure<? super E> falseClosure) {
+    public static <E> Closure<E> ifClosure(Predicate<? super E> predicate, Closure<? super E> trueClosure, Closure<? super E> falseClosure) {
         if (predicate == null) {
             throw new IllegalArgumentException("Predicate must not be null");
         }
diff --git a/src/java/org/apache/commons/collections/functors/InstanceofPredicate.java b/src/java/org/apache/commons/collections/functors/InstanceofPredicate.java
index 58fbe860e..dc376478a 100644
--- a/src/java/org/apache/commons/collections/functors/InstanceofPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/InstanceofPredicate.java
@@ -44,7 +44,7 @@ public final class InstanceofPredicate implements Predicate<Object>, Serializabl
      * @return the predicate
      * @throws IllegalArgumentException if the class is null
      */
-    public static Predicate<Object> getInstance(Class<?> type) {
+    public static Predicate<Object> instanceOfPredicate(Class<?> type) {
         if (type == null) {
             throw new IllegalArgumentException("The type to check instanceof must not be null");
         }
diff --git a/src/java/org/apache/commons/collections/functors/InstantiateFactory.java b/src/java/org/apache/commons/collections/functors/InstantiateFactory.java
index 277c62c23..ac4c15abe 100644
--- a/src/java/org/apache/commons/collections/functors/InstantiateFactory.java
+++ b/src/java/org/apache/commons/collections/functors/InstantiateFactory.java
@@ -53,7 +53,7 @@ public class InstantiateFactory<T> implements Factory<T>, Serializable {
      * @param args  the constructor arguments
      * @return a new instantiate factory
      */
-    public static <T> Factory<T> getInstance(Class<T> classToInstantiate, Class<?>[] paramTypes, Object[] args) {
+    public static <T> Factory<T> instantiateFactory(Class<T> classToInstantiate, Class<?>[] paramTypes, Object[] args) {
         if (classToInstantiate == null) {
             throw new IllegalArgumentException("Class to instantiate must not be null");
         }
diff --git a/src/java/org/apache/commons/collections/functors/InstantiateTransformer.java b/src/java/org/apache/commons/collections/functors/InstantiateTransformer.java
index 82d03914a..ce1e5f22a 100644
--- a/src/java/org/apache/commons/collections/functors/InstantiateTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/InstantiateTransformer.java
@@ -49,7 +49,7 @@ public class InstantiateTransformer<T> implements Transformer<Class<? extends T>
      * @param <T>
      * @return Transformer<Class<? extends T>, T>
      */
-    public static <T> Transformer<Class<? extends T>, T> getInstance() {
+    public static <T> Transformer<Class<? extends T>, T> instantiateTransformer() {
         return new InstantiateTransformer<T>();
     }
 
@@ -60,7 +60,7 @@ public class InstantiateTransformer<T> implements Transformer<Class<? extends T>
      * @param args  the constructor arguments
      * @return an instantiate transformer
      */
-    public static <T> Transformer<Class<? extends T>, T> getInstance(Class<?>[] paramTypes, Object[] args) {
+    public static <T> Transformer<Class<? extends T>, T> instantiateTransformer(Class<?>[] paramTypes, Object[] args) {
         if (((paramTypes == null) && (args != null))
             || ((paramTypes != null) && (args == null))
             || ((paramTypes != null) && (args != null) && (paramTypes.length != args.length))) {
diff --git a/src/java/org/apache/commons/collections/functors/InvokerTransformer.java b/src/java/org/apache/commons/collections/functors/InvokerTransformer.java
index 5fa6964f8..ee2f21ef1 100644
--- a/src/java/org/apache/commons/collections/functors/InvokerTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/InvokerTransformer.java
@@ -50,7 +50,7 @@ public class InvokerTransformer<I, O> implements Transformer<I, O>, Serializable
      * @return an invoker transformer
      * @since Commons Collections 3.1
      */
-    public static <I, O> Transformer<I, O> getInstance(String methodName) {
+    public static <I, O> Transformer<I, O> invokerTransformer(String methodName) {
         if (methodName == null) {
             throw new IllegalArgumentException("The method to invoke must not be null");
         }
@@ -65,7 +65,7 @@ public class InvokerTransformer<I, O> implements Transformer<I, O>, Serializable
      * @param args  the arguments to pass to the method
      * @return an invoker transformer
      */
-    public static <I, O> Transformer<I, O> getInstance(String methodName, Class<?>[] paramTypes, Object[] args) {
+    public static <I, O> Transformer<I, O> invokerTransformer(String methodName, Class<?>[] paramTypes, Object[] args) {
         if (methodName == null) {
             throw new IllegalArgumentException("The method to invoke must not be null");
         }
diff --git a/src/java/org/apache/commons/collections/functors/MapTransformer.java b/src/java/org/apache/commons/collections/functors/MapTransformer.java
index 2bdaa9818..6ab21db8d 100644
--- a/src/java/org/apache/commons/collections/functors/MapTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/MapTransformer.java
@@ -46,9 +46,9 @@ public final class MapTransformer<I, O> implements Transformer<I, O>, Serializab
      * @param map the map, not cloned
      * @return the transformer
      */
-    public static <I, O> Transformer<I, O> getInstance(Map<? super I, ? extends O> map) {
+    public static <I, O> Transformer<I, O> mapTransformer(Map<? super I, ? extends O> map) {
         if (map == null) {
-            return ConstantTransformer.<I, O>getNullInstance();
+            return ConstantTransformer.<I, O>nullTransformer();
         }
         return new MapTransformer<I, O>(map);
     }
diff --git a/src/java/org/apache/commons/collections/functors/NOPClosure.java b/src/java/org/apache/commons/collections/functors/NOPClosure.java
index 3b7cadbb1..fe671dc42 100644
--- a/src/java/org/apache/commons/collections/functors/NOPClosure.java
+++ b/src/java/org/apache/commons/collections/functors/NOPClosure.java
@@ -43,7 +43,7 @@ public final class NOPClosure<E> implements Closure<E>, Serializable {
      * @since Commons Collections 3.1
      */
     @SuppressWarnings("unchecked")
-    public static <E> Closure<E> getInstance() {
+    public static <E> Closure<E> nopClosure() {
         return (Closure<E>) INSTANCE;
     }
 
diff --git a/src/java/org/apache/commons/collections/functors/NOPTransformer.java b/src/java/org/apache/commons/collections/functors/NOPTransformer.java
index 18d4b35ad..a6b301913 100644
--- a/src/java/org/apache/commons/collections/functors/NOPTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/NOPTransformer.java
@@ -43,7 +43,7 @@ public class NOPTransformer<T> implements Transformer<T, T>, Serializable {
      * @since Commons Collections 3.1
      */
     @SuppressWarnings("unchecked")
-    public static <T> Transformer<T, T> getInstance() {
+    public static <T> Transformer<T, T> nopTransformer() {
         return (Transformer<T, T>) INSTANCE;
     }
 
diff --git a/src/java/org/apache/commons/collections/functors/NonePredicate.java b/src/java/org/apache/commons/collections/functors/NonePredicate.java
index 11b07a19f..819708c4b 100644
--- a/src/java/org/apache/commons/collections/functors/NonePredicate.java
+++ b/src/java/org/apache/commons/collections/functors/NonePredicate.java
@@ -53,7 +53,7 @@ public final class NonePredicate<T> implements Predicate<T>, PredicateDecorator<
      * @throws IllegalArgumentException if the predicates array is null
      * @throws IllegalArgumentException if any predicate in the array is null
      */
-    public static <T> Predicate<T> getInstance(Predicate<? super T>[] predicates) {
+    public static <T> Predicate<T> nonePredicate(Predicate<? super T>... predicates) {
         FunctorUtils.validate(predicates);
         if (predicates.length == 0) {
             return TruePredicate.<T>truePredicate();
@@ -72,7 +72,7 @@ public final class NonePredicate<T> implements Predicate<T>, PredicateDecorator<
      * @throws IllegalArgumentException if the predicates array is null
      * @throws IllegalArgumentException if any predicate in the array is null
      */
-    public static <T> Predicate<T> getInstance(Collection<? extends Predicate<T>> predicates) {
+    public static <T> Predicate<T> nonePredicate(Collection<? extends Predicate<T>> predicates) {
         Predicate<? super T>[] preds = FunctorUtils.validate(predicates);
         if (preds.length == 0) {
             return TruePredicate.<T>truePredicate();
diff --git a/src/java/org/apache/commons/collections/functors/NotNullPredicate.java b/src/java/org/apache/commons/collections/functors/NotNullPredicate.java
index 19d847ce7..815b7ffcb 100644
--- a/src/java/org/apache/commons/collections/functors/NotNullPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/NotNullPredicate.java
@@ -43,7 +43,7 @@ public final class NotNullPredicate<T> implements Predicate<T>, Serializable {
      * @since Commons Collections 3.1
      */
     @SuppressWarnings("unchecked")
-    public static <T> Predicate<T> getInstance() {
+    public static <T> Predicate<T> notNullPredicate() {
         return (Predicate<T>) INSTANCE;
     }
 
diff --git a/src/java/org/apache/commons/collections/functors/NotPredicate.java b/src/java/org/apache/commons/collections/functors/NotPredicate.java
index 4f32af35a..be86f23e7 100644
--- a/src/java/org/apache/commons/collections/functors/NotPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/NotPredicate.java
@@ -43,7 +43,7 @@ public final class NotPredicate<T> implements Predicate<T>, PredicateDecorator<T
      * @return the predicate
      * @throws IllegalArgumentException if the predicate is null
      */
-    public static <T> Predicate<T> getInstance(Predicate<? super T> predicate) {
+    public static <T> Predicate<T> notPredicate(Predicate<? super T> predicate) {
         if (predicate == null) {
             throw new IllegalArgumentException("Predicate must not be null");
         }
diff --git a/src/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java b/src/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java
index e9635f37e..a1a090276 100644
--- a/src/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java
@@ -44,7 +44,7 @@ public final class NullIsExceptionPredicate<T> implements Predicate<T>, Predicat
      * @return the predicate
      * @throws IllegalArgumentException if the predicate is null
      */
-    public static <T> Predicate<T> getInstance(Predicate<? super T> predicate) {
+    public static <T> Predicate<T> nullIsExceptionPredicate(Predicate<? super T> predicate) {
         if (predicate == null) {
             throw new IllegalArgumentException("Predicate must not be null");
         }
diff --git a/src/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java b/src/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java
index 217422c17..53da2975e 100644
--- a/src/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java
+++ b/src/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java
@@ -43,7 +43,7 @@ public final class NullIsFalsePredicate<T> implements Predicate<T>, PredicateDec
      * @return the predicate
      * @throws IllegalArgumentException if the predicate is null
      */
-    public static <T> Predicate<T> getInstance(Predicate<? super T> predicate) {
+    public static <T> Predicate<T> nullIsFalsePredicate(Predicate<? super T> predicate) {
         if (predicate == null) {
             throw new IllegalArgumentException("Predicate must not be null");
         }
diff --git a/src/java/org/apache/commons/collections/functors/NullIsTruePredicate.java b/src/java/org/apache/commons/collections/functors/NullIsTruePredicate.java
index e7160a37d..dedf4b54e 100644
--- a/src/java/org/apache/commons/collections/functors/NullIsTruePredicate.java
+++ b/src/java/org/apache/commons/collections/functors/NullIsTruePredicate.java
@@ -43,7 +43,7 @@ public final class NullIsTruePredicate<T> implements Predicate<T>, PredicateDeco
      * @return the predicate
      * @throws IllegalArgumentException if the predicate is null
      */
-    public static <T> Predicate<T> getInstance(Predicate<? super T> predicate) {
+    public static <T> Predicate<T> nullIsTruePredicate(Predicate<? super T> predicate) {
         if (predicate == null) {
             throw new IllegalArgumentException("Predicate must not be null");
         }
diff --git a/src/java/org/apache/commons/collections/functors/OnePredicate.java b/src/java/org/apache/commons/collections/functors/OnePredicate.java
index 83fe86411..9b8c25390 100644
--- a/src/java/org/apache/commons/collections/functors/OnePredicate.java
+++ b/src/java/org/apache/commons/collections/functors/OnePredicate.java
@@ -55,7 +55,7 @@ public final class OnePredicate<T> implements Predicate<T>, PredicateDecorator<T
      * @throws IllegalArgumentException if any predicate in the array is null
      */
     @SuppressWarnings("unchecked")
-    public static <T> Predicate<T> getInstance(Predicate<? super T>[] predicates) {
+    public static <T> Predicate<T> onePredicate(Predicate<? super T>... predicates) {
         FunctorUtils.validate(predicates);
         if (predicates.length == 0) {
             return FalsePredicate.<T>falsePredicate();
@@ -75,7 +75,7 @@ public final class OnePredicate<T> implements Predicate<T>, PredicateDecorator<T
      * @throws IllegalArgumentException if the predicates array is null
      * @throws IllegalArgumentException if any predicate in the array is null
      */
-    public static <T> Predicate<T> getInstance(Collection<? extends Predicate<T>> predicates) {
+    public static <T> Predicate<T> onePredicate(Collection<? extends Predicate<T>> predicates) {
         Predicate<? super T>[] preds = FunctorUtils.validate(predicates);
         return new OnePredicate<T>(preds);
     }
diff --git a/src/java/org/apache/commons/collections/functors/OrPredicate.java b/src/java/org/apache/commons/collections/functors/OrPredicate.java
index e87edbd5d..897a36b82 100644
--- a/src/java/org/apache/commons/collections/functors/OrPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/OrPredicate.java
@@ -46,7 +46,7 @@ public final class OrPredicate<T> implements Predicate<T>, PredicateDecorator<T>
      * @return the <code>and</code> predicate
      * @throws IllegalArgumentException if either predicate is null
      */
-    public static <T> Predicate<T> getInstance(Predicate<? super T> predicate1, Predicate<? super T> predicate2) {
+    public static <T> Predicate<T> orPredicate(Predicate<? super T> predicate1, Predicate<? super T> predicate2) {
         if (predicate1 == null || predicate2 == null) {
             throw new IllegalArgumentException("Predicate must not be null");
         }
diff --git a/src/java/org/apache/commons/collections/functors/PredicateTransformer.java b/src/java/org/apache/commons/collections/functors/PredicateTransformer.java
index 72dceb0c3..98dc4f7e1 100644
--- a/src/java/org/apache/commons/collections/functors/PredicateTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/PredicateTransformer.java
@@ -45,7 +45,7 @@ public class PredicateTransformer<T> implements Transformer<T, Boolean>, Seriali
      * @return the <code>predicate</code> transformer
      * @throws IllegalArgumentException if the predicate is null
      */
-    public static <T> Transformer<T, Boolean> getInstance(Predicate<? super T> predicate) {
+    public static <T> Transformer<T, Boolean> predicateTransformer(Predicate<? super T> predicate) {
         if (predicate == null) {
             throw new IllegalArgumentException("Predicate must not be null");
         }
diff --git a/src/java/org/apache/commons/collections/functors/PrototypeFactory.java b/src/java/org/apache/commons/collections/functors/PrototypeFactory.java
index 5c6d94b58..ed1852a4c 100644
--- a/src/java/org/apache/commons/collections/functors/PrototypeFactory.java
+++ b/src/java/org/apache/commons/collections/functors/PrototypeFactory.java
@@ -56,9 +56,9 @@ public class PrototypeFactory {
      * @throws IllegalArgumentException if the prototype cannot be cloned
      */
     @SuppressWarnings("unchecked")
-    public static <T> Factory<T> getInstance(T prototype) {
+    public static <T> Factory<T> prototypeFactory(T prototype) {
         if (prototype == null) {
-            return ConstantFactory.<T>getInstance(null);
+            return ConstantFactory.<T>constantFactory(null);
         }
         try {
             Method method = prototype.getClass().getMethod("clone", (Class[]) null);
diff --git a/src/java/org/apache/commons/collections/functors/StringValueTransformer.java b/src/java/org/apache/commons/collections/functors/StringValueTransformer.java
index e95cfc038..00ae48b78 100644
--- a/src/java/org/apache/commons/collections/functors/StringValueTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/StringValueTransformer.java
@@ -44,7 +44,7 @@ public final class StringValueTransformer<T> implements Transformer<T, String>,
      * @since Commons Collections 3.1
      */
     @SuppressWarnings("unchecked")
-    public static <T> Transformer<T, String> getInstance() {
+    public static <T> Transformer<T, String> stringValueTransformer() {
         return (Transformer<T, String>) INSTANCE;
     }
 
diff --git a/src/java/org/apache/commons/collections/functors/SwitchClosure.java b/src/java/org/apache/commons/collections/functors/SwitchClosure.java
index 1ee7806d4..dc05d7a10 100644
--- a/src/java/org/apache/commons/collections/functors/SwitchClosure.java
+++ b/src/java/org/apache/commons/collections/functors/SwitchClosure.java
@@ -54,14 +54,14 @@ public class SwitchClosure<E> implements Closure<E>, Serializable {
      * @throws IllegalArgumentException if any element in the array is null
      */
     @SuppressWarnings("unchecked")
-    public static <E> Closure<E> getInstance(Predicate<? super E>[] predicates, Closure<? super E>[] closures, Closure<? super E> defaultClosure) {
+    public static <E> Closure<E> switchClosure(Predicate<? super E>[] predicates, Closure<? super E>[] closures, Closure<? super E> defaultClosure) {
         FunctorUtils.validate(predicates);
         FunctorUtils.validate(closures);
         if (predicates.length != closures.length) {
             throw new IllegalArgumentException("The predicate and closure arrays must be the same size");
         }
         if (predicates.length == 0) {
-            return (Closure<E>) (defaultClosure == null ? NOPClosure.<E>getInstance(): defaultClosure);
+            return (Closure<E>) (defaultClosure == null ? NOPClosure.<E>nopClosure(): defaultClosure);
         }
         predicates = FunctorUtils.copy(predicates);
         closures = FunctorUtils.copy(closures);
@@ -86,7 +86,7 @@ public class SwitchClosure<E> implements Closure<E>, Serializable {
      * @throws ClassCastException  if the map elements are of the wrong type
      */
     @SuppressWarnings("unchecked")
-    public static <E> Closure<E> getInstance(Map<Predicate<E>, Closure<E>> predicatesAndClosures) {
+    public static <E> Closure<E> switchClosure(Map<Predicate<E>, Closure<E>> predicatesAndClosures) {
         if (predicatesAndClosures == null) {
             throw new IllegalArgumentException("The predicate and closure map must not be null");
         }
@@ -94,7 +94,7 @@ public class SwitchClosure<E> implements Closure<E>, Serializable {
         Closure<? super E> defaultClosure = predicatesAndClosures.remove(null);
         int size = predicatesAndClosures.size();
         if (size == 0) {
-            return (Closure<E>) (defaultClosure == null ? NOPClosure.<E>getInstance() : defaultClosure);
+            return (Closure<E>) (defaultClosure == null ? NOPClosure.<E>nopClosure() : defaultClosure);
         }
         Closure<E>[] closures = new Closure[size];
         Predicate<E>[] preds = new Predicate[size];
@@ -120,7 +120,7 @@ public class SwitchClosure<E> implements Closure<E>, Serializable {
         super();
         iPredicates = predicates;
         iClosures = closures;
-        iDefault = (Closure<? super E>) (defaultClosure == null ? NOPClosure.<E>getInstance() : defaultClosure);
+        iDefault = (Closure<? super E>) (defaultClosure == null ? NOPClosure.<E>nopClosure() : defaultClosure);
     }
 
     /**
diff --git a/src/java/org/apache/commons/collections/functors/SwitchTransformer.java b/src/java/org/apache/commons/collections/functors/SwitchTransformer.java
index 0fc71cc62..feb5101be 100644
--- a/src/java/org/apache/commons/collections/functors/SwitchTransformer.java
+++ b/src/java/org/apache/commons/collections/functors/SwitchTransformer.java
@@ -54,7 +54,7 @@ public class SwitchTransformer<I, O> implements Transformer<I, O>, Serializable
      * @throws IllegalArgumentException if any element in the array is null
      */
     @SuppressWarnings("unchecked")
-    public static <I, O> Transformer<I, O> getInstance(Predicate<? super I>[] predicates,
+    public static <I, O> Transformer<I, O> switchTransformer(Predicate<? super I>[] predicates,
             Transformer<? super I, ? extends O>[] transformers,
             Transformer<? super I, ? extends O> defaultTransformer) {
         FunctorUtils.validate(predicates);
@@ -63,7 +63,7 @@ public class SwitchTransformer<I, O> implements Transformer<I, O>, Serializable
             throw new IllegalArgumentException("The predicate and transformer arrays must be the same size");
         }
         if (predicates.length == 0) {
-            return (Transformer<I, O>) (defaultTransformer == null ? ConstantTransformer.<I, O>getNullInstance() : defaultTransformer);
+            return (Transformer<I, O>) (defaultTransformer == null ? ConstantTransformer.<I, O>nullTransformer() : defaultTransformer);
         }
         predicates = FunctorUtils.copy(predicates);
         transformers = FunctorUtils.copy(transformers);
@@ -88,19 +88,19 @@ public class SwitchTransformer<I, O> implements Transformer<I, O>, Serializable
      * @throws ClassCastException  if the map elements are of the wrong type
      */
     @SuppressWarnings("unchecked")
-    public static <I, O> Transformer<I, O> getInstance(
+    public static <I, O> Transformer<I, O> switchTransformer(
             Map<? extends Predicate<? super I>, ? extends Transformer<? super I, ? extends O>> predicatesAndTransformers) {
         if (predicatesAndTransformers == null) {
             throw new IllegalArgumentException("The predicate and transformer map must not be null");
         }
         if (predicatesAndTransformers.size() == 0) {
-            return ConstantTransformer.<I, O>getNullInstance();
+            return ConstantTransformer.<I, O>nullTransformer();
         }
         // convert to array like this to guarantee iterator() ordering
         Transformer<? super I, ? extends O> defaultTransformer = predicatesAndTransformers.remove(null);
         int size = predicatesAndTransformers.size();
         if (size == 0) {
-            return (Transformer<I, O>) (defaultTransformer == null ? ConstantTransformer.<I, O>getNullInstance() : defaultTransformer);
+            return (Transformer<I, O>) (defaultTransformer == null ? ConstantTransformer.<I, O>nullTransformer() : defaultTransformer);
         }
         Transformer<? super I, ? extends O>[] transformers = new Transformer[size];
         Predicate<? super I>[] preds = new Predicate[size];
@@ -128,7 +128,7 @@ public class SwitchTransformer<I, O> implements Transformer<I, O>, Serializable
         super();
         iPredicates = predicates;
         iTransformers = transformers;
-        iDefault = (Transformer<? super I, ? extends O>) (defaultTransformer == null ? ConstantTransformer.<I, O>getNullInstance() : defaultTransformer);
+        iDefault = (Transformer<? super I, ? extends O>) (defaultTransformer == null ? ConstantTransformer.<I, O>nullTransformer() : defaultTransformer);
     }
 
     /**
diff --git a/src/java/org/apache/commons/collections/functors/TransformedPredicate.java b/src/java/org/apache/commons/collections/functors/TransformedPredicate.java
index 5b5d3ed24..c15cc70f7 100644
--- a/src/java/org/apache/commons/collections/functors/TransformedPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/TransformedPredicate.java
@@ -49,7 +49,7 @@ public final class TransformedPredicate<T> implements Predicate<T>, PredicateDec
      * @return the predicate
      * @throws IllegalArgumentException if the transformer or the predicate is null
      */
-    public static <T> Predicate<T> getInstance(Transformer<? super T, ? extends T> transformer, Predicate<? super T> predicate) {
+    public static <T> Predicate<T> transformedPredicate(Transformer<? super T, ? extends T> transformer, Predicate<? super T> predicate) {
         if (transformer == null) {
             throw new IllegalArgumentException("The transformer to call must not be null");
         }
diff --git a/src/java/org/apache/commons/collections/functors/TransformerClosure.java b/src/java/org/apache/commons/collections/functors/TransformerClosure.java
index 79c41bbde..57cf59d2e 100644
--- a/src/java/org/apache/commons/collections/functors/TransformerClosure.java
+++ b/src/java/org/apache/commons/collections/functors/TransformerClosure.java
@@ -46,9 +46,9 @@ public class TransformerClosure<E> implements Closure<E>, Serializable {
      * @param transformer  the transformer to call, null means nop
      * @return the <code>transformer</code> closure
      */
-    public static <E> Closure<E> getInstance(Transformer<? super E, ?> transformer) {
+    public static <E> Closure<E> transformerClosure(Transformer<? super E, ?> transformer) {
         if (transformer == null) {
-            return NOPClosure.<E>getInstance();
+            return NOPClosure.<E>nopClosure();
         }
         return new TransformerClosure<E>(transformer);
     }
diff --git a/src/java/org/apache/commons/collections/functors/TransformerPredicate.java b/src/java/org/apache/commons/collections/functors/TransformerPredicate.java
index c912ac23f..0db6ffaa2 100644
--- a/src/java/org/apache/commons/collections/functors/TransformerPredicate.java
+++ b/src/java/org/apache/commons/collections/functors/TransformerPredicate.java
@@ -45,7 +45,7 @@ public final class TransformerPredicate<T> implements Predicate<T>, Serializable
      * @return the predicate
      * @throws IllegalArgumentException if the transformer is null
      */
-    public static <T> Predicate<T> getInstance(Transformer<? super T, Boolean> transformer) {
+    public static <T> Predicate<T> transformerPredicate(Transformer<? super T, Boolean> transformer) {
         if (transformer == null) {
             throw new IllegalArgumentException("The transformer to call must not be null");
         }
diff --git a/src/java/org/apache/commons/collections/functors/UniquePredicate.java b/src/java/org/apache/commons/collections/functors/UniquePredicate.java
index 22f189f3e..ecaa1fff6 100644
--- a/src/java/org/apache/commons/collections/functors/UniquePredicate.java
+++ b/src/java/org/apache/commons/collections/functors/UniquePredicate.java
@@ -45,7 +45,7 @@ public final class UniquePredicate<T> implements Predicate<T>, Serializable {
      * @return the predicate
      * @throws IllegalArgumentException if the predicate is null
      */
-    public static <E> Predicate<E> getInstance() {
+    public static <E> Predicate<E> uniquePredicate() {
         return new UniquePredicate<E>();
     }
 
diff --git a/src/java/org/apache/commons/collections/functors/WhileClosure.java b/src/java/org/apache/commons/collections/functors/WhileClosure.java
index a1bf7cb9d..3b78840d9 100644
--- a/src/java/org/apache/commons/collections/functors/WhileClosure.java
+++ b/src/java/org/apache/commons/collections/functors/WhileClosure.java
@@ -51,7 +51,7 @@ public class WhileClosure<E> implements Closure<E>, Serializable {
      * @return the <code>while</code> closure
      * @throws IllegalArgumentException if the predicate or closure is null
      */
-    public static <E> Closure<E> getInstance(Predicate<? super E> predicate, Closure<? super E> closure, boolean doLoop) {
+    public static <E> Closure<E> whileClosure(Predicate<? super E> predicate, Closure<? super E> closure, boolean doLoop) {
         if (predicate == null) {
             throw new IllegalArgumentException("Predicate must not be null");
         }
diff --git a/src/java/org/apache/commons/collections/iterators/CollatingIterator.java b/src/java/org/apache/commons/collections/iterators/CollatingIterator.java
index f2e00e578..f8f936dd2 100644
--- a/src/java/org/apache/commons/collections/iterators/CollatingIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/CollatingIterator.java
@@ -201,7 +201,7 @@ public class CollatingIterator<E> implements Iterator<E> {
      * @return the unmodifiable list of iterators added
      */
     public List<Iterator<? extends E>> getIterators() {
-        return UnmodifiableList.decorate(iterators);
+        return UnmodifiableList.unmodifiableList(iterators);
     }
 
     /**
diff --git a/src/java/org/apache/commons/collections/iterators/EmptyIterator.java b/src/java/org/apache/commons/collections/iterators/EmptyIterator.java
index c8657f381..d41351533 100644
--- a/src/java/org/apache/commons/collections/iterators/EmptyIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/EmptyIterator.java
@@ -52,7 +52,7 @@ public class EmptyIterator<E> extends AbstractEmptyIterator<E> implements Resett
      * @return ResettableIterator<E>
      */
     @SuppressWarnings("unchecked")
-    public static <E> ResettableIterator<E> getResettableInstance() {
+    public static <E> ResettableIterator<E> resettableEmptyIterator() {
         return (ResettableIterator<E>) RESETTABLE_INSTANCE;
     }
 
@@ -62,7 +62,7 @@ public class EmptyIterator<E> extends AbstractEmptyIterator<E> implements Resett
      * @return Iterator<E>
      */
     @SuppressWarnings("unchecked")
-    public static <E> Iterator<E> getInstance() {
+    public static <E> Iterator<E> emptyIterator() {
         return (Iterator<E>) INSTANCE;
     }
 
diff --git a/src/java/org/apache/commons/collections/iterators/EmptyListIterator.java b/src/java/org/apache/commons/collections/iterators/EmptyListIterator.java
index 8fee2e138..8840f86a4 100644
--- a/src/java/org/apache/commons/collections/iterators/EmptyListIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/EmptyListIterator.java
@@ -53,7 +53,7 @@ public class EmptyListIterator<E> extends AbstractEmptyIterator<E> implements
      * @return {@link ResettableListIterator}<E>
      */
     @SuppressWarnings("unchecked")
-    public static <E> ResettableListIterator<E> getResettableInstance() {
+    public static <E> ResettableListIterator<E> resettableEmptyListIterator() {
         return (ResettableListIterator<E>) RESETTABLE_INSTANCE;
     }
 
@@ -63,7 +63,7 @@ public class EmptyListIterator<E> extends AbstractEmptyIterator<E> implements
      * @return {@link ListIterator}<E>
      */
     @SuppressWarnings("unchecked")
-    public static <E> ListIterator<E> getInstance() {
+    public static <E> ListIterator<E> emptyListIterator() {
         return (ListIterator<E>) INSTANCE;
     }
 
diff --git a/src/java/org/apache/commons/collections/iterators/EmptyMapIterator.java b/src/java/org/apache/commons/collections/iterators/EmptyMapIterator.java
index 507d5dc3b..2f7ae964e 100644
--- a/src/java/org/apache/commons/collections/iterators/EmptyMapIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/EmptyMapIterator.java
@@ -43,7 +43,7 @@ public class EmptyMapIterator<K, V> extends AbstractEmptyMapIterator<K, V> imple
      * @return {@link MapIterator}<K, V>
      */
     @SuppressWarnings("unchecked")
-    public static <K, V> MapIterator<K, V> getInstance() {
+    public static <K, V> MapIterator<K, V> emptyMapIterator() {
         return (MapIterator<K, V>) INSTANCE;
     }
 
diff --git a/src/java/org/apache/commons/collections/iterators/EmptyOrderedIterator.java b/src/java/org/apache/commons/collections/iterators/EmptyOrderedIterator.java
index 35406f811..17f6cbef5 100644
--- a/src/java/org/apache/commons/collections/iterators/EmptyOrderedIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/EmptyOrderedIterator.java
@@ -41,7 +41,7 @@ public class EmptyOrderedIterator<E> extends AbstractEmptyIterator<E> implements
      * @return OrderedIterator<E>
      */
     @SuppressWarnings("unchecked")
-    public static <E> OrderedIterator<E> getInstance() {
+    public static <E> OrderedIterator<E> emptyOrderedIterator() {
         return (OrderedIterator<E>) INSTANCE;
     }
 
diff --git a/src/java/org/apache/commons/collections/iterators/EmptyOrderedMapIterator.java b/src/java/org/apache/commons/collections/iterators/EmptyOrderedMapIterator.java
index 0f029dc5e..2bb82afe4 100644
--- a/src/java/org/apache/commons/collections/iterators/EmptyOrderedMapIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/EmptyOrderedMapIterator.java
@@ -43,7 +43,7 @@ public class EmptyOrderedMapIterator<K, V> extends AbstractEmptyMapIterator<K, V
      * @return {@link OrderedMapIterator}<K, V>
      */
     @SuppressWarnings("unchecked")
-    public static <K, V> OrderedMapIterator<K, V> getInstance() {
+    public static <K, V> OrderedMapIterator<K, V> emptyOrderedMapIterator() {
         return (OrderedMapIterator<K, V>) INSTANCE;
     }
 
diff --git a/src/java/org/apache/commons/collections/iterators/IteratorChain.java b/src/java/org/apache/commons/collections/iterators/IteratorChain.java
index 8d33c101c..91aca1ec6 100644
--- a/src/java/org/apache/commons/collections/iterators/IteratorChain.java
+++ b/src/java/org/apache/commons/collections/iterators/IteratorChain.java
@@ -127,7 +127,7 @@ public class IteratorChain<E> implements Iterator<E> {
      * @param iteratorChain the array of iterators, not null
      * @throws NullPointerException if iterators array is or contains null
      */
-    public IteratorChain(Iterator<? extends E>[] iteratorChain) {
+    public IteratorChain(Iterator<? extends E>... iteratorChain) {
         super();
         for (int i = 0; i < iteratorChain.length; i++) {
             addIterator(iteratorChain[i]);
@@ -193,7 +193,7 @@ public class IteratorChain<E> implements Iterator<E> {
      * @return the unmodifiable list of iterators added
      */
     public List<Iterator<? extends E>> getIterators() {
-        return UnmodifiableList.decorate(iteratorChain);
+        return UnmodifiableList.unmodifiableList(iteratorChain);
     }
 
     /**
@@ -243,7 +243,7 @@ public class IteratorChain<E> implements Iterator<E> {
     protected void updateCurrentIterator() {
         if (currentIterator == null) {
             if (iteratorChain.isEmpty()) {
-                currentIterator = EmptyIterator.<E> getInstance();
+                currentIterator = EmptyIterator.<E> emptyIterator();
             } else {
                 currentIterator = iteratorChain.get(0);
             }
diff --git a/src/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java b/src/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java
index 344311c4e..3d175aae4 100644
--- a/src/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java
@@ -69,7 +69,7 @@ public class ObjectArrayIterator<E>
      * @param array the array to iterate over
      * @throws NullPointerException if <code>array</code> is <code>null</code>
      */
-    public ObjectArrayIterator(E[] array) {
+    public ObjectArrayIterator(E... array) {
         this(array, 0, array.length);
     }
 
diff --git a/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java b/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java
index bb3397f95..db852128c 100644
--- a/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java
@@ -69,7 +69,7 @@ public class ObjectArrayListIterator<E> extends ObjectArrayIterator<E>
      * @param array the array to iterate over
      * @throws NullPointerException if <code>array</code> is <code>null</code>
      */
-    public ObjectArrayListIterator(E[] array) {
+    public ObjectArrayListIterator(E... array) {
         super(array);
     }
 
diff --git a/src/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java b/src/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java
index 64a4b54f8..0b90f7b3e 100644
--- a/src/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java
@@ -40,7 +40,7 @@ public class UniqueFilterIterator<E> extends FilterIterator<E> {
      *  @param iterator  the iterator to use
      */
     public UniqueFilterIterator(Iterator<E> iterator) {
-        super(iterator, UniquePredicate.getInstance());
+        super(iterator, UniquePredicate.uniquePredicate());
     }
 
 }
diff --git a/src/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java b/src/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java
index 6048bfacc..9a8aa698a 100644
--- a/src/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java
@@ -44,7 +44,7 @@ public final class UnmodifiableIterator<E> implements Iterator<E>, Unmodifiable
      * @param iterator  the iterator to decorate
      * @throws IllegalArgumentException if the iterator is null
      */
-    public static <E> Iterator<E> decorate(Iterator<E> iterator) {
+    public static <E> Iterator<E> unmodifiableIterator(Iterator<E> iterator) {
         if (iterator == null) {
             throw new IllegalArgumentException("Iterator must not be null");
         }
diff --git a/src/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java b/src/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java
index 5c4d623d4..bab5eabb9 100644
--- a/src/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java
@@ -42,7 +42,7 @@ public final class UnmodifiableListIterator<E> implements ListIterator<E>, Unmod
      * @param iterator  the iterator to decorate
      * @throws IllegalArgumentException if the iterator is null
      */
-    public static <E> ListIterator<E> decorate(ListIterator<E> iterator) {
+    public static <E> ListIterator<E> umodifiableListIterator(ListIterator<E> iterator) {
         if (iterator == null) {
             throw new IllegalArgumentException("ListIterator must not be null");
         }
diff --git a/src/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java b/src/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java
index 017fe2640..1519e23de 100644
--- a/src/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java
@@ -41,7 +41,7 @@ public final class UnmodifiableMapIterator<K, V> implements MapIterator<K, V>, U
      * @param iterator  the iterator to decorate
      * @throws IllegalArgumentException if the iterator is null
      */
-    public static <K, V> MapIterator<K, V> decorate(MapIterator<K, V> iterator) {
+    public static <K, V> MapIterator<K, V> unmodifiableMapIterator(MapIterator<K, V> iterator) {
         if (iterator == null) {
             throw new IllegalArgumentException("MapIterator must not be null");
         }
diff --git a/src/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java b/src/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java
index be8d72955..d1f44aeac 100644
--- a/src/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java
+++ b/src/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java
@@ -42,7 +42,7 @@ public final class UnmodifiableOrderedMapIterator<K, V> implements OrderedMapIte
      * @param iterator  the iterator to decorate
      * @throws IllegalArgumentException if the iterator is null
      */
-    public static <K, V> OrderedMapIterator<K, V> decorate(OrderedMapIterator<K, V> iterator) {
+    public static <K, V> OrderedMapIterator<K, V> unmodifiableOrderedMapIterator(OrderedMapIterator<K, V> iterator) {
         if (iterator == null) {
             throw new IllegalArgumentException("OrderedMapIterator must not be null");
         }
diff --git a/src/java/org/apache/commons/collections/list/FixedSizeList.java b/src/java/org/apache/commons/collections/list/FixedSizeList.java
index c875d615f..733d84dfb 100644
--- a/src/java/org/apache/commons/collections/list/FixedSizeList.java
+++ b/src/java/org/apache/commons/collections/list/FixedSizeList.java
@@ -52,7 +52,7 @@ public class FixedSizeList<E>
      * @param list  the list to decorate, must not be null
      * @throws IllegalArgumentException if list is null
      */
-    public static <E> List<E> decorate(List<E> list) {
+    public static <E> List<E> fixedSizeList(List<E> list) {
         return new FixedSizeList<E>(list);
     }
 
@@ -105,7 +105,7 @@ public class FixedSizeList<E>
 
     @Override
     public Iterator<E> iterator() {
-        return UnmodifiableIterator.decorate(decorated().iterator());
+        return UnmodifiableIterator.unmodifiableIterator(decorated().iterator());
     }
 
     @Override
diff --git a/src/java/org/apache/commons/collections/list/GrowthList.java b/src/java/org/apache/commons/collections/list/GrowthList.java
index f31b750a7..17a863d5c 100644
--- a/src/java/org/apache/commons/collections/list/GrowthList.java
+++ b/src/java/org/apache/commons/collections/list/GrowthList.java
@@ -66,7 +66,7 @@ public class GrowthList<E> extends AbstractSerializableListDecorator<E> {
      * @param list  the list to decorate, must not be null
      * @throws IllegalArgumentException if list is null
      */
-    public static <E> List<E> decorate(List<E> list) {
+    public static <E> List<E> growthList(List<E> list) {
         return new GrowthList<E>(list);
     }
 
diff --git a/src/java/org/apache/commons/collections/list/LazyList.java b/src/java/org/apache/commons/collections/list/LazyList.java
index 167e858d2..4e156c479 100644
--- a/src/java/org/apache/commons/collections/list/LazyList.java
+++ b/src/java/org/apache/commons/collections/list/LazyList.java
@@ -76,7 +76,7 @@ public class LazyList<E> extends AbstractSerializableListDecorator<E> {
      * @param factory  the factory to use for creation, must not be null
      * @throws IllegalArgumentException if list or factory is null
      */
-    public static <E> List<E> decorate(List<E> list, Factory<? extends E> factory) {
+    public static <E> List<E> lazyList(List<E> list, Factory<? extends E> factory) {
         return new LazyList<E>(list, factory);
     }
     
diff --git a/src/java/org/apache/commons/collections/list/PredicatedList.java b/src/java/org/apache/commons/collections/list/PredicatedList.java
index 61195371c..8f7b3181e 100644
--- a/src/java/org/apache/commons/collections/list/PredicatedList.java
+++ b/src/java/org/apache/commons/collections/list/PredicatedList.java
@@ -60,7 +60,7 @@ public class PredicatedList<E> extends PredicatedCollection<E> implements List<E
      * @throws IllegalArgumentException if list or predicate is null
      * @throws IllegalArgumentException if the list contains invalid elements
      */
-    public static <T> List<T> decorate(List<T> list, Predicate<? super T> predicate) {
+    public static <T> List<T> predicatedList(List<T> list, Predicate<? super T> predicate) {
         return new PredicatedList<T>(list, predicate);
     }
 
diff --git a/src/java/org/apache/commons/collections/list/SetUniqueList.java b/src/java/org/apache/commons/collections/list/SetUniqueList.java
index 2cac90413..14900c0d4 100644
--- a/src/java/org/apache/commons/collections/list/SetUniqueList.java
+++ b/src/java/org/apache/commons/collections/list/SetUniqueList.java
@@ -70,7 +70,7 @@ public class SetUniqueList<E> extends AbstractSerializableListDecorator<E> {
      * @param list  the list to decorate, must not be null
      * @throws IllegalArgumentException if list is null
      */
-    public static <E> SetUniqueList<E> decorate(List<E> list) {
+    public static <E> SetUniqueList<E> setUniqueList(List<E> list) {
         if (list == null) {
             throw new IllegalArgumentException("List must not be null");
         }
@@ -109,7 +109,7 @@ public class SetUniqueList<E> extends AbstractSerializableListDecorator<E> {
      * @return an unmodifiable set view
      */
     public Set<E> asSet() {
-        return UnmodifiableSet.decorate(set);
+        return UnmodifiableSet.unmodifiableSet(set);
     }
 
     //-----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/list/SynchronizedList.java b/src/java/org/apache/commons/collections/list/SynchronizedList.java
index 3a234e058..b171beb7c 100644
--- a/src/java/org/apache/commons/collections/list/SynchronizedList.java
+++ b/src/java/org/apache/commons/collections/list/SynchronizedList.java
@@ -46,7 +46,7 @@ public class SynchronizedList<E> extends SynchronizedCollection<E> implements Li
      * @param list  the list to decorate, must not be null
      * @throws IllegalArgumentException if list is null
      */
-    public static <T> List<T> decorate(List<T> list) {
+    public static <T> List<T> synchronizedList(List<T> list) {
         return new SynchronizedList<T>(list);
     }
     
diff --git a/src/java/org/apache/commons/collections/list/TransformedList.java b/src/java/org/apache/commons/collections/list/TransformedList.java
index 7ffb14aef..473c20585 100644
--- a/src/java/org/apache/commons/collections/list/TransformedList.java
+++ b/src/java/org/apache/commons/collections/list/TransformedList.java
@@ -49,13 +49,13 @@ public class TransformedList<E> extends TransformedCollection<E> implements List
      * <p>
      * If there are any elements already in the list being decorated, they
      * are NOT transformed.
-     * Constrast this with {@link #decorateTransform}.
+     * Contrast this with {@link #transformedList(List, Transformer)}.
      * 
      * @param list  the list to decorate, must not be null
      * @param transformer  the transformer to use for conversion, must not be null
      * @throws IllegalArgumentException if list or transformer is null
      */
-    public static <E> List<E> decorate(List<E> list, Transformer<? super E, ? extends E> transformer) {
+    public static <E> List<E> transformingList(List<E> list, Transformer<? super E, ? extends E> transformer) {
         return new TransformedList<E>(list, transformer);
     }
     
@@ -65,7 +65,7 @@ public class TransformedList<E> extends TransformedCollection<E> implements List
      * <p>
      * If there are any elements already in the list being decorated, they
      * will be transformed by this method.
-     * Constrast this with {@link #decorate}.
+     * Contrast this with {@link #transformingList(List, Transformer)}.
      * 
      * @param list  the list to decorate, must not be null
      * @param transformer  the transformer to use for conversion, must not be null
@@ -73,7 +73,7 @@ public class TransformedList<E> extends TransformedCollection<E> implements List
      * @throws IllegalArgumentException if list or transformer is null
      * @since Commons Collections 3.3
      */
-    public static <E> List<E> decorateTransform(List<E> list, Transformer<? super E, ? extends E> transformer) {
+    public static <E> List<E> transformedList(List<E> list, Transformer<? super E, ? extends E> transformer) {
         TransformedList<E> decorated = new TransformedList<E>(list, transformer);
         if (transformer != null && list != null && list.size() > 0) {
             @SuppressWarnings("unchecked") // list is of type E
diff --git a/src/java/org/apache/commons/collections/list/UnmodifiableList.java b/src/java/org/apache/commons/collections/list/UnmodifiableList.java
index 207141d77..b9a3c2385 100644
--- a/src/java/org/apache/commons/collections/list/UnmodifiableList.java
+++ b/src/java/org/apache/commons/collections/list/UnmodifiableList.java
@@ -50,7 +50,7 @@ public final class UnmodifiableList<E>
      * @param list  the list to decorate, must not be null
      * @throws IllegalArgumentException if list is null
      */
-    public static <E> List<E> decorate(List<E> list) {
+    public static <E> List<E> unmodifiableList(List<E> list) {
         if (list instanceof Unmodifiable) {
             return list;
         }
@@ -72,7 +72,7 @@ public final class UnmodifiableList<E>
     //-----------------------------------------------------------------------
     @Override
     public Iterator<E> iterator() {
-        return UnmodifiableIterator.decorate(decorated().iterator());
+        return UnmodifiableIterator.unmodifiableIterator(decorated().iterator());
     }
 
     @Override
@@ -108,12 +108,12 @@ public final class UnmodifiableList<E>
     //-----------------------------------------------------------------------
     @Override
     public ListIterator<E> listIterator() {
-        return UnmodifiableListIterator.decorate(decorated().listIterator());
+        return UnmodifiableListIterator.umodifiableListIterator(decorated().listIterator());
     }
 
     @Override
     public ListIterator<E> listIterator(int index) {
-        return UnmodifiableListIterator.decorate(decorated().listIterator(index));
+        return UnmodifiableListIterator.umodifiableListIterator(decorated().listIterator(index));
     }
 
     @Override
diff --git a/src/java/org/apache/commons/collections/map/AbstractHashedMap.java b/src/java/org/apache/commons/collections/map/AbstractHashedMap.java
index 0f10a79dc..d9a52a643 100644
--- a/src/java/org/apache/commons/collections/map/AbstractHashedMap.java
+++ b/src/java/org/apache/commons/collections/map/AbstractHashedMap.java
@@ -757,7 +757,7 @@ public class AbstractHashedMap<K, V> extends AbstractMap<K, V> implements Iterab
      */
     public MapIterator<K, V> mapIterator() {
         if (size == 0) {
-            return EmptyMapIterator.<K, V>getInstance();
+            return EmptyMapIterator.<K, V>emptyMapIterator();
         }
         return new HashMapIterator<K, V>(this);
     }
@@ -824,7 +824,7 @@ public class AbstractHashedMap<K, V> extends AbstractMap<K, V> implements Iterab
      */
     protected Iterator<Map.Entry<K, V>> createEntrySetIterator() {
         if (size() == 0) {
-            return EmptyIterator.<Map.Entry<K, V>>getInstance();
+            return EmptyIterator.<Map.Entry<K, V>>emptyIterator();
         }
         return new EntrySetIterator<K, V>(this);
     }
@@ -918,7 +918,7 @@ public class AbstractHashedMap<K, V> extends AbstractMap<K, V> implements Iterab
      */
     protected Iterator<K> createKeySetIterator() {
         if (size() == 0) {
-            return EmptyIterator.<K>getInstance();
+            return EmptyIterator.<K>emptyIterator();
         }
         return new KeySetIterator<K>(this);
     }
@@ -1002,7 +1002,7 @@ public class AbstractHashedMap<K, V> extends AbstractMap<K, V> implements Iterab
      */
     protected Iterator<V> createValuesIterator() {
         if (size() == 0) {
-            return EmptyIterator.<V>getInstance();
+            return EmptyIterator.<V>emptyIterator();
         }
         return new ValuesIterator<V>(this);
     }
diff --git a/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java b/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java
index b928e06ea..a04bcc977 100644
--- a/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java
+++ b/src/java/org/apache/commons/collections/map/AbstractLinkedMap.java
@@ -341,7 +341,7 @@ public abstract class AbstractLinkedMap<K, V> extends AbstractHashedMap<K, V> im
     @Override
     public OrderedMapIterator<K, V> mapIterator() {
         if (size == 0) {
-            return EmptyOrderedMapIterator.<K, V>getInstance();
+            return EmptyOrderedMapIterator.<K, V>emptyOrderedMapIterator();
         }
         return new LinkMapIterator<K, V>(this);
     }
@@ -399,7 +399,7 @@ public abstract class AbstractLinkedMap<K, V> extends AbstractHashedMap<K, V> im
     @Override
     protected Iterator<Map.Entry<K, V>> createEntrySetIterator() {
         if (size() == 0) {
-            return EmptyOrderedIterator.<Map.Entry<K, V>>getInstance();
+            return EmptyOrderedIterator.<Map.Entry<K, V>>emptyOrderedIterator();
         }
         return new EntrySetIterator<K, V>(this);
     }
@@ -433,7 +433,7 @@ public abstract class AbstractLinkedMap<K, V> extends AbstractHashedMap<K, V> im
     @Override
     protected Iterator<K> createKeySetIterator() {
         if (size() == 0) {
-            return EmptyOrderedIterator.<K>getInstance();
+            return EmptyOrderedIterator.<K>emptyOrderedIterator();
         }
         return new KeySetIterator<K>(this);
     }
@@ -468,7 +468,7 @@ public abstract class AbstractLinkedMap<K, V> extends AbstractHashedMap<K, V> im
     @Override
     protected Iterator<V> createValuesIterator() {
         if (size() == 0) {
-            return EmptyOrderedIterator.<V>getInstance();
+            return EmptyOrderedIterator.<V>emptyOrderedIterator();
         }
         return new ValuesIterator<V>(this);
     }
diff --git a/src/java/org/apache/commons/collections/map/CompositeMap.java b/src/java/org/apache/commons/collections/map/CompositeMap.java
index 8dd13d0cc..c9f8c683f 100644
--- a/src/java/org/apache/commons/collections/map/CompositeMap.java
+++ b/src/java/org/apache/commons/collections/map/CompositeMap.java
@@ -94,7 +94,7 @@ public class CompositeMap<K, V> extends AbstractIterableMap<K, V> implements Ser
      * @param composite  the Maps to be composited
      * @throws IllegalArgumentException if there is a key collision
      */
-    public CompositeMap(Map<K, V>[] composite) {
+    public CompositeMap(Map<K, V>... composite) {
         this(composite, null);
     }
 
diff --git a/src/java/org/apache/commons/collections/map/DefaultedMap.java b/src/java/org/apache/commons/collections/map/DefaultedMap.java
index 94ff80f3a..ef138d1e5 100644
--- a/src/java/org/apache/commons/collections/map/DefaultedMap.java
+++ b/src/java/org/apache/commons/collections/map/DefaultedMap.java
@@ -82,8 +82,8 @@ public class DefaultedMap<K, V> extends AbstractMapDecorator<K, V> implements Se
      * @param defaultValue  the default value to return when the key is not found
      * @throws IllegalArgumentException if map is null
      */
-    public static <K, V> Map<K, V> decorate(Map<K, V> map, V defaultValue) {
-        return new DefaultedMap<K, V>(map, ConstantTransformer.getInstance(defaultValue));
+    public static <K, V> Map<K, V> defaultedMap(Map<K, V> map, V defaultValue) {
+        return new DefaultedMap<K, V>(map, ConstantTransformer.constantTransformer(defaultValue));
     }
 
     /**
@@ -96,11 +96,11 @@ public class DefaultedMap<K, V> extends AbstractMapDecorator<K, V> implements Se
      * @param factory  the factory to use to create entries, must not be null
      * @throws IllegalArgumentException if map or factory is null
      */
-    public static <K, V> IterableMap<K, V> decorate(Map<K, V> map, Factory<? extends V> factory) {
+    public static <K, V> IterableMap<K, V> defaultedMap(Map<K, V> map, Factory<? extends V> factory) {
         if (factory == null) {
             throw new IllegalArgumentException("Factory must not be null");
         }
-        return new DefaultedMap<K, V>(map, FactoryTransformer.getInstance(factory));
+        return new DefaultedMap<K, V>(map, FactoryTransformer.factoryTransformer(factory));
     }
 
     /**
@@ -114,7 +114,7 @@ public class DefaultedMap<K, V> extends AbstractMapDecorator<K, V> implements Se
      * @param transformer  the transformer to use as a factory to create entries, must not be null
      * @throws IllegalArgumentException if map or factory is null
      */
-    public static <K, V> Map<K, V> decorate(Map<K, V> map, Transformer<? super K, ? extends V> transformer) {
+    public static <K, V> Map<K, V> defaultedMap(Map<K, V> map, Transformer<? super K, ? extends V> transformer) {
         if (transformer == null) {
            throw new IllegalArgumentException("Transformer must not be null");
        }
@@ -132,7 +132,7 @@ public class DefaultedMap<K, V> extends AbstractMapDecorator<K, V> implements Se
      * @param defaultValue  the default value to return when the key is not found
      */
     public DefaultedMap(V defaultValue) {
-        this(ConstantTransformer.getInstance(defaultValue));
+        this(ConstantTransformer.constantTransformer(defaultValue));
     }
 
     /**
diff --git a/src/java/org/apache/commons/collections/map/FixedSizeMap.java b/src/java/org/apache/commons/collections/map/FixedSizeMap.java
index 114c20e34..a799095aa 100644
--- a/src/java/org/apache/commons/collections/map/FixedSizeMap.java
+++ b/src/java/org/apache/commons/collections/map/FixedSizeMap.java
@@ -69,7 +69,7 @@ public class FixedSizeMap<K, V>
      * @param map  the map to decorate, must not be null
      * @throws IllegalArgumentException if map is null
      */
-    public static <K, V> IterableMap<K, V> decorate(Map<K, V> map) {
+    public static <K, V> IterableMap<K, V> fixedSizeMap(Map<K, V> map) {
         return new FixedSizeMap<K, V>(map);
     }
 
@@ -144,19 +144,19 @@ public class FixedSizeMap<K, V>
     public Set<Map.Entry<K, V>> entrySet() {
         Set<Map.Entry<K, V>> set = map.entrySet();
         // unmodifiable set will still allow modification via Map.Entry objects
-        return UnmodifiableSet.decorate(set);
+        return UnmodifiableSet.unmodifiableSet(set);
     }
 
     @Override
     public Set<K> keySet() {
         Set<K> set = map.keySet();
-        return UnmodifiableSet.decorate(set);
+        return UnmodifiableSet.unmodifiableSet(set);
     }
 
     @Override
     public Collection<V> values() {
         Collection<V> coll = map.values();
-        return UnmodifiableCollection.decorate(coll);
+        return UnmodifiableCollection.unmodifiableCollection(coll);
     }
 
     public boolean isFull() {
diff --git a/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java b/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java
index 48f19e1b5..4cdc79527 100644
--- a/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java
+++ b/src/java/org/apache/commons/collections/map/FixedSizeSortedMap.java
@@ -70,7 +70,7 @@ public class FixedSizeSortedMap<K, V>
      * @param map  the map to decorate, must not be null
      * @throws IllegalArgumentException if map is null
      */
-    public static <K, V> SortedMap<K, V> decorate(SortedMap<K, V> map) {
+    public static <K, V> SortedMap<K, V> fixedSizeSortedMap(SortedMap<K, V> map) {
         return new FixedSizeSortedMap<K, V>(map);
     }
 
@@ -141,17 +141,17 @@ public class FixedSizeSortedMap<K, V>
 
     @Override
     public Set<Map.Entry<K, V>> entrySet() {
-        return UnmodifiableSet.decorate(map.entrySet());
+        return UnmodifiableSet.unmodifiableSet(map.entrySet());
     }
 
     @Override
     public Set<K> keySet() {
-        return UnmodifiableSet.decorate(map.keySet());
+        return UnmodifiableSet.unmodifiableSet(map.keySet());
     }
 
     @Override
     public Collection<V> values() {
-        return UnmodifiableCollection.decorate(map.values());
+        return UnmodifiableCollection.unmodifiableCollection(map.values());
     }
 
     //-----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/map/Flat3Map.java b/src/java/org/apache/commons/collections/map/Flat3Map.java
index cb4f92ad5..54c23d672 100644
--- a/src/java/org/apache/commons/collections/map/Flat3Map.java
+++ b/src/java/org/apache/commons/collections/map/Flat3Map.java
@@ -573,7 +573,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl
             return delegateMap.mapIterator();
         }
         if (size == 0) {
-            return EmptyMapIterator.<K, V>getInstance();
+            return EmptyMapIterator.<K, V>emptyMapIterator();
         }
         return new FlatMapIterator<K, V>(this);
     }
@@ -731,7 +731,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl
                 return parent.delegateMap.entrySet().iterator();
             }
             if (parent.size() == 0) {
-                return EmptyIterator.<Map.Entry<K, V>>getInstance();
+                return EmptyIterator.<Map.Entry<K, V>>emptyIterator();
             }
             return new EntrySetIterator<K, V>(parent);
         }
@@ -922,7 +922,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl
                 return parent.delegateMap.keySet().iterator();
             }
             if (parent.size() == 0) {
-                return EmptyIterator.<K>getInstance();
+                return EmptyIterator.<K>emptyIterator();
             }
             return new KeySetIterator<K>(parent);
         }
@@ -990,7 +990,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl
                 return parent.delegateMap.values().iterator();
             }
             if (parent.size() == 0) {
-                return EmptyIterator.<V>getInstance();
+                return EmptyIterator.<V>emptyIterator();
             }
             return new ValuesIterator<V>(parent);
         }
diff --git a/src/java/org/apache/commons/collections/map/LazyMap.java b/src/java/org/apache/commons/collections/map/LazyMap.java
index 9d280c292..dc71dd94f 100644
--- a/src/java/org/apache/commons/collections/map/LazyMap.java
+++ b/src/java/org/apache/commons/collections/map/LazyMap.java
@@ -77,7 +77,7 @@ public class LazyMap<K, V> extends AbstractMapDecorator<K, V> implements Map<K,
      * @param factory  the factory to use, must not be null
      * @throws IllegalArgumentException if map or factory is null
      */
-    public static <K, V> LazyMap<K, V> getLazyMap(Map<K, V> map, Factory< ? extends V> factory) {
+    public static <K, V> LazyMap<K, V> lazyMap(Map<K, V> map, Factory< ? extends V> factory) {
         return new LazyMap<K,V>(map, factory);
     }
 
@@ -88,7 +88,7 @@ public class LazyMap<K, V> extends AbstractMapDecorator<K, V> implements Map<K,
      * @param factory  the factory to use, must not be null
      * @throws IllegalArgumentException if map or factory is null
      */
-    public static <V, K> LazyMap<K, V> getLazyMap(Map<K, V> map, Transformer<? super K, ? extends V> factory) {
+    public static <V, K> LazyMap<K, V> lazyMap(Map<K, V> map, Transformer<? super K, ? extends V> factory) {
         return new LazyMap<K,V>(map, factory);
     }
 
@@ -105,7 +105,7 @@ public class LazyMap<K, V> extends AbstractMapDecorator<K, V> implements Map<K,
         if (factory == null) {
             throw new IllegalArgumentException("Factory must not be null");
         }
-        this.factory = FactoryTransformer.getInstance(factory);
+        this.factory = FactoryTransformer.factoryTransformer(factory);
     }
 
     /**
diff --git a/src/java/org/apache/commons/collections/map/LazySortedMap.java b/src/java/org/apache/commons/collections/map/LazySortedMap.java
index f6f0e2c64..6b40d026e 100644
--- a/src/java/org/apache/commons/collections/map/LazySortedMap.java
+++ b/src/java/org/apache/commons/collections/map/LazySortedMap.java
@@ -65,7 +65,6 @@ public class LazySortedMap<K,V>
     /** Serialization version */
     private static final long serialVersionUID = 2715322183617658933L;
 
-
     /**
      * Factory method to create a lazily instantiated sorted map.
      * 
@@ -73,7 +72,7 @@ public class LazySortedMap<K,V>
      * @param factory  the factory to use, must not be null
      * @throws IllegalArgumentException if map or factory is null
      */
-    public static <K, V> SortedMap<K, V> getLazySortedMap(SortedMap<K, V> map, Factory<? extends V> factory) {
+    public static <K, V> SortedMap<K, V> lazySortedMap(SortedMap<K, V> map, Factory<? extends V> factory) {
         return new LazySortedMap<K,V>(map, factory);
     }
 
@@ -84,7 +83,7 @@ public class LazySortedMap<K,V>
      * @param factory  the factory to use, must not be null
      * @throws IllegalArgumentException if map or factory is null
      */
-    public static <K, V> SortedMap<K, V> getLazySortedMap(SortedMap<K, V> map, Transformer<? super K, ? extends V> factory) {
+    public static <K, V> SortedMap<K, V> lazySortedMap(SortedMap<K, V> map, Transformer<? super K, ? extends V> factory) {
         return new LazySortedMap<K,V>(map, factory);
     }
 
diff --git a/src/java/org/apache/commons/collections/map/LinkedMap.java b/src/java/org/apache/commons/collections/map/LinkedMap.java
index c1ce5aca2..c0c01ce36 100644
--- a/src/java/org/apache/commons/collections/map/LinkedMap.java
+++ b/src/java/org/apache/commons/collections/map/LinkedMap.java
@@ -283,22 +283,22 @@ public class LinkedMap<K, V> extends AbstractLinkedMap<K, V> implements Serializ
 
         @Override
         public Iterator<K> iterator() {
-            return UnmodifiableIterator.decorate(parent.keySet().iterator());
+            return UnmodifiableIterator.unmodifiableIterator(parent.keySet().iterator());
         }
 
         @Override
         public ListIterator<K> listIterator() {
-            return UnmodifiableListIterator.decorate(super.listIterator());
+            return UnmodifiableListIterator.umodifiableListIterator(super.listIterator());
         }
 
         @Override
         public ListIterator<K> listIterator(int fromIndex) {
-            return UnmodifiableListIterator.decorate(super.listIterator(fromIndex));
+            return UnmodifiableListIterator.umodifiableListIterator(super.listIterator(fromIndex));
         }
 
         @Override
         public List<K> subList(int fromIndexInclusive, int toIndexExclusive) {
-            return UnmodifiableList.decorate(super.subList(fromIndexInclusive, toIndexExclusive));
+            return UnmodifiableList.unmodifiableList(super.subList(fromIndexInclusive, toIndexExclusive));
         }
     }
 
diff --git a/src/java/org/apache/commons/collections/map/ListOrderedMap.java b/src/java/org/apache/commons/collections/map/ListOrderedMap.java
index 0ac82119d..f5f43aa54 100644
--- a/src/java/org/apache/commons/collections/map/ListOrderedMap.java
+++ b/src/java/org/apache/commons/collections/map/ListOrderedMap.java
@@ -96,7 +96,7 @@ public class ListOrderedMap<K, V>
      * @param map  the map to decorate, must not be null
      * @throws IllegalArgumentException if map is null
      */
-    public static <K, V> OrderedMap<K, V> decorate(Map<K, V> map) {
+    public static <K, V> OrderedMap<K, V> listOrderedMap(Map<K, V> map) {
         return new ListOrderedMap<K, V>(map);
     }
 
@@ -285,7 +285,7 @@ public class ListOrderedMap<K, V>
      * @since Commons Collections 3.2
      */
     public List<K> keyList() {
-        return UnmodifiableList.decorate(insertOrder);
+        return UnmodifiableList.unmodifiableList(insertOrder);
     }
 
     /**
diff --git a/src/java/org/apache/commons/collections/map/MultiKeyMap.java b/src/java/org/apache/commons/collections/map/MultiKeyMap.java
index 2bf40cc50..17206bc61 100644
--- a/src/java/org/apache/commons/collections/map/MultiKeyMap.java
+++ b/src/java/org/apache/commons/collections/map/MultiKeyMap.java
@@ -92,7 +92,7 @@ public class MultiKeyMap<K, V> extends AbstractMapDecorator<MultiKey<? extends K
      * @param map  the map to decorate, not null
      * @throws IllegalArgumentException if the map is null or not empty
      */
-    public static <K, V> MultiKeyMap<K, V> decorate(AbstractHashedMap<MultiKey<? extends K>, V> map) {
+    public static <K, V> MultiKeyMap<K, V> multiKeyMap(AbstractHashedMap<MultiKey<? extends K>, V> map) {
         if (map == null) {
             throw new IllegalArgumentException("Map must not be null");
         }
@@ -112,7 +112,7 @@ public class MultiKeyMap<K, V> extends AbstractMapDecorator<MultiKey<? extends K
 
     /**
      * Constructor that decorates the specified map and is called from
-     * {@link #decorate(AbstractHashedMap)}.
+     * {@link #multiKeyMap(AbstractHashedMap)}.
      * The map must not be null and should be empty or only contain valid keys.
      * This constructor performs no validation.
      *
diff --git a/src/java/org/apache/commons/collections/map/MultiValueMap.java b/src/java/org/apache/commons/collections/map/MultiValueMap.java
index e36816cc7..6b0db4cfb 100644
--- a/src/java/org/apache/commons/collections/map/MultiValueMap.java
+++ b/src/java/org/apache/commons/collections/map/MultiValueMap.java
@@ -83,9 +83,9 @@ public class MultiValueMap<K, V> extends AbstractMapDecorator<K, Object> impleme
      *
      * @param map  the map to wrap
      */
-    @SuppressWarnings("unchecked")
-    public static <K, V> MultiValueMap<K, V> decorate(Map<K, ? super Collection<V>> map) {
-        return MultiValueMap.<K, V, ArrayList>decorate((Map<K, ? super Collection>) map, ArrayList.class);
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    public static <K, V> MultiValueMap<K, V> multiValueMap(Map<K, ? super Collection<V>> map) {
+        return MultiValueMap.<K, V, ArrayList> multiValueMap((Map<K, ? super Collection>) map, ArrayList.class);
     }
 
     /**
@@ -95,7 +95,7 @@ public class MultiValueMap<K, V> extends AbstractMapDecorator<K, Object> impleme
      * @param map  the map to wrap
      * @param collectionClass  the type of the collection class
      */
-    public static <K, V, C extends Collection<V>> MultiValueMap<K, V> decorate(Map<K, ? super C> map, Class<C> collectionClass) {
+    public static <K, V, C extends Collection<V>> MultiValueMap<K, V> multiValueMap(Map<K, ? super C> map, Class<C> collectionClass) {
         return new MultiValueMap<K, V>(map, new ReflectionFactory<C>(collectionClass));
     }
 
@@ -106,7 +106,7 @@ public class MultiValueMap<K, V> extends AbstractMapDecorator<K, Object> impleme
      * @param map  the map to decorate
      * @param collectionFactory  the collection factory (must return a Collection object).
      */
-    public static <K, V, C extends Collection<V>> MultiValueMap<K, V> decorate(Map<K, ? super C> map, Factory<C> collectionFactory) {
+    public static <K, V, C extends Collection<V>> MultiValueMap<K, V> multiValueMap(Map<K, ? super C> map, Factory<C> collectionFactory) {
         return new MultiValueMap<K, V>(map, collectionFactory);
     }
 
@@ -115,9 +115,9 @@ public class MultiValueMap<K, V> extends AbstractMapDecorator<K, Object> impleme
      * Creates a MultiValueMap based on a <code>HashMap</code> and
      * storing the multiple values in an <code>ArrayList</code>.
      */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     public MultiValueMap() {
-        this(new HashMap(), new ReflectionFactory(ArrayList.class));
+        this(new HashMap<K, V>(), new ReflectionFactory(ArrayList.class));
     }
 
     /**
@@ -375,7 +375,7 @@ public class MultiValueMap<K, V> extends AbstractMapDecorator<K, Object> impleme
      */
     public Iterator<V> iterator(Object key) {
         if (!containsKey(key)) {
-            return EmptyIterator.<V>getInstance();
+            return EmptyIterator.<V>emptyIterator();
         }
         return new ValuesIterator(key);
     }
diff --git a/src/java/org/apache/commons/collections/map/PredicatedMap.java b/src/java/org/apache/commons/collections/map/PredicatedMap.java
index 77ddc9178..68bc64f0c 100644
--- a/src/java/org/apache/commons/collections/map/PredicatedMap.java
+++ b/src/java/org/apache/commons/collections/map/PredicatedMap.java
@@ -75,7 +75,7 @@ public class PredicatedMap<K, V>
      * @param valuePredicate  the predicate to validate to values, null means no check
      * @throws IllegalArgumentException if the map is null
      */
-    public static <K, V> IterableMap<K, V> decorate(Map<K, V> map, Predicate<? super K> keyPredicate, Predicate<? super V> valuePredicate) {
+    public static <K, V> IterableMap<K, V> predicatedMap(Map<K, V> map, Predicate<? super K> keyPredicate, Predicate<? super V> valuePredicate) {
         return new PredicatedMap<K, V>(map, keyPredicate, valuePredicate);
     }
 
diff --git a/src/java/org/apache/commons/collections/map/PredicatedSortedMap.java b/src/java/org/apache/commons/collections/map/PredicatedSortedMap.java
index 3bbf93a07..b1d631c48 100644
--- a/src/java/org/apache/commons/collections/map/PredicatedSortedMap.java
+++ b/src/java/org/apache/commons/collections/map/PredicatedSortedMap.java
@@ -62,7 +62,7 @@ public class PredicatedSortedMap<K, V> extends PredicatedMap<K, V> implements So
      * @param valuePredicate  the predicate to validate to values, null means no check
      * @throws IllegalArgumentException if the map is null
      */
-    public static <K, V> SortedMap<K, V> decorate(SortedMap<K, V> map,
+    public static <K, V> SortedMap<K, V> predicatedSortedMap(SortedMap<K, V> map,
             Predicate<? super K> keyPredicate, Predicate<? super V> valuePredicate) {
         return new PredicatedSortedMap<K, V>(map, keyPredicate, valuePredicate);
     }
diff --git a/src/java/org/apache/commons/collections/map/TransformedMap.java b/src/java/org/apache/commons/collections/map/TransformedMap.java
index 83d9b100a..f680786bd 100644
--- a/src/java/org/apache/commons/collections/map/TransformedMap.java
+++ b/src/java/org/apache/commons/collections/map/TransformedMap.java
@@ -65,14 +65,14 @@ public class TransformedMap<K, V>
      * <p>
      * If there are any elements already in the map being decorated, they
      * are NOT transformed.
-     * Contrast this with {@link #decorateTransform}.
+     * Contrast this with {@link #transformedMap(Map, Transformer, Transformer)}.
      *
      * @param map  the map to decorate, must not be null
      * @param keyTransformer  the transformer to use for key conversion, null means no transformation
      * @param valueTransformer  the transformer to use for value conversion, null means no transformation
      * @throws IllegalArgumentException if map is null
      */
-    public static <K, V> IterableMap<K, V> decorate(Map<K, V> map,
+    public static <K, V> IterableMap<K, V> transformingMap(Map<K, V> map,
             Transformer<? super K, ? extends K> keyTransformer,
             Transformer<? super V, ? extends V> valueTransformer) {
         return new TransformedMap<K, V>(map, keyTransformer, valueTransformer);
@@ -84,7 +84,7 @@ public class TransformedMap<K, V>
      * <p>
      * If there are any elements already in the map being decorated, they
      * will be transformed by this method.
-     * Contrast this with {@link #decorate}.
+     * Contrast this with {@link #transformingMap(Map, Transformer, Transformer)}.
      *
      * @param map  the map to decorate, must not be null
      * @param keyTransformer  the transformer to use for key conversion, null means no transformation
@@ -92,7 +92,7 @@ public class TransformedMap<K, V>
      * @throws IllegalArgumentException if map is null
      * @since Commons Collections 3.2
      */
-    public static <K, V> Map<K, V> decorateTransform(Map<K, V> map,
+    public static <K, V> Map<K, V> transformedMap(Map<K, V> map,
             Transformer<? super K, ? extends K> keyTransformer,
             Transformer<? super V, ? extends V> valueTransformer) {
         TransformedMap<K, V> decorated = new TransformedMap<K, V>(map, keyTransformer, valueTransformer);
diff --git a/src/java/org/apache/commons/collections/map/TransformedSortedMap.java b/src/java/org/apache/commons/collections/map/TransformedSortedMap.java
index 982850786..42e8892a4 100644
--- a/src/java/org/apache/commons/collections/map/TransformedSortedMap.java
+++ b/src/java/org/apache/commons/collections/map/TransformedSortedMap.java
@@ -55,14 +55,14 @@ public class TransformedSortedMap<K, V>
      * <p>
      * If there are any elements already in the map being decorated, they
      * are NOT transformed.
-     * Constrast this with {@link #decorateTransform}.
+     * Contrast this with {@link #transformedSortedMap(SortedMap, Transformer, Transformer)}.
      * 
      * @param map  the map to decorate, must not be null
      * @param keyTransformer  the predicate to validate the keys, null means no transformation
      * @param valueTransformer  the predicate to validate to values, null means no transformation
      * @throws IllegalArgumentException if the map is null
      */
-    public static <K, V> SortedMap<K, V> decorate(SortedMap<K, V> map,
+    public static <K, V> SortedMap<K, V> transformingSortedMap(SortedMap<K, V> map,
             Transformer<? super K, ? extends K> keyTransformer,
             Transformer<? super V, ? extends V> valueTransformer) {
         return new TransformedSortedMap<K, V>(map, keyTransformer, valueTransformer);
@@ -74,7 +74,7 @@ public class TransformedSortedMap<K, V>
      * <p>
      * If there are any elements already in the map being decorated, they
      * will be transformed by this method.
-     * Constrast this with {@link #decorate}.
+     * Contrast this with {@link #transformingSortedMap(SortedMap, Transformer, Transformer)}.
      * 
      * @param map  the map to decorate, must not be null
      * @param keyTransformer  the transformer to use for key conversion, null means no transformation
@@ -82,7 +82,7 @@ public class TransformedSortedMap<K, V>
      * @throws IllegalArgumentException if map is null
      * @since Commons Collections 3.2
      */
-    public static <K, V> SortedMap<K, V> decorateTransform(SortedMap<K, V> map,
+    public static <K, V> SortedMap<K, V> transformedSortedMap(SortedMap<K, V> map,
             Transformer<? super K, ? extends K> keyTransformer,
             Transformer<? super V, ? extends V> valueTransformer) {
         TransformedSortedMap<K, V> decorated = new TransformedSortedMap<K, V>(map, keyTransformer, valueTransformer);
diff --git a/src/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java b/src/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java
index e99152250..da6ec7ed8 100644
--- a/src/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java
+++ b/src/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java
@@ -49,7 +49,7 @@ public final class UnmodifiableEntrySet<K, V>
      * @param set  the set to decorate, must not be null
      * @throws IllegalArgumentException if set is null
      */
-    public static <K, V> Set<Map.Entry<K, V>> decorate(Set<Map.Entry<K, V>> set) {
+    public static <K, V> Set<Map.Entry<K, V>> unmodifiableEntrySet(Set<Map.Entry<K, V>> set) {
         if (set instanceof Unmodifiable) {
             return set;
         }
diff --git a/src/java/org/apache/commons/collections/map/UnmodifiableMap.java b/src/java/org/apache/commons/collections/map/UnmodifiableMap.java
index 12258cca0..d3136a490 100644
--- a/src/java/org/apache/commons/collections/map/UnmodifiableMap.java
+++ b/src/java/org/apache/commons/collections/map/UnmodifiableMap.java
@@ -57,7 +57,7 @@ public final class UnmodifiableMap<K, V>
      * @param map  the map to decorate, must not be null
      * @throws IllegalArgumentException if map is null
      */
-    public static <K, V> Map<K, V> decorate(Map<K, V> map) {
+    public static <K, V> Map<K, V> unmodifiableMap(Map<K, V> map) {
         if (map instanceof Unmodifiable) {
             return map;
         }
@@ -127,28 +127,28 @@ public final class UnmodifiableMap<K, V>
     public MapIterator<K, V> mapIterator() {
         if (map instanceof IterableMap) {
             MapIterator<K, V> it = ((IterableMap<K, V>) map).mapIterator();
-            return UnmodifiableMapIterator.decorate(it);
+            return UnmodifiableMapIterator.unmodifiableMapIterator(it);
         }
         MapIterator<K, V> it = new EntrySetMapIterator<K, V>(map);
-        return UnmodifiableMapIterator.decorate(it);
+        return UnmodifiableMapIterator.unmodifiableMapIterator(it);
     }
 
     @Override
     public Set<Map.Entry<K, V>> entrySet() {
         Set<Map.Entry<K, V>> set = super.entrySet();
-        return UnmodifiableEntrySet.decorate(set);
+        return UnmodifiableEntrySet.unmodifiableEntrySet(set);
     }
 
     @Override
     public Set<K> keySet() {
         Set<K> set = super.keySet();
-        return UnmodifiableSet.decorate(set);
+        return UnmodifiableSet.unmodifiableSet(set);
     }
 
     @Override
     public Collection<V> values() {
         Collection<V> coll = super.values();
-        return UnmodifiableCollection.decorate(coll);
+        return UnmodifiableCollection.unmodifiableCollection(coll);
     }
 
 }
diff --git a/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java b/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java
index 0a3fa45d6..b2bcee17f 100644
--- a/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java
+++ b/src/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java
@@ -55,7 +55,7 @@ public final class UnmodifiableOrderedMap<K, V> extends AbstractOrderedMapDecora
      * @param map  the map to decorate, must not be null
      * @throws IllegalArgumentException if map is null
      */
-    public static <K, V> OrderedMap<K, V> decorate(OrderedMap<K, V> map) {
+    public static <K, V> OrderedMap<K, V> unmodifiableOrderedMap(OrderedMap<K, V> map) {
         if (map instanceof Unmodifiable) {
             return map;
         }
@@ -104,7 +104,7 @@ public final class UnmodifiableOrderedMap<K, V> extends AbstractOrderedMapDecora
     @Override
     public OrderedMapIterator<K, V> mapIterator() {
         OrderedMapIterator<K, V> it = decorated().mapIterator();
-        return UnmodifiableOrderedMapIterator.decorate(it);
+        return UnmodifiableOrderedMapIterator.unmodifiableOrderedMapIterator(it);
     }
 
     @Override
@@ -130,19 +130,19 @@ public final class UnmodifiableOrderedMap<K, V> extends AbstractOrderedMapDecora
     @Override
     public Set<Map.Entry<K, V>> entrySet() {
         Set<Map.Entry<K, V>> set = super.entrySet();
-        return UnmodifiableEntrySet.decorate(set);
+        return UnmodifiableEntrySet.unmodifiableEntrySet(set);
     }
 
     @Override
     public Set<K> keySet() {
         Set<K> set = super.keySet();
-        return UnmodifiableSet.decorate(set);
+        return UnmodifiableSet.unmodifiableSet(set);
     }
 
     @Override
     public Collection<V> values() {
         Collection<V> coll = super.values();
-        return UnmodifiableCollection.decorate(coll);
+        return UnmodifiableCollection.unmodifiableCollection(coll);
     }
 
 }
diff --git a/src/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java b/src/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java
index 39e69e7d3..61441751c 100644
--- a/src/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java
+++ b/src/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java
@@ -55,7 +55,7 @@ public final class UnmodifiableSortedMap<K, V>
      * @param map  the map to decorate, must not be null
      * @throws IllegalArgumentException if map is null
      */
-    public static <K, V> SortedMap<K, V> decorate(SortedMap<K, V> map) {
+    public static <K, V> SortedMap<K, V> unmodifiableSortedMap(SortedMap<K, V> map) {
         if (map instanceof Unmodifiable) {
             return map;
         }
@@ -123,17 +123,17 @@ public final class UnmodifiableSortedMap<K, V>
 
     @Override
     public Set<Map.Entry<K, V>> entrySet() {
-        return UnmodifiableEntrySet.decorate(super.entrySet());
+        return UnmodifiableEntrySet.unmodifiableEntrySet(super.entrySet());
     }
 
     @Override
     public Set<K> keySet() {
-        return UnmodifiableSet.decorate(super.keySet());
+        return UnmodifiableSet.unmodifiableSet(super.keySet());
     }
 
     @Override
     public Collection<V> values() {
-        return UnmodifiableCollection.decorate(super.values());
+        return UnmodifiableCollection.unmodifiableCollection(super.values());
     }
 
     //-----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/set/CompositeSet.java b/src/java/org/apache/commons/collections/set/CompositeSet.java
index eb95c6e5c..7d0973417 100644
--- a/src/java/org/apache/commons/collections/set/CompositeSet.java
+++ b/src/java/org/apache/commons/collections/set/CompositeSet.java
@@ -58,7 +58,7 @@ public class CompositeSet<E> extends CompositeCollection<E> implements Set<E> {
     /**
      * Create a composite set with sets as the initial set of composited Sets
      */
-    public CompositeSet(Set<E>[] sets) {
+    public CompositeSet(Set<E>... sets) {
         super(sets);
     }
 
diff --git a/src/java/org/apache/commons/collections/set/ListOrderedSet.java b/src/java/org/apache/commons/collections/set/ListOrderedSet.java
index a885ad92d..dc760b8d4 100644
--- a/src/java/org/apache/commons/collections/set/ListOrderedSet.java
+++ b/src/java/org/apache/commons/collections/set/ListOrderedSet.java
@@ -71,7 +71,7 @@ public class ListOrderedSet<E> extends AbstractSerializableSetDecorator<E> imple
      * @throws IllegalArgumentException if either the set or list is not empty
      * @since Commons Collections 3.1
      */
-    public static <E> ListOrderedSet<E> decorate(Set<E> set, List<E> list) {
+    public static <E> ListOrderedSet<E> listOrderedSet(Set<E> set, List<E> list) {
         if (set == null) {
             throw new IllegalArgumentException("Set must not be null");
         }
@@ -92,7 +92,7 @@ public class ListOrderedSet<E> extends AbstractSerializableSetDecorator<E> imple
      * @param set  the set to decorate, must not be null
      * @throws IllegalArgumentException if set is null
      */
-    public static <E> ListOrderedSet<E> decorate(Set<E> set) {
+    public static <E> ListOrderedSet<E> listOrderedSet(Set<E> set) {
         return new ListOrderedSet<E>(set);
     }
 
@@ -107,7 +107,7 @@ public class ListOrderedSet<E> extends AbstractSerializableSetDecorator<E> imple
      * @param list  the list to decorate, must not be null
      * @throws IllegalArgumentException if list is null
      */
-    public static <E> ListOrderedSet<E> decorate(List<E> list) {
+    public static <E> ListOrderedSet<E> listOrderedSet(List<E> list) {
         if (list == null) {
             throw new IllegalArgumentException("List must not be null");
         }
@@ -164,7 +164,7 @@ public class ListOrderedSet<E> extends AbstractSerializableSetDecorator<E> imple
      * @return an unmodifiable list view
      */
     public List<E> asList() {
-        return UnmodifiableList.decorate(setOrder);
+        return UnmodifiableList.unmodifiableList(setOrder);
     }
 
     //-----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/collections/set/MapBackedSet.java b/src/java/org/apache/commons/collections/set/MapBackedSet.java
index c1b150ac2..d1224390d 100644
--- a/src/java/org/apache/commons/collections/set/MapBackedSet.java
+++ b/src/java/org/apache/commons/collections/set/MapBackedSet.java
@@ -54,8 +54,8 @@ public final class MapBackedSet<E, V> implements Set<E>, Serializable {
      * @param map  the map to decorate, must not be null
      * @throws IllegalArgumentException if set is null
      */
-    public static <E, V> Set<E> decorate(Map<E, ? super V> map) {
-        return decorate(map, null);
+    public static <E, V> Set<E> mapBackedSet(Map<E, ? super V> map) {
+        return mapBackedSet(map, null);
     }
 
     /**
@@ -65,7 +65,7 @@ public final class MapBackedSet<E, V> implements Set<E>, Serializable {
      * @param dummyValue  the dummy value to use
      * @throws IllegalArgumentException if map is null
      */
-    public static <E, V> Set<E> decorate(Map<E, ? super V> map, V dummyValue) {
+    public static <E, V> Set<E> mapBackedSet(Map<E, ? super V> map, V dummyValue) {
         if (map == null) {
             throw new IllegalArgumentException("The map must not be null");
         }
diff --git a/src/java/org/apache/commons/collections/set/PredicatedSet.java b/src/java/org/apache/commons/collections/set/PredicatedSet.java
index a40802d47..7080ddf97 100644
--- a/src/java/org/apache/commons/collections/set/PredicatedSet.java
+++ b/src/java/org/apache/commons/collections/set/PredicatedSet.java
@@ -57,7 +57,7 @@ public class PredicatedSet<E> extends PredicatedCollection<E> implements Set<E>
      * @throws IllegalArgumentException if set or predicate is null
      * @throws IllegalArgumentException if the set contains invalid elements
      */
-    public static <T> Set<T> decorate(Set<T> set, Predicate<? super T> predicate) {
+    public static <T> Set<T> predicatedSet(Set<T> set, Predicate<? super T> predicate) {
         return new PredicatedSet<T>(set, predicate);
     }
 
diff --git a/src/java/org/apache/commons/collections/set/PredicatedSortedSet.java b/src/java/org/apache/commons/collections/set/PredicatedSortedSet.java
index 0e3022733..8dc92513f 100644
--- a/src/java/org/apache/commons/collections/set/PredicatedSortedSet.java
+++ b/src/java/org/apache/commons/collections/set/PredicatedSortedSet.java
@@ -57,7 +57,7 @@ public class PredicatedSortedSet<E> extends PredicatedSet<E> implements SortedSe
      * @throws IllegalArgumentException if set or predicate is null
      * @throws IllegalArgumentException if the set contains invalid elements
      */
-    public static <T> SortedSet<T> decorate(SortedSet<T> set, Predicate<? super T> predicate) {
+    public static <T> SortedSet<T> predicatedSortedSet(SortedSet<T> set, Predicate<? super T> predicate) {
         return new PredicatedSortedSet<T>(set, predicate);
     }
 
diff --git a/src/java/org/apache/commons/collections/set/SynchronizedSet.java b/src/java/org/apache/commons/collections/set/SynchronizedSet.java
index 464efd60a..fdf3135b5 100644
--- a/src/java/org/apache/commons/collections/set/SynchronizedSet.java
+++ b/src/java/org/apache/commons/collections/set/SynchronizedSet.java
@@ -44,7 +44,7 @@ public class SynchronizedSet<E> extends SynchronizedCollection<E> implements Set
      * @param set  the set to decorate, must not be null
      * @throws IllegalArgumentException if set is null
      */
-    public static <T> Set<T> decorate(Set<T> set) {
+    public static <T> Set<T> synchronizedSet(Set<T> set) {
         return new SynchronizedSet<T>(set);
     }
     
diff --git a/src/java/org/apache/commons/collections/set/SynchronizedSortedSet.java b/src/java/org/apache/commons/collections/set/SynchronizedSortedSet.java
index 59a3e1664..a3d83e3cb 100644
--- a/src/java/org/apache/commons/collections/set/SynchronizedSortedSet.java
+++ b/src/java/org/apache/commons/collections/set/SynchronizedSortedSet.java
@@ -45,7 +45,7 @@ public class SynchronizedSortedSet<E> extends SynchronizedCollection<E> implemen
      * @param set  the set to decorate, must not be null
      * @throws IllegalArgumentException if set is null
      */
-    public static <T> SortedSet<T> decorate(SortedSet<T> set) {
+    public static <T> SortedSet<T> synchronizedSortedSet(SortedSet<T> set) {
         return new SynchronizedSortedSet<T>(set);
     }
 
diff --git a/src/java/org/apache/commons/collections/set/TransformedSet.java b/src/java/org/apache/commons/collections/set/TransformedSet.java
index 4a2c08565..80f529211 100644
--- a/src/java/org/apache/commons/collections/set/TransformedSet.java
+++ b/src/java/org/apache/commons/collections/set/TransformedSet.java
@@ -46,13 +46,13 @@ public class TransformedSet<E> extends TransformedCollection<E> implements Set<E
      * <p>
      * If there are any elements already in the set being decorated, they
      * are NOT transformed.
-     * Constrast this with {@link #decorateTransform}.
+     * Contrast this with {@link #transformedSet(Set, Transformer)}.
      * 
      * @param set  the set to decorate, must not be null
      * @param transformer  the transformer to use for conversion, must not be null
      * @throws IllegalArgumentException if set or transformer is null
      */
-    public static <E> Set<E> decorate(Set<E> set, Transformer<? super E, ? extends E> transformer) {
+    public static <E> Set<E> transformingSet(Set<E> set, Transformer<? super E, ? extends E> transformer) {
         return new TransformedSet<E>(set, transformer);
     }
     
@@ -62,7 +62,7 @@ public class TransformedSet<E> extends TransformedCollection<E> implements Set<E
      * <p>
      * If there are any elements already in the set being decorated, they
      * will be transformed by this method.
-     * Constrast this with {@link #decorate}.
+     * Contrast this with {@link #transformingSet(Set, Transformer)}.
      * 
      * @param set  the set to decorate, must not be null
      * @param transformer  the transformer to use for conversion, must not be null
@@ -70,7 +70,7 @@ public class TransformedSet<E> extends TransformedCollection<E> implements Set<E
      * @throws IllegalArgumentException if set or transformer is null
      * @since Commons Collections 3.3
      */
-    public static <E> Set<E> decorateTransform(Set<E> set, Transformer<? super E, ? extends E> transformer) {
+    public static <E> Set<E> transformedSet(Set<E> set, Transformer<? super E, ? extends E> transformer) {
         TransformedSet<E> decorated = new TransformedSet<E>(set, transformer);
         if (transformer != null && set != null && set.size() > 0) {
             @SuppressWarnings("unchecked") // set is type E
diff --git a/src/java/org/apache/commons/collections/set/TransformedSortedSet.java b/src/java/org/apache/commons/collections/set/TransformedSortedSet.java
index a0018ecf9..ecd892d1a 100644
--- a/src/java/org/apache/commons/collections/set/TransformedSortedSet.java
+++ b/src/java/org/apache/commons/collections/set/TransformedSortedSet.java
@@ -46,13 +46,13 @@ public class TransformedSortedSet<E> extends TransformedSet<E> implements Sorted
      * <p>
      * If there are any elements already in the set being decorated, they
      * are NOT transformed.
-     * Constrast this with {@link #decorateTransform}.
+     * Contrast this with {@link #transformedSortedSet(SortedSet, Transformer)}.
      * 
      * @param set  the set to decorate, must not be null
      * @param transformer  the transformer to use for conversion, must not be null
      * @throws IllegalArgumentException if set or transformer is null
      */
-    public static <E> SortedSet<E> decorate(SortedSet<E> set, Transformer<? super E, ? extends E> transformer) {
+    public static <E> SortedSet<E> transformingSortedSet(SortedSet<E> set, Transformer<? super E, ? extends E> transformer) {
         return new TransformedSortedSet<E>(set, transformer);
     }
     
@@ -62,7 +62,7 @@ public class TransformedSortedSet<E> extends TransformedSet<E> implements Sorted
      * <p>
      * If there are any elements already in the set being decorated, they
      * will be transformed by this method.
-     * Constrast this with {@link #decorate}.
+     * Contrast this with {@link #transformingSortedSet(SortedSet, Transformer)}.
      * 
      * @param set  the set to decorate, must not be null
      * @param transformer  the transformer to use for conversion, must not be null
@@ -70,7 +70,7 @@ public class TransformedSortedSet<E> extends TransformedSet<E> implements Sorted
      * @throws IllegalArgumentException if set or transformer is null
      * @since Commons Collections 3.3
      */
-    public static <E> SortedSet<E> decorateTransform(SortedSet<E> set, Transformer<? super E, ? extends E> transformer) {
+    public static <E> SortedSet<E> transformedSortedSet(SortedSet<E> set, Transformer<? super E, ? extends E> transformer) {
         TransformedSortedSet<E> decorated = new TransformedSortedSet<E>(set, transformer);
         if (transformer != null && set != null && set.size() > 0) {
             @SuppressWarnings("unchecked") // set is type E
diff --git a/src/java/org/apache/commons/collections/set/UnmodifiableSet.java b/src/java/org/apache/commons/collections/set/UnmodifiableSet.java
index e79ed02ef..06d65caa8 100644
--- a/src/java/org/apache/commons/collections/set/UnmodifiableSet.java
+++ b/src/java/org/apache/commons/collections/set/UnmodifiableSet.java
@@ -48,7 +48,7 @@ public final class UnmodifiableSet<E>
      * @param set  the set to decorate, must not be null
      * @throws IllegalArgumentException if set is null
      */
-    public static <E> Set<E> decorate(Set<E> set) {
+    public static <E> Set<E> unmodifiableSet(Set<E> set) {
         if (set instanceof Unmodifiable) {
             return set;
         }
@@ -69,7 +69,7 @@ public final class UnmodifiableSet<E>
     //-----------------------------------------------------------------------
     @Override
     public Iterator<E> iterator() {
-        return UnmodifiableIterator.<E>decorate(decorated().iterator());
+        return UnmodifiableIterator.<E>unmodifiableIterator(decorated().iterator());
     }
 
     @Override
diff --git a/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java b/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java
index 21de5502c..cc3e4f214 100644
--- a/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java
+++ b/src/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java
@@ -52,7 +52,7 @@ public final class UnmodifiableSortedSet<E>
      * @param set  the set to decorate, must not be null
      * @throws IllegalArgumentException if set is null
      */
-    public static <T> SortedSet<T> decorate(SortedSet<T> set) {
+    public static <T> SortedSet<T> unmodifiableSortedSet(SortedSet<T> set) {
         if (set instanceof Unmodifiable) {
             return set;
         }
@@ -98,7 +98,7 @@ public final class UnmodifiableSortedSet<E>
     //-----------------------------------------------------------------------
     @Override
     public Iterator<E> iterator() {
-        return UnmodifiableIterator.decorate(decorated().iterator());
+        return UnmodifiableIterator.unmodifiableIterator(decorated().iterator());
     }
 
     @Override
diff --git a/src/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java b/src/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java
index 7ce439250..e975c8bcf 100644
--- a/src/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java
+++ b/src/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java
@@ -29,8 +29,7 @@ import org.apache.commons.collections.map.EntrySetToMapIteratorAdapter;
  * {@link IterableGet} that uses a {@link Map}<K, V> for the {@link Get}<K, V>
  * implementation.
  *
- * @since Commons Collections 5
- * @TODO fix version
+ * @since Commons Collections 4.0
  * @version $Revision$ $Date$
  *
  * @author Matt Benson
diff --git a/src/java/org/apache/commons/collections/splitmap/SplitMapUtils.java b/src/java/org/apache/commons/collections/splitmap/SplitMapUtils.java
index 771f6aecd..f5490ef40 100644
--- a/src/java/org/apache/commons/collections/splitmap/SplitMapUtils.java
+++ b/src/java/org/apache/commons/collections/splitmap/SplitMapUtils.java
@@ -37,8 +37,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * Utilities for working with "split maps:" objects that implement {@link Put}
  * and/or {@link Get} but not {@link Map}.
  *
- * @since Commons Collections 5
- * @TODO fix version
+ * @since Commons Collections 4.0
  * @version $Revision$ $Date$
  * @see Get
  * @see Put
@@ -53,7 +52,7 @@ public class SplitMapUtils {
     }
 
     private static class WrappedGet<K, V> implements IterableMap<K, V>, Unmodifiable {
-        private Get<K, V> get;
+        private final Get<K, V> get;
 
         private WrappedGet(Get<K, V> get) {
             this.get = get;
@@ -72,7 +71,7 @@ public class SplitMapUtils {
         }
 
         public Set<java.util.Map.Entry<K, V>> entrySet() {
-            return UnmodifiableEntrySet.decorate(get.entrySet());
+            return UnmodifiableEntrySet.unmodifiableEntrySet(get.entrySet());
         }
 
         @Override
@@ -97,7 +96,7 @@ public class SplitMapUtils {
         }
 
         public Set<K> keySet() {
-            return UnmodifiableSet.decorate(get.keySet());
+            return UnmodifiableSet.unmodifiableSet(get.keySet());
         }
 
         public V put(K key, V value) {
@@ -117,7 +116,7 @@ public class SplitMapUtils {
         }
 
         public Collection<V> values() {
-            return UnmodifiableCollection.decorate(get.values());
+            return UnmodifiableCollection.unmodifiableCollection(get.values());
         }
 
         public MapIterator<K, V> mapIterator() {
@@ -127,12 +126,12 @@ public class SplitMapUtils {
             } else {
                 it = new EntrySetToMapIteratorAdapter<K, V>(get.entrySet());
             }
-            return UnmodifiableMapIterator.decorate(it);
+            return UnmodifiableMapIterator.unmodifiableMapIterator(it);
         }
     }
 
     private static class WrappedPut<K, V> implements Map<K, V>, Put<K, V> {
-        private Put<K, V> put;
+        private final Put<K, V> put;
 
         private WrappedPut(Put<K, V> put) {
             this.put = put;
diff --git a/src/java/org/apache/commons/collections/splitmap/TransformedMap.java b/src/java/org/apache/commons/collections/splitmap/TransformedMap.java
index 8de7516ab..fb8d386e9 100644
--- a/src/java/org/apache/commons/collections/splitmap/TransformedMap.java
+++ b/src/java/org/apache/commons/collections/splitmap/TransformedMap.java
@@ -49,13 +49,14 @@ import org.apache.commons.collections.map.LinkedMap;
  * In practice this would often mean <code>&gt;Object, Object&gt;</code>, defeating
  * much of the usefulness of having parameterized types.
  * <p>
- * On the downside, this class is not a drop-in replacement for {@link java.util.Map}
+ * On the downside, this class is not drop-in compatible with {@link java.util.Map}
  * but is intended to be worked with either directly or by {@link Put} and {@link Get}
  * generalizations.
  *
- * @since Commons Collections 5
- * @TODO fix version
+ * @since Commons Collections 4.0
  * @version $Revision$ $Date$
+ * @see SplitMapUtils#readableMap(Get)
+ * @see SplitMapUtils#writableMap(Put)
  *
  * @author Stephen Colebourne
  * @author Matt Benson
@@ -84,7 +85,7 @@ public class TransformedMap<J, K, U, V> extends AbstractIterableGetMapDecorator<
      * means no transformation
      * @throws IllegalArgumentException if map is null
      */
-    public static <J, K, U, V> TransformedMap<J, K, U, V> decorate(Map<K, V> map,
+    public static <J, K, U, V> TransformedMap<J, K, U, V> transformingMap(Map<K, V> map,
             Transformer<? super J, ? extends K> keyTransformer,
             Transformer<? super U, ? extends V> valueTransformer) {
         return new TransformedMap<J, K, U, V>(map, keyTransformer, valueTransformer);
diff --git a/src/test/org/apache/commons/collections/TestBagUtils.java b/src/test/org/apache/commons/collections/TestBagUtils.java
index ed0b35128..41ad9e803 100644
--- a/src/test/org/apache/commons/collections/TestBagUtils.java
+++ b/src/test/org/apache/commons/collections/TestBagUtils.java
@@ -99,17 +99,17 @@ public class TestBagUtils extends BulkTest {
     }
 
      public void testTransformedBag() {
-        Bag<Object> bag = BagUtils.transformedBag(new HashBag<Object>(), nopTransformer);
+        Bag<Object> bag = BagUtils.transformingBag(new HashBag<Object>(), nopTransformer);
         assertTrue("Returned object should be an TransformedBag.",
             bag instanceof TransformedBag);
         try {
-            bag = BagUtils.transformedBag(null, nopTransformer);
+            bag = BagUtils.transformingBag(null, nopTransformer);
             fail("Expecting IllegalArgumentException for null bag.");
         } catch (IllegalArgumentException ex) {
             // expected
         }
         try {
-            bag = BagUtils.transformedBag(new HashBag<Object>(), null);
+            bag = BagUtils.transformingBag(new HashBag<Object>(), null);
             fail("Expecting IllegalArgumentException for null transformer.");
         } catch (IllegalArgumentException ex) {
             // expected
@@ -159,17 +159,17 @@ public class TestBagUtils extends BulkTest {
     }
 
     public void testTransformedSortedBag() {
-        Bag<Object> bag = BagUtils.transformedSortedBag(new TreeBag<Object>(), nopTransformer);
+        Bag<Object> bag = BagUtils.transformingSortedBag(new TreeBag<Object>(), nopTransformer);
         assertTrue("Returned object should be an TransformedSortedBag",
             bag instanceof TransformedSortedBag);
         try {
-            bag = BagUtils.transformedSortedBag(null, nopTransformer);
+            bag = BagUtils.transformingSortedBag(null, nopTransformer);
             fail("Expecting IllegalArgumentException for null bag.");
         } catch (IllegalArgumentException ex) {
             // expected
         }
         try {
-            bag = BagUtils.transformedSortedBag(new TreeBag<Object>(), null);
+            bag = BagUtils.transformingSortedBag(new TreeBag<Object>(), null);
             fail("Expecting IllegalArgumentException for null transformer.");
         } catch (IllegalArgumentException ex) {
             // expected
diff --git a/src/test/org/apache/commons/collections/TestCollectionUtils.java b/src/test/org/apache/commons/collections/TestCollectionUtils.java
index a5b3bd42a..448428687 100644
--- a/src/test/org/apache/commons/collections/TestCollectionUtils.java
+++ b/src/test/org/apache/commons/collections/TestCollectionUtils.java
@@ -1261,16 +1261,16 @@ public class TestCollectionUtils extends MockTestCase {
     @Test
     public void testTransformedCollection() {
         Transformer<Object, Object> transformer = TransformerUtils.nopTransformer();
-        Collection<Object> collection = CollectionUtils.transformedCollection(new ArrayList<Object>(), transformer);
+        Collection<Object> collection = CollectionUtils.transformingCollection(new ArrayList<Object>(), transformer);
         assertTrue("returned object should be a TransformedCollection", collection instanceof TransformedCollection);
         try {
-            collection = CollectionUtils.transformedCollection(new ArrayList<Object>(), null);
+            collection = CollectionUtils.transformingCollection(new ArrayList<Object>(), null);
             fail("Expecting IllegalArgumentException for null transformer.");
         } catch (IllegalArgumentException ex) {
             // expected
         }
         try {
-            collection = CollectionUtils.transformedCollection(null, transformer);
+            collection = CollectionUtils.transformingCollection(null, transformer);
             fail("Expecting IllegalArgumentException for null collection.");
         } catch (IllegalArgumentException ex) {
             // expected
@@ -1283,7 +1283,7 @@ public class TestCollectionUtils extends MockTestCase {
         list.add("1");
         list.add("2");
         list.add("3");
-        Collection<Object> result = CollectionUtils.transformedCollection(list, TRANSFORM_TO_INTEGER);
+        Collection<Object> result = CollectionUtils.transformingCollection(list, TRANSFORM_TO_INTEGER);
         assertEquals(true, result.contains("1")); // untransformed
         assertEquals(true, result.contains("2")); // untransformed
         assertEquals(true, result.contains("3")); // untransformed
diff --git a/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java b/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java
index ba36c50d3..67b3384ab 100644
--- a/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java
+++ b/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java
@@ -50,7 +50,7 @@ public class TestPredicatedBag<T> extends AbstractTestBag<T> {
     protected Predicate<T> truePredicate = TruePredicate.<T>truePredicate();
 
     protected Bag<T> decorateBag(HashBag<T> bag, Predicate<T> predicate) {
-        return PredicatedBag.decorate(bag, predicate);
+        return PredicatedBag.predicatedBag(bag, predicate);
     }
 
     @Override
diff --git a/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java b/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java
index 34e9a2842..2417b021f 100644
--- a/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java
+++ b/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java
@@ -52,7 +52,7 @@ public class TestPredicatedSortedBag<T> extends AbstractTestSortedBag<T> {
     protected Predicate<T> truePredicate = TruePredicate.<T>truePredicate();
 
     protected SortedBag<T> decorateBag(SortedBag<T> bag, Predicate<T> predicate) {
-        return PredicatedSortedBag.decorate(bag, predicate);
+        return PredicatedSortedBag.predicatedSortedBag(bag, predicate);
     }
 
     @Override
diff --git a/src/test/org/apache/commons/collections/bag/TestTransformedBag.java b/src/test/org/apache/commons/collections/bag/TestTransformedBag.java
index 2e45cfef6..b501e6ad1 100644
--- a/src/test/org/apache/commons/collections/bag/TestTransformedBag.java
+++ b/src/test/org/apache/commons/collections/bag/TestTransformedBag.java
@@ -38,13 +38,13 @@ public class TestTransformedBag<T> extends AbstractTestBag<T> {
     @Override
     @SuppressWarnings("unchecked")
     public Bag<T> makeObject() {
-        return TransformedBag.decorate(new HashBag<T>(), (Transformer<T, T>) TestTransformedCollection.NOOP_TRANSFORMER);
+        return TransformedBag.transformingBag(new HashBag<T>(), (Transformer<T, T>) TestTransformedCollection.NOOP_TRANSFORMER);
     }
 
     @SuppressWarnings("unchecked")
     public void testTransformedBag() {
         //T had better be Object!
-        Bag<T> bag = TransformedBag.decorate(new HashBag<T>(), (Transformer<T, T>) TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
+        Bag<T> bag = TransformedBag.transformingBag(new HashBag<T>(), (Transformer<T, T>) TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(0, bag.size());
         Object[] els = new Object[] {"1", "3", "5", "7", "2", "4", "6"};
         for (int i = 0; i < els.length; i++) {
@@ -65,7 +65,7 @@ public class TestTransformedBag<T> extends AbstractTestBag<T> {
         for (int i = 0; i < els.length; i++) {
             originalBag.add(els[i]);
         }
-        Bag bag = TransformedBag.decorateTransform(originalBag, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
+        Bag bag = TransformedBag.transformedBag(originalBag, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(els.length, bag.size());
         for (int i = 0; i < els.length; i++) {
             assertEquals(true, bag.contains(new Integer((String) els[i])));
diff --git a/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java b/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java
index 71cca2a26..15357570b 100644
--- a/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java
+++ b/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java
@@ -39,12 +39,12 @@ public class TestTransformedSortedBag<T> extends AbstractTestSortedBag<T> {
     @Override
     @SuppressWarnings("unchecked")
     public SortedBag<T> makeObject() {
-        return TransformedSortedBag.decorate(new TreeBag<T>(), (Transformer<T, T>) TestTransformedCollection.NOOP_TRANSFORMER);
+        return TransformedSortedBag.transformingSortedBag(new TreeBag<T>(), (Transformer<T, T>) TestTransformedCollection.NOOP_TRANSFORMER);
     }
 
     @SuppressWarnings("unchecked")
     public void testTransformedBag() {
-        SortedBag<T> bag = TransformedSortedBag.decorate(new TreeBag<T>(), (Transformer<T, T>) TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
+        SortedBag<T> bag = TransformedSortedBag.transformingSortedBag(new TreeBag<T>(), (Transformer<T, T>) TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(0, bag.size());
         Object[] els = new Object[] {"1", "3", "5", "7", "2", "4", "6"};
         for (int i = 0; i < els.length; i++) {
@@ -63,7 +63,7 @@ public class TestTransformedSortedBag<T> extends AbstractTestSortedBag<T> {
         for (int i = 0; i < els.length; i++) {
             originalBag.add(els[i]);
         }
-        Bag<?> bag = TransformedBag.decorateTransform(originalBag, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
+        Bag<?> bag = TransformedBag.transformedBag(originalBag, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(els.length, bag.size());
         for (int i = 0; i < els.length; i++) {
             assertEquals(true, bag.contains(new Integer((String) els[i])));
diff --git a/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java b/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java
index cad8794fe..49647c82c 100644
--- a/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java
+++ b/src/test/org/apache/commons/collections/bidimap/TestDualTreeBidiMap2.java
@@ -56,13 +56,13 @@ public class TestDualTreeBidiMap2<K extends Comparable<K>, V extends Comparable<
     @Override
     public DualTreeBidiMap<K, V> makeObject() {
         return new DualTreeBidiMap<K, V>(
-                new ReverseComparator<K>(ComparableComparator.<K> getInstance()),
-                new ReverseComparator<V>(ComparableComparator.<V> getInstance()));
+                new ReverseComparator<K>(ComparableComparator.<K> comparableComparator()),
+                new ReverseComparator<V>(ComparableComparator.<V> comparableComparator()));
     }
 
     @Override
     public TreeMap<K, V> makeConfirmedMap() {
-        return new TreeMap<K, V>(new ReverseComparator<K>(ComparableComparator.<K>getInstance()));
+        return new TreeMap<K, V>(new ReverseComparator<K>(ComparableComparator.<K>comparableComparator()));
     }
 
     public void testComparator() {
@@ -132,7 +132,7 @@ public class TestDualTreeBidiMap2<K extends Comparable<K>, V extends Comparable<
 
         // Sort by the comparator used in the makeEmptyBidiMap() method
         List<K> newSortedKeys = getAsList(getSampleKeys());
-        Collections.sort(newSortedKeys, new ReverseComparator<K>(ComparableComparator.<K>getInstance()));
+        Collections.sort(newSortedKeys, new ReverseComparator<K>(ComparableComparator.<K>comparableComparator()));
         newSortedKeys = Collections.unmodifiableList(newSortedKeys);
 
         Iterator<K> mapIter = sm.keySet().iterator();
diff --git a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java
index e1600fcc2..1e0d11312 100644
--- a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java
+++ b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableBidiMap.java
@@ -42,14 +42,14 @@ public class TestUnmodifiableBidiMap<K, V> extends AbstractTestBidiMap<K, V> {
 
     @Override
     public BidiMap<K, V> makeObject() {
-        return UnmodifiableBidiMap.decorate(new DualHashBidiMap<K, V>());
+        return UnmodifiableBidiMap.unmodifiableBidiMap(new DualHashBidiMap<K, V>());
     }
 
     @Override
     public BidiMap<K, V> makeFullMap() {
         BidiMap<K, V> bidi = new DualHashBidiMap<K, V>();
         addSampleMappings(bidi);
-        return UnmodifiableBidiMap.decorate(bidi);
+        return UnmodifiableBidiMap.unmodifiableBidiMap(bidi);
     }
 
     @Override
diff --git a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java
index 1ed372011..dabc4fa59 100644
--- a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java
+++ b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableOrderedBidiMap.java
@@ -43,14 +43,14 @@ public class TestUnmodifiableOrderedBidiMap<K extends Comparable<K>, V extends C
 
     @Override
     public OrderedBidiMap<K, V> makeObject() {
-        return UnmodifiableOrderedBidiMap.decorate(new TreeBidiMap<K, V>());
+        return UnmodifiableOrderedBidiMap.unmodifiableOrderedBidiMap(new TreeBidiMap<K, V>());
     }
 
     @Override
     public BidiMap<K, V> makeFullMap() {
         OrderedBidiMap<K, V> bidi = new TreeBidiMap<K, V>();
         addSampleMappings(bidi);
-        return UnmodifiableOrderedBidiMap.decorate(bidi);
+        return UnmodifiableOrderedBidiMap.unmodifiableOrderedBidiMap(bidi);
     }
 
     @Override
diff --git a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java
index 2d7645a54..6637c6186 100644
--- a/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java
+++ b/src/test/org/apache/commons/collections/bidimap/TestUnmodifiableSortedBidiMap.java
@@ -43,14 +43,14 @@ public class TestUnmodifiableSortedBidiMap<K extends Comparable<K>, V extends Co
     //-----------------------------------------------------------------------
     @Override
     public SortedBidiMap<K, V> makeObject() {
-        return UnmodifiableSortedBidiMap.decorate(new DualTreeBidiMap<K, V>());
+        return UnmodifiableSortedBidiMap.unmodifiableSortedBidiMap(new DualTreeBidiMap<K, V>());
     }
 
     @Override
     public SortedBidiMap<K, V> makeFullMap() {
         SortedBidiMap<K, V> bidi = new DualTreeBidiMap<K, V>();
         addSampleMappings(bidi);
-        return UnmodifiableSortedBidiMap.decorate(bidi);
+        return UnmodifiableSortedBidiMap.unmodifiableSortedBidiMap(bidi);
     }
 
     @Override
diff --git a/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java b/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java
index 1c8689f5b..e77b12fc0 100644
--- a/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java
+++ b/src/test/org/apache/commons/collections/buffer/TestBlockingBuffer.java
@@ -43,7 +43,7 @@ public class TestBlockingBuffer<E> extends AbstractTestObject {
 
     @Override
     public Buffer<E> makeObject() {
-        return BlockingBuffer.decorate(new MyBuffer<E>());
+        return BlockingBuffer.blockingBuffer(new MyBuffer<E>());
     }
 
     @Override
@@ -72,7 +72,7 @@ public class TestBlockingBuffer<E> extends AbstractTestObject {
     }
 
     public void testGetWithAddTimeout() {
-        Buffer<E> blockingBuffer = BlockingBuffer.decorate(new MyBuffer<E>(), 500);
+        Buffer<E> blockingBuffer = BlockingBuffer.blockingBuffer(new MyBuffer<E>(), 500);
         E obj = makeElement();
         new DelayedAdd<E>(blockingBuffer, obj, 100).start();
 
@@ -96,7 +96,7 @@ public class TestBlockingBuffer<E> extends AbstractTestObject {
     }
 
     public void testGetWithAddAllTimeout() {
-        Buffer<E> blockingBuffer = BlockingBuffer.decorate(new MyBuffer<E>(), 500);
+        Buffer<E> blockingBuffer = BlockingBuffer.blockingBuffer(new MyBuffer<E>(), 500);
         E obj = makeElement();
         new DelayedAddAll<E>(blockingBuffer, obj, 100).start();
 
@@ -120,7 +120,7 @@ public class TestBlockingBuffer<E> extends AbstractTestObject {
     }
 
     public void testRemoveWithAddTimeout() {
-        Buffer<E> blockingBuffer = BlockingBuffer.decorate(new MyBuffer<E>(), 100);
+        Buffer<E> blockingBuffer = BlockingBuffer.blockingBuffer(new MyBuffer<E>(), 100);
         E obj = makeElement();
         new DelayedAdd<E>(blockingBuffer, obj, 500).start();
         try {
@@ -145,7 +145,7 @@ public class TestBlockingBuffer<E> extends AbstractTestObject {
     }
 
     public void testRemoveWithAddAllTimeout() {
-        Buffer<E> blockingBuffer = BlockingBuffer.decorate(new MyBuffer<E>(), 100);
+        Buffer<E> blockingBuffer = BlockingBuffer.blockingBuffer(new MyBuffer<E>(), 100);
         E obj = makeElement();
         new DelayedAddAll<E>(blockingBuffer, obj, 500).start();
         try {
diff --git a/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java b/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java
index 52e66ebbf..ac9b300f2 100644
--- a/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java
+++ b/src/test/org/apache/commons/collections/buffer/TestBoundedBuffer.java
@@ -43,13 +43,13 @@ public class TestBoundedBuffer<E> extends AbstractTestObject {
 
     @Override
     public Buffer<E> makeObject() {
-        return BoundedBuffer.decorate(new UnboundedFifoBuffer<E>(), 1);
+        return BoundedBuffer.boundedBuffer(new UnboundedFifoBuffer<E>(), 1);
     }
 
     //-----------------------------------------------------------------------
     @SuppressWarnings("unchecked")
     public void testMaxSize() {
-        final Buffer<E> bounded = BoundedBuffer.decorate(new UnboundedFifoBuffer<E>(), 2, 500);
+        final Buffer<E> bounded = BoundedBuffer.boundedBuffer(new UnboundedFifoBuffer<E>(), 2, 500);
         BoundedCollection<?> bc = (BoundedCollection<?>) bounded;
         assertEquals(2, bc.maxSize());
         assertEquals(false, bc.isFull());
@@ -60,11 +60,11 @@ public class TestBoundedBuffer<E> extends AbstractTestObject {
         bounded.remove();
         assertEquals(false, bc.isFull());
         try {
-            BoundedBuffer.decorate(new UnboundedFifoBuffer<E>(), 0);
+            BoundedBuffer.boundedBuffer(new UnboundedFifoBuffer<E>(), 0);
             fail();
         } catch (IllegalArgumentException ex) {}
         try {
-            BoundedBuffer.decorate(new UnboundedFifoBuffer<E>(), -1);
+            BoundedBuffer.boundedBuffer(new UnboundedFifoBuffer<E>(), -1);
             fail();
         } catch (IllegalArgumentException ex) {}
     }
@@ -103,7 +103,7 @@ public class TestBoundedBuffer<E> extends AbstractTestObject {
 
     @SuppressWarnings("unchecked")
     public void testAddToFullBufferRemoveViaIterator() {
-        final Buffer<E> bounded = BoundedBuffer.decorate(new UnboundedFifoBuffer<E>(), 1, 500);
+        final Buffer<E> bounded = BoundedBuffer.boundedBuffer(new UnboundedFifoBuffer<E>(), 1, 500);
         bounded.add((E) "Hello");
         new DelayedIteratorRemove(bounded, 200).start();
         bounded.add((E) "World");
@@ -114,7 +114,7 @@ public class TestBoundedBuffer<E> extends AbstractTestObject {
 
     @SuppressWarnings("unchecked")
     public void testAddAllToFullBufferRemoveViaIterator() {
-        final Buffer<E> bounded = BoundedBuffer.decorate(new UnboundedFifoBuffer<E>(), 2, 500);
+        final Buffer<E> bounded = BoundedBuffer.boundedBuffer(new UnboundedFifoBuffer<E>(), 2, 500);
         bounded.add((E) "Hello");
         bounded.add((E) "World");
         new DelayedIteratorRemove(bounded, 200, 2).start();
@@ -126,7 +126,7 @@ public class TestBoundedBuffer<E> extends AbstractTestObject {
 
     @SuppressWarnings("unchecked")
     public void testAddToFullBufferWithTimeout() {
-        final Buffer<E> bounded = BoundedBuffer.decorate(new UnboundedFifoBuffer<E>(), 1, 500);
+        final Buffer<E> bounded = BoundedBuffer.boundedBuffer(new UnboundedFifoBuffer<E>(), 1, 500);
         bounded.add((E) "Hello");
         new DelayedRemove(bounded, 200).start();
         bounded.add((E) "World");
@@ -141,7 +141,7 @@ public class TestBoundedBuffer<E> extends AbstractTestObject {
 
     @SuppressWarnings("unchecked")
     public void testAddAllToFullBufferWithTimeout() {
-        final Buffer<E> bounded = BoundedBuffer.decorate(new UnboundedFifoBuffer<E>(), 2, 500);
+        final Buffer<E> bounded = BoundedBuffer.boundedBuffer(new UnboundedFifoBuffer<E>(), 2, 500);
         bounded.add((E) "Hello");
         bounded.add((E) "World");
         new DelayedRemove(bounded, 200, 2).start();
diff --git a/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java b/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java
index 0fe8f8b9e..041dbcdc7 100644
--- a/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java
+++ b/src/test/org/apache/commons/collections/buffer/TestPredicatedBuffer.java
@@ -42,7 +42,7 @@ public class TestPredicatedBuffer<E> extends TestPredicatedCollection<E> {
     //---------------------------------------------------------------
 
     protected Buffer<E> decorateCollection(Buffer<E> buffer, Predicate<E> predicate) {
-        return PredicatedBuffer.decorate(buffer, predicate);
+        return PredicatedBuffer.predicatedBuffer(buffer, predicate);
     }
 
     @Override
diff --git a/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java b/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java
index 88f7aa5f8..377aea88e 100644
--- a/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java
+++ b/src/test/org/apache/commons/collections/buffer/TestSynchronizedBuffer.java
@@ -42,14 +42,14 @@ public class TestSynchronizedBuffer<E> extends AbstractTestCollection<E> {
     //-----------------------------------------------------------------------
     @Override
     public Buffer<E> makeObject() {
-        return SynchronizedBuffer.decorate(new UnboundedFifoBuffer<E>());
+        return SynchronizedBuffer.synchronizedBuffer(new UnboundedFifoBuffer<E>());
     }
 
     @Override
     public Collection<E> makeFullCollection() {
         Buffer<E> buffer = new UnboundedFifoBuffer<E>();
         buffer.addAll(Arrays.asList(getFullElements()));
-        return SynchronizedBuffer.decorate(buffer);
+        return SynchronizedBuffer.synchronizedBuffer(buffer);
     }
 
     @Override
diff --git a/src/test/org/apache/commons/collections/buffer/TestTransformedBuffer.java b/src/test/org/apache/commons/collections/buffer/TestTransformedBuffer.java
index 70f1e3eab..cd8a45846 100644
--- a/src/test/org/apache/commons/collections/buffer/TestTransformedBuffer.java
+++ b/src/test/org/apache/commons/collections/buffer/TestTransformedBuffer.java
@@ -37,7 +37,7 @@ public class TestTransformedBuffer extends TestCase {
     }
 
     public void testTransformedBuffer() {
-        Buffer<Object> buffer = TransformedBuffer.decorate(new ArrayStack<Object>(), TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
+        Buffer<Object> buffer = TransformedBuffer.transformingBuffer(new ArrayStack<Object>(), TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(0, buffer.size());
         Object[] els = new Object[] { "1", "3", "5", "7", "2", "4", "6" };
         for (int i = 0; i < els.length; i++) {
@@ -58,7 +58,7 @@ public class TestTransformedBuffer extends TestCase {
         for (int i = 0; i < els.length; i++) {
             originalBuffer.add(els[i]);
         }
-        Buffer buffer = TransformedBuffer.decorateTransform(originalBuffer, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
+        Buffer buffer = TransformedBuffer.transformedBuffer(originalBuffer, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(els.length, buffer.size());
         for (int i = 0; i < els.length; i++) {
             assertEquals(true, buffer.contains(new Integer((String) els[i])));
diff --git a/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java b/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java
index 55f105604..1cb355951 100644
--- a/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java
+++ b/src/test/org/apache/commons/collections/buffer/TestUnmodifiableBuffer.java
@@ -42,14 +42,14 @@ public class TestUnmodifiableBuffer<E> extends AbstractTestCollection<E> {
     //-----------------------------------------------------------------------
     @Override
     public Collection<E> makeObject() {
-        return UnmodifiableBuffer.decorate(new UnboundedFifoBuffer<E>());
+        return UnmodifiableBuffer.unmodifiableBuffer(new UnboundedFifoBuffer<E>());
     }
 
     @Override
     public Collection<E> makeFullCollection() {
         Buffer<E> buffer = new UnboundedFifoBuffer<E>();
         buffer.addAll(Arrays.asList(getFullElements()));
-        return UnmodifiableBuffer.decorate(buffer);
+        return UnmodifiableBuffer.unmodifiableBuffer(buffer);
     }
 
     @Override
diff --git a/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java b/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java
index 705606f8f..c69532e08 100644
--- a/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java
+++ b/src/test/org/apache/commons/collections/collection/TestPredicatedCollection.java
@@ -44,7 +44,7 @@ public class TestPredicatedCollection<E> extends AbstractTestCollection<E> {
 
     protected Collection<E> decorateCollection(
                 Collection<E> collection, Predicate<E> predicate) {
-        return PredicatedCollection.decorate(collection, predicate);
+        return PredicatedCollection.predicatedCollection(collection, predicate);
     }
 
     @Override
diff --git a/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java b/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java
index 83656652c..3c9ebfaf6 100644
--- a/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java
+++ b/src/test/org/apache/commons/collections/collection/TestSynchronizedCollection.java
@@ -39,7 +39,7 @@ public class TestSynchronizedCollection<E> extends AbstractTestCollection<E> {
     //-----------------------------------------------------------------------
     @Override
     public Collection<E> makeObject() {
-        return SynchronizedCollection.decorate(new ArrayList<E>());
+        return SynchronizedCollection.synchronizedCollection(new ArrayList<E>());
     }
 
     @Override
diff --git a/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java b/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java
index 22ef478da..74b56d8d0 100644
--- a/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java
+++ b/src/test/org/apache/commons/collections/collection/TestTransformedCollection.java
@@ -63,14 +63,14 @@ public class TestTransformedCollection extends AbstractTestCollection<Object> {
     
     @Override
     public Collection<Object> makeObject() {
-        return TransformedCollection.decorate(new ArrayList<Object>(), NOOP_TRANSFORMER);
+        return TransformedCollection.transformingCollection(new ArrayList<Object>(), NOOP_TRANSFORMER);
     }
 
     @Override
     public Collection<Object> makeFullCollection() {
         List<Object> list = new ArrayList<Object>();
         list.addAll(Arrays.asList(getFullElements()));
-        return TransformedCollection.decorate(list, NOOP_TRANSFORMER);
+        return TransformedCollection.transformingCollection(list, NOOP_TRANSFORMER);
     }
     
     //-----------------------------------------------------------------------
@@ -86,7 +86,7 @@ public class TestTransformedCollection extends AbstractTestCollection<Object> {
 
     //-----------------------------------------------------------------------
     public void testTransformedCollection() {
-        Collection<Object> coll = TransformedCollection.decorate(new ArrayList<Object>(), STRING_TO_INTEGER_TRANSFORMER);
+        Collection<Object> coll = TransformedCollection.transformingCollection(new ArrayList<Object>(), STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(0, coll.size());
         Object[] els = getFullElements();
         for (int i = 0; i < els.length; i++) {
@@ -105,7 +105,7 @@ public class TestTransformedCollection extends AbstractTestCollection<Object> {
         for (int i = 0; i < els.length; i++) {
             originalCollection.add(els[i]);
         }
-        Collection collection = TransformedCollection.decorateTransform(originalCollection, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
+        Collection collection = TransformedCollection.transformedCollection(originalCollection, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(els.length, collection.size());
         for (int i = 0; i < els.length; i++) {
             assertEquals(true, collection.contains(new Integer((String) els[i])));
diff --git a/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java b/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java
index 844b7881e..9c9f8ca59 100644
--- a/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java
+++ b/src/test/org/apache/commons/collections/collection/TestUnmodifiableCollection.java
@@ -40,14 +40,14 @@ public class TestUnmodifiableCollection<E> extends AbstractTestCollection<E> {
     //-----------------------------------------------------------------------
     @Override
     public Collection<E> makeObject() {
-        return UnmodifiableCollection.decorate(new ArrayList<E>());
+        return UnmodifiableCollection.unmodifiableCollection(new ArrayList<E>());
     }
 
     @Override
     public Collection<E> makeFullCollection() {
         List<E> list = new ArrayList<E>();
         list.addAll(Arrays.asList(getFullElements()));
-        return UnmodifiableCollection.decorate(list);
+        return UnmodifiableCollection.unmodifiableCollection(list);
     }
 
     @Override
diff --git a/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java b/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java
index bbad7a84f..91732f7f9 100644
--- a/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java
+++ b/src/test/org/apache/commons/collections/comparators/TestBooleanComparator.java
@@ -73,20 +73,20 @@ public class TestBooleanComparator extends AbstractTestComparator<Boolean> {
 
     public void testStaticFactoryMethods() {
         allTests(false,BooleanComparator.getFalseFirstComparator());
-        allTests(false,BooleanComparator.getBooleanComparator(false));
+        allTests(false,BooleanComparator.booleanComparator(false));
         allTests(true,BooleanComparator.getTrueFirstComparator());
-        allTests(true,BooleanComparator.getBooleanComparator(true));
+        allTests(true,BooleanComparator.booleanComparator(true));
     }
 
     public void testEqualsCompatibleInstance() {
         assertEquals(new BooleanComparator(),new BooleanComparator(false));
         assertEquals(new BooleanComparator(false),new BooleanComparator(false));
         assertEquals(new BooleanComparator(false),BooleanComparator.getFalseFirstComparator());
-        assertSame(BooleanComparator.getFalseFirstComparator(),BooleanComparator.getBooleanComparator(false));
+        assertSame(BooleanComparator.getFalseFirstComparator(),BooleanComparator.booleanComparator(false));
 
         assertEquals(new BooleanComparator(true),new BooleanComparator(true));
         assertEquals(new BooleanComparator(true),BooleanComparator.getTrueFirstComparator());
-        assertSame(BooleanComparator.getTrueFirstComparator(),BooleanComparator.getBooleanComparator(true));
+        assertSame(BooleanComparator.getTrueFirstComparator(),BooleanComparator.booleanComparator(true));
 
         assertTrue(!(new BooleanComparator().equals(new BooleanComparator(true))));
         assertTrue(!(new BooleanComparator(true).equals(new BooleanComparator(false))));
diff --git a/src/test/org/apache/commons/collections/functors/TestComparatorPredicate.java b/src/test/org/apache/commons/collections/functors/TestComparatorPredicate.java
index b3d66d369..8bcd9b724 100644
--- a/src/test/org/apache/commons/collections/functors/TestComparatorPredicate.java
+++ b/src/test/org/apache/commons/collections/functors/TestComparatorPredicate.java
@@ -33,7 +33,7 @@ public class TestComparatorPredicate extends BasicPredicateTestBase {
     @Test
     public void compareEquals() {
         Integer value = Integer.valueOf(10);
-        Predicate<Integer> p = getInstance(value, new TestComparator<Integer>());
+        Predicate<Integer> p = comparatorPredicate(value, new TestComparator<Integer>());
         assertFalse(p, Integer.valueOf(value.intValue() - 1));
         assertTrue(p, Integer.valueOf(value.intValue()));
         assertFalse(p, Integer.valueOf(value.intValue() + 1));
@@ -42,7 +42,7 @@ public class TestComparatorPredicate extends BasicPredicateTestBase {
     @Test
     public void compareGreater() {
         Integer value = Integer.valueOf(10);
-        Predicate<Integer> p = getInstance(value, new TestComparator<Integer>(), Criterion.GREATER);
+        Predicate<Integer> p = comparatorPredicate(value, new TestComparator<Integer>(), Criterion.GREATER);
         assertTrue(p, Integer.valueOf(value.intValue() - 1));
         assertFalse(p, Integer.valueOf(value.intValue()));
         assertFalse(p, Integer.valueOf(value.intValue() + 1));
@@ -51,7 +51,7 @@ public class TestComparatorPredicate extends BasicPredicateTestBase {
     @Test
     public void compareLess() {
         Integer value = Integer.valueOf(10);
-        Predicate<Integer> p = getInstance(value, new TestComparator<Integer>(), Criterion.LESS);
+        Predicate<Integer> p = comparatorPredicate(value, new TestComparator<Integer>(), Criterion.LESS);
         assertFalse(p, Integer.valueOf(value.intValue() - 1));
         assertFalse(p, Integer.valueOf(value.intValue()));
         assertTrue(p, Integer.valueOf(value.intValue() + 1));
@@ -60,7 +60,7 @@ public class TestComparatorPredicate extends BasicPredicateTestBase {
     @Test
     public void compareGreaterOrEqual() {
         Integer value = Integer.valueOf(10);
-        Predicate<Integer> p = getInstance(value, new TestComparator<Integer>(), Criterion.GREATER_OR_EQUAL);
+        Predicate<Integer> p = comparatorPredicate(value, new TestComparator<Integer>(), Criterion.GREATER_OR_EQUAL);
         assertTrue(p, Integer.valueOf(value.intValue() - 1));
         assertTrue(p, Integer.valueOf(value.intValue()));
         assertFalse(p, Integer.valueOf(value.intValue() + 1));
@@ -69,7 +69,7 @@ public class TestComparatorPredicate extends BasicPredicateTestBase {
     @Test
     public void compareLessOrEqual() {
         Integer value = Integer.valueOf(10);
-        Predicate<Integer> p = getInstance(value, new TestComparator<Integer>(), Criterion.LESS_OR_EQUAL);
+        Predicate<Integer> p = comparatorPredicate(value, new TestComparator<Integer>(), Criterion.LESS_OR_EQUAL);
         assertFalse(p, Integer.valueOf(value.intValue() - 1));
         assertTrue(p, Integer.valueOf(value.intValue()));
         assertTrue(p, Integer.valueOf(value.intValue() + 1));
@@ -77,6 +77,6 @@ public class TestComparatorPredicate extends BasicPredicateTestBase {
     
     @Override
     protected Predicate<?> generatePredicate() {
-        return getInstance(Integer.valueOf(10), new TestComparator<Integer>());
+        return comparatorPredicate(Integer.valueOf(10), new TestComparator<Integer>());
     }    
 }
diff --git a/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java b/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java
index dd9e303b4..3de60b653 100644
--- a/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java
@@ -145,7 +145,7 @@ public class TestFilterIterator<E> extends AbstractTestIterator<E> {
         assertEquals(true, filterIterator.hasNext());
 
         // this predicate doesn't match
-        filterIterator.setPredicate(NotNullPredicate.getInstance());
+        filterIterator.setPredicate(NotNullPredicate.notNullPredicate());
         assertEquals(false, filterIterator.hasNext());
     }
 
diff --git a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java
index c4a8199f6..b5163dae3 100644
--- a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableIterator.java
@@ -52,12 +52,12 @@ public class TestUnmodifiableIterator<E> extends AbstractTestIterator<E> {
 
     @Override
     public Iterator<E> makeEmptyIterator() {
-        return UnmodifiableIterator.decorate(Collections.<E>emptyList().iterator());
+        return UnmodifiableIterator.unmodifiableIterator(Collections.<E>emptyList().iterator());
     }
 
     @Override
     public Iterator<E> makeObject() {
-        return UnmodifiableIterator.decorate(testList.iterator());
+        return UnmodifiableIterator.unmodifiableIterator(testList.iterator());
     }
 
     @Override
@@ -72,13 +72,13 @@ public class TestUnmodifiableIterator<E> extends AbstractTestIterator<E> {
 
     public void testDecorateFactory() {
         Iterator<E> it = makeObject();
-        assertSame(it, UnmodifiableIterator.decorate(it));
+        assertSame(it, UnmodifiableIterator.unmodifiableIterator(it));
 
         it = testList.iterator();
-        assertTrue(it != UnmodifiableIterator.decorate(it));
+        assertTrue(it != UnmodifiableIterator.unmodifiableIterator(it));
 
         try {
-            UnmodifiableIterator.decorate(null);
+            UnmodifiableIterator.unmodifiableIterator(null);
             fail();
         } catch (IllegalArgumentException ex) {}
     }
diff --git a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java
index cc515b7ee..1a0df152d 100644
--- a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableListIterator.java
@@ -52,12 +52,12 @@ public class TestUnmodifiableListIterator<E> extends AbstractTestListIterator<E>
 
     @Override
     public ListIterator<E> makeEmptyIterator() {
-        return UnmodifiableListIterator.decorate(Collections.<E>emptyList().listIterator());
+        return UnmodifiableListIterator.umodifiableListIterator(Collections.<E>emptyList().listIterator());
     }
 
     @Override
     public ListIterator<E> makeObject() {
-        return UnmodifiableListIterator.decorate(testList.listIterator());
+        return UnmodifiableListIterator.umodifiableListIterator(testList.listIterator());
     }
 
     @Override
@@ -82,13 +82,13 @@ public class TestUnmodifiableListIterator<E> extends AbstractTestListIterator<E>
 
     public void testDecorateFactory() {
         ListIterator<E> it = makeObject();
-        assertSame(it, UnmodifiableListIterator.decorate(it));
+        assertSame(it, UnmodifiableListIterator.umodifiableListIterator(it));
 
         it = testList.listIterator();
-        assertTrue(it != UnmodifiableListIterator.decorate(it));
+        assertTrue(it != UnmodifiableListIterator.umodifiableListIterator(it));
 
         try {
-            UnmodifiableListIterator.decorate(null);
+            UnmodifiableListIterator.umodifiableListIterator(null);
             fail();
         } catch (IllegalArgumentException ex) {}
     }
diff --git a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java
index 658f14f85..1ebf6fbd6 100644
--- a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableMapIterator.java
@@ -39,12 +39,12 @@ public class TestUnmodifiableMapIterator<K, V> extends AbstractTestMapIterator<K
 
     @Override
     public MapIterator<K, V> makeEmptyIterator() {
-        return UnmodifiableMapIterator.decorate(new DualHashBidiMap<K, V>().mapIterator());
+        return UnmodifiableMapIterator.unmodifiableMapIterator(new DualHashBidiMap<K, V>().mapIterator());
     }
 
     @Override
     public MapIterator<K, V> makeObject() {
-        return UnmodifiableMapIterator.decorate(getMap().mapIterator());
+        return UnmodifiableMapIterator.unmodifiableMapIterator(getMap().mapIterator());
     }
 
     @Override
@@ -84,13 +84,13 @@ public class TestUnmodifiableMapIterator<K, V> extends AbstractTestMapIterator<K
 
     public void testDecorateFactory() {
         MapIterator<K, V> it = makeObject();
-        assertSame(it, UnmodifiableMapIterator.decorate(it));
+        assertSame(it, UnmodifiableMapIterator.unmodifiableMapIterator(it));
 
         it = getMap().mapIterator() ;
-        assertTrue(it != UnmodifiableMapIterator.decorate(it));
+        assertTrue(it != UnmodifiableMapIterator.unmodifiableMapIterator(it));
 
         try {
-            UnmodifiableMapIterator.decorate(null);
+            UnmodifiableMapIterator.unmodifiableMapIterator(null);
             fail();
         } catch (IllegalArgumentException ex) {}
     }
diff --git a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java
index c46b5b130..a26277463 100644
--- a/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java
+++ b/src/test/org/apache/commons/collections/iterators/TestUnmodifiableOrderedMapIterator.java
@@ -40,19 +40,19 @@ public class TestUnmodifiableOrderedMapIterator<K, V> extends AbstractTestOrdere
 
     @Override
     public OrderedMapIterator<K, V> makeEmptyIterator() {
-        return UnmodifiableOrderedMapIterator.decorate(
-                ListOrderedMap.decorate(new HashMap<K, V>()).mapIterator());
+        return UnmodifiableOrderedMapIterator.unmodifiableOrderedMapIterator(
+                ListOrderedMap.listOrderedMap(new HashMap<K, V>()).mapIterator());
     }
 
     @Override
     public OrderedMapIterator<K, V> makeObject() {
-        return UnmodifiableOrderedMapIterator.decorate(getMap().mapIterator());
+        return UnmodifiableOrderedMapIterator.unmodifiableOrderedMapIterator(getMap().mapIterator());
     }
 
     @Override
     @SuppressWarnings("unchecked")
     public OrderedMap<K, V> getMap() {
-        OrderedMap<K, V> testMap = ListOrderedMap.decorate(new HashMap<K, V>());
+        OrderedMap<K, V> testMap = ListOrderedMap.listOrderedMap(new HashMap<K, V>());
         testMap.put((K) "A", (V) "a");
         testMap.put((K) "B", (V) "b");
         testMap.put((K) "C", (V) "c");
@@ -86,13 +86,13 @@ public class TestUnmodifiableOrderedMapIterator<K, V> extends AbstractTestOrdere
 
     public void testDecorateFactory() {
         OrderedMapIterator<K, V> it = makeObject();
-        assertSame(it, UnmodifiableOrderedMapIterator.decorate(it));
+        assertSame(it, UnmodifiableOrderedMapIterator.unmodifiableOrderedMapIterator(it));
 
         it = getMap().mapIterator() ;
-        assertTrue(it != UnmodifiableOrderedMapIterator.decorate(it));
+        assertTrue(it != UnmodifiableOrderedMapIterator.unmodifiableOrderedMapIterator(it));
 
         try {
-            UnmodifiableOrderedMapIterator.decorate(null);
+            UnmodifiableOrderedMapIterator.unmodifiableOrderedMapIterator(null);
             fail();
         } catch (IllegalArgumentException ex) {}
     }
diff --git a/src/test/org/apache/commons/collections/list/TestFixedSizeList.java b/src/test/org/apache/commons/collections/list/TestFixedSizeList.java
index 640952c24..3475d75d0 100644
--- a/src/test/org/apache/commons/collections/list/TestFixedSizeList.java
+++ b/src/test/org/apache/commons/collections/list/TestFixedSizeList.java
@@ -37,14 +37,14 @@ public class TestFixedSizeList<E> extends AbstractTestList<E> {
 
     @Override
     public List<E> makeObject() {
-        return FixedSizeList.decorate(new ArrayList<E>());
+        return FixedSizeList.fixedSizeList(new ArrayList<E>());
     }
 
     @Override
     public List<E> makeFullCollection() {
         List<E> list = new ArrayList<E>();
         list.addAll(Arrays.asList(getFullElements()));
-        return FixedSizeList.decorate(list);
+        return FixedSizeList.fixedSizeList(list);
     }
 
     @Override
diff --git a/src/test/org/apache/commons/collections/list/TestGrowthList.java b/src/test/org/apache/commons/collections/list/TestGrowthList.java
index f21ed9963..5ecdc4ffa 100644
--- a/src/test/org/apache/commons/collections/list/TestGrowthList.java
+++ b/src/test/org/apache/commons/collections/list/TestGrowthList.java
@@ -44,7 +44,7 @@ public class TestGrowthList<E> extends AbstractTestList<E> {
     public List<E> makeFullCollection() {
         List<E> list = new ArrayList<E>();
         list.addAll(Arrays.asList(getFullElements()));
-        return GrowthList.decorate(list);
+        return GrowthList.growthList(list);
     }
 
     //-----------------------------------------------------------------------
diff --git a/src/test/org/apache/commons/collections/list/TestPredicatedList.java b/src/test/org/apache/commons/collections/list/TestPredicatedList.java
index 4c2fb6ea3..ef18dbb07 100644
--- a/src/test/org/apache/commons/collections/list/TestPredicatedList.java
+++ b/src/test/org/apache/commons/collections/list/TestPredicatedList.java
@@ -42,7 +42,7 @@ public class TestPredicatedList<E> extends AbstractTestList<E> {
     protected Predicate<E> truePredicate = TruePredicate.<E>truePredicate();
 
     protected List<E> decorateList(List<E> list, Predicate<E> predicate) {
-        return PredicatedList.decorate(list, predicate);
+        return PredicatedList.predicatedList(list, predicate);
     }
 
     @Override
diff --git a/src/test/org/apache/commons/collections/list/TestSetUniqueList.java b/src/test/org/apache/commons/collections/list/TestSetUniqueList.java
index 88db03738..82f9c2e5c 100644
--- a/src/test/org/apache/commons/collections/list/TestSetUniqueList.java
+++ b/src/test/org/apache/commons/collections/list/TestSetUniqueList.java
@@ -214,7 +214,7 @@ public class TestSetUniqueList<E> extends AbstractTestList<E> {
     public void testFactory() {
         Integer[] array = new Integer[] { new Integer(1), new Integer(2), new Integer(1) };
         ArrayList<Integer> list = new ArrayList<Integer>(Arrays.asList(array));
-        final SetUniqueList<Integer> lset = SetUniqueList.decorate(list);
+        final SetUniqueList<Integer> lset = SetUniqueList.setUniqueList(list);
 
         assertEquals("Duplicate element was added.", 2, lset.size());
         assertEquals(new Integer(1), lset.get(0));
@@ -311,7 +311,7 @@ public class TestSetUniqueList<E> extends AbstractTestList<E> {
 
     @SuppressWarnings("unchecked")
     public void testUniqueListReInsert() {
-        List<E> l = SetUniqueList.decorate(new LinkedList<E>());
+        List<E> l = SetUniqueList.setUniqueList(new LinkedList<E>());
         l.add((E) new Object());
         l.add((E) new Object());
 
@@ -328,7 +328,7 @@ public class TestSetUniqueList<E> extends AbstractTestList<E> {
 
     @SuppressWarnings("unchecked")
     public void testUniqueListDoubleInsert() {
-        List<E> l = SetUniqueList.decorate(new LinkedList<E>());
+        List<E> l = SetUniqueList.setUniqueList(new LinkedList<E>());
         l.add((E) new Object());
         l.add((E) new Object());
 
@@ -458,7 +458,7 @@ public class TestSetUniqueList<E> extends AbstractTestList<E> {
     // TODO: Generics
     public void testCollections304() {
         List list = new LinkedList();
-        SetUniqueList decoratedList = SetUniqueList.decorate(list);
+        SetUniqueList decoratedList = SetUniqueList.setUniqueList(list);
         String s1 = "Apple";
         String s2 = "Lemon";
         String s3 = "Orange";
@@ -486,7 +486,7 @@ public class TestSetUniqueList<E> extends AbstractTestList<E> {
     @SuppressWarnings("unchecked")
     public void testCollections307() {
         List<E> list = new ArrayList<E>();
-        List<E> uniqueList = SetUniqueList.decorate(list);
+        List<E> uniqueList = SetUniqueList.setUniqueList(list);
 
         String hello = "Hello";
         String world = "World";
diff --git a/src/test/org/apache/commons/collections/list/TestSynchronizedList.java b/src/test/org/apache/commons/collections/list/TestSynchronizedList.java
index e2c12171b..ffcdf8c09 100644
--- a/src/test/org/apache/commons/collections/list/TestSynchronizedList.java
+++ b/src/test/org/apache/commons/collections/list/TestSynchronizedList.java
@@ -41,7 +41,7 @@ public class TestSynchronizedList<E> extends AbstractTestList<E> {
 
     @Override
     public List<E> makeObject() {
-        return SynchronizedList.decorate(new ArrayList<E>());
+        return SynchronizedList.synchronizedList(new ArrayList<E>());
     }
 
     @Override
diff --git a/src/test/org/apache/commons/collections/list/TestTransformedList.java b/src/test/org/apache/commons/collections/list/TestTransformedList.java
index 413ee122c..68aa50ee9 100644
--- a/src/test/org/apache/commons/collections/list/TestTransformedList.java
+++ b/src/test/org/apache/commons/collections/list/TestTransformedList.java
@@ -54,7 +54,7 @@ public class TestTransformedList<E> extends AbstractTestList<E> {
     @Override
     @SuppressWarnings("unchecked")
     public List<E> makeObject() {
-        return TransformedList.decorate(new ArrayList<E>(), (Transformer<E, E>) TestTransformedCollection.NOOP_TRANSFORMER);
+        return TransformedList.transformingList(new ArrayList<E>(), (Transformer<E, E>) TestTransformedCollection.NOOP_TRANSFORMER);
     }
 
     @Override
@@ -62,12 +62,12 @@ public class TestTransformedList<E> extends AbstractTestList<E> {
     public List<E> makeFullCollection() {
         List<E> list = new ArrayList<E>();
         list.addAll(Arrays.asList(getFullElements()));
-        return TransformedList.decorate(list, (Transformer<E, E>) TestTransformedCollection.NOOP_TRANSFORMER);
+        return TransformedList.transformingList(list, (Transformer<E, E>) TestTransformedCollection.NOOP_TRANSFORMER);
     }
 
     @SuppressWarnings("unchecked")
     public void testTransformedList() {
-        List<E> list = TransformedList.decorate(new ArrayList<E>(), (Transformer<E, E>) TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
+        List<E> list = TransformedList.transformingList(new ArrayList<E>(), (Transformer<E, E>) TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(0, list.size());
         E[] els = (E[]) new Object[] {"1", "3", "5", "7", "2", "4", "6"};
         for (int i = 0; i < els.length; i++) {
@@ -119,7 +119,7 @@ public class TestTransformedList<E> extends AbstractTestList<E> {
         for (int i = 0; i < els.length; i++) {
             originalList.add(els[i]);
         }
-        List list = TransformedList.decorateTransform(originalList, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
+        List list = TransformedList.transformedList(originalList, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(els.length, list.size());
         for (int i = 0; i < els.length; i++) {
             assertEquals(true, list.contains(new Integer((String) els[i])));
diff --git a/src/test/org/apache/commons/collections/map/TestDefaultedMap.java b/src/test/org/apache/commons/collections/map/TestDefaultedMap.java
index 60d535ebd..aba26dbe9 100644
--- a/src/test/org/apache/commons/collections/map/TestDefaultedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestDefaultedMap.java
@@ -45,7 +45,7 @@ public class TestDefaultedMap<K, V> extends AbstractTestIterableMap<K, V> {
     //-----------------------------------------------------------------------
     @Override
     public IterableMap<K, V> makeObject() {
-        return DefaultedMap.decorate(new HashMap<K, V>(), nullFactory);
+        return DefaultedMap.defaultedMap(new HashMap<K, V>(), nullFactory);
     }
 
     //-----------------------------------------------------------------------
@@ -69,7 +69,7 @@ public class TestDefaultedMap<K, V> extends AbstractTestIterableMap<K, V> {
     @SuppressWarnings("unchecked")
     public void testMapGet2() {
         HashMap<K, V> base = new HashMap<K, V>();
-        Map<K, V> map = DefaultedMap.decorate(base, (V) "NULL");
+        Map<K, V> map = DefaultedMap.defaultedMap(base, (V) "NULL");
 
         assertEquals(0, map.size());
         assertEquals(0, base.size());
@@ -88,7 +88,7 @@ public class TestDefaultedMap<K, V> extends AbstractTestIterableMap<K, V> {
     @SuppressWarnings("unchecked")
     public void testMapGet3() {
         HashMap<K, V> base = new HashMap<K, V>();
-        Map<K, V> map = DefaultedMap.decorate(base, ConstantFactory.getInstance((V) "NULL"));
+        Map<K, V> map = DefaultedMap.defaultedMap(base, ConstantFactory.constantFactory((V) "NULL"));
 
         assertEquals(0, map.size());
         assertEquals(0, base.size());
@@ -107,7 +107,7 @@ public class TestDefaultedMap<K, V> extends AbstractTestIterableMap<K, V> {
     @SuppressWarnings("unchecked")
     public void testMapGet4() {
         HashMap<K, V> base = new HashMap<K, V>();
-        Map<K, V> map = DefaultedMap.decorate(base, new Transformer<K, V>() {
+        Map<K, V> map = DefaultedMap.defaultedMap(base, new Transformer<K, V>() {
             public V transform(K input) {
                 if (input instanceof String) {
                     return (V) "NULL";
diff --git a/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java b/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java
index 8479d4b8a..041a7aed5 100644
--- a/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java
+++ b/src/test/org/apache/commons/collections/map/TestFixedSizeMap.java
@@ -38,14 +38,14 @@ public class TestFixedSizeMap<K, V> extends AbstractTestIterableMap<K, V> {
 
     @Override
     public IterableMap<K, V> makeObject() {
-        return FixedSizeMap.decorate(new HashMap<K, V>());
+        return FixedSizeMap.fixedSizeMap(new HashMap<K, V>());
     }
 
     @Override
     public IterableMap<K, V> makeFullMap() {
         Map<K, V> map = new HashMap<K, V>();
         addSampleMappings(map);
-        return FixedSizeMap.decorate(map);
+        return FixedSizeMap.fixedSizeMap(map);
     }
 
     @Override
diff --git a/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java b/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java
index 2f25fe422..882478071 100644
--- a/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java
@@ -45,14 +45,14 @@ public class TestFixedSizeSortedMap<K, V> extends AbstractTestSortedMap<K, V> {
     //-----------------------------------------------------------------------
     @Override
     public SortedMap<K, V> makeObject() {
-        return FixedSizeSortedMap.decorate(new TreeMap<K, V>());
+        return FixedSizeSortedMap.fixedSizeSortedMap(new TreeMap<K, V>());
     }
 
     @Override
     public SortedMap<K, V> makeFullMap() {
         SortedMap<K, V> map = new TreeMap<K, V>();
         addSampleMappings(map);
-        return FixedSizeSortedMap.decorate(map);
+        return FixedSizeSortedMap.fixedSizeSortedMap(map);
     }
 
     @Override
diff --git a/src/test/org/apache/commons/collections/map/TestLazyMap.java b/src/test/org/apache/commons/collections/map/TestLazyMap.java
index b3070abd4..3c9a88ba7 100644
--- a/src/test/org/apache/commons/collections/map/TestLazyMap.java
+++ b/src/test/org/apache/commons/collections/map/TestLazyMap.java
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.collections.map;
 
-import static org.apache.commons.collections.map.LazyMap.getLazyMap;
+import static org.apache.commons.collections.map.LazyMap.lazyMap;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -46,7 +46,7 @@ public class TestLazyMap<K, V> extends AbstractTestIterableMap<K, V> {
 
     @Override
     public LazyMap<K,V> makeObject() {
-        return getLazyMap(new HashMap<K,V>(), FactoryUtils.<V>nullFactory());
+        return lazyMap(new HashMap<K,V>(), FactoryUtils.<V>nullFactory());
     }
 
     //-----------------------------------------------------------------------
@@ -57,7 +57,7 @@ public class TestLazyMap<K, V> extends AbstractTestIterableMap<K, V> {
 
     @Test
     public void mapGetWithFactory() {
-        Map<Integer, Number> map = getLazyMap(new HashMap<Integer,Number>(), oneFactory);
+        Map<Integer, Number> map = lazyMap(new HashMap<Integer,Number>(), oneFactory);
         assertEquals(0, map.size());
         Number i1 = map.get("Five");
         assertEquals(1, i1);
@@ -67,7 +67,7 @@ public class TestLazyMap<K, V> extends AbstractTestIterableMap<K, V> {
         assertEquals(1, map.size());
         assertSame(i1, i2);
 
-        map = getLazyMap(new HashMap<Integer,Number>(), FactoryUtils.<Long>nullFactory());
+        map = lazyMap(new HashMap<Integer,Number>(), FactoryUtils.<Long>nullFactory());
         Object o = map.get("Five");
         assertEquals(null,o);
         assertEquals(1, map.size());
@@ -80,7 +80,7 @@ public class TestLazyMap<K, V> extends AbstractTestIterableMap<K, V> {
                 return input.intValue();
             }
         };
-        Map<Long, Number> map = getLazyMap(new HashMap<Long,Number>(), intConverter );
+        Map<Long, Number> map = lazyMap(new HashMap<Long,Number>(), intConverter );
         assertEquals(0, map.size());
         Number i1 = map.get(123L);
         assertEquals(123, i1);
diff --git a/src/test/org/apache/commons/collections/map/TestLazySortedMap.java b/src/test/org/apache/commons/collections/map/TestLazySortedMap.java
index b837c2e2f..fb7925364 100644
--- a/src/test/org/apache/commons/collections/map/TestLazySortedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestLazySortedMap.java
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.collections.map;
 
-import static org.apache.commons.collections.map.LazySortedMap.getLazySortedMap;
+import static org.apache.commons.collections.map.LazySortedMap.lazySortedMap;
 
 import java.util.Comparator;
 import java.util.Map;
@@ -49,7 +49,7 @@ public class TestLazySortedMap<K, V> extends AbstractTestSortedMap<K, V> {
     
     @Override
     public SortedMap<K,V> makeObject() {
-        return getLazySortedMap(new TreeMap<K,V>(), FactoryUtils.<V>nullFactory());
+        return lazySortedMap(new TreeMap<K,V>(), FactoryUtils.<V>nullFactory());
     }
     
     @Override
@@ -72,13 +72,13 @@ public class TestLazySortedMap<K, V> extends AbstractTestSortedMap<K, V> {
     
     @Test
     public void mapGet() {
-        Map<Integer, Number> map = getLazySortedMap(new TreeMap<Integer,Number>(), oneFactory);
+        Map<Integer, Number> map = lazySortedMap(new TreeMap<Integer,Number>(), oneFactory);
         assertEquals(0, map.size());
         Number i1 = map.get(5);
         assertEquals(1, i1);
         assertEquals(1, map.size());
 
-        map = getLazySortedMap(new TreeMap<Integer,Number>(), FactoryUtils.<Number>nullFactory());
+        map = lazySortedMap(new TreeMap<Integer,Number>(), FactoryUtils.<Number>nullFactory());
         Number o = map.get(5);
         assertEquals(null,o);
         assertEquals(1, map.size());
@@ -87,7 +87,7 @@ public class TestLazySortedMap<K, V> extends AbstractTestSortedMap<K, V> {
     
     //-----------------------------------------------------------------------
     public void testSortOrder() {
-        SortedMap<String, Number> map = getLazySortedMap(new TreeMap<String,Number>(), oneFactory);
+        SortedMap<String, Number> map = lazySortedMap(new TreeMap<String,Number>(), oneFactory);
         map.put("A",  5);
         map.get("B"); // Entry with value "One" created
         map.put("C", 8);
@@ -107,16 +107,16 @@ public class TestLazySortedMap<K, V> extends AbstractTestSortedMap<K, V> {
     
     public void testTransformerDecorate() {
         Transformer<Object, Integer> transformer = TransformerUtils.asTransformer(oneFactory);
-        SortedMap<Integer, Number> map = getLazySortedMap(new TreeMap<Integer, Number>(), transformer);     
+        SortedMap<Integer, Number> map = lazySortedMap(new TreeMap<Integer, Number>(), transformer);     
         assertTrue(map instanceof LazySortedMap);  
          try {
-            map = getLazySortedMap(new TreeMap<Integer, Number>(), (Transformer<Integer, Number>) null);
+            map = lazySortedMap(new TreeMap<Integer, Number>(), (Transformer<Integer, Number>) null);
             fail("Expecting IllegalArgumentException for null transformer");
         } catch (IllegalArgumentException e) {
             // expected
         }
         try {
-            map = getLazySortedMap((SortedMap<Integer,Number>) null, transformer);
+            map = lazySortedMap((SortedMap<Integer,Number>) null, transformer);
             fail("Expecting IllegalArgumentException for null map");
         } catch (IllegalArgumentException e) {
             // expected
diff --git a/src/test/org/apache/commons/collections/map/TestListOrderedMap.java b/src/test/org/apache/commons/collections/map/TestListOrderedMap.java
index f123c1014..7d2b1f358 100644
--- a/src/test/org/apache/commons/collections/map/TestListOrderedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestListOrderedMap.java
@@ -49,7 +49,7 @@ public class TestListOrderedMap<K, V> extends AbstractTestOrderedMap<K, V> {
 
     @Override
     public ListOrderedMap<K, V> makeObject() {
-        return (ListOrderedMap<K, V>) ListOrderedMap.decorate(new HashMap<K, V>());
+        return (ListOrderedMap<K, V>) ListOrderedMap.listOrderedMap(new HashMap<K, V>());
     }
 
     /**
diff --git a/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java b/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
index ca3f35fea..dff69ac54 100644
--- a/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
+++ b/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
@@ -419,7 +419,7 @@ public class TestMultiKeyMap<K, V> extends AbstractTestIterableMap<MultiKey<? ex
     //-----------------------------------------------------------------------
     @SuppressWarnings("unchecked")
     public void testLRUMultiKeyMap() {
-        MultiKeyMap<K, V> map = MultiKeyMap.decorate(new LRUMap<MultiKey<? extends K>, V>(2));
+        MultiKeyMap<K, V> map = MultiKeyMap.multiKeyMap(new LRUMap<MultiKey<? extends K>, V>(2));
         map.put((K) I1, (K) I2, (V) "1-2");
         map.put((K) I1, (K) I3, (V) "1-1");
         assertEquals(2, map.size());
diff --git a/src/test/org/apache/commons/collections/map/TestMultiValueMap.java b/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
index 7efc3dd42..52e667a7b 100644
--- a/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
+++ b/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
@@ -109,7 +109,7 @@ public class TestMultiValueMap<K, V> extends AbstractTestObject {
 
     @SuppressWarnings("unchecked")
     private <C extends Collection<V>> MultiValueMap<K, V> createTestMap(Class<C> collectionClass) {
-        final MultiValueMap<K, V> map = MultiValueMap.decorate(new HashMap<K, C>(), collectionClass);
+        final MultiValueMap<K, V> map = MultiValueMap.multiValueMap(new HashMap<K, C>(), collectionClass);
         map.put((K) "one", (V) "uno");
         map.put((K) "one", (V) "un");
         map.put((K) "two", (V) "dos");
@@ -254,7 +254,7 @@ public class TestMultiValueMap<K, V> extends AbstractTestObject {
 
     @SuppressWarnings("unchecked")
     public void testPutWithList() {
-        MultiValueMap<K, V> test = MultiValueMap.decorate(new HashMap<K, Collection>(), ArrayList.class);
+        MultiValueMap<K, V> test = MultiValueMap.multiValueMap(new HashMap<K, Collection>(), ArrayList.class);
         assertEquals("a", test.put((K) "A", "a"));
         assertEquals("b", test.put((K) "A", "b"));
         assertEquals(1, test.size());
@@ -264,7 +264,7 @@ public class TestMultiValueMap<K, V> extends AbstractTestObject {
 
     @SuppressWarnings("unchecked")
     public void testPutWithSet() {
-        MultiValueMap<K, V> test = MultiValueMap.decorate(new HashMap<K, HashSet>(), HashSet.class);
+        MultiValueMap<K, V> test = MultiValueMap.multiValueMap(new HashMap<K, HashSet>(), HashSet.class);
         assertEquals("a", test.put((K) "A", "a"));
         assertEquals("b", test.put((K) "A", "b"));
         assertEquals(null, test.put((K) "A", "a"));
diff --git a/src/test/org/apache/commons/collections/map/TestPredicatedMap.java b/src/test/org/apache/commons/collections/map/TestPredicatedMap.java
index 6026d0588..8e6725fb0 100644
--- a/src/test/org/apache/commons/collections/map/TestPredicatedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestPredicatedMap.java
@@ -50,7 +50,7 @@ public class TestPredicatedMap<K, V> extends AbstractTestIterableMap<K, V> {
     //-----------------------------------------------------------------------
     protected IterableMap<K, V> decorateMap(Map<K, V> map, Predicate<? super K> keyPredicate,
         Predicate<? super V> valuePredicate) {
-        return PredicatedMap.decorate(map, keyPredicate, valuePredicate);
+        return PredicatedMap.predicatedMap(map, keyPredicate, valuePredicate);
     }
 
     @Override
diff --git a/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java b/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java
index 584fd0f4c..e022a9eac 100644
--- a/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestPredicatedSortedMap.java
@@ -52,7 +52,7 @@ public class TestPredicatedSortedMap<K, V> extends AbstractTestSortedMap<K, V> {
     //-----------------------------------------------------------------------
     protected SortedMap<K, V> decorateMap(SortedMap<K, V> map, Predicate<? super K> keyPredicate,
         Predicate<? super V> valuePredicate) {
-        return PredicatedSortedMap.decorate(map, keyPredicate, valuePredicate);
+        return PredicatedSortedMap.predicatedSortedMap(map, keyPredicate, valuePredicate);
     }
 
     @Override
diff --git a/src/test/org/apache/commons/collections/map/TestSingletonMap.java b/src/test/org/apache/commons/collections/map/TestSingletonMap.java
index 5f7683cca..1b8d7a706 100644
--- a/src/test/org/apache/commons/collections/map/TestSingletonMap.java
+++ b/src/test/org/apache/commons/collections/map/TestSingletonMap.java
@@ -50,7 +50,7 @@ public class TestSingletonMap<K, V> extends AbstractTestOrderedMap<K, V> {
     public OrderedMap<K, V> makeObject() {
         // need an empty singleton map, but thats not possible
         // use a ridiculous fake instead to make the tests pass
-        return UnmodifiableOrderedMap.decorate(ListOrderedMap.decorate(new HashMap<K, V>()));
+        return UnmodifiableOrderedMap.unmodifiableOrderedMap(ListOrderedMap.listOrderedMap(new HashMap<K, V>()));
     }
 
     @Override
diff --git a/src/test/org/apache/commons/collections/map/TestTransformedMap.java b/src/test/org/apache/commons/collections/map/TestTransformedMap.java
index f1acb563c..04413b586 100644
--- a/src/test/org/apache/commons/collections/map/TestTransformedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestTransformedMap.java
@@ -43,7 +43,7 @@ public class TestTransformedMap<K, V> extends AbstractTestIterableMap<K, V> {
     //-----------------------------------------------------------------------
     @Override
     public IterableMap<K, V> makeObject() {
-        return TransformedMap.decorate(new HashMap<K, V>(), TransformerUtils.<K> nopTransformer(),
+        return TransformedMap.transformingMap(new HashMap<K, V>(), TransformerUtils.<K> nopTransformer(),
                 TransformerUtils.<V> nopTransformer());
     }
 
@@ -53,7 +53,7 @@ public class TestTransformedMap<K, V> extends AbstractTestIterableMap<K, V> {
         Object[] els = new Object[] { "1", "3", "5", "7", "2", "4", "6" };
 
         Map<K, V> map = TransformedMap
-                .decorate(
+                .transformingMap(
                         new HashMap<K, V>(),
                         (Transformer<? super K, ? extends K>) TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER,
                         null);
@@ -70,7 +70,7 @@ public class TestTransformedMap<K, V> extends AbstractTestIterableMap<K, V> {
         assertEquals(null, map.remove(els[0]));
         assertEquals(els[0], map.remove(new Integer((String) els[0])));
 
-        map = TransformedMap.decorate(new HashMap(), null, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
+        map = TransformedMap.transformingMap(new HashMap(), null, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(0, map.size());
         for (int i = 0; i < els.length; i++) {
             map.put((K) els[i], (V) els[i]);
@@ -104,7 +104,7 @@ public class TestTransformedMap<K, V> extends AbstractTestIterableMap<K, V> {
         base.put((K) "C", (V) "3");
 
         Map<K, V> trans = TransformedMap
-                .decorate(
+                .transformingMap(
                         base,
                         null,
                         (Transformer<? super V, ? extends V>) TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
@@ -124,7 +124,7 @@ public class TestTransformedMap<K, V> extends AbstractTestIterableMap<K, V> {
         base.put((K) "C", (V) "3");
 
         Map<K, V> trans = TransformedMap
-                .decorateTransform(
+                .transformedMap(
                         base,
                         null,
                         (Transformer<? super V, ? extends V>) TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
diff --git a/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java b/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java
index 9ec5a44f5..3ba281fc5 100644
--- a/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestTransformedSortedMap.java
@@ -51,7 +51,7 @@ public class TestTransformedSortedMap<K, V> extends AbstractTestSortedMap<K, V>
     @Override
     @SuppressWarnings("unchecked")
     public SortedMap<K, V> makeObject() {
-        return TransformedSortedMap.decorate(new TreeMap<K, V>(),
+        return TransformedSortedMap.transformingSortedMap(new TreeMap<K, V>(),
                 (Transformer<? super K, ? extends K>) TransformerUtils.nopTransformer(),
                 (Transformer<? super V, ? extends V>) TransformerUtils.nopTransformer());
     }
@@ -68,7 +68,7 @@ public class TestTransformedSortedMap<K, V> extends AbstractTestSortedMap<K, V>
         Object[] els = new Object[] { "1", "3", "5", "7", "2", "4", "6" };
 
         SortedMap<K, V> map = TransformedSortedMap
-                .decorate(
+                .transformingSortedMap(
                         new TreeMap<K, V>(),
                         (Transformer<? super K, ? extends K>) TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER,
                         null);
@@ -92,7 +92,7 @@ public class TestTransformedSortedMap<K, V> extends AbstractTestSortedMap<K, V>
         assertEquals(els[0], map.remove(new Integer((String) els[0])));
 
         map = TransformedSortedMap
-                .decorate(
+                .transformingSortedMap(
                         new TreeMap<K, V>(),
                         null,
                         (Transformer<? super V, ? extends V>) TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
@@ -129,7 +129,7 @@ public class TestTransformedSortedMap<K, V> extends AbstractTestSortedMap<K, V>
         base.put((K) "C", (V) "3");
 
         SortedMap<K, V> trans = TransformedSortedMap
-                .decorate(
+                .transformingSortedMap(
                         base,
                         null,
                         (Transformer<? super V, ? extends V>) TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
@@ -149,7 +149,7 @@ public class TestTransformedSortedMap<K, V> extends AbstractTestSortedMap<K, V>
         base.put((K) "C", (V) "3");
 
         SortedMap<K, V> trans = TransformedSortedMap
-                .decorateTransform(
+                .transformedSortedMap(
                         base,
                         null,
                         (Transformer<? super V, ? extends V>) TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
diff --git a/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java b/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java
index 9d2447412..ef12520e8 100644
--- a/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java
+++ b/src/test/org/apache/commons/collections/map/TestUnmodifiableMap.java
@@ -41,7 +41,7 @@ public class TestUnmodifiableMap<K, V> extends AbstractTestIterableMap<K, V> {
 
     @Override
     public IterableMap<K, V> makeObject() {
-        return (IterableMap<K, V>) UnmodifiableMap.decorate(new HashMap<K, V>());
+        return (IterableMap<K, V>) UnmodifiableMap.unmodifiableMap(new HashMap<K, V>());
     }
 
     @Override
@@ -63,7 +63,7 @@ public class TestUnmodifiableMap<K, V> extends AbstractTestIterableMap<K, V> {
     public IterableMap<K, V> makeFullMap() {
         Map<K, V> m = new HashMap<K, V>();
         addSampleMappings(m);
-        return (IterableMap<K, V>) UnmodifiableMap.decorate(m);
+        return (IterableMap<K, V>) UnmodifiableMap.unmodifiableMap(m);
     }
 
     //-----------------------------------------------------------------------
@@ -74,10 +74,10 @@ public class TestUnmodifiableMap<K, V> extends AbstractTestIterableMap<K, V> {
 
     public void testDecorateFactory() {
         Map<K, V> map = makeFullMap();
-        assertSame(map, UnmodifiableMap.decorate(map));
+        assertSame(map, UnmodifiableMap.unmodifiableMap(map));
 
         try {
-            UnmodifiableMap.decorate(null);
+            UnmodifiableMap.unmodifiableMap(null);
             fail();
         } catch (IllegalArgumentException ex) {}
     }
diff --git a/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java b/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java
index 8992136ce..05d096a6e 100644
--- a/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestUnmodifiableOrderedMap.java
@@ -40,7 +40,7 @@ public class TestUnmodifiableOrderedMap<K, V> extends AbstractTestOrderedMap<K,
 
     @Override
     public OrderedMap<K, V> makeObject() {
-        return UnmodifiableOrderedMap.decorate(ListOrderedMap.decorate(new HashMap<K, V>()));
+        return UnmodifiableOrderedMap.unmodifiableOrderedMap(ListOrderedMap.listOrderedMap(new HashMap<K, V>()));
     }
 
     @Override
@@ -60,9 +60,9 @@ public class TestUnmodifiableOrderedMap<K, V> extends AbstractTestOrderedMap<K,
 
     @Override
     public OrderedMap<K, V> makeFullMap() {
-        OrderedMap<K, V> m = ListOrderedMap.decorate(new HashMap<K, V>());
+        OrderedMap<K, V> m = ListOrderedMap.listOrderedMap(new HashMap<K, V>());
         addSampleMappings(m);
-        return UnmodifiableOrderedMap.decorate(m);
+        return UnmodifiableOrderedMap.unmodifiableOrderedMap(m);
     }
 
     //-----------------------------------------------------------------------
@@ -73,10 +73,10 @@ public class TestUnmodifiableOrderedMap<K, V> extends AbstractTestOrderedMap<K,
 
     public void testDecorateFactory() {
         OrderedMap<K, V> map = makeFullMap();
-        assertSame(map, UnmodifiableOrderedMap.decorate(map));
+        assertSame(map, UnmodifiableOrderedMap.unmodifiableOrderedMap(map));
 
         try {
-            UnmodifiableOrderedMap.decorate(null);
+            UnmodifiableOrderedMap.unmodifiableOrderedMap(null);
             fail();
         } catch (IllegalArgumentException ex) {}
     }
diff --git a/src/test/org/apache/commons/collections/map/TestUnmodifiableSortedMap.java b/src/test/org/apache/commons/collections/map/TestUnmodifiableSortedMap.java
index cca5236c8..b242f643f 100644
--- a/src/test/org/apache/commons/collections/map/TestUnmodifiableSortedMap.java
+++ b/src/test/org/apache/commons/collections/map/TestUnmodifiableSortedMap.java
@@ -40,7 +40,7 @@ public class TestUnmodifiableSortedMap<K, V> extends AbstractTestSortedMap<K, V>
 
     @Override
     public SortedMap<K, V> makeObject() {
-        return UnmodifiableSortedMap.decorate(new TreeMap<K, V>());
+        return UnmodifiableSortedMap.unmodifiableSortedMap(new TreeMap<K, V>());
     }
 
     @Override
@@ -62,7 +62,7 @@ public class TestUnmodifiableSortedMap<K, V> extends AbstractTestSortedMap<K, V>
     public SortedMap<K, V> makeFullMap() {
         SortedMap<K, V> m = new TreeMap<K, V>();
         addSampleMappings(m);
-        return UnmodifiableSortedMap.decorate(m);
+        return UnmodifiableSortedMap.unmodifiableSortedMap(m);
     }
 
     //-----------------------------------------------------------------------
@@ -73,10 +73,10 @@ public class TestUnmodifiableSortedMap<K, V> extends AbstractTestSortedMap<K, V>
 
     public void testDecorateFactory() {
         SortedMap<K, V> map = makeFullMap();
-        assertSame(map, UnmodifiableSortedMap.decorate(map));
+        assertSame(map, UnmodifiableSortedMap.unmodifiableSortedMap(map));
 
         try {
-            UnmodifiableSortedMap.decorate(null);
+            UnmodifiableSortedMap.unmodifiableSortedMap(null);
             fail();
         } catch (IllegalArgumentException ex) {}
     }
diff --git a/src/test/org/apache/commons/collections/set/TestListOrderedSet.java b/src/test/org/apache/commons/collections/set/TestListOrderedSet.java
index 6296785b6..9bf976a77 100644
--- a/src/test/org/apache/commons/collections/set/TestListOrderedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestListOrderedSet.java
@@ -45,7 +45,7 @@ public class TestListOrderedSet<E> extends AbstractTestSet<E> {
 
     @Override
     public ListOrderedSet<E> makeObject() {
-        return ListOrderedSet.decorate(new HashSet<E>());
+        return ListOrderedSet.listOrderedSet(new HashSet<E>());
     }
 
     @SuppressWarnings("unchecked")
@@ -198,23 +198,23 @@ public class TestListOrderedSet<E> extends AbstractTestSet<E> {
 
     public void testDecorator() {
         try {
-            ListOrderedSet.decorate((List<E>) null);
+            ListOrderedSet.listOrderedSet((List<E>) null);
             fail();
         } catch (IllegalArgumentException ex) {}
         try {
-            ListOrderedSet.decorate((Set<E>) null);
+            ListOrderedSet.listOrderedSet((Set<E>) null);
             fail();
         } catch (IllegalArgumentException ex) {}
         try {
-            ListOrderedSet.decorate(null, null);
+            ListOrderedSet.listOrderedSet(null, null);
             fail();
         } catch (IllegalArgumentException ex) {}
         try {
-            ListOrderedSet.decorate(new HashSet<E>(), null);
+            ListOrderedSet.listOrderedSet(new HashSet<E>(), null);
             fail();
         } catch (IllegalArgumentException ex) {}
         try {
-            ListOrderedSet.decorate(null, new ArrayList<E>());
+            ListOrderedSet.listOrderedSet(null, new ArrayList<E>());
             fail();
         } catch (IllegalArgumentException ex) {}
     }
diff --git a/src/test/org/apache/commons/collections/set/TestMapBackedSet.java b/src/test/org/apache/commons/collections/set/TestMapBackedSet.java
index cbf683c51..abc903caa 100644
--- a/src/test/org/apache/commons/collections/set/TestMapBackedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestMapBackedSet.java
@@ -36,7 +36,7 @@ public class TestMapBackedSet<E> extends AbstractTestSet<E> {
 
     @Override
     public Set<E> makeObject() {
-        return MapBackedSet.decorate(new HashedMap<E, Object>());
+        return MapBackedSet.mapBackedSet(new HashedMap<E, Object>());
     }
 
     @Override
diff --git a/src/test/org/apache/commons/collections/set/TestMapBackedSet2.java b/src/test/org/apache/commons/collections/set/TestMapBackedSet2.java
index c305ceb20..2d13e2eff 100644
--- a/src/test/org/apache/commons/collections/set/TestMapBackedSet2.java
+++ b/src/test/org/apache/commons/collections/set/TestMapBackedSet2.java
@@ -37,7 +37,7 @@ public class TestMapBackedSet2<E> extends AbstractTestSet<E> {
 
     @Override
     public Set<E> makeObject() {
-        return MapBackedSet.decorate(new LinkedMap<E, Object>());
+        return MapBackedSet.mapBackedSet(new LinkedMap<E, Object>());
     }
 
     @SuppressWarnings("unchecked")
diff --git a/src/test/org/apache/commons/collections/set/TestPredicatedSet.java b/src/test/org/apache/commons/collections/set/TestPredicatedSet.java
index 77d9eced7..b918c8615 100644
--- a/src/test/org/apache/commons/collections/set/TestPredicatedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestPredicatedSet.java
@@ -42,7 +42,7 @@ public class TestPredicatedSet<E> extends AbstractTestSet<E> {
     protected Predicate<E> truePredicate = TruePredicate.<E>truePredicate();
 
     protected PredicatedSet<E> decorateSet(Set<E> set, Predicate<? super E> predicate) {
-        return (PredicatedSet<E>) PredicatedSet.decorate(set, predicate);
+        return (PredicatedSet<E>) PredicatedSet.predicatedSet(set, predicate);
     }
 
     @Override
diff --git a/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java b/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java
index 042eb3c62..e759e4c8e 100644
--- a/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestPredicatedSortedSet.java
@@ -53,14 +53,14 @@ public class TestPredicatedSortedSet<E> extends AbstractTestSortedSet<E> {
 
     @Override
     public SortedSet<E> makeObject() {
-        return PredicatedSortedSet.decorate(new TreeSet<E>(), truePredicate);
+        return PredicatedSortedSet.predicatedSortedSet(new TreeSet<E>(), truePredicate);
     }
 
     @Override
     public SortedSet<E> makeFullCollection() {
         TreeSet<E> set = new TreeSet<E>();
         set.addAll(Arrays.asList(getFullElements()));
-        return PredicatedSortedSet.decorate(set, truePredicate);
+        return PredicatedSortedSet.predicatedSortedSet(set, truePredicate);
     }
 
 //--------------------------------------------------------------------
@@ -72,7 +72,7 @@ public class TestPredicatedSortedSet<E> extends AbstractTestSortedSet<E> {
         };
 
     protected PredicatedSortedSet<E> makeTestSet() {
-        return (PredicatedSortedSet<E>) PredicatedSortedSet.decorate(new TreeSet<E>(), testPredicate);
+        return (PredicatedSortedSet<E>) PredicatedSortedSet.predicatedSortedSet(new TreeSet<E>(), testPredicate);
     }
 
     public void testGetSet() {
diff --git a/src/test/org/apache/commons/collections/set/TestSynchronizedSet.java b/src/test/org/apache/commons/collections/set/TestSynchronizedSet.java
index 561e67b79..4f2e07eb9 100644
--- a/src/test/org/apache/commons/collections/set/TestSynchronizedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestSynchronizedSet.java
@@ -45,7 +45,7 @@ public class TestSynchronizedSet<E> extends AbstractTestSet<E> {
    //-------------------------------------------------------------------
     @Override
     public Set<E> makeObject() {
-        return SynchronizedSet.decorate(new HashSet<E>());
+        return SynchronizedSet.synchronizedSet(new HashSet<E>());
     }
 
     @Override
diff --git a/src/test/org/apache/commons/collections/set/TestSynchronizedSortedSet.java b/src/test/org/apache/commons/collections/set/TestSynchronizedSortedSet.java
index 111142fe2..de759991f 100644
--- a/src/test/org/apache/commons/collections/set/TestSynchronizedSortedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestSynchronizedSortedSet.java
@@ -45,7 +45,7 @@ public class TestSynchronizedSortedSet<E> extends AbstractTestSortedSet<E> {
    //-------------------------------------------------------------------
     @Override
     public SortedSet<E> makeObject() {
-        return SynchronizedSortedSet.decorate(new TreeSet<E>());
+        return SynchronizedSortedSet.synchronizedSortedSet(new TreeSet<E>());
     }
 
     @Override
diff --git a/src/test/org/apache/commons/collections/set/TestTransformedSet.java b/src/test/org/apache/commons/collections/set/TestTransformedSet.java
index e35e52725..df35374c2 100644
--- a/src/test/org/apache/commons/collections/set/TestTransformedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestTransformedSet.java
@@ -53,7 +53,7 @@ public class TestTransformedSet<E> extends AbstractTestSet<E> {
     @Override
     @SuppressWarnings("unchecked")
     public Set<E> makeObject() {
-        return TransformedSet.decorate(new HashSet<E>(),
+        return TransformedSet.transformingSet(new HashSet<E>(),
                 (Transformer<E, E>) TestTransformedCollection.NOOP_TRANSFORMER);
     }
 
@@ -62,13 +62,13 @@ public class TestTransformedSet<E> extends AbstractTestSet<E> {
     public Set<E> makeFullCollection() {
         Set<E> list = new HashSet<E>();
         list.addAll(Arrays.asList(getFullElements()));
-        return TransformedSet.decorate(list,
+        return TransformedSet.transformingSet(list,
                 (Transformer<E, E>) TestTransformedCollection.NOOP_TRANSFORMER);
     }
 
     @SuppressWarnings("unchecked")
     public void testTransformedSet() {
-        Set<E> set = TransformedSet.decorate(new HashSet<E>(),
+        Set<E> set = TransformedSet.transformingSet(new HashSet<E>(),
                 (Transformer<E, E>) TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(0, set.size());
         E[] els = (E[]) new Object[] { "1", "3", "5", "7", "2", "4", "6" };
@@ -90,7 +90,7 @@ public class TestTransformedSet<E> extends AbstractTestSet<E> {
         for (int i = 0; i < els.length; i++) {
             originalSet.add(els[i]);
         }
-        Set<?> set = TransformedSet.decorateTransform(originalSet, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
+        Set<?> set = TransformedSet.transformedSet(originalSet, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(els.length, set.size());
         for (int i = 0; i < els.length; i++) {
             assertEquals(true, set.contains(new Integer((String) els[i])));
diff --git a/src/test/org/apache/commons/collections/set/TestTransformedSortedSet.java b/src/test/org/apache/commons/collections/set/TestTransformedSortedSet.java
index 0b52dc489..68c9316ae 100644
--- a/src/test/org/apache/commons/collections/set/TestTransformedSortedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestTransformedSortedSet.java
@@ -50,7 +50,7 @@ public class TestTransformedSortedSet<E> extends AbstractTestSortedSet<E> {
     @Override
     @SuppressWarnings("unchecked")
     public SortedSet<E> makeObject() {
-        return TransformedSortedSet.decorate(new TreeSet<E>(), (Transformer<E, E>) TestTransformedCollection.NOOP_TRANSFORMER);
+        return TransformedSortedSet.transformingSortedSet(new TreeSet<E>(), (Transformer<E, E>) TestTransformedCollection.NOOP_TRANSFORMER);
     }
 
     @Override
@@ -58,13 +58,13 @@ public class TestTransformedSortedSet<E> extends AbstractTestSortedSet<E> {
     public SortedSet<E> makeFullCollection() {
         SortedSet<E> set = new TreeSet<E>();
         set.addAll(Arrays.asList(getFullElements()));
-        return TransformedSortedSet.decorate(set, (Transformer<E, E>) TestTransformedCollection.NOOP_TRANSFORMER);
+        return TransformedSortedSet.transformingSortedSet(set, (Transformer<E, E>) TestTransformedCollection.NOOP_TRANSFORMER);
     }
 
     //-----------------------------------------------------------------------
     @SuppressWarnings("unchecked")
     public void testTransformedSet() {
-        SortedSet<E> set = TransformedSortedSet.decorate(new TreeSet<E>(),
+        SortedSet<E> set = TransformedSortedSet.transformingSortedSet(new TreeSet<E>(),
                 (Transformer<E, E>) TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(0, set.size());
         E[] els = (E[]) new Object[] { "1", "3", "5", "7", "2", "4", "6" };
@@ -83,7 +83,7 @@ public class TestTransformedSortedSet<E> extends AbstractTestSortedSet<E> {
         for (int i = 0; i < els.length; i++) {
             originalSet.add(els[i]);
         }
-        Set<?> set = TransformedSortedSet.decorateTransform(originalSet, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
+        Set<?> set = TransformedSortedSet.transformedSet(originalSet, TestTransformedCollection.STRING_TO_INTEGER_TRANSFORMER);
         assertEquals(els.length, set.size());
         for (int i = 0; i < els.length; i++) {
             assertEquals(true, set.contains(new Integer((String) els[i])));
diff --git a/src/test/org/apache/commons/collections/set/TestUnmodifiableSet.java b/src/test/org/apache/commons/collections/set/TestUnmodifiableSet.java
index 67afdd702..f70721491 100644
--- a/src/test/org/apache/commons/collections/set/TestUnmodifiableSet.java
+++ b/src/test/org/apache/commons/collections/set/TestUnmodifiableSet.java
@@ -46,14 +46,14 @@ public class TestUnmodifiableSet<E> extends AbstractTestSet<E> {
     //-------------------------------------------------------------------
     @Override
     public Set<E> makeObject() {
-        return UnmodifiableSet.decorate(new HashSet<E>());
+        return UnmodifiableSet.unmodifiableSet(new HashSet<E>());
     }
 
     @Override
     public Set<E> makeFullCollection() {
         HashSet<E> set = new HashSet<E>();
         set.addAll(Arrays.asList(getFullElements()));
-        return UnmodifiableSet.decorate(set);
+        return UnmodifiableSet.unmodifiableSet(set);
     }
 
     @Override
diff --git a/src/test/org/apache/commons/collections/set/TestUnmodifiableSortedSet.java b/src/test/org/apache/commons/collections/set/TestUnmodifiableSortedSet.java
index 4d6a417b1..4a0cf14cc 100644
--- a/src/test/org/apache/commons/collections/set/TestUnmodifiableSortedSet.java
+++ b/src/test/org/apache/commons/collections/set/TestUnmodifiableSortedSet.java
@@ -51,14 +51,14 @@ public class TestUnmodifiableSortedSet<E> extends AbstractTestSortedSet<E> {
     //-------------------------------------------------------------------
     @Override
     public SortedSet<E> makeObject() {
-        return UnmodifiableSortedSet.decorate(new TreeSet<E>());
+        return UnmodifiableSortedSet.unmodifiableSortedSet(new TreeSet<E>());
     }
 
     @Override
     public UnmodifiableSortedSet<E> makeFullCollection() {
         TreeSet<E> set = new TreeSet<E>();
         set.addAll(Arrays.asList(getFullElements()));
-        return (UnmodifiableSortedSet<E>) UnmodifiableSortedSet.decorate(set);
+        return (UnmodifiableSortedSet<E>) UnmodifiableSortedSet.unmodifiableSortedSet(set);
     }
 
     @Override
diff --git a/src/test/org/apache/commons/collections/splitmap/TestSplitMapUtils.java b/src/test/org/apache/commons/collections/splitmap/TestSplitMapUtils.java
index c531e69d3..0c33dd69b 100644
--- a/src/test/org/apache/commons/collections/splitmap/TestSplitMapUtils.java
+++ b/src/test/org/apache/commons/collections/splitmap/TestSplitMapUtils.java
@@ -57,7 +57,7 @@ public class TestSplitMapUtils extends BulkTest {
     protected void setUp() throws Exception {
         super.setUp();
         backingMap = new HashMap<String, Integer>();
-        transformedMap = TransformedMap.decorate(backingMap, NOPTransformer.<String> getInstance(),
+        transformedMap = TransformedMap.transformingMap(backingMap, NOPTransformer.<String> nopTransformer(),
                 stringToInt);
         for (int i = 0; i < 10; i++) {
             transformedMap.put(String.valueOf(i), String.valueOf(i));
diff --git a/src/test/org/apache/commons/collections/splitmap/TestTransformedMap.java b/src/test/org/apache/commons/collections/splitmap/TestTransformedMap.java
index 1fe588566..890d85b43 100644
--- a/src/test/org/apache/commons/collections/splitmap/TestTransformedMap.java
+++ b/src/test/org/apache/commons/collections/splitmap/TestTransformedMap.java
@@ -62,7 +62,7 @@ public class TestTransformedMap extends BulkTest {
 
     // -----------------------------------------------------------------------
     public void testTransformedMap() {
-        TransformedMap<Integer, String, Object, Class<?>> map = TransformedMap.decorate(
+        TransformedMap<Integer, String, Object, Class<?>> map = TransformedMap.transformingMap(
                 new HashMap<String, Class<?>>(), intToString, objectToClass);
 
         Integer[] k = new Integer[] { 0, 1, 2, 3, 4, 5, 6 };
@@ -86,8 +86,8 @@ public class TestTransformedMap extends BulkTest {
         assertEquals(objectToClass.transform(v[0]), map.remove(intToString.transform(k[0])));
         assertEquals(--sz, map.size());
 
-        TransformedMap<String, String, String, Integer> map2 = TransformedMap.decorate(
-                new HashMap<String, Integer>(), NOPTransformer.<String> getInstance(), stringToInt);
+        TransformedMap<String, String, String, Integer> map2 = TransformedMap.transformingMap(
+                new HashMap<String, Integer>(), NOPTransformer.<String> nopTransformer(), stringToInt);
         assertEquals(0, map2.size());
         for (int i = 0; i < 6; i++) {
             map2.put(String.valueOf(i), String.valueOf(i));
@@ -106,8 +106,8 @@ public class TestTransformedMap extends BulkTest {
     // -----------------------------------------------------------------------
 
     public void testMapIterator() {
-        TransformedMap<String, String, String, Integer> map = TransformedMap.decorate(
-                new HashMap<String, Integer>(), NOPTransformer.<String> getInstance(), stringToInt);
+        TransformedMap<String, String, String, Integer> map = TransformedMap.transformingMap(
+                new HashMap<String, Integer>(), NOPTransformer.<String> nopTransformer(), stringToInt);
         assertEquals(0, map.size());
         for (int i = 0; i < 6; i++) {
             map.put(String.valueOf(i), String.valueOf(i));
@@ -121,10 +121,10 @@ public class TestTransformedMap extends BulkTest {
     }
 
     public void testEmptyMap() throws IOException, ClassNotFoundException {
-        TransformedMap<String, String, String, String> map = TransformedMap.decorate(
+        TransformedMap<String, String, String, String> map = TransformedMap.transformingMap(
                 new HashMap<String, String>(),
-                NOPTransformer.<String>getInstance(),
-                NOPTransformer.<String>getInstance() );
+                NOPTransformer.<String>nopTransformer(),
+                NOPTransformer.<String>nopTransformer() );
 
         ObjectInputStream in = new ObjectInputStream( new FileInputStream( "data/test/TransformedMap.emptyCollection.version3.2.obj" ) );
         Object readObject = in.readObject();
@@ -136,10 +136,10 @@ public class TestTransformedMap extends BulkTest {
     }
 
     public void testFullMap() throws IOException, ClassNotFoundException {
-        TransformedMap<String, String, String, String> map = TransformedMap.decorate(
+        TransformedMap<String, String, String, String> map = TransformedMap.transformingMap(
                 new HashMap<String, String>(),
-                NOPTransformer.<String>getInstance(),
-                NOPTransformer.<String>getInstance() );
+                NOPTransformer.<String>nopTransformer(),
+                NOPTransformer.<String>nopTransformer() );
         map.put( "a", "b" );
         map.put( "c", "d" );
         map.put( "e", "f" );