diff --git a/src/main/java/org/apache/commons/collections/ArrayStack.java b/src/main/java/org/apache/commons/collections/ArrayStack.java
index 40ac902b9..1fab04ae6 100644
--- a/src/main/java/org/apache/commons/collections/ArrayStack.java
+++ b/src/main/java/org/apache/commons/collections/ArrayStack.java
@@ -35,7 +35,7 @@ import java.util.EmptyStackException;
  * Unlike <code>Stack</code>, <code>ArrayStack</code> accepts null entries.
  *
  * @see java.util.Stack
- * @since Commons Collections 1.0
+ * @since 1.0
  * @version $Revision$
  *
  * @author Craig R. McClanahan
diff --git a/src/main/java/org/apache/commons/collections/Bag.java b/src/main/java/org/apache/commons/collections/Bag.java
index 896c80e93..f3b9cdeae 100644
--- a/src/main/java/org/apache/commons/collections/Bag.java
+++ b/src/main/java/org/apache/commons/collections/Bag.java
@@ -39,7 +39,7 @@ import java.util.Set;
  * it has been decided to maintain backwards compatibility instead.
  *
  * @param <E> the type held in the bag
- * @since Commons Collections 2.0
+ * @since 2.0
  * @version $Revision$
  *
  * @author Chuck Burdick
diff --git a/src/main/java/org/apache/commons/collections/BagUtils.java b/src/main/java/org/apache/commons/collections/BagUtils.java
index 3bb63136d..bb84ef84a 100644
--- a/src/main/java/org/apache/commons/collections/BagUtils.java
+++ b/src/main/java/org/apache/commons/collections/BagUtils.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.bag.UnmodifiableSortedBag;
  * Provides utility methods and decorators for {@link Bag} and {@link SortedBag}
  * instances.
  *
- * @since Commons Collections 2.1
+ * @since 2.1
  * @version $Revision$
  * 2007) $
  *
diff --git a/src/main/java/org/apache/commons/collections/BidiMap.java b/src/main/java/org/apache/commons/collections/BidiMap.java
index f95cd964f..d10e04bfa 100644
--- a/src/main/java/org/apache/commons/collections/BidiMap.java
+++ b/src/main/java/org/apache/commons/collections/BidiMap.java
@@ -36,7 +36,7 @@ package org.apache.commons.collections;
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/BoundedCollection.java b/src/main/java/org/apache/commons/collections/BoundedCollection.java
index 8b521d631..e1723843a 100644
--- a/src/main/java/org/apache/commons/collections/BoundedCollection.java
+++ b/src/main/java/org/apache/commons/collections/BoundedCollection.java
@@ -28,7 +28,7 @@ import java.util.Collection;
  * @see CollectionUtils#isFull
  * @see CollectionUtils#maxSize
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Herve Quiroz
diff --git a/src/main/java/org/apache/commons/collections/BoundedMap.java b/src/main/java/org/apache/commons/collections/BoundedMap.java
index 5a148ca2b..8b192891d 100644
--- a/src/main/java/org/apache/commons/collections/BoundedMap.java
+++ b/src/main/java/org/apache/commons/collections/BoundedMap.java
@@ -23,7 +23,7 @@ package org.apache.commons.collections;
  * maximum number of elements. This interface allows the querying of details
  * associated with the maximum number of elements.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/Buffer.java b/src/main/java/org/apache/commons/collections/Buffer.java
index cb398c4ce..ea6e01015 100644
--- a/src/main/java/org/apache/commons/collections/Buffer.java
+++ b/src/main/java/org/apache/commons/collections/Buffer.java
@@ -36,7 +36,7 @@ import java.util.Collection;
  * {@link Bag}.
  *
  * @param <E> the type of the elements in the buffer
- * @since Commons Collections 2.1
+ * @since 2.1
  * @version $Revision$
  *
  * @author Avalon
diff --git a/src/main/java/org/apache/commons/collections/BufferOverflowException.java b/src/main/java/org/apache/commons/collections/BufferOverflowException.java
index b50e6b0b9..6d794713c 100644
--- a/src/main/java/org/apache/commons/collections/BufferOverflowException.java
+++ b/src/main/java/org/apache/commons/collections/BufferOverflowException.java
@@ -20,7 +20,7 @@ package org.apache.commons.collections;
  * The BufferOverflowException is used when the buffer's capacity has been
  * exceeded.
  *
- * @since Commons Collections 2.1
+ * @since 2.1
  * @version $Revision$
  *
  * @author Avalon
diff --git a/src/main/java/org/apache/commons/collections/BufferUnderflowException.java b/src/main/java/org/apache/commons/collections/BufferUnderflowException.java
index 8250d6d48..6c4bec1c7 100644
--- a/src/main/java/org/apache/commons/collections/BufferUnderflowException.java
+++ b/src/main/java/org/apache/commons/collections/BufferUnderflowException.java
@@ -23,7 +23,7 @@ import java.util.NoSuchElementException;
  * <p>
  * NOTE: From version 3.0, this exception extends NoSuchElementException.
  *
- * @since Commons Collections 2.1
+ * @since 2.1
  * @version $Revision$
  *
  * @author Avalon
