diff --git a/src/main/java/org/apache/commons/collections4/Get.java b/src/main/java/org/apache/commons/collections4/Get.java
index cc09ef4d5..61663a9c4 100644
--- a/src/main/java/org/apache/commons/collections4/Get.java
+++ b/src/main/java/org/apache/commons/collections4/Get.java
@@ -32,7 +32,7 @@ public interface Get<K, V> {
 
     /**
      * @param key key whose presence in this map is to be tested
-     * @return <tt>true</tt> if this map contains a mapping for the specified
+     * @return <code>true</code> if this map contains a mapping for the specified
      *         key
      * @see java.util.Map#containsKey(Object)
      */
@@ -40,7 +40,7 @@ public interface Get<K, V> {
 
     /**
      * @param value value whose presence in this map is to be tested
-     * @return <tt>true</tt> if this map maps one or more keys to the
+     * @return <code>true</code> if this map maps one or more keys to the
      *         specified value
      * @see java.util.Map#containsValue(Object)
      */
@@ -62,14 +62,14 @@ public interface Get<K, V> {
 
     /**
      * @param key key whose mapping is to be removed from the map
-     * @return the previous value associated with <tt>key</tt>, or
-     *         <tt>null</tt> if there was no mapping for <tt>key</tt>.
+     * @return the previous value associated with <code>key</code>, or
+     *         <code>null</tt> if there was no mapping for <tt>key</code>.
      * @see java.util.Map#remove(Object)
      */
     V remove(Object key);
 
     /**
-     * @return <tt>true</tt> if this map contains no key-value mappings
+     * @return <code>true</code> if this map contains no key-value mappings
      * @see java.util.Map#isEmpty()
      */
     boolean isEmpty();
diff --git a/src/main/java/org/apache/commons/collections4/MultiSet.java b/src/main/java/org/apache/commons/collections4/MultiSet.java
index 982768f0e..835eb6305 100644
--- a/src/main/java/org/apache/commons/collections4/MultiSet.java
+++ b/src/main/java/org/apache/commons/collections4/MultiSet.java
@@ -240,7 +240,7 @@ public interface MultiSet<E> extends Collection<E> {
          * and the two entries represent the same element with the same
          * number of occurrences.
          * <p>
-         * More formally, two entries <tt>e1</tt> and <tt>e2</tt> represent
+         * More formally, two entries <code>e1</tt> and <tt>e2</code> represent
          * the same mapping if
          * <pre>
          *     (e1.getElement()==null ? e2.getElement()==null
@@ -257,7 +257,7 @@ public interface MultiSet<E> extends Collection<E> {
         /**
          * Returns the hash code value for this multiset entry.
          * <p>
-         * The hash code of a multiset entry <tt>e</tt> is defined to be:
+         * The hash code of a multiset entry <code>e</code> is defined to be:
          * <pre>
          *      (e==null ? 0 : e.hashCode()) ^ noOccurances)
          * </pre>
diff --git a/src/main/java/org/apache/commons/collections4/Put.java b/src/main/java/org/apache/commons/collections4/Put.java
index 8d86832a0..ed0ec1788 100644
--- a/src/main/java/org/apache/commons/collections4/Put.java
+++ b/src/main/java/org/apache/commons/collections4/Put.java
@@ -46,11 +46,11 @@ public interface Put<K, V> {
      *
      * @param key key with which the specified value is to be associated
      * @param value value to be associated with the specified key
-     * @return the previous value associated with <tt>key</tt>, or
-     *         <tt>null</tt> if there was no mapping for <tt>key</tt>.
-     *         (A <tt>null</tt> return can also indicate that the map
-     *         previously associated <tt>null</tt> with <tt>key</tt>,
-     *         if the implementation supports <tt>null</tt> values.)
+     * @return the previous value associated with <code>key</code>, or
+     *         <code>null</tt> if there was no mapping for <tt>key</code>.
+     *         (A <code>null</code> return can also indicate that the map
+     *         previously associated <code>null</tt> with <tt>key</code>,
+     *         if the implementation supports <code>null</code> values.)
      * @see Map#put(Object, Object)
      */
     Object put(K key, V value);