diff --git a/src/main/java/org/apache/commons/collections/BufferUtils.java b/src/main/java/org/apache/commons/collections/BufferUtils.java
index fb4a6b1c1..7a99ec819 100644
--- a/src/main/java/org/apache/commons/collections/BufferUtils.java
+++ b/src/main/java/org/apache/commons/collections/BufferUtils.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections.buffer.UnmodifiableBuffer;
 /**
  * Provides utility methods and decorators for {@link Buffer} instances.
  *
- * @since Commons Collections 2.1
+ * @since 2.1
  * @version $Revision$
  *
  * @author Paul Jack
@@ -101,7 +101,7 @@ public class BufferUtils {
      * @param timeoutMillis  the timeout value in milliseconds, zero or less for no timeout
      * @return a blocking buffer backed by that buffer
      * @throws IllegalArgumentException  if the Buffer is null
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public static <E> Buffer<E> blockingBuffer(Buffer<E> buffer, long timeoutMillis) {
         return BlockingBuffer.blockingBuffer(buffer, timeoutMillis);
@@ -119,7 +119,7 @@ public class BufferUtils {
      * @param maximumSize  the maximum size
      * @return a bounded buffer backed by the given buffer
      * @throws IllegalArgumentException if the given buffer is null
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public static <E> Buffer<E> boundedBuffer(Buffer<E> buffer, int maximumSize) {
         return BoundedBuffer.boundedBuffer(buffer, maximumSize);
@@ -138,7 +138,7 @@ public class BufferUtils {
      * @param timeoutMillis  the timeout value in milliseconds, zero or less for no timeout
      * @return a bounded buffer backed by the given buffer
      * @throws IllegalArgumentException if the given buffer is null
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public static <E> Buffer<E> boundedBuffer(Buffer<E> buffer, int maximumSize, long timeoutMillis) {
         return BoundedBuffer.boundedBuffer(buffer, maximumSize, timeoutMillis);
diff --git a/src/main/java/org/apache/commons/collections/Closure.java b/src/main/java/org/apache/commons/collections/Closure.java
index e3d7c47f7..cb912c11c 100644
--- a/src/main/java/org/apache/commons/collections/Closure.java
+++ b/src/main/java/org/apache/commons/collections/Closure.java
@@ -26,7 +26,7 @@ package org.apache.commons.collections;
  * {@link ClosureUtils}. These include method invocation and for/while loops.
  *
  * @param <T> the type that the closure acts on
- * @since Commons Collections 1.0
+ * @since 1.0
  * @version $Revision$
  *
  * @author James Strachan
diff --git a/src/main/java/org/apache/commons/collections/ClosureUtils.java b/src/main/java/org/apache/commons/collections/ClosureUtils.java
index 48ad1d24b..64014bd26 100644
--- a/src/main/java/org/apache/commons/collections/ClosureUtils.java
+++ b/src/main/java/org/apache/commons/collections/ClosureUtils.java
@@ -47,7 +47,7 @@ import org.apache.commons.collections.functors.WhileClosure;
  * </ul>
  * All the supplied closures are Serializable.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -238,7 +238,7 @@ public class ClosureUtils {
      * @return the <code>if</code> closure
      * @throws IllegalArgumentException if the predicate is null
      * @throws IllegalArgumentException if the closure is null
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public static <E> Closure<E> ifClosure(Predicate<? super E> predicate, Closure<? super E> trueClosure) {
         return IfClosure.<E>ifClosure(predicate, trueClosure);
diff --git a/src/main/java/org/apache/commons/collections/CollectionUtils.java b/src/main/java/org/apache/commons/collections/CollectionUtils.java
index 157859170..c286c8e54 100644
--- a/src/main/java/org/apache/commons/collections/CollectionUtils.java
+++ b/src/main/java/org/apache/commons/collections/CollectionUtils.java
@@ -40,7 +40,7 @@ import org.apache.commons.collections.functors.TruePredicate;
  * Provides utility methods and decorators for {@link Collection} instances.
  * Method parameters will take {@link Iterable} objects when possible.
  *
- * @since Commons Collections 1.0
+ * @since 1.0
  * @version $Revision$
  *
  * @author Rodney Waldhoff
@@ -793,7 +793,7 @@ public class CollectionUtils {
      * @param object  the object to add, if null it will not be added
      * @return true if the collection changed
      * @throws NullPointerException if the collection is null
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public static <T> boolean addIgnoreNull(Collection<T> collection, T object) {
         if (collection == null) {
@@ -1037,7 +1037,7 @@ public class CollectionUtils {
      * @param object  the object to get the size of, may be null
      * @return the size of the specified collection or 0 if the object was null
      * @throws IllegalArgumentException thrown if object is not recognised
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public static int size(Object object) {
         if (object == null) {
@@ -1090,7 +1090,7 @@ public class CollectionUtils {
      * @param object  the object to get the size of, may be null
      * @return true if empty or null
      * @throws IllegalArgumentException thrown if object is not recognised
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public static boolean sizeIsEmpty(Object object) {
         if (object == null) {
@@ -1122,7 +1122,7 @@ public class CollectionUtils {
      *
      * @param coll  the collection to check, may be null
      * @return true if empty or null
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public static boolean isEmpty(Collection<?> coll) {
         return (coll == null || coll.isEmpty());
@@ -1135,7 +1135,7 @@ public class CollectionUtils {
      *
      * @param coll  the collection to check, may be null
      * @return true if non-null and non-empty
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public static boolean isNotEmpty(Collection<?> coll) {
         return !isEmpty(coll);
@@ -1237,7 +1237,7 @@ public class CollectionUtils {
      * @return a <code>Collection</code> containing all the elements of <code>collection</code>
      * that occur at least once in <code>retain</code>.
      * @throws NullPointerException if either parameter is null
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public static <C> Collection<C> retainAll(Collection<C> collection, Collection<?> retain) {
         return ListUtils.retainAll(collection, retain);
@@ -1257,7 +1257,7 @@ public class CollectionUtils {
      * @return a <code>Collection</code> containing all the elements of <code>collection</code> except
      * any elements that also occur in <code>remove</code>.
      * @throws NullPointerException if either parameter is null
-     * @since Commons Collections 3.3 (method existed in 3.2 but was completely broken)
+     * @since 3.3 (method existed in 3.2 but was completely broken)
      */
     public static <E> Collection<E> removeAll(Collection<E> collection, Collection<?> remove) {
         return ListUtils.removeAll(collection, remove);
diff --git a/src/main/java/org/apache/commons/collections/ComparatorUtils.java b/src/main/java/org/apache/commons/collections/ComparatorUtils.java
index ddf2a38f4..b35e99ce8 100644
--- a/src/main/java/org/apache/commons/collections/ComparatorUtils.java
+++ b/src/main/java/org/apache/commons/collections/ComparatorUtils.java
@@ -35,7 +35,7 @@ import org.apache.commons.collections.comparators.TransformingComparator;
  * convenient central place if you have use for more than one class
  * in the <code>comparators</code> subpackage.
  *
- * @since Commons Collections 2.1
+ * @since 2.1
  * @version $Revision$
  *
  * @author Paul Jack
diff --git a/src/main/java/org/apache/commons/collections/EnumerationUtils.java b/src/main/java/org/apache/commons/collections/EnumerationUtils.java
index 588860eda..8121b4be7 100644
--- a/src/main/java/org/apache/commons/collections/EnumerationUtils.java
+++ b/src/main/java/org/apache/commons/collections/EnumerationUtils.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections.iterators.EnumerationIterator;
 /**
  * Provides utility methods for {@link Enumeration} instances.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  *
  * @author <a href="mailto:ggregory@seagullsw.com">Gary Gregory</a>
diff --git a/src/main/java/org/apache/commons/collections/ExtendedProperties.java b/src/main/java/org/apache/commons/collections/ExtendedProperties.java
index 58c1bc203..73d1e6086 100644
--- a/src/main/java/org/apache/commons/collections/ExtendedProperties.java
+++ b/src/main/java/org/apache/commons/collections/ExtendedProperties.java
@@ -129,7 +129,7 @@ import java.util.Vector;
  * much time to improve it), I wrote it this way.  If you don't like
  * it, go ahead and tune it up!
  *
- * @since Commons Collections 1.0
+ * @since 1.0
  * @version $Revision$
  *
  * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
@@ -1105,7 +1105,7 @@ public class ExtendedProperties extends Hashtable<String, Object> {
      * @return The associated List object.
      * @throws ClassCastException is thrown if the key maps to an
      * object that is not a List.
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public List<String> getList(String key) {
         return getList(key, null);
@@ -1122,7 +1122,7 @@ public class ExtendedProperties extends Hashtable<String, Object> {
      * @return The associated List.
      * @throws ClassCastException is thrown if the key maps to an
      * object that is not a List.
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public List<String> getList(String key, List<String> defaultValue) {
         Object value = get(key);
diff --git a/src/main/java/org/apache/commons/collections/Factory.java b/src/main/java/org/apache/commons/collections/Factory.java
index d97cdd562..c1614152e 100644
--- a/src/main/java/org/apache/commons/collections/Factory.java
+++ b/src/main/java/org/apache/commons/collections/Factory.java
@@ -28,7 +28,7 @@ package org.apache.commons.collections;
  *
  * @param <T> the type that the factory creates
  *
- * @since Commons Collections 2.1
+ * @since 2.1
  * @version $Revision$
  *
  * @author Arron Bates
diff --git a/src/main/java/org/apache/commons/collections/FactoryUtils.java b/src/main/java/org/apache/commons/collections/FactoryUtils.java
index d0380017b..97f0ec60d 100644
--- a/src/main/java/org/apache/commons/collections/FactoryUtils.java
+++ b/src/main/java/org/apache/commons/collections/FactoryUtils.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.functors.PrototypeFactory;
  * </ul>
  * All the supplied factories are Serializable.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/FunctorException.java b/src/main/java/org/apache/commons/collections/FunctorException.java
index 22308bd97..7bb000c36 100644
--- a/src/main/java/org/apache/commons/collections/FunctorException.java
+++ b/src/main/java/org/apache/commons/collections/FunctorException.java
@@ -20,7 +20,7 @@ package org.apache.commons.collections;
  * Runtime exception thrown from functors.
  * If required, a root cause error can be wrapped within this one.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/Get.java b/src/main/java/org/apache/commons/collections/Get.java
index 189b95eaa..2fd79391d 100644
--- a/src/main/java/org/apache/commons/collections/Get.java
+++ b/src/main/java/org/apache/commons/collections/Get.java
@@ -22,7 +22,7 @@ import java.util.Set;
 /**
  * The "read" subset of the {@link Map} interface.
  * 
- * @since Commons Collections 4.0
+ * @since 4.0
  * @version $Id$
  *
  * @see Put
diff --git a/src/main/java/org/apache/commons/collections/IterableGet.java b/src/main/java/org/apache/commons/collections/IterableGet.java
index 1216cb451..52e324b0c 100644
--- a/src/main/java/org/apache/commons/collections/IterableGet.java
+++ b/src/main/java/org/apache/commons/collections/IterableGet.java
@@ -20,11 +20,11 @@ import java.util.Map;
 
 /**
  * The "read" subset of the {@link Map} interface.
- * @since Commons Collections 5
- * TODO fix version
- * @version $Revision$
+ *
+ * @since 4.0
+ * @version $Id$
+ *
  * @see Put
- * @author Matt Benson
  */
 public interface IterableGet<K, V> extends Get<K, V> {
     /**
diff --git a/src/main/java/org/apache/commons/collections/IterableMap.java b/src/main/java/org/apache/commons/collections/IterableMap.java
index d2fc02c14..1fcb2af60 100644
--- a/src/main/java/org/apache/commons/collections/IterableMap.java
+++ b/src/main/java/org/apache/commons/collections/IterableMap.java
@@ -36,7 +36,7 @@ import java.util.Map;
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/IterableSortedMap.java b/src/main/java/org/apache/commons/collections/IterableSortedMap.java
index 0c6e41665..4fc162b01 100644
--- a/src/main/java/org/apache/commons/collections/IterableSortedMap.java
+++ b/src/main/java/org/apache/commons/collections/IterableSortedMap.java
@@ -23,11 +23,9 @@ import java.util.SortedMap;
  *
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
- * @since Commons Collections 5
- * TODO fix version
- * @version $Revision$
  *
- * @author Matt Benson
+ * @since 4.0
+ * @version $Id$
  */
 public interface IterableSortedMap<K, V> extends SortedMap<K, V>, OrderedMap<K, V> {
 }
diff --git a/src/main/java/org/apache/commons/collections/IteratorUtils.java b/src/main/java/org/apache/commons/collections/IteratorUtils.java
index 8fb729769..ff61e9394 100644
--- a/src/main/java/org/apache/commons/collections/IteratorUtils.java
+++ b/src/main/java/org/apache/commons/collections/IteratorUtils.java
@@ -67,7 +67,7 @@ import org.apache.commons.collections.iterators.UnmodifiableMapIterator;
  * such, together with alternate solutions that are binary compatible
  * against versions 2.1.1 and 3.1.
  *
- * @since Commons Collections 2.1
+ * @since 2.1
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -601,7 +601,7 @@ public class IteratorUtils {
      * @param root  the root object to start iterating from, null results in an empty iterator
      * @param transformer  the transformer to use, see above, null uses no effect transformer
      * @return a new object graph iterator
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public static <E> Iterator<E> objectGraphIterator(E root, Transformer<? super E, ? extends E> transformer) {
         return new ObjectGraphIterator<E>(root, transformer);
@@ -703,7 +703,7 @@ public class IteratorUtils {
      * @param list  the list to iterate over, not null
      * @return a new looping iterator
      * @throws NullPointerException if the list is null
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public static <E> ResettableListIterator<E> loopingListIterator(List<E> list) {
         if (list == null) {
diff --git a/src/main/java/org/apache/commons/collections/KeyValue.java b/src/main/java/org/apache/commons/collections/KeyValue.java
index 0ebe5c656..a7890739e 100644
--- a/src/main/java/org/apache/commons/collections/KeyValue.java
+++ b/src/main/java/org/apache/commons/collections/KeyValue.java
@@ -25,7 +25,7 @@ package org.apache.commons.collections;
  *
  * @param <K> the type of the key
  * @param <V> the type of the value
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/ListUtils.java b/src/main/java/org/apache/commons/collections/ListUtils.java
index 6e67084b9..9a2829124 100644
--- a/src/main/java/org/apache/commons/collections/ListUtils.java
+++ b/src/main/java/org/apache/commons/collections/ListUtils.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.list.UnmodifiableList;
 /**
  * Provides utility methods and decorators for {@link List} instances.
  *
- * @since Commons Collections 1.0
+ * @since 1.0
  * @version $Id$
  */
 public class ListUtils {
@@ -237,7 +237,7 @@ public class ListUtils {
      * @return a <code>List</code> containing all the elements of <code>c</code>
      * that occur at least once in <code>retain</code>.
      * @throws NullPointerException if either parameter is null
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public static <E> List<E> retainAll(Collection<E> collection, Collection<?> retain) {
         List<E> list = new ArrayList<E>(Math.min(collection.size(), retain.size()));
@@ -265,7 +265,7 @@ public class ListUtils {
      * @return a <code>List</code> containing all the elements of <code>c</code> except
      * any elements that also occur in <code>remove</code>.
      * @throws NullPointerException if either parameter is null
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public static <E> List<E> removeAll(Collection<E> collection, Collection<?> remove) {
         List<E> list = new ArrayList<E>();
diff --git a/src/main/java/org/apache/commons/collections/MapIterator.java b/src/main/java/org/apache/commons/collections/MapIterator.java
index 238796e9c..dabb41801 100644
--- a/src/main/java/org/apache/commons/collections/MapIterator.java
+++ b/src/main/java/org/apache/commons/collections/MapIterator.java
@@ -43,7 +43,7 @@ import java.util.NoSuchElementException;
  *
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/MapUtils.java b/src/main/java/org/apache/commons/collections/MapUtils.java
index b1b2aff49..63404f3ee 100644
--- a/src/main/java/org/apache/commons/collections/MapUtils.java
+++ b/src/main/java/org/apache/commons/collections/MapUtils.java
@@ -70,7 +70,7 @@ import org.apache.commons.collections.map.UnmodifiableSortedMap;
  *  <li>{@link #multiValueMap( Map, Factory )}
  *  </ul>
  *
- * @since Commons Collections 1.0
+ * @since 1.0
  * @version $Revision$
  *
  * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
@@ -1138,7 +1138,7 @@ public class MapUtils {
      * @throws IllegalArgumentException  if sub-array or entry matching used and an
      *  entry is invalid
      * @throws ClassCastException if the array contents is mixed
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     @SuppressWarnings("unchecked")
     public static <K, V> Map<K, V> putAll(Map<K, V> map, Object[] array) {
@@ -1181,7 +1181,7 @@ public class MapUtils {
      *
      * @param map  the map to check, may be null
      * @return true if empty or null
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public static boolean isEmpty(Map<?,?> map) {
         return (map == null || map.isEmpty());
@@ -1194,7 +1194,7 @@ public class MapUtils {
      *
      * @param map  the map to check, may be null
      * @return true if non-null and non-empty
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public static boolean isNotEmpty(Map<?,?> map) {
         return !MapUtils.isEmpty(map);
@@ -1394,7 +1394,7 @@ public class MapUtils {
      * @param map  the map to decorate
      * @return a multi-value map backed by the given map which returns ArrayLists of values.
      * @see MultiValueMap
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public static <K, V> MultiValueMap<K, V> multiValueMap(Map<K, ? super Collection<V>> map) {
         return MultiValueMap.<K, V>multiValueMap(map);
@@ -1409,7 +1409,7 @@ public class MapUtils {
      *  and extend Collection).
      * @return a multi-value map backed by the given map which returns collections of the specified type
      * @see MultiValueMap
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public static <K, V, C extends Collection<V>> MultiValueMap<K, V> multiValueMap(Map<K, C> map, Class<C> collectionClass) {
         return MultiValueMap.multiValueMap(map, collectionClass);
@@ -1424,7 +1424,7 @@ public class MapUtils {
      * @return a multi-value map backed by the given map which returns collections
      * created by the specified collection factory
      * @see MultiValueMap
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public static <K, V, C extends Collection<V>> MultiValueMap<K, V> multiValueMap(Map<K, C> map, Factory<C> collectionFactory) {
         return MultiValueMap.multiValueMap(map, collectionFactory);
@@ -1648,8 +1648,7 @@ public class MapUtils {
      * @param <V>
      * @param map to wrap if necessary.
      * @return IterableMap<K, V>
-     * @since Commons Collections 5
-     * TODO fix version
+     * @since 4.0
      */
     public static <K, V> IterableMap<K, V> iterableMap(Map<K, V> map) {
         if (map == null) {
@@ -1666,8 +1665,7 @@ public class MapUtils {
      * @param <V>
      * @param sortedMap to wrap if necessary
      * @return {@link IterableSortedMap}<K, V>
-     * @since Commons Collections 5
-     * TODO fix version
+     * @since 4.0
      */
     public static <K, V> IterableSortedMap<K, V> iterableSortedMap(SortedMap<K, V> sortedMap) {
         if (sortedMap == null) {
diff --git a/src/main/java/org/apache/commons/collections/MultiMap.java b/src/main/java/org/apache/commons/collections/MultiMap.java
index 47a7dfc63..f7356273e 100644
--- a/src/main/java/org/apache/commons/collections/MultiMap.java
+++ b/src/main/java/org/apache/commons/collections/MultiMap.java
@@ -39,7 +39,7 @@ import java.util.Collection;
  * These were added solely for documentation purposes and do not change the interface
  * as they were defined in the superinterface <code>Map</code> anyway.
  *
- * @since Commons Collections 2.0
+ * @since 2.0
  * @version $Revision$
  *
  * @author Christopher Berry
diff --git a/src/main/java/org/apache/commons/collections/OrderedBidiMap.java b/src/main/java/org/apache/commons/collections/OrderedBidiMap.java
index 817533b4f..adcad2a8f 100644
--- a/src/main/java/org/apache/commons/collections/OrderedBidiMap.java
+++ b/src/main/java/org/apache/commons/collections/OrderedBidiMap.java
@@ -26,7 +26,7 @@ package org.apache.commons.collections;
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/OrderedIterator.java b/src/main/java/org/apache/commons/collections/OrderedIterator.java
index 7e7b1b5ab..cf4e9b44d 100644
--- a/src/main/java/org/apache/commons/collections/OrderedIterator.java
+++ b/src/main/java/org/apache/commons/collections/OrderedIterator.java
@@ -26,7 +26,7 @@ import java.util.NoSuchElementException;
  * This iterator allows both forward and reverse iteration through the container.
  *
  * @param <E> the type to iterate over
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/OrderedMap.java b/src/main/java/org/apache/commons/collections/OrderedMap.java
index ed901c538..f84589367 100644
--- a/src/main/java/org/apache/commons/collections/OrderedMap.java
+++ b/src/main/java/org/apache/commons/collections/OrderedMap.java
@@ -23,7 +23,7 @@ package org.apache.commons.collections;
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/OrderedMapIterator.java b/src/main/java/org/apache/commons/collections/OrderedMapIterator.java
index 12a019a3c..ebd20d233 100644
--- a/src/main/java/org/apache/commons/collections/OrderedMapIterator.java
+++ b/src/main/java/org/apache/commons/collections/OrderedMapIterator.java
@@ -25,7 +25,7 @@ import java.util.NoSuchElementException;
  *
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/Predicate.java b/src/main/java/org/apache/commons/collections/Predicate.java
index f88999a4e..84f3e018a 100644
--- a/src/main/java/org/apache/commons/collections/Predicate.java
+++ b/src/main/java/org/apache/commons/collections/Predicate.java
@@ -30,7 +30,7 @@ package org.apache.commons.collections;
  *
  * @param <T> the type that the predicate queries
  *
- * @since Commons Collections 1.0
+ * @since 1.0
  * @version $Revision$
  *
  * @author James Strachan
diff --git a/src/main/java/org/apache/commons/collections/PredicateUtils.java b/src/main/java/org/apache/commons/collections/PredicateUtils.java
index 6963f29be..b17fa718e 100644
--- a/src/main/java/org/apache/commons/collections/PredicateUtils.java
+++ b/src/main/java/org/apache/commons/collections/PredicateUtils.java
@@ -66,7 +66,7 @@ import org.apache.commons.collections.functors.UniquePredicate;
  * </ul>
  * All the supplied predicates are Serializable.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class PredicateUtils {
@@ -538,7 +538,7 @@ public class PredicateUtils {
      * @param predicate  the predicate to call with the result of the transform
      * @return the predicate
      * @throws IllegalArgumentException if the transformer or the predicate is null
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public static <T> Predicate<T> transformedPredicate(
             Transformer<? super T, ? extends T> transformer, Predicate<? super T> predicate) {
diff --git a/src/main/java/org/apache/commons/collections/Put.java b/src/main/java/org/apache/commons/collections/Put.java
index f8de59072..cf9ff78b1 100644
--- a/src/main/java/org/apache/commons/collections/Put.java
+++ b/src/main/java/org/apache/commons/collections/Put.java
@@ -21,7 +21,7 @@ import java.util.Map;
 /**
  * The "write" subset of the {@link Map} interface.
  * 
- * @since Commons Collections 4.0
+ * @since 4.0
  * @version $Id$
  * 
  * @see Get
diff --git a/src/main/java/org/apache/commons/collections/ResettableIterator.java b/src/main/java/org/apache/commons/collections/ResettableIterator.java
index 6542ae0fe..f5c1a55ea 100644
--- a/src/main/java/org/apache/commons/collections/ResettableIterator.java
+++ b/src/main/java/org/apache/commons/collections/ResettableIterator.java
@@ -24,7 +24,7 @@ import java.util.Iterator;
  * This interface allows an iterator to be repeatedly reused.
  *
  * @param <E> the type to iterate over
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/ResettableListIterator.java b/src/main/java/org/apache/commons/collections/ResettableListIterator.java
index 12b76cbae..31c1e913e 100644
--- a/src/main/java/org/apache/commons/collections/ResettableListIterator.java
+++ b/src/main/java/org/apache/commons/collections/ResettableListIterator.java
@@ -24,7 +24,7 @@ import java.util.ListIterator;
  * This interface allows an iterator to be repeatedly reused.
  *
  * @param <E> the type to iterate over
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/SetUtils.java b/src/main/java/org/apache/commons/collections/SetUtils.java
index a1f0b0716..056f67f8b 100644
--- a/src/main/java/org/apache/commons/collections/SetUtils.java
+++ b/src/main/java/org/apache/commons/collections/SetUtils.java
@@ -36,7 +36,7 @@ import org.apache.commons.collections.set.UnmodifiableSortedSet;
  * Provides utility methods and decorators for
  * {@link Set} and {@link SortedSet} instances.
  *
- * @since Commons Collections 2.1
+ * @since 2.1
  * @version $Revision$
  *
  * @author Paul Jack
diff --git a/src/main/java/org/apache/commons/collections/SortedBag.java b/src/main/java/org/apache/commons/collections/SortedBag.java
index 6aa58087e..3ab3117b5 100644
--- a/src/main/java/org/apache/commons/collections/SortedBag.java
+++ b/src/main/java/org/apache/commons/collections/SortedBag.java
@@ -23,7 +23,7 @@ import java.util.Comparator;
  * its unique representative members.
  *
  * @param <E> the type to iterate over
- * @since Commons Collections 2.0
+ * @since 2.0
  * @version $Revision$
  *
  * @author Chuck Burdick
diff --git a/src/main/java/org/apache/commons/collections/SortedBidiMap.java b/src/main/java/org/apache/commons/collections/SortedBidiMap.java
index 7fc3f0a8c..76fc51bdd 100644
--- a/src/main/java/org/apache/commons/collections/SortedBidiMap.java
+++ b/src/main/java/org/apache/commons/collections/SortedBidiMap.java
@@ -28,7 +28,7 @@ import java.util.SortedMap;
  *  
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/SplitMapUtils.java b/src/main/java/org/apache/commons/collections/SplitMapUtils.java
index ecbf6ade6..f7a66782c 100644
--- a/src/main/java/org/apache/commons/collections/SplitMapUtils.java
+++ b/src/main/java/org/apache/commons/collections/SplitMapUtils.java
@@ -30,7 +30,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 4.0
+ * @since 4.0
  * @version $Id$
  *
  * @see Get
diff --git a/src/main/java/org/apache/commons/collections/Transformer.java b/src/main/java/org/apache/commons/collections/Transformer.java
index 2346b9c51..71af183a6 100644
--- a/src/main/java/org/apache/commons/collections/Transformer.java
+++ b/src/main/java/org/apache/commons/collections/Transformer.java
@@ -32,7 +32,7 @@ package org.apache.commons.collections;
  * @param <I> the input type to the transformer
  * @param <O> the output type from the transformer
  *
- * @since Commons Collections 1.0
+ * @since 1.0
  * @version $Revision$
  *
  * @author James Strachan
diff --git a/src/main/java/org/apache/commons/collections/TransformerUtils.java b/src/main/java/org/apache/commons/collections/TransformerUtils.java
index 03a2f1ed1..c94962cc8 100644
--- a/src/main/java/org/apache/commons/collections/TransformerUtils.java
+++ b/src/main/java/org/apache/commons/collections/TransformerUtils.java
@@ -56,7 +56,7 @@ import org.apache.commons.collections.functors.SwitchTransformer;
  * </ul>
  * All the supplied transformers are Serializable.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/Unmodifiable.java b/src/main/java/org/apache/commons/collections/Unmodifiable.java
index e367984b5..b6e1d62f0 100644
--- a/src/main/java/org/apache/commons/collections/Unmodifiable.java
+++ b/src/main/java/org/apache/commons/collections/Unmodifiable.java
@@ -30,7 +30,7 @@ package org.apache.commons.collections;
  * in this library. If you use the JDK unmodifiable class via java util Collections
  * then the interface won't be there.
  *  
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/bag/AbstractBagDecorator.java b/src/main/java/org/apache/commons/collections/bag/AbstractBagDecorator.java
index 450345ec8..2cdef9a8c 100644
--- a/src/main/java/org/apache/commons/collections/bag/AbstractBagDecorator.java
+++ b/src/main/java/org/apache/commons/collections/bag/AbstractBagDecorator.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections.collection.AbstractCollectionDecorator;
  * <p>
  * Methods are forwarded directly to the decorated bag.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public abstract class AbstractBagDecorator<E>
@@ -37,7 +37,7 @@ public abstract class AbstractBagDecorator<E>
 
     /**
      * Constructor only used in deserialization, do not use otherwise.
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     protected AbstractBagDecorator() {
         super();
diff --git a/src/main/java/org/apache/commons/collections/bag/AbstractMapBag.java b/src/main/java/org/apache/commons/collections/bag/AbstractMapBag.java
index 715119b0e..3418e12c0 100644
--- a/src/main/java/org/apache/commons/collections/bag/AbstractMapBag.java
+++ b/src/main/java/org/apache/commons/collections/bag/AbstractMapBag.java
@@ -37,7 +37,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * map will be used to map bag elements to a number; the number represents the
  * number of occurrences of that element in the bag.
  *
- * @since Commons Collections 3.0 (previously DefaultMapBag v2.0)
+ * @since 3.0 (previously DefaultMapBag v2.0)
  * @version $Id$
  */
 public abstract class AbstractMapBag<E> implements Bag<E> {
diff --git a/src/main/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java b/src/main/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java
index bd9f729f9..a3b7343c5 100644
--- a/src/main/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java
+++ b/src/main/java/org/apache/commons/collections/bag/AbstractSortedBagDecorator.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.SortedBag;
  * <p>
  * Methods are forwarded directly to the decorated bag.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public abstract class AbstractSortedBagDecorator<E>
@@ -36,7 +36,7 @@ public abstract class AbstractSortedBagDecorator<E>
 
     /**
      * Constructor only used in deserialization, do not use otherwise.
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     protected AbstractSortedBagDecorator() {
         super();
diff --git a/src/main/java/org/apache/commons/collections/bag/HashBag.java b/src/main/java/org/apache/commons/collections/bag/HashBag.java
index 4251393f5..4f46ca5ce 100644
--- a/src/main/java/org/apache/commons/collections/bag/HashBag.java
+++ b/src/main/java/org/apache/commons/collections/bag/HashBag.java
@@ -35,7 +35,7 @@ import org.apache.commons.collections.Bag;
  * interface javadoc carefully as several methods violate the
  * {@link Collection} interface specification.
  *
- * @since Commons Collections 3.0 (previously in main package v2.0)
+ * @since 3.0 (previously in main package v2.0)
  * @version $Id$
  */
 public class HashBag<E>
diff --git a/src/main/java/org/apache/commons/collections/bag/PredicatedBag.java b/src/main/java/org/apache/commons/collections/bag/PredicatedBag.java
index ced4fc0c3..caac5a109 100644
--- a/src/main/java/org/apache/commons/collections/bag/PredicatedBag.java
+++ b/src/main/java/org/apache/commons/collections/bag/PredicatedBag.java
@@ -35,7 +35,7 @@ import org.apache.commons.collections.collection.PredicatedCollection;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class PredicatedBag<E>
diff --git a/src/main/java/org/apache/commons/collections/bag/PredicatedSortedBag.java b/src/main/java/org/apache/commons/collections/bag/PredicatedSortedBag.java
index 15e4c6899..968c3717c 100644
--- a/src/main/java/org/apache/commons/collections/bag/PredicatedSortedBag.java
+++ b/src/main/java/org/apache/commons/collections/bag/PredicatedSortedBag.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.SortedBag;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class PredicatedSortedBag<E>
diff --git a/src/main/java/org/apache/commons/collections/bag/SynchronizedBag.java b/src/main/java/org/apache/commons/collections/bag/SynchronizedBag.java
index ae921903f..bc1a15f05 100644
--- a/src/main/java/org/apache/commons/collections/bag/SynchronizedBag.java
+++ b/src/main/java/org/apache/commons/collections/bag/SynchronizedBag.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.set.SynchronizedSet;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class SynchronizedBag<E>
diff --git a/src/main/java/org/apache/commons/collections/bag/SynchronizedSortedBag.java b/src/main/java/org/apache/commons/collections/bag/SynchronizedSortedBag.java
index ada6a3db8..df5cc4fdd 100644
--- a/src/main/java/org/apache/commons/collections/bag/SynchronizedSortedBag.java
+++ b/src/main/java/org/apache/commons/collections/bag/SynchronizedSortedBag.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.SortedBag;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class SynchronizedSortedBag<E>
diff --git a/src/main/java/org/apache/commons/collections/bag/TransformedBag.java b/src/main/java/org/apache/commons/collections/bag/TransformedBag.java
index f3f39669c..fd48c3a6f 100644
--- a/src/main/java/org/apache/commons/collections/bag/TransformedBag.java
+++ b/src/main/java/org/apache/commons/collections/bag/TransformedBag.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.set.TransformedSet;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class TransformedBag<E>
@@ -71,7 +71,7 @@ public class TransformedBag<E>
      * @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
-     * @since Commons Collections 3.3
+     * @since 3.3
      */
     public static <E> Bag<E> transformedBag(Bag<E> bag, Transformer<? super E, ? extends E> transformer) {
         TransformedBag<E> decorated = new TransformedBag<E>(bag, transformer);
diff --git a/src/main/java/org/apache/commons/collections/bag/TransformedSortedBag.java b/src/main/java/org/apache/commons/collections/bag/TransformedSortedBag.java
index 68f281a80..26572b230 100644
--- a/src/main/java/org/apache/commons/collections/bag/TransformedSortedBag.java
+++ b/src/main/java/org/apache/commons/collections/bag/TransformedSortedBag.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.Transformer;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class TransformedSortedBag<E>
@@ -70,7 +70,7 @@ public class TransformedSortedBag<E>
      * @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
-     * @since Commons Collections 3.3
+     * @since 3.3
      */
     public static <E> TransformedSortedBag<E> transformedSortedBag(SortedBag<E> bag,
                                                                    Transformer<? super E, ? extends E> transformer) {
diff --git a/src/main/java/org/apache/commons/collections/bag/TreeBag.java b/src/main/java/org/apache/commons/collections/bag/TreeBag.java
index 0b2ff6cd5..855b55d0a 100644
--- a/src/main/java/org/apache/commons/collections/bag/TreeBag.java
+++ b/src/main/java/org/apache/commons/collections/bag/TreeBag.java
@@ -40,7 +40,7 @@ import org.apache.commons.collections.SortedBag;
  * javadoc carefully as several methods violate the {@link Collection}
  * interface specification.
  *
- * @since Commons Collections 3.0 (previously in main package v2.0)
+ * @since 3.0 (previously in main package v2.0)
  * @version $Id$
  */
 public class TreeBag<E> extends AbstractMapBag<E> implements SortedBag<E>, Serializable {
diff --git a/src/main/java/org/apache/commons/collections/bag/UnmodifiableBag.java b/src/main/java/org/apache/commons/collections/bag/UnmodifiableBag.java
index d4a74ea2c..bf6dbf204 100644
--- a/src/main/java/org/apache/commons/collections/bag/UnmodifiableBag.java
+++ b/src/main/java/org/apache/commons/collections/bag/UnmodifiableBag.java
@@ -36,7 +36,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException. 
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public final class UnmodifiableBag<E>
diff --git a/src/main/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java b/src/main/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java
index 834006b7a..465cedfa2 100644
--- a/src/main/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java
+++ b/src/main/java/org/apache/commons/collections/bag/UnmodifiableSortedBag.java
@@ -36,7 +36,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException. 
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public final class UnmodifiableSortedBag<E>
diff --git a/src/main/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java b/src/main/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java
index 50e3cf530..b3614259d 100644
--- a/src/main/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections/bidimap/AbstractBidiMapDecorator.java
@@ -32,7 +32,7 @@ import org.apache.commons.collections.map.AbstractMapDecorator;
  * it would provide a loophole around the validation.
  * But, you might want that loophole, so this class is kept simple.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public abstract class AbstractBidiMapDecorator<K, V>
diff --git a/src/main/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java b/src/main/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java
index 15b3b0217..0a4cfff61 100644
--- a/src/main/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java
+++ b/src/main/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java
@@ -36,7 +36,7 @@ import org.apache.commons.collections.keyvalue.AbstractMapEntryDecorator;
  *
  * @see DualHashBidiMap
  * @see DualTreeBidiMap
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public abstract class AbstractDualBidiMap<K, V> implements BidiMap<K, V> {
@@ -94,7 +94,7 @@ public abstract class AbstractDualBidiMap<K, V> implements BidiMap<K, V> {
      *
      * @param normalMap  the normal direction map
      * @param reverseMap  the reverse direction map
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     protected AbstractDualBidiMap(Map<K, V> normalMap, Map<V, K> reverseMap) {
         super();
diff --git a/src/main/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java b/src/main/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java
index b521a4488..54a0bf426 100644
--- a/src/main/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections/bidimap/AbstractOrderedBidiMapDecorator.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.OrderedMapIterator;
  * it would provide a loophole around the validation.
  * But, you might want that loophole, so this class is kept simple.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public abstract class AbstractOrderedBidiMapDecorator<K, V>
diff --git a/src/main/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java b/src/main/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java
index 4086ec40b..e25deb9e7 100644
--- a/src/main/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections/bidimap/AbstractSortedBidiMapDecorator.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.SortedBidiMap;
  * it would provide a loophole around the validation.
  * But, you might want that loophole, so this class is kept simple.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public abstract class AbstractSortedBidiMapDecorator<K, V>
diff --git a/src/main/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java b/src/main/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java
index 463c9241f..f4c428d0e 100644
--- a/src/main/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java
+++ b/src/main/java/org/apache/commons/collections/bidimap/DualHashBidiMap.java
@@ -36,7 +36,7 @@ import org.apache.commons.collections.BidiMap;
  * NOTE: From Commons Collections 3.1, all subclasses will use {@link HashMap}
  * and the flawed <code>createMap</code> method is ignored.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class DualHashBidiMap<K, V> extends AbstractDualBidiMap<K, V> implements Serializable {
diff --git a/src/main/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java b/src/main/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java
index 1e082b305..55f47f89a 100644
--- a/src/main/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java
+++ b/src/main/java/org/apache/commons/collections/bidimap/DualTreeBidiMap.java
@@ -49,7 +49,7 @@ import org.apache.commons.collections.map.AbstractSortedMapDecorator;
  * NOTE: From Commons Collections 3.1, all subclasses will use {@link TreeMap}
  * and the flawed <code>createMap</code> method is ignored.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class DualTreeBidiMap<K, V> extends AbstractDualBidiMap<K, V>
diff --git a/src/main/java/org/apache/commons/collections/bidimap/TreeBidiMap.java b/src/main/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
index 744e48f5e..ccfbd3904 100644
--- a/src/main/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
+++ b/src/main/java/org/apache/commons/collections/bidimap/TreeBidiMap.java
@@ -69,7 +69,7 @@ import static org.apache.commons.collections.bidimap.TreeBidiMap.DataElement.VAL
  * not allow setValue() and will throw an
  * UnsupportedOperationException on attempts to call that method.
  *
- * @since Commons Collections 3.0 (previously DoubleOrderedMap v2.0)
+ * @since 3.0 (previously DoubleOrderedMap v2.0)
  * @version $Id$
  */
 public class TreeBidiMap<K extends Comparable<K>, V extends Comparable<V>> implements OrderedBidiMap<K, V> {
diff --git a/src/main/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java b/src/main/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java
index 871346849..3c5485020 100644
--- a/src/main/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java
+++ b/src/main/java/org/apache/commons/collections/bidimap/UnmodifiableBidiMap.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException. 
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public final class UnmodifiableBidiMap<K, V>
diff --git a/src/main/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java b/src/main/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java
index 3817680e2..675b1bcc5 100644
--- a/src/main/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java
+++ b/src/main/java/org/apache/commons/collections/bidimap/UnmodifiableOrderedBidiMap.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException. 
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public final class UnmodifiableOrderedBidiMap<K, V>
diff --git a/src/main/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java b/src/main/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java
index 67d531f14..6b982f807 100644
--- a/src/main/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java
+++ b/src/main/java/org/apache/commons/collections/bidimap/UnmodifiableSortedBidiMap.java
@@ -35,7 +35,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * <p>
  * Attempts to modify it will result in an {@link UnsupportedOperationException}. 
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public final class UnmodifiableSortedBidiMap<K, V>
diff --git a/src/main/java/org/apache/commons/collections/buffer/AbstractBufferDecorator.java b/src/main/java/org/apache/commons/collections/buffer/AbstractBufferDecorator.java
index 0e48b8129..a345915d7 100644
--- a/src/main/java/org/apache/commons/collections/buffer/AbstractBufferDecorator.java
+++ b/src/main/java/org/apache/commons/collections/buffer/AbstractBufferDecorator.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.collection.AbstractCollectionDecorator;
  * Methods are forwarded directly to the decorated buffer.
  *
  * @param <E> the type of the elements in the buffer
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public abstract class AbstractBufferDecorator<E> extends AbstractCollectionDecorator<E>
@@ -36,7 +36,7 @@ public abstract class AbstractBufferDecorator<E> extends AbstractCollectionDecor
 
     /**
      * Constructor only used in deserialization, do not use otherwise.
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     protected AbstractBufferDecorator() {
         super();
diff --git a/src/main/java/org/apache/commons/collections/buffer/BlockingBuffer.java b/src/main/java/org/apache/commons/collections/buffer/BlockingBuffer.java
index 7b0f4f89a..78446acb9 100644
--- a/src/main/java/org/apache/commons/collections/buffer/BlockingBuffer.java
+++ b/src/main/java/org/apache/commons/collections/buffer/BlockingBuffer.java
@@ -43,7 +43,7 @@ import org.apache.commons.collections.BufferUnderflowException;
  *
  * @param <E> the type of the elements in the buffer
  * @version $Revision$
- * @since Commons Collections 3.0
+ * @since 3.0
  */
 public class BlockingBuffer<E> extends SynchronizedBuffer<E> {
 
@@ -72,7 +72,7 @@ public class BlockingBuffer<E> extends SynchronizedBuffer<E> {
      * @param timeoutMillis  the timeout value in milliseconds, zero or less for no timeout
      * @return a new blocking buffer
      * @throws IllegalArgumentException if the buffer is null
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public static <E> BlockingBuffer<E> blockingBuffer(Buffer<E> buffer, long timeoutMillis) {
         return new BlockingBuffer<E>(buffer, timeoutMillis);
@@ -96,7 +96,7 @@ public class BlockingBuffer<E> extends SynchronizedBuffer<E> {
      * @param buffer  the buffer to decorate, must not be null
      * @param timeoutMillis  the timeout value in milliseconds, zero or less for no timeout
      * @throws IllegalArgumentException if the buffer is null
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     protected BlockingBuffer(Buffer<E> buffer, long timeoutMillis) {
         super(buffer);
@@ -158,7 +158,7 @@ public class BlockingBuffer<E> extends SynchronizedBuffer<E> {
      * @return the next object in the buffer
      * @throws BufferUnderflowException if an interrupt is received
      * @throws BufferUnderflowException if the timeout expires
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public E get(final long timeout) {
         synchronized (lock) {
@@ -217,7 +217,7 @@ public class BlockingBuffer<E> extends SynchronizedBuffer<E> {
      * @return the next object in the buffer, which is also removed
      * @throws BufferUnderflowException if an interrupt is received
      * @throws BufferUnderflowException if the timeout expires
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public E remove(final long timeout) {
         synchronized (lock) {
diff --git a/src/main/java/org/apache/commons/collections/buffer/BoundedBuffer.java b/src/main/java/org/apache/commons/collections/buffer/BoundedBuffer.java
index aa3071d43..b4f7f78c3 100644
--- a/src/main/java/org/apache/commons/collections/buffer/BoundedBuffer.java
+++ b/src/main/java/org/apache/commons/collections/buffer/BoundedBuffer.java
@@ -40,7 +40,7 @@ import org.apache.commons.collections.iterators.AbstractIteratorDecorator;
  * With a timeout, the add methods will wait for up to the timeout period
  * to try and add the elements.
  *
- * @since Commons Collections 3.2
+ * @since 3.2
  * @version $Id$
  */
 public class BoundedBuffer<E> extends SynchronizedBuffer<E> implements BoundedCollection<E> {
diff --git a/src/main/java/org/apache/commons/collections/buffer/BoundedFifoBuffer.java b/src/main/java/org/apache/commons/collections/buffer/BoundedFifoBuffer.java
index 7a20ddc54..d6fdcfc9a 100644
--- a/src/main/java/org/apache/commons/collections/buffer/BoundedFifoBuffer.java
+++ b/src/main/java/org/apache/commons/collections/buffer/BoundedFifoBuffer.java
@@ -53,7 +53,7 @@ import org.apache.commons.collections.BufferUnderflowException;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0 (previously in main package v2.1)
+ * @since 3.0 (previously in main package v2.1)
  * @version $Id$
  */
 public class BoundedFifoBuffer<E> extends AbstractCollection<E>
diff --git a/src/main/java/org/apache/commons/collections/buffer/CircularFifoBuffer.java b/src/main/java/org/apache/commons/collections/buffer/CircularFifoBuffer.java
index 465d63ab6..319e80e0f 100644
--- a/src/main/java/org/apache/commons/collections/buffer/CircularFifoBuffer.java
+++ b/src/main/java/org/apache/commons/collections/buffer/CircularFifoBuffer.java
@@ -40,7 +40,7 @@ import java.util.Collection;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class CircularFifoBuffer<E> extends BoundedFifoBuffer<E> {
diff --git a/src/main/java/org/apache/commons/collections/buffer/PredicatedBuffer.java b/src/main/java/org/apache/commons/collections/buffer/PredicatedBuffer.java
index d1b0f7ac5..ffbefd40c 100644
--- a/src/main/java/org/apache/commons/collections/buffer/PredicatedBuffer.java
+++ b/src/main/java/org/apache/commons/collections/buffer/PredicatedBuffer.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.collection.PredicatedCollection;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class PredicatedBuffer<E> extends PredicatedCollection<E> implements Buffer<E> {
diff --git a/src/main/java/org/apache/commons/collections/buffer/PriorityBuffer.java b/src/main/java/org/apache/commons/collections/buffer/PriorityBuffer.java
index eaec88017..70f657959 100644
--- a/src/main/java/org/apache/commons/collections/buffer/PriorityBuffer.java
+++ b/src/main/java/org/apache/commons/collections/buffer/PriorityBuffer.java
@@ -53,7 +53,7 @@ import org.apache.commons.collections.comparators.ComparableComparator;
  * <p>
  * This class is Serializable from Commons Collections 3.2.
  *
- * @since Commons Collections 3.0 (previously BinaryHeap v1.0)
+ * @since 3.0 (previously BinaryHeap v1.0)
  * @version $Id$
  */
 public class PriorityBuffer<E> extends AbstractCollection<E> implements Buffer<E>, Serializable {
diff --git a/src/main/java/org/apache/commons/collections/buffer/SynchronizedBuffer.java b/src/main/java/org/apache/commons/collections/buffer/SynchronizedBuffer.java
index 15ff4a33f..e16412f5f 100644
--- a/src/main/java/org/apache/commons/collections/buffer/SynchronizedBuffer.java
+++ b/src/main/java/org/apache/commons/collections/buffer/SynchronizedBuffer.java
@@ -28,7 +28,7 @@ import org.apache.commons.collections.collection.SynchronizedCollection;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @param <E> the type of the elements in the buffer
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class SynchronizedBuffer<E>
diff --git a/src/main/java/org/apache/commons/collections/buffer/TransformedBuffer.java b/src/main/java/org/apache/commons/collections/buffer/TransformedBuffer.java
index bac85ba6a..87f265dbd 100644
--- a/src/main/java/org/apache/commons/collections/buffer/TransformedBuffer.java
+++ b/src/main/java/org/apache/commons/collections/buffer/TransformedBuffer.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.collection.TransformedCollection;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class TransformedBuffer<E> extends TransformedCollection<E> implements Buffer<E> {
@@ -69,7 +69,7 @@ public class TransformedBuffer<E> extends TransformedCollection<E> implements Bu
      * @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
-     * @since Commons Collections 3.3
+     * @since 3.3
      */
     public static <E> TransformedBuffer<E> transformedBuffer(Buffer<E> buffer,
                                                              Transformer<? super E, ? extends E> transformer) {
diff --git a/src/main/java/org/apache/commons/collections/buffer/UnboundedFifoBuffer.java b/src/main/java/org/apache/commons/collections/buffer/UnboundedFifoBuffer.java
index 157d7984c..caa62a785 100644
--- a/src/main/java/org/apache/commons/collections/buffer/UnboundedFifoBuffer.java
+++ b/src/main/java/org/apache/commons/collections/buffer/UnboundedFifoBuffer.java
@@ -51,7 +51,7 @@ import org.apache.commons.collections.BufferUnderflowException;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0 (previously in main package v2.1)
+ * @since 3.0 (previously in main package v2.1)
  * @version $Id$
  */
 public class UnboundedFifoBuffer<E> extends AbstractCollection<E> implements Buffer<E>, Serializable {
diff --git a/src/main/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java b/src/main/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java
index a224802c2..98e8df3de 100644
--- a/src/main/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java
+++ b/src/main/java/org/apache/commons/collections/buffer/UnmodifiableBuffer.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.iterators.UnmodifiableIterator;
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException. 
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public final class UnmodifiableBuffer<E>
diff --git a/src/main/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java b/src/main/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java
index 84db09bde..cb24aa9a9 100644
--- a/src/main/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java
+++ b/src/main/java/org/apache/commons/collections/collection/AbstractCollectionDecorator.java
@@ -36,7 +36,7 @@ import java.util.Iterator;
  * to write an unmodifiable implementation it might provide a loophole.
  *
  * @param <E> the type of the elements in the collection
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public abstract class AbstractCollectionDecorator<E>
@@ -50,7 +50,7 @@ public abstract class AbstractCollectionDecorator<E>
 
     /**
      * Constructor only used in deserialization, do not use otherwise.
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     protected AbstractCollectionDecorator() {
         super();
diff --git a/src/main/java/org/apache/commons/collections/collection/AbstractUntypedCollectionDecorator.java b/src/main/java/org/apache/commons/collections/collection/AbstractUntypedCollectionDecorator.java
index 68f159325..214f06b19 100644
--- a/src/main/java/org/apache/commons/collections/collection/AbstractUntypedCollectionDecorator.java
+++ b/src/main/java/org/apache/commons/collections/collection/AbstractUntypedCollectionDecorator.java
@@ -38,7 +38,7 @@ import java.util.Collection;
  *
  * @param <D> the type of the elements in the decorated collection
  * @param <E> the element type of the Collection implementation
- * @since Commons Collections 4.0
+ * @since 4.0
  * @version $Id$
  */
 public abstract class AbstractUntypedCollectionDecorator<E, D> implements Collection<E>, Serializable {
diff --git a/src/main/java/org/apache/commons/collections/collection/CompositeCollection.java b/src/main/java/org/apache/commons/collections/collection/CompositeCollection.java
index 4066ceccd..70f03f324 100644
--- a/src/main/java/org/apache/commons/collections/collection/CompositeCollection.java
+++ b/src/main/java/org/apache/commons/collections/collection/CompositeCollection.java
@@ -36,7 +36,7 @@ import org.apache.commons.collections.list.UnmodifiableList;
  * strategy is provided then add and remove are unsupported.
  *
  * @param <E> the type of the elements in the collection
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class CompositeCollection<E> implements Collection<E>, Serializable {
diff --git a/src/main/java/org/apache/commons/collections/collection/PredicatedCollection.java b/src/main/java/org/apache/commons/collections/collection/PredicatedCollection.java
index 8ad78c4de..818bf5c5d 100644
--- a/src/main/java/org/apache/commons/collections/collection/PredicatedCollection.java
+++ b/src/main/java/org/apache/commons/collections/collection/PredicatedCollection.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.Predicate;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @param <E> the type of the elements in the collection
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class PredicatedCollection<E> extends AbstractCollectionDecorator<E> {
diff --git a/src/main/java/org/apache/commons/collections/collection/SynchronizedCollection.java b/src/main/java/org/apache/commons/collections/collection/SynchronizedCollection.java
index a28fdeaff..ebe8dbca2 100644
--- a/src/main/java/org/apache/commons/collections/collection/SynchronizedCollection.java
+++ b/src/main/java/org/apache/commons/collections/collection/SynchronizedCollection.java
@@ -35,7 +35,7 @@ import java.util.Iterator;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @param <E> the type of the elements in the collection
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class SynchronizedCollection<E> implements Collection<E>, Serializable {
diff --git a/src/main/java/org/apache/commons/collections/collection/TransformedCollection.java b/src/main/java/org/apache/commons/collections/collection/TransformedCollection.java
index c450aa930..7b371ba4c 100644
--- a/src/main/java/org/apache/commons/collections/collection/TransformedCollection.java
+++ b/src/main/java/org/apache/commons/collections/collection/TransformedCollection.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.Transformer;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @param <E> the type of the elements in the collection
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class TransformedCollection<E> extends AbstractCollectionDecorator<E> {
@@ -75,7 +75,7 @@ public class TransformedCollection<E> extends AbstractCollectionDecorator<E> {
      * @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
-     * @since Commons Collections 3.3
+     * @since 3.3
      */
     public static <E> TransformedCollection<E> transformedCollection(Collection<E> collection,
                                                                      Transformer<? super E, ? extends E> transformer) {
diff --git a/src/main/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java b/src/main/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java
index 7c703a686..7de9f19eb 100644
--- a/src/main/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java
+++ b/src/main/java/org/apache/commons/collections/collection/UnmodifiableBoundedCollection.java
@@ -36,7 +36,7 @@ import org.apache.commons.collections.iterators.UnmodifiableIterator;
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException. 
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public final class UnmodifiableBoundedCollection<E> extends AbstractCollectionDecorator<E>
diff --git a/src/main/java/org/apache/commons/collections/collection/UnmodifiableCollection.java b/src/main/java/org/apache/commons/collections/collection/UnmodifiableCollection.java
index f04e964f6..31de61f38 100644
--- a/src/main/java/org/apache/commons/collections/collection/UnmodifiableCollection.java
+++ b/src/main/java/org/apache/commons/collections/collection/UnmodifiableCollection.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.iterators.UnmodifiableIterator;
  * Attempts to modify it will result in an UnsupportedOperationException. 
  *
  * @param <E> the type of the elements in the collection
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public final class UnmodifiableCollection<E>
diff --git a/src/main/java/org/apache/commons/collections/comparators/BooleanComparator.java b/src/main/java/org/apache/commons/collections/comparators/BooleanComparator.java
index 47881c9cc..3d045126a 100644
--- a/src/main/java/org/apache/commons/collections/comparators/BooleanComparator.java
+++ b/src/main/java/org/apache/commons/collections/comparators/BooleanComparator.java
@@ -27,7 +27,7 @@ import java.util.Comparator;
  * @see #getFalseFirstComparator()
  * @see #booleanComparator(boolean)
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public final class BooleanComparator implements Comparator<Boolean>, Serializable {
diff --git a/src/main/java/org/apache/commons/collections/comparators/ComparableComparator.java b/src/main/java/org/apache/commons/collections/comparators/ComparableComparator.java
index 7ded59842..653147394 100644
--- a/src/main/java/org/apache/commons/collections/comparators/ComparableComparator.java
+++ b/src/main/java/org/apache/commons/collections/comparators/ComparableComparator.java
@@ -34,7 +34,7 @@ import java.util.Comparator;
  * This is no longer the case. See {@link #compare(Object, Object) compare} for
  * details.
  * 
- * @since Commons Collections 2.0
+ * @since 2.0
  * @version $Id$
  * 
  * @see java.util.Collections#reverseOrder()
@@ -98,7 +98,7 @@ public class ComparableComparator<E extends Comparable<? super E>> implements Co
      * {@link #equals(Object) equals}.
      *
      * @return a hash code for this comparator.
-     * @since Commons Collections 3.0
+     * @since 3.0
      */
     @Override
     public int hashCode() {
@@ -116,7 +116,7 @@ public class ComparableComparator<E extends Comparable<? super E>> implements Co
      * 
      * @param object  the object to compare with
      * @return {@code true} if equal
-     * @since Commons Collections 3.0
+     * @since 3.0
      */
     @Override
     public boolean equals(Object object) {
diff --git a/src/main/java/org/apache/commons/collections/comparators/ComparatorChain.java b/src/main/java/org/apache/commons/collections/comparators/ComparatorChain.java
index 81210a71a..e6571e7bb 100644
--- a/src/main/java/org/apache/commons/collections/comparators/ComparatorChain.java
+++ b/src/main/java/org/apache/commons/collections/comparators/ComparatorChain.java
@@ -44,7 +44,7 @@ import java.util.List;
  * thread-safe at construction time, but it <i>is</i> thread-safe to perform
  * multiple comparisons after all the setup operations are complete.
  * 
- * @since Commons Collections 2.0
+ * @since 2.0
  * @version $Id$
  */
 public class ComparatorChain<E> implements Comparator<E>, Serializable {
@@ -300,7 +300,7 @@ public class ComparatorChain<E> implements Comparator<E>, Serializable {
      * {@link #equals(Object) equals}.
      *
      * @return a suitable hash code
-     * @since Commons Collections 3.0
+     * @since 3.0
      */
     @Override
     public int hashCode() {
@@ -328,7 +328,7 @@ public class ComparatorChain<E> implements Comparator<E>, Serializable {
      *
      * @param object  the object to compare with
      * @return true if equal
-     * @since Commons Collections 3.0
+     * @since 3.0
      */
     @Override
     public boolean equals(Object object) {
diff --git a/src/main/java/org/apache/commons/collections/comparators/FixedOrderComparator.java b/src/main/java/org/apache/commons/collections/comparators/FixedOrderComparator.java
index b522fde6a..9d55ec120 100644
--- a/src/main/java/org/apache/commons/collections/comparators/FixedOrderComparator.java
+++ b/src/main/java/org/apache/commons/collections/comparators/FixedOrderComparator.java
@@ -40,14 +40,14 @@ import java.util.Map;
  * thread-safe at construction time, but it is thread-safe to perform
  * multiple comparisons  after all the setup operations are complete.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class FixedOrderComparator<T> implements Comparator<T> {
 
     /**
      * Unknown object behavior enum.
-     * @since Commons Collections 4.0
+     * @since 4.0
      */
     public static enum UnknownObjectBehavior {
         BEFORE, AFTER, EXCEPTION;
diff --git a/src/main/java/org/apache/commons/collections/comparators/NullComparator.java b/src/main/java/org/apache/commons/collections/comparators/NullComparator.java
index 5b8e28d6c..40b6fe5c9 100644
--- a/src/main/java/org/apache/commons/collections/comparators/NullComparator.java
+++ b/src/main/java/org/apache/commons/collections/comparators/NullComparator.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.ComparatorUtils;
  * A Comparator that will compare nulls to be either lower or higher than
  * other objects.
  *
- * @since Commons Collections 2.0
+ * @since 2.0
  * @version $Id$
  */
 public class NullComparator<E> implements Comparator<E>, Serializable {
diff --git a/src/main/java/org/apache/commons/collections/comparators/ReverseComparator.java b/src/main/java/org/apache/commons/collections/comparators/ReverseComparator.java
index 7fdcc2cb1..203d25c19 100644
--- a/src/main/java/org/apache/commons/collections/comparators/ReverseComparator.java
+++ b/src/main/java/org/apache/commons/collections/comparators/ReverseComparator.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.ComparatorUtils;
  * Reverses the order of another comparator by reversing the arguments
  * to its {@link #compare(Object, Object) compare} method.
  *
- * @since Commons Collections 2.0
+ * @since 2.0
  * @version $Id$
  *
  * @see java.util.Collections#reverseOrder()
@@ -83,7 +83,7 @@ public class ReverseComparator<E> implements Comparator<E>, Serializable {
      * {@link #equals(Object) equals}.
      * 
      * @return a suitable hash code
-     * @since Commons Collections 3.0
+     * @since 3.0
      */
     @Override
     public int hashCode() {
@@ -104,7 +104,7 @@ public class ReverseComparator<E> implements Comparator<E>, Serializable {
      * 
      * @param object  the object to compare to
      * @return true if equal
-     * @since Commons Collections 3.0
+     * @since 3.0
      */
     @Override
     public boolean equals(Object object) {
diff --git a/src/main/java/org/apache/commons/collections/comparators/TransformingComparator.java b/src/main/java/org/apache/commons/collections/comparators/TransformingComparator.java
index 77d9f3f49..4c5bd4cca 100644
--- a/src/main/java/org/apache/commons/collections/comparators/TransformingComparator.java
+++ b/src/main/java/org/apache/commons/collections/comparators/TransformingComparator.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections.Transformer;
  * return value from the transform operation will be passed to the decorated
  * {@link Comparator#compare(Object,Object) compare} method.
  *
- * @since Commons Collections 2.1
+ * @since 2.1
  * @version $Id$
  *
  * @see org.apache.commons.collections.Transformer
diff --git a/src/main/java/org/apache/commons/collections/functors/AllPredicate.java b/src/main/java/org/apache/commons/collections/functors/AllPredicate.java
index 3bb8d09cb..0e3fbffd4 100644
--- a/src/main/java/org/apache/commons/collections/functors/AllPredicate.java
+++ b/src/main/java/org/apache/commons/collections/functors/AllPredicate.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.Predicate;
  * NOTE: In versions prior to 3.2 an array size of zero or one
  * threw an exception.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -123,7 +123,7 @@ public final class AllPredicate<T> implements Predicate<T>, PredicateDecorator<T
      * Gets the predicates, do not modify the array.
      * 
      * @return the predicates
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public Predicate<? super T>[] getPredicates() {
         return iPredicates;
diff --git a/src/main/java/org/apache/commons/collections/functors/AndPredicate.java b/src/main/java/org/apache/commons/collections/functors/AndPredicate.java
index 7fb78b8df..e59801a51 100644
--- a/src/main/java/org/apache/commons/collections/functors/AndPredicate.java
+++ b/src/main/java/org/apache/commons/collections/functors/AndPredicate.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Predicate;
 /**
  * Predicate implementation that returns true if both the predicates return true.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -80,7 +80,7 @@ public final class AndPredicate<T> implements Predicate<T>, PredicateDecorator<T
      * Gets the two predicates being decorated as an array.
      *
      * @return the predicates
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @SuppressWarnings("unchecked")
     public Predicate<? super T>[] getPredicates() {
diff --git a/src/main/java/org/apache/commons/collections/functors/AnyPredicate.java b/src/main/java/org/apache/commons/collections/functors/AnyPredicate.java
index de9ffd102..7ce600dde 100644
--- a/src/main/java/org/apache/commons/collections/functors/AnyPredicate.java
+++ b/src/main/java/org/apache/commons/collections/functors/AnyPredicate.java
@@ -29,7 +29,7 @@ import org.apache.commons.collections.Predicate;
  * NOTE: In versions prior to 3.2 an array size of zero or one
  * threw an exception.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -119,7 +119,7 @@ public final class AnyPredicate<T> implements Predicate<T>, PredicateDecorator<T
      * Gets the predicates, do not modify the array.
      *
      * @return the predicates
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public Predicate<? super T>[] getPredicates() {
         return iPredicates;
diff --git a/src/main/java/org/apache/commons/collections/functors/CatchAndRethrowClosure.java b/src/main/java/org/apache/commons/collections/functors/CatchAndRethrowClosure.java
index a77e91dce..06b5e3ff8 100644
--- a/src/main/java/org/apache/commons/collections/functors/CatchAndRethrowClosure.java
+++ b/src/main/java/org/apache/commons/collections/functors/CatchAndRethrowClosure.java
@@ -43,7 +43,7 @@ import org.apache.commons.collections.FunctorException;
  * }
  * </pre>
  * 
- * @since Commons Collections 4.0
+ * @since 4.0
  * @version $Revision$
  */
 public abstract class CatchAndRethrowClosure<E> implements Closure<E> {
diff --git a/src/main/java/org/apache/commons/collections/functors/ChainedClosure.java b/src/main/java/org/apache/commons/collections/functors/ChainedClosure.java
index ec43ee897..c82ae273e 100644
--- a/src/main/java/org/apache/commons/collections/functors/ChainedClosure.java
+++ b/src/main/java/org/apache/commons/collections/functors/ChainedClosure.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.Closure;
 /**
  * Closure implementation that chains the specified closures together.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -106,7 +106,7 @@ public class ChainedClosure<E> implements Closure<E>, Serializable {
     /**
      * Gets the closures, do not modify the array.
      * @return the closures
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public Closure<? super E>[] getClosures() {
         return iClosures;
diff --git a/src/main/java/org/apache/commons/collections/functors/ChainedTransformer.java b/src/main/java/org/apache/commons/collections/functors/ChainedTransformer.java
index 40e111909..2931cd67c 100644
--- a/src/main/java/org/apache/commons/collections/functors/ChainedTransformer.java
+++ b/src/main/java/org/apache/commons/collections/functors/ChainedTransformer.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.Transformer;
  * The input object is passed to the first transformer. The transformed result
  * is passed to the second transformer and so on.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -107,7 +107,7 @@ public class ChainedTransformer<T> implements Transformer<T, T>, Serializable {
     /**
      * Gets the transformers, do not modify the array.
      * @return the transformers
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public Transformer<? super T, ? extends T>[] getTransformers() {
         return iTransformers;
diff --git a/src/main/java/org/apache/commons/collections/functors/CloneTransformer.java b/src/main/java/org/apache/commons/collections/functors/CloneTransformer.java
index c141b906e..22a2722d6 100644
--- a/src/main/java/org/apache/commons/collections/functors/CloneTransformer.java
+++ b/src/main/java/org/apache/commons/collections/functors/CloneTransformer.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.Transformer;
  * <p>
  * Clone is performed using <code>PrototypeFactory.getInstance(input).create()</code>.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -42,7 +42,7 @@ public class CloneTransformer<T> implements Transformer<T, T>, Serializable {
      * Factory returning the singleton instance.
      * 
      * @return the singleton instance
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @SuppressWarnings("unchecked")
     public static <T> Transformer<T, T> cloneTransformer() {
diff --git a/src/main/java/org/apache/commons/collections/functors/ClosureTransformer.java b/src/main/java/org/apache/commons/collections/functors/ClosureTransformer.java
index 9a5868fcc..7e8ea8c85 100644
--- a/src/main/java/org/apache/commons/collections/functors/ClosureTransformer.java
+++ b/src/main/java/org/apache/commons/collections/functors/ClosureTransformer.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.Transformer;
  * Transformer implementation that calls a Closure using the input object
  * and then returns the input.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -78,7 +78,7 @@ public class ClosureTransformer<T> implements Transformer<T, T>, Serializable {
      * Gets the closure.
      * 
      * @return the closure
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public Closure<? super T> getClosure() {
         return iClosure;
diff --git a/src/main/java/org/apache/commons/collections/functors/ComparatorPredicate.java b/src/main/java/org/apache/commons/collections/functors/ComparatorPredicate.java
index 60bbb6b32..186c0987e 100644
--- a/src/main/java/org/apache/commons/collections/functors/ComparatorPredicate.java
+++ b/src/main/java/org/apache/commons/collections/functors/ComparatorPredicate.java
@@ -73,7 +73,7 @@ import org.apache.commons.collections.Predicate;
  * using the <code>GREATER</code> evaluation criterion constant. This instructs the predicate to
  * return <code>true</code> if the comparator returns a value greater than <code>0</code>.
  *
- * @since Commons Collections 4.0
+ * @since 4.0
  * @version $Revision$
  *
  * @author Rune Peter Bjørnstad.
diff --git a/src/main/java/org/apache/commons/collections/functors/ConstantFactory.java b/src/main/java/org/apache/commons/collections/functors/ConstantFactory.java
index 2f32e0148..6c49af326 100644
--- a/src/main/java/org/apache/commons/collections/functors/ConstantFactory.java
+++ b/src/main/java/org/apache/commons/collections/functors/ConstantFactory.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.Factory;
  * objects should use the constant factory. Mutable objects should
  * use the prototype factory.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -81,7 +81,7 @@ public class ConstantFactory<T> implements Factory<T>, Serializable {
      * Gets the constant.
      * 
      * @return the constant
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public T getConstant() {
         return iConstant;
diff --git a/src/main/java/org/apache/commons/collections/functors/ConstantTransformer.java b/src/main/java/org/apache/commons/collections/functors/ConstantTransformer.java
index f888bd6ba..405f1f4f4 100644
--- a/src/main/java/org/apache/commons/collections/functors/ConstantTransformer.java
+++ b/src/main/java/org/apache/commons/collections/functors/ConstantTransformer.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.Transformer;
  * objects should use the constant factory. Mutable objects should
  * use the prototype factory.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -92,7 +92,7 @@ public class ConstantTransformer<I, O> implements Transformer<I, O>, Serializabl
      * Gets the constant.
      * 
      * @return the constant
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public O getConstant() {
         return iConstant;
diff --git a/src/main/java/org/apache/commons/collections/functors/DefaultEquator.java b/src/main/java/org/apache/commons/collections/functors/DefaultEquator.java
index 11c5ecaad..ec74e395a 100644
--- a/src/main/java/org/apache/commons/collections/functors/DefaultEquator.java
+++ b/src/main/java/org/apache/commons/collections/functors/DefaultEquator.java
@@ -20,7 +20,7 @@ package org.apache.commons.collections.functors;
  * Default {@link Equator} implementation.
  * 
  * @param <T>
- * @since Commons Collections 4.0
+ * @since 4.0
  * @version $Revision$
  */
 public class DefaultEquator<T> implements Equator<T> {
diff --git a/src/main/java/org/apache/commons/collections/functors/EqualPredicate.java b/src/main/java/org/apache/commons/collections/functors/EqualPredicate.java
index e4fbbb8bc..3dc464a5b 100644
--- a/src/main/java/org/apache/commons/collections/functors/EqualPredicate.java
+++ b/src/main/java/org/apache/commons/collections/functors/EqualPredicate.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections.Predicate;
  * Predicate implementation that returns true if the input is the same object
  * as the one stored in this predicate by equals.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -78,7 +78,7 @@ public final class EqualPredicate<T> implements Predicate<T>, Serializable {
      * Gets the value.
      * 
      * @return the value
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public Object getValue() {
         return iValue;
diff --git a/src/main/java/org/apache/commons/collections/functors/Equator.java b/src/main/java/org/apache/commons/collections/functors/Equator.java
index f99d90317..421eaa928 100644
--- a/src/main/java/org/apache/commons/collections/functors/Equator.java
+++ b/src/main/java/org/apache/commons/collections/functors/Equator.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.map.HashedMap;
  * 
  * @param <T> the types of object this {@link Equator} can evaluate.
  * @author Stephen Kestle
- * @since Commons Collections 4.0
+ * @since 4.0
  * @version $Revision$
  */
 public interface Equator<T> {
diff --git a/src/main/java/org/apache/commons/collections/functors/ExceptionClosure.java b/src/main/java/org/apache/commons/collections/functors/ExceptionClosure.java
index 3c75229f4..2c9ebaa79 100644
--- a/src/main/java/org/apache/commons/collections/functors/ExceptionClosure.java
+++ b/src/main/java/org/apache/commons/collections/functors/ExceptionClosure.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.FunctorException;
 /**
  * Closure implementation that always throws an exception.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -41,7 +41,7 @@ public final class ExceptionClosure<E> implements Closure<E>, Serializable {
      * Factory returning the singleton instance.
      * 
      * @return the singleton instance
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @SuppressWarnings("unchecked")
     public static <E> Closure<E> exceptionClosure() {
diff --git a/src/main/java/org/apache/commons/collections/functors/ExceptionFactory.java b/src/main/java/org/apache/commons/collections/functors/ExceptionFactory.java
index b6b9e0179..58efbf45b 100644
--- a/src/main/java/org/apache/commons/collections/functors/ExceptionFactory.java
+++ b/src/main/java/org/apache/commons/collections/functors/ExceptionFactory.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.FunctorException;
 /**
  * Factory implementation that always throws an exception.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -41,7 +41,7 @@ public final class ExceptionFactory<T> implements Factory<T>, Serializable {
      * Factory returning the singleton instance.
      * 
      * @return the singleton instance
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @SuppressWarnings("unchecked")
     public static <T> Factory<T> exceptionFactory() {
diff --git a/src/main/java/org/apache/commons/collections/functors/ExceptionPredicate.java b/src/main/java/org/apache/commons/collections/functors/ExceptionPredicate.java
index fac3b683b..9bbf556cf 100644
--- a/src/main/java/org/apache/commons/collections/functors/ExceptionPredicate.java
+++ b/src/main/java/org/apache/commons/collections/functors/ExceptionPredicate.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.Predicate;
 /**
  * Predicate implementation that always throws an exception.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -41,7 +41,7 @@ public final class ExceptionPredicate<T> implements Predicate<T>, Serializable {
      * Factory returning the singleton instance.
      *
      * @return the singleton instance
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @SuppressWarnings("unchecked")
     public static <T> Predicate<T> exceptionPredicate() {
diff --git a/src/main/java/org/apache/commons/collections/functors/ExceptionTransformer.java b/src/main/java/org/apache/commons/collections/functors/ExceptionTransformer.java
index 8fa220569..5fbe4b972 100644
--- a/src/main/java/org/apache/commons/collections/functors/ExceptionTransformer.java
+++ b/src/main/java/org/apache/commons/collections/functors/ExceptionTransformer.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.Transformer;
 /**
  * Transformer implementation that always throws an exception.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -41,7 +41,7 @@ public final class ExceptionTransformer<I, O> implements Transformer<I, O>, Seri
      * Factory returning the singleton instance.
      *
      * @return the singleton instance
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @SuppressWarnings("unchecked")
     public static <I, O> Transformer<I, O> exceptionTransformer() {
diff --git a/src/main/java/org/apache/commons/collections/functors/FactoryTransformer.java b/src/main/java/org/apache/commons/collections/functors/FactoryTransformer.java
index 0a784ee7d..435ff104d 100644
--- a/src/main/java/org/apache/commons/collections/functors/FactoryTransformer.java
+++ b/src/main/java/org/apache/commons/collections/functors/FactoryTransformer.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.Transformer;
 /**
  * Transformer implementation that calls a Factory and returns the result.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -77,7 +77,7 @@ public class FactoryTransformer<I, O> implements Transformer<I, O>, Serializable
      * Gets the factory.
      * 
      * @return the factory
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public Factory<? extends O> getFactory() {
         return iFactory;
diff --git a/src/main/java/org/apache/commons/collections/functors/FalsePredicate.java b/src/main/java/org/apache/commons/collections/functors/FalsePredicate.java
index 7105d035a..3941e7ec2 100644
--- a/src/main/java/org/apache/commons/collections/functors/FalsePredicate.java
+++ b/src/main/java/org/apache/commons/collections/functors/FalsePredicate.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Predicate;
 /**
  * Predicate implementation that always returns false.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -40,7 +40,7 @@ public final class FalsePredicate<T> implements Predicate<T>, Serializable {
      * Get a typed instance.
      *
      * @return the singleton instance
-     * @since Commons Collections 4.0
+     * @since 4.0
      */
     @SuppressWarnings("unchecked")
     public static <T> Predicate<T> falsePredicate() {
diff --git a/src/main/java/org/apache/commons/collections/functors/ForClosure.java b/src/main/java/org/apache/commons/collections/functors/ForClosure.java
index 64aad5bc9..58113e4dd 100644
--- a/src/main/java/org/apache/commons/collections/functors/ForClosure.java
+++ b/src/main/java/org/apache/commons/collections/functors/ForClosure.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Closure;
 /**
  * Closure implementation that calls another closure n times, like a for loop.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -87,7 +87,7 @@ public class ForClosure<E> implements Closure<E>, Serializable {
      * Gets the closure.
      * 
      * @return the closure
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public Closure<? super E> getClosure() {
         return iClosure;
@@ -97,7 +97,7 @@ public class ForClosure<E> implements Closure<E>, Serializable {
      * Gets the count.
      * 
      * @return the count
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public int getCount() {
         return iCount;
diff --git a/src/main/java/org/apache/commons/collections/functors/FunctorUtils.java b/src/main/java/org/apache/commons/collections/functors/FunctorUtils.java
index 154e7737a..a15a7c3de 100644
--- a/src/main/java/org/apache/commons/collections/functors/FunctorUtils.java
+++ b/src/main/java/org/apache/commons/collections/functors/FunctorUtils.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.Transformer;
 /**
  * Internal utilities for functors.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/functors/IdentityPredicate.java b/src/main/java/org/apache/commons/collections/functors/IdentityPredicate.java
index 1102122b7..54474c145 100644
--- a/src/main/java/org/apache/commons/collections/functors/IdentityPredicate.java
+++ b/src/main/java/org/apache/commons/collections/functors/IdentityPredicate.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.Predicate;
  * Predicate implementation that returns true if the input is the same object
  * as the one stored in this predicate.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -77,7 +77,7 @@ public final class IdentityPredicate<T> implements Predicate<T>, Serializable {
      * Gets the value.
      *
      * @return the value
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public T getValue() {
         return iValue;
diff --git a/src/main/java/org/apache/commons/collections/functors/IfClosure.java b/src/main/java/org/apache/commons/collections/functors/IfClosure.java
index 7a5989aa1..19a8b9806 100644
--- a/src/main/java/org/apache/commons/collections/functors/IfClosure.java
+++ b/src/main/java/org/apache/commons/collections/functors/IfClosure.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.Predicate;
  * Closure implementation acts as an if statement calling one or other closure
  * based on a predicate.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -53,7 +53,7 @@ public class IfClosure<E> implements Closure<E>, Serializable {
      * @param trueClosure  closure used if true
      * @return the <code>if</code> closure
      * @throws IllegalArgumentException if either argument is null
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public static <E> Closure<E> ifClosure(Predicate<? super E> predicate, Closure<? super E> trueClosure) {
         return IfClosure.<E>ifClosure(predicate, trueClosure, NOPClosure.<E>nopClosure());
@@ -87,7 +87,7 @@ public class IfClosure<E> implements Closure<E>, Serializable {
      * 
      * @param predicate  predicate to switch on, not null
      * @param trueClosure  closure used if true, not null
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public IfClosure(Predicate<? super E> predicate, Closure<? super E> trueClosure) {
         this(predicate, trueClosure, NOPClosure.INSTANCE);
@@ -125,7 +125,7 @@ public class IfClosure<E> implements Closure<E>, Serializable {
      * Gets the predicate.
      * 
      * @return the predicate
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public Predicate<? super E> getPredicate() {
         return iPredicate;
@@ -135,7 +135,7 @@ public class IfClosure<E> implements Closure<E>, Serializable {
      * Gets the closure called when true.
      * 
      * @return the closure
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public Closure<? super E> getTrueClosure() {
         return iTrueClosure;
@@ -145,7 +145,7 @@ public class IfClosure<E> implements Closure<E>, Serializable {
      * Gets the closure called when false.
      * 
      * @return the closure
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public Closure<? super E> getFalseClosure() {
         return iFalseClosure;
diff --git a/src/main/java/org/apache/commons/collections/functors/InstanceofPredicate.java b/src/main/java/org/apache/commons/collections/functors/InstanceofPredicate.java
index 5f1b79a36..630ad8d91 100644
--- a/src/main/java/org/apache/commons/collections/functors/InstanceofPredicate.java
+++ b/src/main/java/org/apache/commons/collections/functors/InstanceofPredicate.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.Predicate;
  * Predicate implementation that returns true if the input is an instanceof
  * the type stored in this predicate.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -76,7 +76,7 @@ public final class InstanceofPredicate implements Predicate<Object>, Serializabl
      * Gets the type to compare to.
      *
      * @return the type
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public Class<?> getType() {
         return iType;
diff --git a/src/main/java/org/apache/commons/collections/functors/InstantiateFactory.java b/src/main/java/org/apache/commons/collections/functors/InstantiateFactory.java
index 293d0d0de..5a963a450 100644
--- a/src/main/java/org/apache/commons/collections/functors/InstantiateFactory.java
+++ b/src/main/java/org/apache/commons/collections/functors/InstantiateFactory.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections.FunctorException;
 /**
  * Factory implementation that creates a new object instance by reflection.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/functors/InstantiateTransformer.java b/src/main/java/org/apache/commons/collections/functors/InstantiateTransformer.java
index f566481a5..0aeffb66d 100644
--- a/src/main/java/org/apache/commons/collections/functors/InstantiateTransformer.java
+++ b/src/main/java/org/apache/commons/collections/functors/InstantiateTransformer.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections.Transformer;
 /**
  * Transformer implementation that creates a new object instance by reflection.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/functors/InvokerTransformer.java b/src/main/java/org/apache/commons/collections/functors/InvokerTransformer.java
index f426e4e9f..84970dcf0 100644
--- a/src/main/java/org/apache/commons/collections/functors/InvokerTransformer.java
+++ b/src/main/java/org/apache/commons/collections/functors/InvokerTransformer.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections.Transformer;
 /**
  * Transformer implementation that creates a new object instance by reflection.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -48,7 +48,7 @@ public class InvokerTransformer<I, O> implements Transformer<I, O>, Serializable
      * 
      * @param methodName  the method name to call
      * @return an invoker transformer
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public static <I, O> Transformer<I, O> invokerTransformer(String methodName) {
         if (methodName == null) {
diff --git a/src/main/java/org/apache/commons/collections/functors/MapTransformer.java b/src/main/java/org/apache/commons/collections/functors/MapTransformer.java
index 2adc80615..e42b8b611 100644
--- a/src/main/java/org/apache/commons/collections/functors/MapTransformer.java
+++ b/src/main/java/org/apache/commons/collections/functors/MapTransformer.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.Transformer;
  * Transformer implementation that returns the value held in a specified map
  * using the input parameter as a key.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -78,7 +78,7 @@ public final class MapTransformer<I, O> implements Transformer<I, O>, Serializab
      * Gets the map to lookup in.
      *
      * @return the map
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public Map<? super I, ? extends O> getMap() {
         return iMap;
diff --git a/src/main/java/org/apache/commons/collections/functors/NOPClosure.java b/src/main/java/org/apache/commons/collections/functors/NOPClosure.java
index d19c651b7..ad6c97e2c 100644
--- a/src/main/java/org/apache/commons/collections/functors/NOPClosure.java
+++ b/src/main/java/org/apache/commons/collections/functors/NOPClosure.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Closure;
 /**
  * Closure implementation that does nothing.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -40,7 +40,7 @@ public final class NOPClosure<E> implements Closure<E>, Serializable {
      * Factory returning the singleton instance.
      *
      * @return the singleton instance
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @SuppressWarnings("unchecked")
     public static <E> Closure<E> nopClosure() {
diff --git a/src/main/java/org/apache/commons/collections/functors/NOPTransformer.java b/src/main/java/org/apache/commons/collections/functors/NOPTransformer.java
index eb209cb60..245f941f0 100644
--- a/src/main/java/org/apache/commons/collections/functors/NOPTransformer.java
+++ b/src/main/java/org/apache/commons/collections/functors/NOPTransformer.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Transformer;
 /**
  * Transformer implementation that does nothing.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -40,7 +40,7 @@ public class NOPTransformer<T> implements Transformer<T, T>, Serializable {
      * Factory returning the singleton instance.
      *
      * @return the singleton instance
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @SuppressWarnings("unchecked")
     public static <T> Transformer<T, T> nopTransformer() {
diff --git a/src/main/java/org/apache/commons/collections/functors/NonePredicate.java b/src/main/java/org/apache/commons/collections/functors/NonePredicate.java
index d2065bbd9..765591744 100644
--- a/src/main/java/org/apache/commons/collections/functors/NonePredicate.java
+++ b/src/main/java/org/apache/commons/collections/functors/NonePredicate.java
@@ -29,7 +29,7 @@ import org.apache.commons.collections.Predicate;
  * NOTE: In versions prior to 3.2 an array size of zero or one
  * threw an exception.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -109,7 +109,7 @@ public final class NonePredicate<T> implements Predicate<T>, PredicateDecorator<
      * Gets the predicates, do not modify the array.
      *
      * @return the predicates
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public Predicate<? super T>[] getPredicates() {
         return iPredicates;
diff --git a/src/main/java/org/apache/commons/collections/functors/NotNullPredicate.java b/src/main/java/org/apache/commons/collections/functors/NotNullPredicate.java
index 28a2a9c67..6191a1083 100644
--- a/src/main/java/org/apache/commons/collections/functors/NotNullPredicate.java
+++ b/src/main/java/org/apache/commons/collections/functors/NotNullPredicate.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Predicate;
 /**
  * Predicate implementation that returns true if the input is not null.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -40,7 +40,7 @@ public final class NotNullPredicate<T> implements Predicate<T>, Serializable {
      * Factory returning the singleton instance.
      *
      * @return the singleton instance
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @SuppressWarnings("unchecked")
     public static <T> Predicate<T> notNullPredicate() {
diff --git a/src/main/java/org/apache/commons/collections/functors/NotPredicate.java b/src/main/java/org/apache/commons/collections/functors/NotPredicate.java
index 06e3e4752..5ac71988d 100644
--- a/src/main/java/org/apache/commons/collections/functors/NotPredicate.java
+++ b/src/main/java/org/apache/commons/collections/functors/NotPredicate.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Predicate;
 /**
  * Predicate implementation that returns the opposite of the decorated predicate.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -75,7 +75,7 @@ public final class NotPredicate<T> implements Predicate<T>, PredicateDecorator<T
      * Gets the predicate being decorated.
      * 
      * @return the predicate as the only element in an array
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @SuppressWarnings("unchecked")
     public Predicate<? super T>[] getPredicates() {
diff --git a/src/main/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java b/src/main/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java
index 8f95d1f0c..69f481da7 100644
--- a/src/main/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java
+++ b/src/main/java/org/apache/commons/collections/functors/NullIsExceptionPredicate.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.Predicate;
 /**
  * Predicate implementation that throws an exception if the input is null.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -81,7 +81,7 @@ public final class NullIsExceptionPredicate<T> implements Predicate<T>, Predicat
      * Gets the predicate being decorated.
      * 
      * @return the predicate as the only element in an array
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @SuppressWarnings("unchecked")
     public Predicate<? super T>[] getPredicates() {
diff --git a/src/main/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java b/src/main/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java
index eef3e0eb3..f0d979873 100644
--- a/src/main/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java
+++ b/src/main/java/org/apache/commons/collections/functors/NullIsFalsePredicate.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Predicate;
 /**
  * Predicate implementation that returns false if the input is null.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -79,7 +79,7 @@ public final class NullIsFalsePredicate<T> implements Predicate<T>, PredicateDec
      * Gets the predicate being decorated.
      *
      * @return the predicate as the only element in an array
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @SuppressWarnings("unchecked")
     public Predicate<? super T>[] getPredicates() {
diff --git a/src/main/java/org/apache/commons/collections/functors/NullIsTruePredicate.java b/src/main/java/org/apache/commons/collections/functors/NullIsTruePredicate.java
index 8c2128e10..aebd258ab 100644
--- a/src/main/java/org/apache/commons/collections/functors/NullIsTruePredicate.java
+++ b/src/main/java/org/apache/commons/collections/functors/NullIsTruePredicate.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Predicate;
 /**
  * Predicate implementation that returns true if the input is null.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -79,7 +79,7 @@ public final class NullIsTruePredicate<T> implements Predicate<T>, PredicateDeco
      * Gets the predicate being decorated.
      * 
      * @return the predicate as the only element in an array
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @SuppressWarnings("unchecked")
     public Predicate<? super T>[] getPredicates() {
diff --git a/src/main/java/org/apache/commons/collections/functors/NullPredicate.java b/src/main/java/org/apache/commons/collections/functors/NullPredicate.java
index 462b94caa..8b1bd0350 100644
--- a/src/main/java/org/apache/commons/collections/functors/NullPredicate.java
+++ b/src/main/java/org/apache/commons/collections/functors/NullPredicate.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Predicate;
 /**
  * Predicate implementation that returns true if the input is null.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -40,7 +40,7 @@ public final class NullPredicate<T> implements Predicate<T>, Serializable {
      * Factory returning the singleton instance.
      *
      * @return the singleton instance
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @SuppressWarnings("unchecked")
     public static <T> Predicate<T> nullPredicate() {
diff --git a/src/main/java/org/apache/commons/collections/functors/OnePredicate.java b/src/main/java/org/apache/commons/collections/functors/OnePredicate.java
index 5c5645405..fbba4100f 100644
--- a/src/main/java/org/apache/commons/collections/functors/OnePredicate.java
+++ b/src/main/java/org/apache/commons/collections/functors/OnePredicate.java
@@ -29,7 +29,7 @@ import org.apache.commons.collections.Predicate;
  * NOTE: In versions prior to 3.2 an array size of zero or one
  * threw an exception.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -114,7 +114,7 @@ public final class OnePredicate<T> implements Predicate<T>, PredicateDecorator<T
      * Gets the predicates, do not modify the array.
      * 
      * @return the predicates
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public Predicate<? super T>[] getPredicates() {
         return iPredicates;
diff --git a/src/main/java/org/apache/commons/collections/functors/OrPredicate.java b/src/main/java/org/apache/commons/collections/functors/OrPredicate.java
index 62a392f6d..0701b837b 100644
--- a/src/main/java/org/apache/commons/collections/functors/OrPredicate.java
+++ b/src/main/java/org/apache/commons/collections/functors/OrPredicate.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Predicate;
 /**
  * Predicate implementation that returns true if either of the predicates return true.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -80,7 +80,7 @@ public final class OrPredicate<T> implements Predicate<T>, PredicateDecorator<T>
      * Gets the two predicates being decorated as an array.
      *
      * @return the predicates
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @SuppressWarnings("unchecked")
     public Predicate<? super T>[] getPredicates() {
diff --git a/src/main/java/org/apache/commons/collections/functors/PredicateDecorator.java b/src/main/java/org/apache/commons/collections/functors/PredicateDecorator.java
index 7bf23449a..a6cf1776e 100644
--- a/src/main/java/org/apache/commons/collections/functors/PredicateDecorator.java
+++ b/src/main/java/org/apache/commons/collections/functors/PredicateDecorator.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Predicate;
  * <p>
  * This interface enables tools to access the decorated predicates.
  *
- * @since Commons Collections 3.1
+ * @since 3.1
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/functors/PredicateTransformer.java b/src/main/java/org/apache/commons/collections/functors/PredicateTransformer.java
index 7649d95da..ddf8201e7 100644
--- a/src/main/java/org/apache/commons/collections/functors/PredicateTransformer.java
+++ b/src/main/java/org/apache/commons/collections/functors/PredicateTransformer.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.Transformer;
  * Transformer implementation that calls a Predicate using the input object
  * and then returns the result.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -77,7 +77,7 @@ public class PredicateTransformer<T> implements Transformer<T, Boolean>, Seriali
      * Gets the predicate.
      * 
      * @return the predicate
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public Predicate<? super T> getPredicate() {
         return iPredicate;
diff --git a/src/main/java/org/apache/commons/collections/functors/PrototypeFactory.java b/src/main/java/org/apache/commons/collections/functors/PrototypeFactory.java
index 7c341a778..94518918f 100644
--- a/src/main/java/org/apache/commons/collections/functors/PrototypeFactory.java
+++ b/src/main/java/org/apache/commons/collections/functors/PrototypeFactory.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.FunctorException;
 /**
  * Factory implementation that creates a new instance each time based on a prototype.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/functors/StringValueTransformer.java b/src/main/java/org/apache/commons/collections/functors/StringValueTransformer.java
index a58a3e7a1..19b458257 100644
--- a/src/main/java/org/apache/commons/collections/functors/StringValueTransformer.java
+++ b/src/main/java/org/apache/commons/collections/functors/StringValueTransformer.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.Transformer;
  * Transformer implementation that returns the result of calling
  * <code>String.valueOf</code> on the input object.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -41,7 +41,7 @@ public final class StringValueTransformer<T> implements Transformer<T, String>,
      * Factory returning the singleton instance.
      *
      * @return the singleton instance
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @SuppressWarnings("unchecked")
     public static <T> Transformer<T, String> stringValueTransformer() {
diff --git a/src/main/java/org/apache/commons/collections/functors/SwitchClosure.java b/src/main/java/org/apache/commons/collections/functors/SwitchClosure.java
index 6b7d6df18..91a24ff44 100644
--- a/src/main/java/org/apache/commons/collections/functors/SwitchClosure.java
+++ b/src/main/java/org/apache/commons/collections/functors/SwitchClosure.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections.Predicate;
  * Closure implementation calls the closure whose predicate returns true,
  * like a switch statement.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -140,7 +140,7 @@ public class SwitchClosure<E> implements Closure<E>, Serializable {
      * Gets the predicates, do not modify the array.
      *
      * @return the predicates
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public Predicate<? super E>[] getPredicates() {
         return iPredicates;
@@ -150,7 +150,7 @@ public class SwitchClosure<E> implements Closure<E>, Serializable {
      * Gets the closures, do not modify the array.
      *
      * @return the closures
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public Closure<? super E>[] getClosures() {
         return iClosures;
@@ -160,7 +160,7 @@ public class SwitchClosure<E> implements Closure<E>, Serializable {
      * Gets the default closure.
      *
      * @return the default closure
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public Closure<? super E> getDefaultClosure() {
         return iDefault;
diff --git a/src/main/java/org/apache/commons/collections/functors/SwitchTransformer.java b/src/main/java/org/apache/commons/collections/functors/SwitchTransformer.java
index 37031f672..367d749db 100644
--- a/src/main/java/org/apache/commons/collections/functors/SwitchTransformer.java
+++ b/src/main/java/org/apache/commons/collections/functors/SwitchTransformer.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections.Transformer;
  * Transformer implementation calls the transformer whose predicate returns true,
  * like a switch statement.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -151,7 +151,7 @@ public class SwitchTransformer<I, O> implements Transformer<I, O>, Serializable
      * Gets the predicates, do not modify the array.
      * 
      * @return the predicates
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public Predicate<? super I>[] getPredicates() {
         return iPredicates;
@@ -161,7 +161,7 @@ public class SwitchTransformer<I, O> implements Transformer<I, O>, Serializable
      * Gets the transformers, do not modify the array.
      * 
      * @return the transformers
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public Transformer<? super I, ? extends O>[] getTransformers() {
         return iTransformers;
@@ -171,7 +171,7 @@ public class SwitchTransformer<I, O> implements Transformer<I, O>, Serializable
      * Gets the default transformer.
      * 
      * @return the default transformer
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public Transformer<? super I, ? extends O> getDefaultTransformer() {
         return iDefault;
diff --git a/src/main/java/org/apache/commons/collections/functors/TransformedPredicate.java b/src/main/java/org/apache/commons/collections/functors/TransformedPredicate.java
index 9ae36c6fd..bca023328 100644
--- a/src/main/java/org/apache/commons/collections/functors/TransformedPredicate.java
+++ b/src/main/java/org/apache/commons/collections/functors/TransformedPredicate.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.Transformer;
  * Predicate implementation that transforms the given object before invoking
  * another <code>Predicate</code>.
  *
- * @since Commons Collections 3.1
+ * @since 3.1
  * @version $Revision$
  * @author Alban Peignier
  * @author Stephen Colebourne
@@ -87,7 +87,7 @@ public final class TransformedPredicate<T> implements Predicate<T>, PredicateDec
      * Gets the predicate being decorated.
      *
      * @return the predicate as the only element in an array
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @SuppressWarnings("unchecked")
     public Predicate<? super T>[] getPredicates() {
diff --git a/src/main/java/org/apache/commons/collections/functors/TransformerClosure.java b/src/main/java/org/apache/commons/collections/functors/TransformerClosure.java
index 8e9b21420..5359468e6 100644
--- a/src/main/java/org/apache/commons/collections/functors/TransformerClosure.java
+++ b/src/main/java/org/apache/commons/collections/functors/TransformerClosure.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.Transformer;
  * Closure implementation that calls a Transformer using the input object
  * and ignore the result.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -77,7 +77,7 @@ public class TransformerClosure<E> implements Closure<E>, Serializable {
      * Gets the transformer.
      * 
      * @return the transformer
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public Transformer<? super E, ?> getTransformer() {
         return iTransformer;
diff --git a/src/main/java/org/apache/commons/collections/functors/TransformerPredicate.java b/src/main/java/org/apache/commons/collections/functors/TransformerPredicate.java
index 9c7a33d08..26bfd868d 100644
--- a/src/main/java/org/apache/commons/collections/functors/TransformerPredicate.java
+++ b/src/main/java/org/apache/commons/collections/functors/TransformerPredicate.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.Transformer;
 /**
  * Predicate implementation that returns the result of a transformer.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -83,7 +83,7 @@ public final class TransformerPredicate<T> implements Predicate<T>, Serializable
      * Gets the transformer.
      *
      * @return the transformer
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public Transformer<? super T, Boolean> getTransformer() {
         return iTransformer;
diff --git a/src/main/java/org/apache/commons/collections/functors/TruePredicate.java b/src/main/java/org/apache/commons/collections/functors/TruePredicate.java
index 6b62fcc74..582e81389 100644
--- a/src/main/java/org/apache/commons/collections/functors/TruePredicate.java
+++ b/src/main/java/org/apache/commons/collections/functors/TruePredicate.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Predicate;
 /**
  * Predicate implementation that always returns true.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -41,7 +41,7 @@ public final class TruePredicate<T> implements Predicate<T>, Serializable {
      * Factory returning the singleton instance.
      *
      * @return the singleton instance
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @SuppressWarnings("unchecked")
     public static <T> Predicate<T> truePredicate() {
diff --git a/src/main/java/org/apache/commons/collections/functors/UniquePredicate.java b/src/main/java/org/apache/commons/collections/functors/UniquePredicate.java
index 9003e6f36..1fad4d96f 100644
--- a/src/main/java/org/apache/commons/collections/functors/UniquePredicate.java
+++ b/src/main/java/org/apache/commons/collections/functors/UniquePredicate.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections.Predicate;
  * Predicate implementation that returns true the first time an object is
  * passed into the predicate.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/functors/WhileClosure.java b/src/main/java/org/apache/commons/collections/functors/WhileClosure.java
index 3ea500ed7..56d783f01 100644
--- a/src/main/java/org/apache/commons/collections/functors/WhileClosure.java
+++ b/src/main/java/org/apache/commons/collections/functors/WhileClosure.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.Predicate;
  * Closure implementation that executes a closure repeatedly until a condition is met,
  * like a do-while or while loop.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -94,7 +94,7 @@ public class WhileClosure<E> implements Closure<E>, Serializable {
      * Gets the predicate in use.
      * 
      * @return the predicate
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public Predicate<? super E> getPredicate() {
         return iPredicate;
@@ -104,7 +104,7 @@ public class WhileClosure<E> implements Closure<E>, Serializable {
      * Gets the closure.
      * 
      * @return the closure
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public Closure<? super E> getClosure() {
         return iClosure;
@@ -114,7 +114,7 @@ public class WhileClosure<E> implements Closure<E>, Serializable {
      * Is the loop a do-while loop.
      * 
      * @return true is do-while, false if while
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public boolean isDoLoop() {
         return iDoLoop;
diff --git a/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java b/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java
index b304d1590..6f0b89d34 100644
--- a/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyIterator.java
@@ -21,7 +21,7 @@ import java.util.NoSuchElementException;
 /** 
  * Provides an implementation of an empty iterator.
  *
- * @since Commons Collections 3.1
+ * @since 3.1
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyMapIterator.java b/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyMapIterator.java
index 741f1bd92..22bded1d4 100644
--- a/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyMapIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/AbstractEmptyMapIterator.java
@@ -19,11 +19,8 @@ package org.apache.commons.collections.iterators;
 /** 
  * Provides an implementation of an empty map iterator.
  *
- * @since Commons Collections 5
- * @version $Revision$
- *
- * @author Stephen Colebourne
- * @author Matt Benson
+ * @since 4.0
+ * @version $Id$
  */
 public abstract class AbstractEmptyMapIterator<K, V> extends AbstractEmptyIterator<K> {
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/AbstractIteratorDecorator.java b/src/main/java/org/apache/commons/collections/iterators/AbstractIteratorDecorator.java
index bbf33e617..23dd86cb1 100644
--- a/src/main/java/org/apache/commons/collections/iterators/AbstractIteratorDecorator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/AbstractIteratorDecorator.java
@@ -23,7 +23,7 @@ import java.util.Iterator;
  * <p>
  * All methods are forwarded to the decorated iterator.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author James Strachan
diff --git a/src/main/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java b/src/main/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java
index 32a440030..035d4ef1f 100644
--- a/src/main/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/AbstractListIteratorDecorator.java
@@ -23,7 +23,7 @@ import java.util.ListIterator;
  * <p>
  * All methods are forwarded to the decorated list iterator.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Rodney Waldhoff
diff --git a/src/main/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java b/src/main/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java
index d72545152..83d5a766e 100644
--- a/src/main/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/AbstractMapIteratorDecorator.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.MapIterator;
  * <p>
  * All methods are forwarded to the decorated map iterator.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java b/src/main/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java
index 611228d8e..d37167e8d 100644
--- a/src/main/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/AbstractOrderedMapIteratorDecorator.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.OrderedMapIterator;
  * <p>
  * All methods are forwarded to the decorated map iterator.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/iterators/AbstractUntypedIteratorDecorator.java b/src/main/java/org/apache/commons/collections/iterators/AbstractUntypedIteratorDecorator.java
index 4484efbe8..88c0077e5 100644
--- a/src/main/java/org/apache/commons/collections/iterators/AbstractUntypedIteratorDecorator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/AbstractUntypedIteratorDecorator.java
@@ -24,12 +24,8 @@ import java.util.Iterator;
  * <p>
  * All methods are forwarded to the decorated iterator.
  *
- * @since Commons Collections 5
- * @version $Revision$
- *
- * @author James Strachan
- * @author Stephen Colebourne
- * @author Matt Benson
+ * @since 4.0
+ * @version $Id$
  */
 public abstract class AbstractUntypedIteratorDecorator<I, O> implements Iterator<O> {
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/ArrayIterator.java b/src/main/java/org/apache/commons/collections/iterators/ArrayIterator.java
index d16feef8f..37b1a00d4 100644
--- a/src/main/java/org/apache/commons/collections/iterators/ArrayIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/ArrayIterator.java
@@ -32,7 +32,7 @@ import org.apache.commons.collections.ResettableIterator;
  * The iterator implements a {@link #reset} method, allowing the reset of 
  * the iterator back to the start if required.
  *
- * @since Commons Collections 1.0
+ * @since 1.0
  * @version $Revision$
  *
  * @author James Strachan
diff --git a/src/main/java/org/apache/commons/collections/iterators/ArrayListIterator.java b/src/main/java/org/apache/commons/collections/iterators/ArrayListIterator.java
index c56190ed4..26e976cae 100644
--- a/src/main/java/org/apache/commons/collections/iterators/ArrayListIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/ArrayListIterator.java
@@ -37,7 +37,7 @@ import org.apache.commons.collections.ResettableListIterator;
  * @see java.util.Iterator
  * @see java.util.ListIterator
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Neil O'Toole
diff --git a/src/main/java/org/apache/commons/collections/iterators/CollatingIterator.java b/src/main/java/org/apache/commons/collections/iterators/CollatingIterator.java
index 7b0fe9d25..84353d750 100644
--- a/src/main/java/org/apache/commons/collections/iterators/CollatingIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/CollatingIterator.java
@@ -35,7 +35,7 @@ import org.apache.commons.collections.list.UnmodifiableList;
  * <code>B</code>, the {@link #next} method on this iterator will return the
  * lesser of <code>A.next()</code> and <code>B.next()</code>.
  *
- * @since Commons Collections 2.1
+ * @since 2.1
  * @version $Revision$
  *
  * @author Rodney Waldhoff
diff --git a/src/main/java/org/apache/commons/collections/iterators/EmptyIterator.java b/src/main/java/org/apache/commons/collections/iterators/EmptyIterator.java
index 2d6a3fc58..fa09555bd 100644
--- a/src/main/java/org/apache/commons/collections/iterators/EmptyIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/EmptyIterator.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.ResettableIterator;
  * This class provides for binary compatability between Commons Collections
  * 2.1.1 and 3.1 due to issues with <code>IteratorUtils</code>.
  *
- * @since Commons Collections 2.1.1 and 3.1
+ * @since 2.1.1 and 3.1
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -36,13 +36,13 @@ public class EmptyIterator<E> extends AbstractEmptyIterator<E> implements Resett
 
     /**
      * Singleton instance of the iterator.
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public static final ResettableIterator<Object> RESETTABLE_INSTANCE = new EmptyIterator<Object>();
 
     /**
      * Singleton instance of the iterator.
-     * @since Commons Collections 2.1.1 and 3.1
+     * @since 2.1.1 and 3.1
      */
     public static final Iterator<Object> INSTANCE = RESETTABLE_INSTANCE;
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/EmptyListIterator.java b/src/main/java/org/apache/commons/collections/iterators/EmptyListIterator.java
index fd66a8dbf..cf0ef3bb0 100644
--- a/src/main/java/org/apache/commons/collections/iterators/EmptyListIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/EmptyListIterator.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.ResettableListIterator;
  * provides for binary compatability between Commons Collections 2.1.1 and 3.1
  * due to issues with <code>IteratorUtils</code>.
  *
- * @since Commons Collections 2.1.1 and 3.1
+ * @since 2.1.1 and 3.1
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -37,13 +37,13 @@ public class EmptyListIterator<E> extends AbstractEmptyIterator<E> implements
 
     /**
      * Singleton instance of the iterator.
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public static final ResettableListIterator<Object> RESETTABLE_INSTANCE = new EmptyListIterator<Object>();
 
     /**
      * Singleton instance of the iterator.
-     * @since Commons Collections 2.1.1 and 3.1
+     * @since 2.1.1 and 3.1
      */
     public static final ListIterator<Object> INSTANCE = RESETTABLE_INSTANCE;
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/EmptyMapIterator.java b/src/main/java/org/apache/commons/collections/iterators/EmptyMapIterator.java
index 6fe71fc3f..9fa247ef3 100644
--- a/src/main/java/org/apache/commons/collections/iterators/EmptyMapIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/EmptyMapIterator.java
@@ -22,7 +22,7 @@ import org.apache.commons.collections.ResettableIterator;
 /** 
  * Provides an implementation of an empty map iterator.
  *
- * @since Commons Collections 3.1
+ * @since 3.1
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -32,7 +32,7 @@ public class EmptyMapIterator<K, V> extends AbstractEmptyMapIterator<K, V> imple
 
     /**
      * Singleton instance of the iterator.
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public static final MapIterator<Object, Object> INSTANCE = new EmptyMapIterator<Object, Object>();
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/EmptyOrderedIterator.java b/src/main/java/org/apache/commons/collections/iterators/EmptyOrderedIterator.java
index 6457bc862..b6a9b0819 100644
--- a/src/main/java/org/apache/commons/collections/iterators/EmptyOrderedIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/EmptyOrderedIterator.java
@@ -22,7 +22,7 @@ import org.apache.commons.collections.ResettableIterator;
 /** 
  * Provides an implementation of an empty ordered iterator.
  *
- * @since Commons Collections 3.1
+ * @since 3.1
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -31,7 +31,7 @@ public class EmptyOrderedIterator<E> extends AbstractEmptyIterator<E> implements
 
     /**
      * Singleton instance of the iterator.
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public static final OrderedIterator<Object> INSTANCE = new EmptyOrderedIterator<Object>();
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/EmptyOrderedMapIterator.java b/src/main/java/org/apache/commons/collections/iterators/EmptyOrderedMapIterator.java
index c84c22810..51029ab7f 100644
--- a/src/main/java/org/apache/commons/collections/iterators/EmptyOrderedMapIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/EmptyOrderedMapIterator.java
@@ -22,7 +22,7 @@ import org.apache.commons.collections.ResettableIterator;
 /** 
  * Provides an implementation of an empty ordered map iterator.
  *
- * @since Commons Collections 3.1
+ * @since 3.1
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -32,7 +32,7 @@ public class EmptyOrderedMapIterator<K, V> extends AbstractEmptyMapIterator<K, V
 
     /**
      * Singleton instance of the iterator.
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public static final OrderedMapIterator<Object, Object> INSTANCE = new EmptyOrderedMapIterator<Object, Object>();
 
diff --git a/src/main/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java b/src/main/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java
index ed352f280..995f97f95 100644
--- a/src/main/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/EntrySetMapIterator.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.ResettableIterator;
  * }
  * </pre>
  *  
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/iterators/EnumerationIterator.java b/src/main/java/org/apache/commons/collections/iterators/EnumerationIterator.java
index b9c822703..31aab0a04 100644
--- a/src/main/java/org/apache/commons/collections/iterators/EnumerationIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/EnumerationIterator.java
@@ -24,7 +24,7 @@ import java.util.Iterator;
  * Adapter to make {@link Enumeration Enumeration} instances appear
  * to be {@link Iterator Iterator} instances.
  *
- * @since Commons Collections 1.0
+ * @since 1.0
  * @version $Revision$
  *
  * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
diff --git a/src/main/java/org/apache/commons/collections/iterators/FilterIterator.java b/src/main/java/org/apache/commons/collections/iterators/FilterIterator.java
index ff2cff5fc..d1397ee1c 100644
--- a/src/main/java/org/apache/commons/collections/iterators/FilterIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/FilterIterator.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.Predicate;
  * This iterator decorates the underlying iterator, only allowing through
  * those elements that match the specified {@link Predicate Predicate}.
  *
- * @since Commons Collections 1.0
+ * @since 1.0
  * @version $Revision$
  *
  * @author James Strachan
diff --git a/src/main/java/org/apache/commons/collections/iterators/FilterListIterator.java b/src/main/java/org/apache/commons/collections/iterators/FilterListIterator.java
index 1c51b2a21..1e84a44d0 100644
--- a/src/main/java/org/apache/commons/collections/iterators/FilterListIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/FilterListIterator.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.Predicate;
  * This iterator decorates the underlying iterator, only allowing through
  * those elements that match the specified {@link Predicate Predicate}.
  *
- * @since Commons Collections 2.0
+ * @since 2.0
  * @version $Revision$
  *
  * @author Rodney Waldhoff
diff --git a/src/main/java/org/apache/commons/collections/iterators/IteratorChain.java b/src/main/java/org/apache/commons/collections/iterators/IteratorChain.java
index 8057deaf0..7071d56d9 100644
--- a/src/main/java/org/apache/commons/collections/iterators/IteratorChain.java
+++ b/src/main/java/org/apache/commons/collections/iterators/IteratorChain.java
@@ -43,7 +43,7 @@ import org.apache.commons.collections.list.UnmodifiableList;
  * NOTE: As from version 3.0, the IteratorChain may contain no iterators. In
  * this case the class will function as an empty iterator.
  *
- * @since Commons Collections 2.1
+ * @since 2.1
  * @version $Revision$
  * 2006) $
  *
diff --git a/src/main/java/org/apache/commons/collections/iterators/IteratorEnumeration.java b/src/main/java/org/apache/commons/collections/iterators/IteratorEnumeration.java
index 3d1128081..f512e6a46 100644
--- a/src/main/java/org/apache/commons/collections/iterators/IteratorEnumeration.java
+++ b/src/main/java/org/apache/commons/collections/iterators/IteratorEnumeration.java
@@ -23,7 +23,7 @@ import java.util.Iterator;
  * Adapter to make an {@link Iterator Iterator} instance appear to be an
  * {@link Enumeration Enumeration} instance.
  *
- * @since Commons Collections 1.0
+ * @since 1.0
  * @version $Revision$
  *
  * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
diff --git a/src/main/java/org/apache/commons/collections/iterators/IteratorIterable.java b/src/main/java/org/apache/commons/collections/iterators/IteratorIterable.java
index 2b3ac269a..585627d89 100644
--- a/src/main/java/org/apache/commons/collections/iterators/IteratorIterable.java
+++ b/src/main/java/org/apache/commons/collections/iterators/IteratorIterable.java
@@ -57,7 +57,7 @@ import org.apache.commons.collections.ResettableIterator;
  * </pre>
  * </p>
  * 
- * @since Commons Collections 4.0
+ * @since 4.0
  * @version $Revision$
  */
 public class IteratorIterable<E> implements Iterable<E> {
diff --git a/src/main/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java b/src/main/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java
index e278776bf..692da75b4 100644
--- a/src/main/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java
+++ b/src/main/java/org/apache/commons/collections/iterators/ListIteratorWrapper.java
@@ -42,7 +42,7 @@ import org.apache.commons.collections.ResettableListIterator;
  * <p>
  * This class implements ResettableListIterator from Commons Collections 3.2.
  *
- * @since Commons Collections 2.1
+ * @since 2.1
  * @version $Revision$
  *
  * @author Morgan Delagrange
@@ -248,7 +248,7 @@ public class ListIteratorWrapper<E> implements ResettableListIterator<E> {
      * Resets this iterator back to the position at which the iterator
      * was created.
      *
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public void reset()  {
         if (iterator instanceof ListIterator) {
diff --git a/src/main/java/org/apache/commons/collections/iterators/LoopingIterator.java b/src/main/java/org/apache/commons/collections/iterators/LoopingIterator.java
index 8db1ef90c..d270916b9 100644
--- a/src/main/java/org/apache/commons/collections/iterators/LoopingIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/LoopingIterator.java
@@ -32,7 +32,7 @@ import org.apache.commons.collections.ResettableIterator;
  * Concurrent modifications are not directly supported, and for most collection
  * implementations will throw a ConcurrentModificationException. 
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author <a href="mailto:joncrlsn@users.sf.net">Jonathan Carlson</a>
diff --git a/src/main/java/org/apache/commons/collections/iterators/LoopingListIterator.java b/src/main/java/org/apache/commons/collections/iterators/LoopingListIterator.java
index 269841552..33dfa1f55 100644
--- a/src/main/java/org/apache/commons/collections/iterators/LoopingListIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/LoopingListIterator.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.ResettableListIterator;
  * collection implementations will throw a
  * ConcurrentModificationException.
  *
- * @since Commons Collections 3.2
+ * @since 3.2
  * @version $Revision$
  *
  * @author Eric Crampton <ccesc@eonomine.com>
diff --git a/src/main/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java b/src/main/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java
index e21503111..aa0890919 100644
--- a/src/main/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/ObjectArrayIterator.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.ResettableIterator;
  * The iterator implements a {@link #reset} method, allowing the reset of the iterator
  * back to the start if required.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author James Strachan
diff --git a/src/main/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java b/src/main/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java
index 2dde6e2b3..b5e7a5eff 100644
--- a/src/main/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/ObjectArrayListIterator.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.ResettableListIterator;
  * @see java.util.Iterator
  * @see java.util.ListIterator
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Neil O'Toole
diff --git a/src/main/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java b/src/main/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java
index c03f3bc96..34e8dd3da 100644
--- a/src/main/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/ObjectGraphIterator.java
@@ -70,7 +70,7 @@ import org.apache.commons.collections.Transformer;
  * Under many circumstances, linking Iterators together in this manner is
  * more efficient (and convenient) than using nested for loops to extract a list.
  *
- * @since Commons Collections 3.1
+ * @since 3.1
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/iterators/ReverseListIterator.java b/src/main/java/org/apache/commons/collections/iterators/ReverseListIterator.java
index 2f2ecada2..49348753c 100644
--- a/src/main/java/org/apache/commons/collections/iterators/ReverseListIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/ReverseListIterator.java
@@ -35,7 +35,7 @@ import org.apache.commons.collections.ResettableListIterator;
  *
  * @author Serge Knystautas
  * @author Stephen Colebourne
- * @since Commons Collections 3.2
+ * @since 3.2
  * @version $Revision$
  */
 public class ReverseListIterator<E> implements ResettableListIterator<E> {
diff --git a/src/main/java/org/apache/commons/collections/iterators/SingletonIterator.java b/src/main/java/org/apache/commons/collections/iterators/SingletonIterator.java
index 706f4048e..10d0eb6f7 100644
--- a/src/main/java/org/apache/commons/collections/iterators/SingletonIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/SingletonIterator.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.ResettableIterator;
  * <code>SingletonIterator</code> is an {@link Iterator} over a single 
  * object instance.
  *
- * @since Commons Collections 2.0
+ * @since 2.0
  * @version $Revision$
  *
  * @author James Strachan
@@ -60,7 +60,7 @@ public class SingletonIterator<E>
      *
      * @param object  the single object to return from the iterator
      * @param removeAllowed  true if remove is allowed
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public SingletonIterator(E object, boolean removeAllowed) {
         super();
diff --git a/src/main/java/org/apache/commons/collections/iterators/SingletonListIterator.java b/src/main/java/org/apache/commons/collections/iterators/SingletonListIterator.java
index 4166a343a..cdd7303ad 100644
--- a/src/main/java/org/apache/commons/collections/iterators/SingletonListIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/SingletonListIterator.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.ResettableListIterator;
  * <code>SingletonIterator</code> is an {@link ListIterator} over a single 
  * object instance.
  *
- * @since Commons Collections 2.1
+ * @since 2.1
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/iterators/TransformIterator.java b/src/main/java/org/apache/commons/collections/iterators/TransformIterator.java
index e4211ad17..4d0ee4612 100644
--- a/src/main/java/org/apache/commons/collections/iterators/TransformIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/TransformIterator.java
@@ -23,7 +23,7 @@ import org.apache.commons.collections.Transformer;
 /** 
  * Decorates an iterator such that each element returned is transformed.
  *
- * @since Commons Collections 1.0
+ * @since 1.0
  * @version $Revision$
  *
  * @author James Strachan
diff --git a/src/main/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java b/src/main/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java
index e6c81c608..898de79e8 100644
--- a/src/main/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/UniqueFilterIterator.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.functors.UniquePredicate;
  * the Iterator maintains a Set of objects it has already encountered,
  * and duplicate Objects are skipped.
  *
- * @since Commons Collections 2.1
+ * @since 2.1
  * @version $Revision$
  *
  * @author Morgan Delagrange
diff --git a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java b/src/main/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java
index 54803a20c..99744df6a 100644
--- a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/UnmodifiableIterator.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.Unmodifiable;
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException. 
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java b/src/main/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java
index 5fe0b8b58..330977b32 100644
--- a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/UnmodifiableListIterator.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.Unmodifiable;
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException. 
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java b/src/main/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java
index 47f142060..2a5403b9f 100644
--- a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/UnmodifiableMapIterator.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.Unmodifiable;
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException. 
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java b/src/main/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java
index c3558448e..fa95db522 100644
--- a/src/main/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java
+++ b/src/main/java/org/apache/commons/collections/iterators/UnmodifiableOrderedMapIterator.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.Unmodifiable;
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException. 
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java b/src/main/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java
index baf0d4a72..de7a9d197 100644
--- a/src/main/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java
+++ b/src/main/java/org/apache/commons/collections/keyvalue/AbstractKeyValue.java
@@ -22,7 +22,7 @@ import org.apache.commons.collections.KeyValue;
  * Abstract pair class to assist with creating <code>KeyValue</code>
  * and {@link java.util.Map.Entry Map.Entry} implementations.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public abstract class AbstractKeyValue<K, V> implements KeyValue<K, V> {
diff --git a/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java b/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java
index 87133794c..4a27a2f67 100644
--- a/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java
+++ b/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntry.java
@@ -22,7 +22,7 @@ import java.util.Map;
  * Abstract Pair class to assist with creating correct
  * {@link java.util.Map.Entry Map.Entry} implementations.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public abstract class AbstractMapEntry<K, V> extends AbstractKeyValue<K, V> implements Map.Entry<K, V> {
diff --git a/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java b/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java
index 34aab85f3..9725f29c1 100644
--- a/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java
+++ b/src/main/java/org/apache/commons/collections/keyvalue/AbstractMapEntryDecorator.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.KeyValue;
  * Provides a base decorator that allows additional functionality to be
  * added to a {@link java.util.Map.Entry Map.Entry}.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public abstract class AbstractMapEntryDecorator<K, V> implements Map.Entry<K, V>, KeyValue<K, V> {
diff --git a/src/main/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java b/src/main/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java
index b6afcb2b2..40540e09e 100644
--- a/src/main/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java
+++ b/src/main/java/org/apache/commons/collections/keyvalue/DefaultKeyValue.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.KeyValue;
  * Note that a <code>DefaultKeyValue</code> instance may not contain
  * itself as a key or value.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class DefaultKeyValue<K, V> extends AbstractKeyValue<K, V> {
diff --git a/src/main/java/org/apache/commons/collections/keyvalue/DefaultMapEntry.java b/src/main/java/org/apache/commons/collections/keyvalue/DefaultMapEntry.java
index e6b488fe8..a23d4d3ed 100644
--- a/src/main/java/org/apache/commons/collections/keyvalue/DefaultMapEntry.java
+++ b/src/main/java/org/apache/commons/collections/keyvalue/DefaultMapEntry.java
@@ -24,7 +24,7 @@ import org.apache.commons.collections.KeyValue;
  * A restricted implementation of {@link Map.Entry} that prevents
  * the {@link Map.Entry} contract from being broken.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public final class DefaultMapEntry<K, V> extends AbstractMapEntry<K, V> {
diff --git a/src/main/java/org/apache/commons/collections/keyvalue/MultiKey.java b/src/main/java/org/apache/commons/collections/keyvalue/MultiKey.java
index f20ddf7e8..b80a78aca 100644
--- a/src/main/java/org/apache/commons/collections/keyvalue/MultiKey.java
+++ b/src/main/java/org/apache/commons/collections/keyvalue/MultiKey.java
@@ -39,7 +39,7 @@ import java.util.Arrays;
  * String localizedText = (String) map.get(multiKey);
  * </pre>
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class MultiKey<K> implements Serializable {
@@ -152,7 +152,7 @@ public class MultiKey<K> implements Serializable {
      * @param keys  the array of keys, not null
      * @param makeClone  true to clone the array, false to assign it
      * @throws IllegalArgumentException if the key array is null
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public MultiKey(K[] keys, boolean makeClone) {
         super();
@@ -190,7 +190,7 @@ public class MultiKey<K> implements Serializable {
      * @param index  the index to retrieve
      * @return the key at the index
      * @throws IndexOutOfBoundsException if the index is invalid
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public K getKey(int index) {
         return keys[index];
@@ -200,7 +200,7 @@ public class MultiKey<K> implements Serializable {
      * Gets the size of the list of keys.
      * 
      * @return the size of the list of keys
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public int size() {
         return keys.length;
diff --git a/src/main/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java b/src/main/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java
index 6b0cff0f9..6a018f5ef 100644
--- a/src/main/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java
+++ b/src/main/java/org/apache/commons/collections/keyvalue/TiedMapEntry.java
@@ -27,7 +27,7 @@ import org.apache.commons.collections.KeyValue;
  * This can be used to enable a map entry to make changes on the underlying
  * map, however this will probably mess up any iterators.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class TiedMapEntry<K, V> implements Map.Entry<K, V>, KeyValue<K, V>, Serializable {
diff --git a/src/main/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java b/src/main/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java
index dcf532a54..02a2fc386 100644
--- a/src/main/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java
+++ b/src/main/java/org/apache/commons/collections/keyvalue/UnmodifiableMapEntry.java
@@ -25,7 +25,7 @@ import org.apache.commons.collections.Unmodifiable;
  * A {@link java.util.Map.Entry Map.Entry} that throws
  * UnsupportedOperationException when <code>setValue</code> is called.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public final class UnmodifiableMapEntry<K, V> extends AbstractMapEntry<K, V> implements Unmodifiable {
diff --git a/src/main/java/org/apache/commons/collections/list/AbstractLinkedList.java b/src/main/java/org/apache/commons/collections/list/AbstractLinkedList.java
index f87e08bb0..f139f823e 100644
--- a/src/main/java/org/apache/commons/collections/list/AbstractLinkedList.java
+++ b/src/main/java/org/apache/commons/collections/list/AbstractLinkedList.java
@@ -38,7 +38,7 @@ import org.apache.commons.collections.OrderedIterator;
  * nodes are added to and removed. Hopefully, all you need for unusual subclasses
  * is here.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public abstract class AbstractLinkedList<E> implements List<E> {
@@ -640,7 +640,7 @@ public abstract class AbstractLinkedList<E> implements List<E> {
          * Gets the value of the node.
          *
          * @return the value
-         * @since Commons Collections 3.1
+         * @since 3.1
          */
         protected E getValue() {
             return value;
@@ -650,7 +650,7 @@ public abstract class AbstractLinkedList<E> implements List<E> {
          * Sets the value of the node.
          *
          * @param value  the value
-         * @since Commons Collections 3.1
+         * @since 3.1
          */
         protected void setValue(E value) {
             this.value = value;
@@ -660,7 +660,7 @@ public abstract class AbstractLinkedList<E> implements List<E> {
          * Gets the previous node.
          *
          * @return the previous node
-         * @since Commons Collections 3.1
+         * @since 3.1
          */
         protected Node<E> getPreviousNode() {
             return previous;
@@ -670,7 +670,7 @@ public abstract class AbstractLinkedList<E> implements List<E> {
          * Sets the previous node.
          *
          * @param previous  the previous node
-         * @since Commons Collections 3.1
+         * @since 3.1
          */
         protected void setPreviousNode(Node<E> previous) {
             this.previous = previous;
@@ -680,7 +680,7 @@ public abstract class AbstractLinkedList<E> implements List<E> {
          * Gets the next node.
          *
          * @return the next node
-         * @since Commons Collections 3.1
+         * @since 3.1
          */
         protected Node<E> getNextNode() {
             return next;
@@ -690,7 +690,7 @@ public abstract class AbstractLinkedList<E> implements List<E> {
          * Sets the next node.
          *
          * @param next  the next node
-         * @since Commons Collections 3.1
+         * @since 3.1
          */
         protected void setNextNode(Node<E> next) {
             this.next = next;
diff --git a/src/main/java/org/apache/commons/collections/list/AbstractListDecorator.java b/src/main/java/org/apache/commons/collections/list/AbstractListDecorator.java
index 35a7e0030..f7659c158 100644
--- a/src/main/java/org/apache/commons/collections/list/AbstractListDecorator.java
+++ b/src/main/java/org/apache/commons/collections/list/AbstractListDecorator.java
@@ -28,7 +28,7 @@ import org.apache.commons.collections.collection.AbstractCollectionDecorator;
  * Methods are forwarded directly to the decorated list.
  *
  * @param <E> the type of the elements in the list
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public abstract class AbstractListDecorator<E> extends AbstractCollectionDecorator<E>
@@ -39,7 +39,7 @@ public abstract class AbstractListDecorator<E> extends AbstractCollectionDecorat
 
     /**
      * Constructor only used in deserialization, do not use otherwise.
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     protected AbstractListDecorator() {
         super();
diff --git a/src/main/java/org/apache/commons/collections/list/AbstractSerializableListDecorator.java b/src/main/java/org/apache/commons/collections/list/AbstractSerializableListDecorator.java
index 20fadb671..7067b40d0 100644
--- a/src/main/java/org/apache/commons/collections/list/AbstractSerializableListDecorator.java
+++ b/src/main/java/org/apache/commons/collections/list/AbstractSerializableListDecorator.java
@@ -26,7 +26,7 @@ import java.util.List;
 /**
  * Serializable subclass of AbstractListDecorator.
  *
- * @since Commons Collections 3.1
+ * @since 3.1
  * @version $Id$
  */
 public abstract class AbstractSerializableListDecorator<E>
diff --git a/src/main/java/org/apache/commons/collections/list/CursorableLinkedList.java b/src/main/java/org/apache/commons/collections/list/CursorableLinkedList.java
index 4c0602e19..2672af2a2 100644
--- a/src/main/java/org/apache/commons/collections/list/CursorableLinkedList.java
+++ b/src/main/java/org/apache/commons/collections/list/CursorableLinkedList.java
@@ -52,7 +52,7 @@ import java.util.ListIterator;
  * <b>Note that this implementation is not synchronized.</b>
  *
  * @see java.util.LinkedList
- * @since Commons Collections 1.0
+ * @since 1.0
  * @version $Id$
  */
 public class CursorableLinkedList<E> extends AbstractLinkedList<E> implements Serializable {
@@ -567,7 +567,7 @@ public class CursorableLinkedList<E> extends AbstractLinkedList<E> implements Se
     /**
      * A cursor for the sublist based on LinkedSubListIterator.
      *
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     protected static class SubCursor<E> extends Cursor<E> {
 
diff --git a/src/main/java/org/apache/commons/collections/list/FixedSizeList.java b/src/main/java/org/apache/commons/collections/list/FixedSizeList.java
index 1a4af5918..d350b12ca 100644
--- a/src/main/java/org/apache/commons/collections/list/FixedSizeList.java
+++ b/src/main/java/org/apache/commons/collections/list/FixedSizeList.java
@@ -33,7 +33,7 @@ import org.apache.commons.collections.iterators.UnmodifiableIterator;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class FixedSizeList<E>
diff --git a/src/main/java/org/apache/commons/collections/list/GrowthList.java b/src/main/java/org/apache/commons/collections/list/GrowthList.java
index e061dfa2a..76e8c3183 100644
--- a/src/main/java/org/apache/commons/collections/list/GrowthList.java
+++ b/src/main/java/org/apache/commons/collections/list/GrowthList.java
@@ -49,7 +49,7 @@ import java.util.List;
  * can be used together by decorating twice.
  *
  * @see LazyList
- * @since Commons Collections 3.2
+ * @since 3.2
  * @version $Id$
  */
 public class GrowthList<E> extends AbstractSerializableListDecorator<E> {
diff --git a/src/main/java/org/apache/commons/collections/list/LazyList.java b/src/main/java/org/apache/commons/collections/list/LazyList.java
index c6c17e32d..8544111a4 100644
--- a/src/main/java/org/apache/commons/collections/list/LazyList.java
+++ b/src/main/java/org/apache/commons/collections/list/LazyList.java
@@ -54,7 +54,7 @@ import org.apache.commons.collections.Factory;
  * This class is Serializable from Commons Collections 3.1.
  *
  * @see GrowthList
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class LazyList<E> extends AbstractSerializableListDecorator<E> {
diff --git a/src/main/java/org/apache/commons/collections/list/NodeCachingLinkedList.java b/src/main/java/org/apache/commons/collections/list/NodeCachingLinkedList.java
index 3ed2f96a2..8ed116fc9 100644
--- a/src/main/java/org/apache/commons/collections/list/NodeCachingLinkedList.java
+++ b/src/main/java/org/apache/commons/collections/list/NodeCachingLinkedList.java
@@ -36,7 +36,7 @@ import java.util.Collection;
  * <p>
  * <b>Note that this implementation is not synchronized.</b>
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class NodeCachingLinkedList<E> extends AbstractLinkedList<E> implements Serializable {
diff --git a/src/main/java/org/apache/commons/collections/list/PredicatedList.java b/src/main/java/org/apache/commons/collections/list/PredicatedList.java
index 409b6b484..859f895b8 100644
--- a/src/main/java/org/apache/commons/collections/list/PredicatedList.java
+++ b/src/main/java/org/apache/commons/collections/list/PredicatedList.java
@@ -37,7 +37,7 @@ import java.util.ListIterator;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class PredicatedList<E> extends PredicatedCollection<E> implements List<E> {
diff --git a/src/main/java/org/apache/commons/collections/list/SetUniqueList.java b/src/main/java/org/apache/commons/collections/list/SetUniqueList.java
index eba89ffdc..9e0d5d27f 100644
--- a/src/main/java/org/apache/commons/collections/list/SetUniqueList.java
+++ b/src/main/java/org/apache/commons/collections/list/SetUniqueList.java
@@ -44,7 +44,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class SetUniqueList<E> extends AbstractSerializableListDecorator<E> {
diff --git a/src/main/java/org/apache/commons/collections/list/SynchronizedList.java b/src/main/java/org/apache/commons/collections/list/SynchronizedList.java
index 83863d86e..f60a30e17 100644
--- a/src/main/java/org/apache/commons/collections/list/SynchronizedList.java
+++ b/src/main/java/org/apache/commons/collections/list/SynchronizedList.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.collection.SynchronizedCollection;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class SynchronizedList<E> extends SynchronizedCollection<E> implements List<E> {
diff --git a/src/main/java/org/apache/commons/collections/list/TransformedList.java b/src/main/java/org/apache/commons/collections/list/TransformedList.java
index a5ee52f85..0bc7ce6b0 100644
--- a/src/main/java/org/apache/commons/collections/list/TransformedList.java
+++ b/src/main/java/org/apache/commons/collections/list/TransformedList.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.iterators.AbstractListIteratorDecorator;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class TransformedList<E> extends TransformedCollection<E> implements List<E> {
@@ -73,7 +73,7 @@ public class TransformedList<E> extends TransformedCollection<E> implements List
      * @param transformer  the transformer to use for conversion, must not be null
      * @return a new transformed List
      * @throws IllegalArgumentException if list or transformer is null
-     * @since Commons Collections 3.3
+     * @since 3.3
      */
     public static <E> TransformedList<E> transformedList(List<E> list,
                                                          Transformer<? super E, ? extends E> transformer) {
diff --git a/src/main/java/org/apache/commons/collections/list/TreeList.java b/src/main/java/org/apache/commons/collections/list/TreeList.java
index 5d19fb706..5f93effa7 100644
--- a/src/main/java/org/apache/commons/collections/list/TreeList.java
+++ b/src/main/java/org/apache/commons/collections/list/TreeList.java
@@ -50,7 +50,7 @@ import org.apache.commons.collections.OrderedIterator;
  * <code>TreeList</code> is almost always a good replacement for it, although it
  * does use slightly more memory.
  *
- * @since Commons Collections 3.1
+ * @since 3.1
  * @version $Id$
  */
 public class TreeList<E> extends AbstractList<E> {
diff --git a/src/main/java/org/apache/commons/collections/list/UnmodifiableList.java b/src/main/java/org/apache/commons/collections/list/UnmodifiableList.java
index f764daec4..6e81a59db 100644
--- a/src/main/java/org/apache/commons/collections/list/UnmodifiableList.java
+++ b/src/main/java/org/apache/commons/collections/list/UnmodifiableList.java
@@ -32,7 +32,7 @@ import org.apache.commons.collections.iterators.UnmodifiableListIterator;
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException. 
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public final class UnmodifiableList<E>
diff --git a/src/main/java/org/apache/commons/collections/map/AbstractHashedMap.java b/src/main/java/org/apache/commons/collections/map/AbstractHashedMap.java
index b8cf04eac..d7dcbd855 100644
--- a/src/main/java/org/apache/commons/collections/map/AbstractHashedMap.java
+++ b/src/main/java/org/apache/commons/collections/map/AbstractHashedMap.java
@@ -52,7 +52,7 @@ import org.apache.commons.collections.iterators.EmptyMapIterator;
  * This is to provide backwards compatibility for ReferenceMap between v3.0 and v3.1.
  * This extends clause will be removed in v4.0.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author java util HashMap
@@ -698,7 +698,7 @@ public class AbstractHashedMap<K, V> extends AbstractMap<K, V> implements Iterab
      * @param entry  the entry to query, must not be null
      * @return the <code>next</code> field of the entry
      * @throws NullPointerException if the entry is null
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     protected HashEntry<K, V> entryNext(HashEntry<K, V> entry) {
         return entry.next;
@@ -711,7 +711,7 @@ public class AbstractHashedMap<K, V> extends AbstractMap<K, V> implements Iterab
      * @param entry  the entry to query, must not be null
      * @return the <code>hashCode</code> field of the entry
      * @throws NullPointerException if the entry is null
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     protected int entryHashCode(HashEntry<K, V> entry) {
         return entry.hashCode;
@@ -724,7 +724,7 @@ public class AbstractHashedMap<K, V> extends AbstractMap<K, V> implements Iterab
      * @param entry  the entry to query, must not be null
      * @return the <code>key</code> field of the entry
      * @throws NullPointerException if the entry is null
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     protected K entryKey(HashEntry<K, V> entry) {
         return entry.getKey();
@@ -737,7 +737,7 @@ public class AbstractHashedMap<K, V> extends AbstractMap<K, V> implements Iterab
      * @param entry  the entry to query, must not be null
      * @return the <code>value</code> field of the entry
      * @throws NullPointerException if the entry is null
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     protected V entryValue(HashEntry<K, V> entry) {
         return entry.getValue();
diff --git a/src/main/java/org/apache/commons/collections/map/AbstractInputCheckedMapDecorator.java b/src/main/java/org/apache/commons/collections/map/AbstractInputCheckedMapDecorator.java
index 41983eab7..ee7895524 100644
--- a/src/main/java/org/apache/commons/collections/map/AbstractInputCheckedMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections/map/AbstractInputCheckedMapDecorator.java
@@ -39,7 +39,7 @@ import org.apache.commons.collections.set.AbstractSetDecorator;
  * This class is package-scoped, and may be withdrawn or replaced in future
  * versions of Commons Collections.
  *
- * @since Commons Collections 3.1
+ * @since 3.1
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/map/AbstractIterableMap.java b/src/main/java/org/apache/commons/collections/map/AbstractIterableMap.java
index 2c32f2e23..679bfdaf9 100644
--- a/src/main/java/org/apache/commons/collections/map/AbstractIterableMap.java
+++ b/src/main/java/org/apache/commons/collections/map/AbstractIterableMap.java
@@ -21,11 +21,9 @@ import org.apache.commons.collections.MapIterator;
 
 /**
  * Provide a basic {@link IterableMap} implementation.
- * @since Commons Collections 5
- * TODO fix version
- * @version $Revision$
  *
- * @author Matt Benson
+ * @since 4.0
+ * @version $Id$
  */
 public abstract class AbstractIterableMap<K, V> implements IterableMap<K, V> {
 
diff --git a/src/main/java/org/apache/commons/collections/map/AbstractLinkedMap.java b/src/main/java/org/apache/commons/collections/map/AbstractLinkedMap.java
index 7b068b57c..e79496753 100644
--- a/src/main/java/org/apache/commons/collections/map/AbstractLinkedMap.java
+++ b/src/main/java/org/apache/commons/collections/map/AbstractLinkedMap.java
@@ -56,7 +56,7 @@ import org.apache.commons.collections.iterators.EmptyOrderedMapIterator;
  * The implementation is also designed to be subclassed, with lots of useful
  * methods exposed.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author java util LinkedHashMap
@@ -315,7 +315,7 @@ public abstract class AbstractLinkedMap<K, V> extends AbstractHashedMap<K, V> im
      * @param entry  the entry to query, must not be null
      * @return the <code>before</code> field of the entry
      * @throws NullPointerException if the entry is null
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     protected LinkEntry<K, V> entryBefore(LinkEntry<K, V> entry) {
         return entry.before;
@@ -328,7 +328,7 @@ public abstract class AbstractLinkedMap<K, V> extends AbstractHashedMap<K, V> im
      * @param entry  the entry to query, must not be null
      * @return the <code>after</code> field of the entry
      * @throws NullPointerException if the entry is null
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     protected LinkEntry<K, V> entryAfter(LinkEntry<K, V> entry) {
         return entry.after;
diff --git a/src/main/java/org/apache/commons/collections/map/AbstractMapDecorator.java b/src/main/java/org/apache/commons/collections/map/AbstractMapDecorator.java
index 03dbbcf81..0fc520e1e 100644
--- a/src/main/java/org/apache/commons/collections/map/AbstractMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections/map/AbstractMapDecorator.java
@@ -35,7 +35,7 @@ import java.util.Set;
  *
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Daniel Rall
@@ -48,7 +48,7 @@ public abstract class AbstractMapDecorator<K, V> extends AbstractIterableMap<K,
 
     /**
      * Constructor only used in deserialization, do not use otherwise.
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     protected AbstractMapDecorator() {
         super();
diff --git a/src/main/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java b/src/main/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java
index 8e6a81624..f923d2a0e 100644
--- a/src/main/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections/map/AbstractOrderedMapDecorator.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.OrderedMapIterator;
  * it would provide a loophole around the validation.
  * But, you might want that loophole, so this class is kept simple.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -41,7 +41,7 @@ public abstract class AbstractOrderedMapDecorator<K, V> extends AbstractMapDecor
 
     /**
      * Constructor only used in deserialization, do not use otherwise.
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     protected AbstractOrderedMapDecorator() {
         super();
diff --git a/src/main/java/org/apache/commons/collections/map/AbstractReferenceMap.java b/src/main/java/org/apache/commons/collections/map/AbstractReferenceMap.java
index 24e763985..e592e3c5e 100644
--- a/src/main/java/org/apache/commons/collections/map/AbstractReferenceMap.java
+++ b/src/main/java/org/apache/commons/collections/map/AbstractReferenceMap.java
@@ -76,7 +76,7 @@ import org.apache.commons.collections.keyvalue.DefaultMapEntry;
  * provide synchronized access to a <code>ReferenceMap</code>.
  *
  * @see java.lang.ref.Reference
- * @since Commons Collections 3.1 (extracted from ReferenceMap in 3.0)
+ * @since 3.1 (extracted from ReferenceMap in 3.0)
  * @version $Revision$
  *
  * @author Paul Jack
@@ -589,7 +589,7 @@ public abstract class AbstractReferenceMap<K, V> extends AbstractHashedMap<K, V>
      * If getKey() or getValue() returns null, it means
      * the mapping is stale and should be removed.
      *
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     protected static class ReferenceEntry<K, V> extends HashEntry<K, V> {
         /** The parent map */
diff --git a/src/main/java/org/apache/commons/collections/map/AbstractSortedMapDecorator.java b/src/main/java/org/apache/commons/collections/map/AbstractSortedMapDecorator.java
index a6f09d63e..4278f3aab 100644
--- a/src/main/java/org/apache/commons/collections/map/AbstractSortedMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections/map/AbstractSortedMapDecorator.java
@@ -41,7 +41,7 @@ import org.apache.commons.collections.iterators.ListIteratorWrapper;
  *
  * @param <K> the type of the keys in the map
  * @param <V> the type of the values in the map
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -51,7 +51,7 @@ public abstract class AbstractSortedMapDecorator<K, V> extends AbstractMapDecora
 
     /**
      * Constructor only used in deserialization, do not use otherwise.
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     protected AbstractSortedMapDecorator() {
         super();
diff --git a/src/main/java/org/apache/commons/collections/map/CaseInsensitiveMap.java b/src/main/java/org/apache/commons/collections/map/CaseInsensitiveMap.java
index 1e361ed2e..378068ca3 100644
--- a/src/main/java/org/apache/commons/collections/map/CaseInsensitiveMap.java
+++ b/src/main/java/org/apache/commons/collections/map/CaseInsensitiveMap.java
@@ -57,7 +57,7 @@ import java.util.Map;
  * using {@link java.util.Collections#synchronizedMap(Map)}. This class may throw 
  * exceptions when accessed by concurrent threads without synchronization.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Commons-Collections team
diff --git a/src/main/java/org/apache/commons/collections/map/CompositeMap.java b/src/main/java/org/apache/commons/collections/map/CompositeMap.java
index 93af46924..ae2d631a5 100644
--- a/src/main/java/org/apache/commons/collections/map/CompositeMap.java
+++ b/src/main/java/org/apache/commons/collections/map/CompositeMap.java
@@ -39,7 +39,7 @@ import org.apache.commons.collections.set.CompositeSet;
  * using {@link java.util.Collections#synchronizedMap(Map)}. This class may throw
  * exceptions when accessed by concurrent threads without synchronization.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Brian McCallister
diff --git a/src/main/java/org/apache/commons/collections/map/DefaultedMap.java b/src/main/java/org/apache/commons/collections/map/DefaultedMap.java
index b0d743f00..887e2712a 100644
--- a/src/main/java/org/apache/commons/collections/map/DefaultedMap.java
+++ b/src/main/java/org/apache/commons/collections/map/DefaultedMap.java
@@ -56,7 +56,7 @@ import org.apache.commons.collections.functors.FactoryTransformer;
  * using {@link java.util.Collections#synchronizedMap(Map)}. This class may throw 
  * exceptions when accessed by concurrent threads without synchronization.
  *
- * @since Commons Collections 3.2
+ * @since 3.2
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/map/EntrySetToMapIteratorAdapter.java b/src/main/java/org/apache/commons/collections/map/EntrySetToMapIteratorAdapter.java
index 431023abc..db5a9eb7b 100644
--- a/src/main/java/org/apache/commons/collections/map/EntrySetToMapIteratorAdapter.java
+++ b/src/main/java/org/apache/commons/collections/map/EntrySetToMapIteratorAdapter.java
@@ -26,11 +26,8 @@ import org.apache.commons.collections.ResettableIterator;
 /**
  * Adapts a Map entrySet to the MapIterator interface.
  *
- * @since Commons Collections 5
- * TODO fix version
- * @version $Revision$
- *
- * @author Matt Benson
+ * @since 4.0
+ * @version $Id$
  */
 public class EntrySetToMapIteratorAdapter<K, V> implements MapIterator<K, V>, ResettableIterator<K> {
     /** The adapted Map entry Set. */
diff --git a/src/main/java/org/apache/commons/collections/map/FixedSizeMap.java b/src/main/java/org/apache/commons/collections/map/FixedSizeMap.java
index cccd9068a..be7dd5b92 100644
--- a/src/main/java/org/apache/commons/collections/map/FixedSizeMap.java
+++ b/src/main/java/org/apache/commons/collections/map/FixedSizeMap.java
@@ -49,7 +49,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -89,7 +89,7 @@ public class FixedSizeMap<K, V>
      * 
      * @param out  the output stream
      * @throws IOException
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     private void writeObject(ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -102,7 +102,7 @@ public class FixedSizeMap<K, V>
      * @param in  the input stream
      * @throws IOException
      * @throws ClassNotFoundException
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @SuppressWarnings("unchecked") // (1) should only fail if input stream is incorrect 
     private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
diff --git a/src/main/java/org/apache/commons/collections/map/FixedSizeSortedMap.java b/src/main/java/org/apache/commons/collections/map/FixedSizeSortedMap.java
index 6111867e5..58ab9fd17 100644
--- a/src/main/java/org/apache/commons/collections/map/FixedSizeSortedMap.java
+++ b/src/main/java/org/apache/commons/collections/map/FixedSizeSortedMap.java
@@ -51,7 +51,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/map/Flat3Map.java b/src/main/java/org/apache/commons/collections/map/Flat3Map.java
index 0be9cdd97..2894c7722 100644
--- a/src/main/java/org/apache/commons/collections/map/Flat3Map.java
+++ b/src/main/java/org/apache/commons/collections/map/Flat3Map.java
@@ -67,7 +67,7 @@ import org.apache.commons.collections.iterators.EmptyMapIterator;
  * using {@link java.util.Collections#synchronizedMap(Map)}. This class may throw
  * exceptions when accessed by concurrent threads without synchronization.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -384,7 +384,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl
      * would be poor choices.
      *
      * @return a new AbstractHashedMap or subclass
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     protected AbstractHashedMap<K, V> createDelegateMap() {
         return new HashedMap<K, V>();
@@ -1045,7 +1045,7 @@ public class Flat3Map<K, V> implements IterableMap<K, V>, Serializable, Cloneabl
      * Clones the map without cloning the keys or values.
      *
      * @return a shallow clone
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @Override
     @SuppressWarnings("unchecked")
diff --git a/src/main/java/org/apache/commons/collections/map/HashedMap.java b/src/main/java/org/apache/commons/collections/map/HashedMap.java
index d6c87b072..af5b29e73 100644
--- a/src/main/java/org/apache/commons/collections/map/HashedMap.java
+++ b/src/main/java/org/apache/commons/collections/map/HashedMap.java
@@ -36,7 +36,7 @@ import java.util.Map;
  * using {@link java.util.Collections#synchronizedMap(Map)}. This class may throw
  * exceptions when accessed by concurrent threads without synchronization.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/map/IdentityMap.java b/src/main/java/org/apache/commons/collections/map/IdentityMap.java
index a6fb06854..52c88c272 100644
--- a/src/main/java/org/apache/commons/collections/map/IdentityMap.java
+++ b/src/main/java/org/apache/commons/collections/map/IdentityMap.java
@@ -37,7 +37,7 @@ import java.util.Map;
  * using {@link java.util.Collections#synchronizedMap(Map)}. This class may throw
  * exceptions when accessed by concurrent threads without synchronization.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author java util HashMap
diff --git a/src/main/java/org/apache/commons/collections/map/LRUMap.java b/src/main/java/org/apache/commons/collections/map/LRUMap.java
index 596125e4f..086123de5 100644
--- a/src/main/java/org/apache/commons/collections/map/LRUMap.java
+++ b/src/main/java/org/apache/commons/collections/map/LRUMap.java
@@ -54,7 +54,7 @@ import org.apache.commons.collections.BoundedMap;
  * using {@link java.util.Collections#synchronizedMap(Map)}. This class may throw
  * <code>NullPointerException</code>'s when accessed by concurrent threads.
  *
- * @since Commons Collections 3.0 (previously in main package v1.0)
+ * @since 3.0 (previously in main package v1.0)
  * @version $Revision$
  *
  * @author James Strachan
@@ -99,7 +99,7 @@ public class LRUMap<K, V>
      * @param maxSize  the maximum size of the map
      * @param scanUntilRemovable  scan until a removeable entry is found, default false
      * @throws IllegalArgumentException if the maximum size is less than one
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public LRUMap(int maxSize, boolean scanUntilRemovable) {
         this(maxSize, DEFAULT_LOAD_FACTOR, scanUntilRemovable);
@@ -127,7 +127,7 @@ public class LRUMap<K, V>
      * @param scanUntilRemovable  scan until a removeable entry is found, default false
      * @throws IllegalArgumentException if the maximum size is less than one
      * @throws IllegalArgumentException if the load factor is less than zero
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public LRUMap(int maxSize, float loadFactor, boolean scanUntilRemovable) {
         super((maxSize < 1 ? DEFAULT_CAPACITY : maxSize), loadFactor);
@@ -160,7 +160,7 @@ public class LRUMap<K, V>
      * @param scanUntilRemovable  scan until a removeable entry is found, default false
      * @throws NullPointerException if the map is null
      * @throws IllegalArgumentException if the map is empty
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public LRUMap(Map<K, V> map, boolean scanUntilRemovable) {
         this(map.size(), DEFAULT_LOAD_FACTOR, scanUntilRemovable);
@@ -395,7 +395,7 @@ public class LRUMap<K, V>
      * map is full.
      *
      * @return true if this map scans
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public boolean isScanUntilRemovable() {
         return scanUntilRemovable;
diff --git a/src/main/java/org/apache/commons/collections/map/LazyMap.java b/src/main/java/org/apache/commons/collections/map/LazyMap.java
index 2b9a7c528..8d5b877ce 100644
--- a/src/main/java/org/apache/commons/collections/map/LazyMap.java
+++ b/src/main/java/org/apache/commons/collections/map/LazyMap.java
@@ -56,7 +56,7 @@ import org.apache.commons.collections.functors.FactoryTransformer;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -129,7 +129,7 @@ public class LazyMap<K, V> extends AbstractMapDecorator<K, V> implements Map<K,
      * 
      * @param out  the output stream
      * @throws IOException
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     private void writeObject(ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -142,7 +142,7 @@ public class LazyMap<K, V> extends AbstractMapDecorator<K, V> implements Map<K,
      * @param in  the input stream
      * @throws IOException
      * @throws ClassNotFoundException
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @SuppressWarnings("unchecked")
     private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
diff --git a/src/main/java/org/apache/commons/collections/map/LazySortedMap.java b/src/main/java/org/apache/commons/collections/map/LazySortedMap.java
index e2910833a..380363dc7 100644
--- a/src/main/java/org/apache/commons/collections/map/LazySortedMap.java
+++ b/src/main/java/org/apache/commons/collections/map/LazySortedMap.java
@@ -52,7 +52,7 @@ import org.apache.commons.collections.Transformer;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/map/LinkedMap.java b/src/main/java/org/apache/commons/collections/map/LinkedMap.java
index 7a3930e65..6a84b9b78 100644
--- a/src/main/java/org/apache/commons/collections/map/LinkedMap.java
+++ b/src/main/java/org/apache/commons/collections/map/LinkedMap.java
@@ -57,7 +57,7 @@ import org.apache.commons.collections.list.UnmodifiableList;
  * using {@link java.util.Collections#synchronizedMap(Map)}. This class may throw 
  * exceptions when accessed by concurrent threads without synchronization.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/map/ListOrderedMap.java b/src/main/java/org/apache/commons/collections/map/ListOrderedMap.java
index 4236ea2a4..72d8e952a 100644
--- a/src/main/java/org/apache/commons/collections/map/ListOrderedMap.java
+++ b/src/main/java/org/apache/commons/collections/map/ListOrderedMap.java
@@ -71,7 +71,7 @@ import org.apache.commons.collections.list.UnmodifiableList;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -105,7 +105,7 @@ public class ListOrderedMap<K, V>
      * Constructs a new empty <code>ListOrderedMap</code> that decorates
      * a <code>HashMap</code>.
      * 
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public ListOrderedMap() {
         this(new HashMap<K, V>());
@@ -128,7 +128,7 @@ public class ListOrderedMap<K, V>
      * 
      * @param out  the output stream
      * @throws IOException
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     private void writeObject(ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -141,7 +141,7 @@ public class ListOrderedMap<K, V>
      * @param in  the input stream
      * @throws IOException
      * @throws ClassNotFoundException
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @SuppressWarnings("unchecked") // (1) should only fail if input stream is incorrect 
     private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
@@ -288,7 +288,7 @@ public class ListOrderedMap<K, V>
      *
      * @see #keySet()
      * @return the unmodifiable list view over the keys
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public List<K> keyList() {
         return UnmodifiableList.unmodifiableList(insertOrder);
@@ -318,7 +318,7 @@ public class ListOrderedMap<K, V>
      *
      * @see #values()
      * @return the partially modifiable list view over the values
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public List<V> valueList() {
         return new ValuesView<V>(this);
@@ -405,7 +405,7 @@ public class ListOrderedMap<K, V>
      * @param index  the index of the value to set
      * @return the previous value at that index
      * @throws IndexOutOfBoundsException if the index is invalid
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public V setValue(int index, V value) {
         K key = insertOrder.get(index);
@@ -429,7 +429,7 @@ public class ListOrderedMap<K, V>
      * @param value  the value
      * @return the value previously mapped to the key
      * @throws IndexOutOfBoundsException if the index is out of range
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public V put(int index, K key, V value) {
         Map<K, V> m = decorated();
diff --git a/src/main/java/org/apache/commons/collections/map/MultiKeyMap.java b/src/main/java/org/apache/commons/collections/map/MultiKeyMap.java
index 8551c7ed4..1bbe98d0d 100644
--- a/src/main/java/org/apache/commons/collections/map/MultiKeyMap.java
+++ b/src/main/java/org/apache/commons/collections/map/MultiKeyMap.java
@@ -69,7 +69,7 @@ import org.apache.commons.collections.keyvalue.MultiKey;
  * appropriate synchronization. This class may throw exceptions when accessed
  * by concurrent threads without synchronization.
  *
- * @since Commons Collections 3.1
+ * @since 3.1
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/map/MultiValueMap.java b/src/main/java/org/apache/commons/collections/map/MultiValueMap.java
index a6ec79217..e762f2534 100644
--- a/src/main/java/org/apache/commons/collections/map/MultiValueMap.java
+++ b/src/main/java/org/apache/commons/collections/map/MultiValueMap.java
@@ -65,7 +65,7 @@ import org.apache.commons.collections.iterators.IteratorChain;
  * @author Julien Buret
  * @author Serhiy Yevtushenko
  * @version $Revision$
- * @since Commons Collections 3.2
+ * @since 3.2
  */
 public class MultiValueMap<K, V> extends AbstractMapDecorator<K, Object> implements MultiMap<K, V>, Serializable {
 
@@ -144,7 +144,7 @@ public class MultiValueMap<K, V> extends AbstractMapDecorator<K, Object> impleme
      * 
      * @param out  the output stream
      * @throws IOException
-     * @since Commons Collections 3.3
+     * @since 3.3
      */
     private void writeObject(ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -157,7 +157,7 @@ public class MultiValueMap<K, V> extends AbstractMapDecorator<K, Object> impleme
      * @param in  the input stream
      * @throws IOException
      * @throws ClassNotFoundException
-     * @since Commons Collections 3.3
+     * @since 3.3
      */
     @SuppressWarnings("unchecked") // (1) should only fail if input stream is incorrect 
     private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
diff --git a/src/main/java/org/apache/commons/collections/map/PredicatedMap.java b/src/main/java/org/apache/commons/collections/map/PredicatedMap.java
index c250b785b..105acf338 100644
--- a/src/main/java/org/apache/commons/collections/map/PredicatedMap.java
+++ b/src/main/java/org/apache/commons/collections/map/PredicatedMap.java
@@ -44,7 +44,7 @@ import org.apache.commons.collections.Predicate;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -107,7 +107,7 @@ public class PredicatedMap<K, V>
      * 
      * @param out  the output stream
      * @throws IOException
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     private void writeObject(ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -120,7 +120,7 @@ public class PredicatedMap<K, V>
      * @param in  the input stream
      * @throws IOException
      * @throws ClassNotFoundException
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @SuppressWarnings("unchecked") // (1) should only fail if input stream is incorrect 
     private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
@@ -150,7 +150,7 @@ public class PredicatedMap<K, V>
      * 
      * @param value  the value to validate
      * @throws IllegalArgumentException if invalid
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @Override
     protected V checkSetValue(V value) {
@@ -164,7 +164,7 @@ public class PredicatedMap<K, V>
      * Override to only return true when there is a value transformer.
      * 
      * @return true if a value predicate is in use
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @Override
     protected boolean isSetValueChecking() {
diff --git a/src/main/java/org/apache/commons/collections/map/PredicatedSortedMap.java b/src/main/java/org/apache/commons/collections/map/PredicatedSortedMap.java
index a3f2fbff8..e5594fc13 100644
--- a/src/main/java/org/apache/commons/collections/map/PredicatedSortedMap.java
+++ b/src/main/java/org/apache/commons/collections/map/PredicatedSortedMap.java
@@ -40,7 +40,7 @@ import org.apache.commons.collections.Predicate;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/map/ReferenceIdentityMap.java b/src/main/java/org/apache/commons/collections/map/ReferenceIdentityMap.java
index 24726fd3a..e04733b27 100644
--- a/src/main/java/org/apache/commons/collections/map/ReferenceIdentityMap.java
+++ b/src/main/java/org/apache/commons/collections/map/ReferenceIdentityMap.java
@@ -65,7 +65,7 @@ import java.lang.ref.Reference;
  *
  * @see java.lang.ref.Reference
  *
- * @since Commons Collections 3.0 (previously in main package v2.1)
+ * @since 3.0 (previously in main package v2.1)
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/map/ReferenceMap.java b/src/main/java/org/apache/commons/collections/map/ReferenceMap.java
index d4759cc51..993cea948 100644
--- a/src/main/java/org/apache/commons/collections/map/ReferenceMap.java
+++ b/src/main/java/org/apache/commons/collections/map/ReferenceMap.java
@@ -67,7 +67,7 @@ import java.io.Serializable;
  *
  * @see java.lang.ref.Reference
  *
- * @since Commons Collections 3.0 (previously in main package v2.1)
+ * @since 3.0 (previously in main package v2.1)
  * @version $Revision$
  *
  * @author Paul Jack
diff --git a/src/main/java/org/apache/commons/collections/map/SingletonMap.java b/src/main/java/org/apache/commons/collections/map/SingletonMap.java
index de6bbe5da..55ea59d3f 100644
--- a/src/main/java/org/apache/commons/collections/map/SingletonMap.java
+++ b/src/main/java/org/apache/commons/collections/map/SingletonMap.java
@@ -53,7 +53,7 @@ import org.apache.commons.collections.keyvalue.TiedMapEntry;
  * <li>the <code>KeyValue</code> interface (just cast - no object creation)
  * </ul>
  *
- * @since Commons Collections 3.1
+ * @since 3.1
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/map/StaticBucketMap.java b/src/main/java/org/apache/commons/collections/map/StaticBucketMap.java
index ff866a829..8e1e985ee 100644
--- a/src/main/java/org/apache/commons/collections/map/StaticBucketMap.java
+++ b/src/main/java/org/apache/commons/collections/map/StaticBucketMap.java
@@ -90,7 +90,7 @@ import org.apache.commons.collections.KeyValue;
  * iterations, or if you can make your own guarantees about how bulk 
  * operations will affect the map.<p>
  *
- * @since Commons Collections 3.0 (previously in main package v2.1)
+ * @since 3.0 (previously in main package v2.1)
  * @version $Revision$
  *
  * @author Berin Loritsch
diff --git a/src/main/java/org/apache/commons/collections/map/TransformedMap.java b/src/main/java/org/apache/commons/collections/map/TransformedMap.java
index b0174ee3a..5574b1299 100644
--- a/src/main/java/org/apache/commons/collections/map/TransformedMap.java
+++ b/src/main/java/org/apache/commons/collections/map/TransformedMap.java
@@ -42,7 +42,7 @@ import org.apache.commons.collections.Transformer;
  * <p>
  * @see org.apache.commons.collections.splitmap.TransformedMap
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -89,7 +89,7 @@ public class TransformedMap<K, V>
      * @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
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public static <K, V> TransformedMap<K, V> transformedMap(Map<K, V> map,
             Transformer<? super K, ? extends K> keyTransformer,
@@ -128,7 +128,7 @@ public class TransformedMap<K, V>
      *
      * @param out  the output stream
      * @throws IOException
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     private void writeObject(ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -141,7 +141,7 @@ public class TransformedMap<K, V>
      * @param in  the input stream
      * @throws IOException
      * @throws ClassNotFoundException
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @SuppressWarnings("unchecked") // (1) should only fail if input stream is incorrect 
     private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
@@ -206,7 +206,7 @@ public class TransformedMap<K, V>
      *
      * @param value  the value to transform
      * @return the transformed value
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @Override
     protected V checkSetValue(V value) {
@@ -217,7 +217,7 @@ public class TransformedMap<K, V>
      * Override to only return true when there is a value transformer.
      *
      * @return true if a value transformer is in use
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @Override
     protected boolean isSetValueChecking() {
diff --git a/src/main/java/org/apache/commons/collections/map/TransformedSortedMap.java b/src/main/java/org/apache/commons/collections/map/TransformedSortedMap.java
index adc9c9ab0..33fd7a664 100644
--- a/src/main/java/org/apache/commons/collections/map/TransformedSortedMap.java
+++ b/src/main/java/org/apache/commons/collections/map/TransformedSortedMap.java
@@ -38,7 +38,7 @@ import org.apache.commons.collections.Transformer;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -80,7 +80,7 @@ public class TransformedSortedMap<K, V>
      * @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
-     * @since Commons Collections 3.2
+     * @since 3.2
      */
     public static <K, V> TransformedSortedMap<K, V> transformedSortedMap(SortedMap<K, V> map,
             Transformer<? super K, ? extends K> keyTransformer,
diff --git a/src/main/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java b/src/main/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java
index 60ee1998d..654a7c1d8 100644
--- a/src/main/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java
+++ b/src/main/java/org/apache/commons/collections/map/UnmodifiableEntrySet.java
@@ -32,7 +32,7 @@ import org.apache.commons.collections.set.AbstractSetDecorator;
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException. 
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
diff --git a/src/main/java/org/apache/commons/collections/map/UnmodifiableMap.java b/src/main/java/org/apache/commons/collections/map/UnmodifiableMap.java
index 939856e26..a8e232666 100644
--- a/src/main/java/org/apache/commons/collections/map/UnmodifiableMap.java
+++ b/src/main/java/org/apache/commons/collections/map/UnmodifiableMap.java
@@ -39,7 +39,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException. 
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -81,7 +81,7 @@ public final class UnmodifiableMap<K, V>
      * 
      * @param out  the output stream
      * @throws IOException
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     private void writeObject(ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -94,7 +94,7 @@ public final class UnmodifiableMap<K, V>
      * @param in  the input stream
      * @throws IOException
      * @throws ClassNotFoundException
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @SuppressWarnings("unchecked")
     private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
diff --git a/src/main/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java b/src/main/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java
index af0c57874..fcc641cf1 100644
--- a/src/main/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java
+++ b/src/main/java/org/apache/commons/collections/map/UnmodifiableOrderedMap.java
@@ -38,7 +38,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException. 
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -79,7 +79,7 @@ public final class UnmodifiableOrderedMap<K, V> extends AbstractOrderedMapDecora
      * 
      * @param out  the output stream
      * @throws IOException
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     private void writeObject(ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -92,7 +92,7 @@ public final class UnmodifiableOrderedMap<K, V> extends AbstractOrderedMapDecora
      * @param in  the input stream
      * @throws IOException
      * @throws ClassNotFoundException
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @SuppressWarnings("unchecked") // (1) should only fail if input stream is incorrect 
     private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
diff --git a/src/main/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java b/src/main/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java
index 77dc9dac9..1286be863 100644
--- a/src/main/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java
+++ b/src/main/java/org/apache/commons/collections/map/UnmodifiableSortedMap.java
@@ -37,7 +37,7 @@ import org.apache.commons.collections.set.UnmodifiableSet;
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException. 
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Revision$
  *
  * @author Stephen Colebourne
@@ -79,7 +79,7 @@ public final class UnmodifiableSortedMap<K, V>
      * 
      * @param out  the output stream
      * @throws IOException
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     private void writeObject(ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -92,7 +92,7 @@ public final class UnmodifiableSortedMap<K, V>
      * @param in  the input stream
      * @throws IOException
      * @throws ClassNotFoundException
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @SuppressWarnings("unchecked")
     private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
diff --git a/src/main/java/org/apache/commons/collections/set/AbstractSerializableSetDecorator.java b/src/main/java/org/apache/commons/collections/set/AbstractSerializableSetDecorator.java
index fd4862756..e4d329bf6 100644
--- a/src/main/java/org/apache/commons/collections/set/AbstractSerializableSetDecorator.java
+++ b/src/main/java/org/apache/commons/collections/set/AbstractSerializableSetDecorator.java
@@ -26,7 +26,7 @@ import java.util.Set;
 /**
  * Serializable subclass of AbstractSetDecorator.
  *
- * @since Commons Collections 3.1
+ * @since 3.1
  * @version $Id$
  */
 public abstract class AbstractSerializableSetDecorator<E>
diff --git a/src/main/java/org/apache/commons/collections/set/AbstractSetDecorator.java b/src/main/java/org/apache/commons/collections/set/AbstractSetDecorator.java
index 59a8174e8..0ac866144 100644
--- a/src/main/java/org/apache/commons/collections/set/AbstractSetDecorator.java
+++ b/src/main/java/org/apache/commons/collections/set/AbstractSetDecorator.java
@@ -26,7 +26,7 @@ import org.apache.commons.collections.collection.AbstractCollectionDecorator;
  * Methods are forwarded directly to the decorated set.
  *
  * @param <E> the type of the elements in the set
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public abstract class AbstractSetDecorator<E> extends AbstractCollectionDecorator<E> implements
@@ -37,7 +37,7 @@ public abstract class AbstractSetDecorator<E> extends AbstractCollectionDecorato
 
     /**
      * Constructor only used in deserialization, do not use otherwise.
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     protected AbstractSetDecorator() {
         super();
diff --git a/src/main/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java b/src/main/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java
index 8cbd8918c..220824201 100644
--- a/src/main/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java
+++ b/src/main/java/org/apache/commons/collections/set/AbstractSortedSetDecorator.java
@@ -26,7 +26,7 @@ import java.util.SortedSet;
  * Methods are forwarded directly to the decorated set.
  *
  * @param <E> the type of the elements in the sorted set
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public abstract class AbstractSortedSetDecorator<E>
@@ -38,7 +38,7 @@ public abstract class AbstractSortedSetDecorator<E>
 
     /**
      * Constructor only used in deserialization, do not use otherwise.
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     protected AbstractSortedSetDecorator() {
         super();
diff --git a/src/main/java/org/apache/commons/collections/set/CompositeSet.java b/src/main/java/org/apache/commons/collections/set/CompositeSet.java
index 43750442c..68f434e7c 100644
--- a/src/main/java/org/apache/commons/collections/set/CompositeSet.java
+++ b/src/main/java/org/apache/commons/collections/set/CompositeSet.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.collection.CompositeCollection;
  * Add operations require the use of a pluggable strategy.
  * If no strategy is provided then add is unsupported.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class CompositeSet<E> extends CompositeCollection<E> implements Set<E> {
diff --git a/src/main/java/org/apache/commons/collections/set/ListOrderedSet.java b/src/main/java/org/apache/commons/collections/set/ListOrderedSet.java
index 6815302e0..8e284cfe4 100644
--- a/src/main/java/org/apache/commons/collections/set/ListOrderedSet.java
+++ b/src/main/java/org/apache/commons/collections/set/ListOrderedSet.java
@@ -46,7 +46,7 @@ import org.apache.commons.collections.list.UnmodifiableList;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class ListOrderedSet<E> extends AbstractSerializableSetDecorator<E> implements Set<E> {
@@ -68,7 +68,7 @@ public class ListOrderedSet<E> extends AbstractSerializableSetDecorator<E> imple
      * @return a new ordered set
      * @throws IllegalArgumentException if set or list is null
      * @throws IllegalArgumentException if either the set or list is not empty
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public static <E> ListOrderedSet<E> listOrderedSet(Set<E> set, List<E> list) {
         if (set == null) {
@@ -125,7 +125,7 @@ public class ListOrderedSet<E> extends AbstractSerializableSetDecorator<E> imple
      * Constructs a new empty <code>ListOrderedSet</code> using
      * a <code>HashSet</code> and an <code>ArrayList</code> internally.
      *
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     public ListOrderedSet() {
         super(new HashSet<E>());
diff --git a/src/main/java/org/apache/commons/collections/set/MapBackedSet.java b/src/main/java/org/apache/commons/collections/set/MapBackedSet.java
index d1567c002..8a38ece21 100644
--- a/src/main/java/org/apache/commons/collections/set/MapBackedSet.java
+++ b/src/main/java/org/apache/commons/collections/set/MapBackedSet.java
@@ -32,7 +32,7 @@ import java.util.Set;
  * Most map implementation can be used to create a set by passing in dummy values.
  * Exceptions include <code>BidiMap</code> implementations, as they require unique values.
  *
- * @since Commons Collections 3.1
+ * @since 3.1
  * @version $Id$
  */
 public final class MapBackedSet<E, V> implements Set<E>, Serializable {
diff --git a/src/main/java/org/apache/commons/collections/set/PredicatedSet.java b/src/main/java/org/apache/commons/collections/set/PredicatedSet.java
index 2f59faa8a..2eda13ca2 100644
--- a/src/main/java/org/apache/commons/collections/set/PredicatedSet.java
+++ b/src/main/java/org/apache/commons/collections/set/PredicatedSet.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.collection.PredicatedCollection;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class PredicatedSet<E> extends PredicatedCollection<E> implements Set<E> {
diff --git a/src/main/java/org/apache/commons/collections/set/PredicatedSortedSet.java b/src/main/java/org/apache/commons/collections/set/PredicatedSortedSet.java
index 0fd59d568..79c736834 100644
--- a/src/main/java/org/apache/commons/collections/set/PredicatedSortedSet.java
+++ b/src/main/java/org/apache/commons/collections/set/PredicatedSortedSet.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.Predicate;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class PredicatedSortedSet<E> extends PredicatedSet<E> implements SortedSet<E> {
diff --git a/src/main/java/org/apache/commons/collections/set/SynchronizedSet.java b/src/main/java/org/apache/commons/collections/set/SynchronizedSet.java
index 3b912fb45..7060d127c 100644
--- a/src/main/java/org/apache/commons/collections/set/SynchronizedSet.java
+++ b/src/main/java/org/apache/commons/collections/set/SynchronizedSet.java
@@ -28,7 +28,7 @@ import org.apache.commons.collections.collection.SynchronizedCollection;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class SynchronizedSet<E> extends SynchronizedCollection<E> implements Set<E> {
diff --git a/src/main/java/org/apache/commons/collections/set/SynchronizedSortedSet.java b/src/main/java/org/apache/commons/collections/set/SynchronizedSortedSet.java
index a898f6c50..baad6c40d 100644
--- a/src/main/java/org/apache/commons/collections/set/SynchronizedSortedSet.java
+++ b/src/main/java/org/apache/commons/collections/set/SynchronizedSortedSet.java
@@ -29,7 +29,7 @@ import org.apache.commons.collections.collection.SynchronizedCollection;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class SynchronizedSortedSet<E> extends SynchronizedCollection<E> implements SortedSet<E> {
diff --git a/src/main/java/org/apache/commons/collections/set/TransformedSet.java b/src/main/java/org/apache/commons/collections/set/TransformedSet.java
index 2f71977d8..0dcf3a469 100644
--- a/src/main/java/org/apache/commons/collections/set/TransformedSet.java
+++ b/src/main/java/org/apache/commons/collections/set/TransformedSet.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.collection.TransformedCollection;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class TransformedSet<E> extends TransformedCollection<E> implements Set<E> {
@@ -69,7 +69,7 @@ public class TransformedSet<E> extends TransformedCollection<E> implements Set<E
      * @param transformer  the transformer to use for conversion, must not be null
      * @return a new transformed set
      * @throws IllegalArgumentException if set or transformer is null
-     * @since Commons Collections 3.3
+     * @since 3.3
      */
     public static <E> Set<E> transformedSet(Set<E> set, Transformer<? super E, ? extends E> transformer) {
         TransformedSet<E> decorated = new TransformedSet<E>(set, transformer);
diff --git a/src/main/java/org/apache/commons/collections/set/TransformedSortedSet.java b/src/main/java/org/apache/commons/collections/set/TransformedSortedSet.java
index deb0293d9..58d26fa0d 100644
--- a/src/main/java/org/apache/commons/collections/set/TransformedSortedSet.java
+++ b/src/main/java/org/apache/commons/collections/set/TransformedSortedSet.java
@@ -31,7 +31,7 @@ import org.apache.commons.collections.Transformer;
  * <p>
  * This class is Serializable from Commons Collections 3.1.
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public class TransformedSortedSet<E> extends TransformedSet<E> implements SortedSet<E> {
@@ -70,7 +70,7 @@ public class TransformedSortedSet<E> extends TransformedSet<E> implements Sorted
      * @param transformer  the transformer to use for conversion, must not be null
      * @return a new transformed {@link SortedSet}
      * @throws IllegalArgumentException if set or transformer is null
-     * @since Commons Collections 3.3
+     * @since 3.3
      */
     public static <E> TransformedSortedSet<E> transformedSortedSet(SortedSet<E> set,
                                                                    Transformer<? super E, ? extends E> transformer) {
diff --git a/src/main/java/org/apache/commons/collections/set/UnmodifiableSet.java b/src/main/java/org/apache/commons/collections/set/UnmodifiableSet.java
index 62f7db432..8e73710be 100644
--- a/src/main/java/org/apache/commons/collections/set/UnmodifiableSet.java
+++ b/src/main/java/org/apache/commons/collections/set/UnmodifiableSet.java
@@ -30,7 +30,7 @@ import org.apache.commons.collections.iterators.UnmodifiableIterator;
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException. 
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public final class UnmodifiableSet<E>
diff --git a/src/main/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java b/src/main/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java
index 074014854..ae5a853fa 100644
--- a/src/main/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java
+++ b/src/main/java/org/apache/commons/collections/set/UnmodifiableSortedSet.java
@@ -34,7 +34,7 @@ import org.apache.commons.collections.iterators.UnmodifiableIterator;
  * <p>
  * Attempts to modify it will result in an UnsupportedOperationException. 
  *
- * @since Commons Collections 3.0
+ * @since 3.0
  * @version $Id$
  */
 public final class UnmodifiableSortedSet<E>
diff --git a/src/main/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java b/src/main/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java
index 1cf2a5f53..48e2bd699 100644
--- a/src/main/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java
+++ b/src/main/java/org/apache/commons/collections/splitmap/AbstractIterableGetMapDecorator.java
@@ -28,7 +28,7 @@ import org.apache.commons.collections.map.EntrySetToMapIteratorAdapter;
  * {@link IterableGet} that uses a {@link Map}<K, V> for the
  * {@link org.apache.commons.collections.Get Get}<K, V> implementation.
  *
- * @since Commons Collections 4.0
+ * @since 4.0
  * @version $Id$
  */
 public class AbstractIterableGetMapDecorator<K, V> implements IterableGet<K, V> {
diff --git a/src/main/java/org/apache/commons/collections/splitmap/TransformedMap.java b/src/main/java/org/apache/commons/collections/splitmap/TransformedMap.java
index 398d6677c..aa68a8283 100644
--- a/src/main/java/org/apache/commons/collections/splitmap/TransformedMap.java
+++ b/src/main/java/org/apache/commons/collections/splitmap/TransformedMap.java
@@ -52,7 +52,7 @@ import org.apache.commons.collections.map.LinkedMap;
  * but is intended to be worked with either directly or by {@link Put} and {@link Get}
  * generalizations.
  *
- * @since Commons Collections 4.0
+ * @since 4.0
  * @version $Id$
  *
  * @see SplitMapUtils#readableMap(Get)
@@ -133,7 +133,7 @@ public class TransformedMap<J, K, U, V> extends AbstractIterableGetMapDecorator<
      * @param in the input stream
      * @throws IOException
      * @throws ClassNotFoundException
-     * @since Commons Collections 3.1
+     * @since 3.1
      */
     @SuppressWarnings("unchecked") // (1) should only fail if input stream is incorrect 
     private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {