diff --git a/src/main/java/org/apache/commons/lang3/Conversion.java b/src/main/java/org/apache/commons/lang3/Conversion.java
index d177cc49c..0427deede 100644
--- a/src/main/java/org/apache/commons/lang3/Conversion.java
+++ b/src/main/java/org/apache/commons/lang3/Conversion.java
@@ -60,7 +60,7 @@ import java.util.UUID;
  * so far.
  * </p>
  *
- * @since Lang 3.2
+ * @since 3.2
  */
 
 public class Conversion {
diff --git a/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java b/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java
index 95e299257..29f163e8a 100644
--- a/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java
+++ b/src/main/java/org/apache/commons/lang3/exception/ExceptionUtils.java
@@ -274,7 +274,7 @@ public class ExceptionUtils {
      *
      * @param throwable  the throwable to inspect, may be null
      * @return the list of throwables, never null
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public static List<Throwable> getThrowableList(Throwable throwable) {
         final List<Throwable> list = new ArrayList<>();
@@ -659,7 +659,7 @@ public class ExceptionUtils {
      *
      * @param th  the throwable to get a message for, null returns empty string
      * @return the message, non-null
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public static String getMessage(final Throwable th) {
         if (th == null) {
@@ -679,7 +679,7 @@ public class ExceptionUtils {
      *
      * @param th  the throwable to get a message for, null returns empty string
      * @return the message, non-null
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public static String getRootCauseMessage(final Throwable th) {
         Throwable root = ExceptionUtils.getRootCause(th);
diff --git a/src/main/java/org/apache/commons/lang3/mutable/MutableByte.java b/src/main/java/org/apache/commons/lang3/mutable/MutableByte.java
index 0d07749ee..fa8853c42 100644
--- a/src/main/java/org/apache/commons/lang3/mutable/MutableByte.java
+++ b/src/main/java/org/apache/commons/lang3/mutable/MutableByte.java
@@ -113,7 +113,7 @@ public class MutableByte extends Number implements Comparable<MutableByte>, Muta
     /**
      * Increments the value.
      *
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void increment() {
         value++;
@@ -147,7 +147,7 @@ public class MutableByte extends Number implements Comparable<MutableByte>, Muta
     /**
      * Decrements the value.
      *
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void decrement() {
         value--;
@@ -183,7 +183,7 @@ public class MutableByte extends Number implements Comparable<MutableByte>, Muta
      * Adds a value to the value of this instance.
      *
      * @param operand  the value to add, not null
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void add(final byte operand) {
         this.value += operand;
@@ -194,7 +194,7 @@ public class MutableByte extends Number implements Comparable<MutableByte>, Muta
      *
      * @param operand  the value to add, not null
      * @throws NullPointerException if the object is null
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void add(final Number operand) {
         this.value += operand.byteValue();
@@ -204,7 +204,7 @@ public class MutableByte extends Number implements Comparable<MutableByte>, Muta
      * Subtracts a value from the value of this instance.
      *
      * @param operand  the value to subtract, not null
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void subtract(final byte operand) {
         this.value -= operand;
@@ -215,7 +215,7 @@ public class MutableByte extends Number implements Comparable<MutableByte>, Muta
      *
      * @param operand  the value to subtract, not null
      * @throws NullPointerException if the object is null
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void subtract(final Number operand) {
         this.value -= operand.byteValue();
diff --git a/src/main/java/org/apache/commons/lang3/mutable/MutableDouble.java b/src/main/java/org/apache/commons/lang3/mutable/MutableDouble.java
index dd0ac0edf..78aa4ff54 100644
--- a/src/main/java/org/apache/commons/lang3/mutable/MutableDouble.java
+++ b/src/main/java/org/apache/commons/lang3/mutable/MutableDouble.java
@@ -130,7 +130,7 @@ public class MutableDouble extends Number implements Comparable<MutableDouble>,
     /**
      * Increments the value.
      *
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void increment() {
         value++;
@@ -164,7 +164,7 @@ public class MutableDouble extends Number implements Comparable<MutableDouble>,
     /**
      * Decrements the value.
      *
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void decrement() {
         value--;
@@ -200,7 +200,7 @@ public class MutableDouble extends Number implements Comparable<MutableDouble>,
      * Adds a value to the value of this instance.
      *
      * @param operand  the value to add
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void add(final double operand) {
         this.value += operand;
@@ -211,7 +211,7 @@ public class MutableDouble extends Number implements Comparable<MutableDouble>,
      *
      * @param operand  the value to add, not null
      * @throws NullPointerException if the object is null
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void add(final Number operand) {
         this.value += operand.doubleValue();
@@ -221,7 +221,7 @@ public class MutableDouble extends Number implements Comparable<MutableDouble>,
      * Subtracts a value from the value of this instance.
      *
      * @param operand  the value to subtract, not null
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void subtract(final double operand) {
         this.value -= operand;
@@ -232,7 +232,7 @@ public class MutableDouble extends Number implements Comparable<MutableDouble>,
      *
      * @param operand  the value to subtract, not null
      * @throws NullPointerException if the object is null
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void subtract(final Number operand) {
         this.value -= operand.doubleValue();
diff --git a/src/main/java/org/apache/commons/lang3/mutable/MutableFloat.java b/src/main/java/org/apache/commons/lang3/mutable/MutableFloat.java
index eec7cf126..53880f85b 100644
--- a/src/main/java/org/apache/commons/lang3/mutable/MutableFloat.java
+++ b/src/main/java/org/apache/commons/lang3/mutable/MutableFloat.java
@@ -130,7 +130,7 @@ public class MutableFloat extends Number implements Comparable<MutableFloat>, Mu
     /**
      * Increments the value.
      *
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void increment() {
         value++;
@@ -164,7 +164,7 @@ public class MutableFloat extends Number implements Comparable<MutableFloat>, Mu
     /**
      * Decrements the value.
      *
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void decrement() {
         value--;
@@ -200,7 +200,7 @@ public class MutableFloat extends Number implements Comparable<MutableFloat>, Mu
      * Adds a value to the value of this instance.
      *
      * @param operand  the value to add, not null
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void add(final float operand) {
         this.value += operand;
@@ -211,7 +211,7 @@ public class MutableFloat extends Number implements Comparable<MutableFloat>, Mu
      *
      * @param operand  the value to add, not null
      * @throws NullPointerException if the object is null
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void add(final Number operand) {
         this.value += operand.floatValue();
@@ -221,7 +221,7 @@ public class MutableFloat extends Number implements Comparable<MutableFloat>, Mu
      * Subtracts a value from the value of this instance.
      *
      * @param operand  the value to subtract
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void subtract(final float operand) {
         this.value -= operand;
@@ -232,7 +232,7 @@ public class MutableFloat extends Number implements Comparable<MutableFloat>, Mu
      *
      * @param operand  the value to subtract, not null
      * @throws NullPointerException if the object is null
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void subtract(final Number operand) {
         this.value -= operand.floatValue();
diff --git a/src/main/java/org/apache/commons/lang3/mutable/MutableInt.java b/src/main/java/org/apache/commons/lang3/mutable/MutableInt.java
index 6e022bd79..7484abdcb 100644
--- a/src/main/java/org/apache/commons/lang3/mutable/MutableInt.java
+++ b/src/main/java/org/apache/commons/lang3/mutable/MutableInt.java
@@ -113,7 +113,7 @@ public class MutableInt extends Number implements Comparable<MutableInt>, Mutabl
     /**
      * Increments the value.
      *
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void increment() {
         value++;
@@ -147,7 +147,7 @@ public class MutableInt extends Number implements Comparable<MutableInt>, Mutabl
     /**
      * Decrements the value.
      *
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void decrement() {
         value--;
@@ -183,7 +183,7 @@ public class MutableInt extends Number implements Comparable<MutableInt>, Mutabl
      * Adds a value to the value of this instance.
      *
      * @param operand  the value to add, not null
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void add(final int operand) {
         this.value += operand;
@@ -194,7 +194,7 @@ public class MutableInt extends Number implements Comparable<MutableInt>, Mutabl
      *
      * @param operand  the value to add, not null
      * @throws NullPointerException if the object is null
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void add(final Number operand) {
         this.value += operand.intValue();
@@ -204,7 +204,7 @@ public class MutableInt extends Number implements Comparable<MutableInt>, Mutabl
      * Subtracts a value from the value of this instance.
      *
      * @param operand  the value to subtract, not null
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void subtract(final int operand) {
         this.value -= operand;
@@ -215,7 +215,7 @@ public class MutableInt extends Number implements Comparable<MutableInt>, Mutabl
      *
      * @param operand  the value to subtract, not null
      * @throws NullPointerException if the object is null
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void subtract(final Number operand) {
         this.value -= operand.intValue();
diff --git a/src/main/java/org/apache/commons/lang3/mutable/MutableLong.java b/src/main/java/org/apache/commons/lang3/mutable/MutableLong.java
index dbd32d5d7..520ff078d 100644
--- a/src/main/java/org/apache/commons/lang3/mutable/MutableLong.java
+++ b/src/main/java/org/apache/commons/lang3/mutable/MutableLong.java
@@ -113,7 +113,7 @@ public class MutableLong extends Number implements Comparable<MutableLong>, Muta
     /**
      * Increments the value.
      *
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void increment() {
         value++;
@@ -147,7 +147,7 @@ public class MutableLong extends Number implements Comparable<MutableLong>, Muta
     /**
      * Decrements the value.
      *
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void decrement() {
         value--;
@@ -183,7 +183,7 @@ public class MutableLong extends Number implements Comparable<MutableLong>, Muta
      * Adds a value to the value of this instance.
      *
      * @param operand  the value to add, not null
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void add(final long operand) {
         this.value += operand;
@@ -194,7 +194,7 @@ public class MutableLong extends Number implements Comparable<MutableLong>, Muta
      *
      * @param operand  the value to add, not null
      * @throws NullPointerException if the object is null
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void add(final Number operand) {
         this.value += operand.longValue();
@@ -204,7 +204,7 @@ public class MutableLong extends Number implements Comparable<MutableLong>, Muta
      * Subtracts a value from the value of this instance.
      *
      * @param operand  the value to subtract, not null
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void subtract(final long operand) {
         this.value -= operand;
@@ -215,7 +215,7 @@ public class MutableLong extends Number implements Comparable<MutableLong>, Muta
      *
      * @param operand  the value to subtract, not null
      * @throws NullPointerException if the object is null
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void subtract(final Number operand) {
         this.value -= operand.longValue();
diff --git a/src/main/java/org/apache/commons/lang3/mutable/MutableShort.java b/src/main/java/org/apache/commons/lang3/mutable/MutableShort.java
index 1cbd84768..dbcaebf2b 100644
--- a/src/main/java/org/apache/commons/lang3/mutable/MutableShort.java
+++ b/src/main/java/org/apache/commons/lang3/mutable/MutableShort.java
@@ -113,7 +113,7 @@ public class MutableShort extends Number implements Comparable<MutableShort>, Mu
     /**
      * Increments the value.
      *
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void increment() {
         value++;
@@ -147,7 +147,7 @@ public class MutableShort extends Number implements Comparable<MutableShort>, Mu
     /**
      * Decrements the value.
      *
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void decrement() {
         value--;
@@ -183,7 +183,7 @@ public class MutableShort extends Number implements Comparable<MutableShort>, Mu
      * Adds a value to the value of this instance.
      *
      * @param operand  the value to add, not null
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void add(final short operand) {
         this.value += operand;
@@ -194,7 +194,7 @@ public class MutableShort extends Number implements Comparable<MutableShort>, Mu
      *
      * @param operand  the value to add, not null
      * @throws NullPointerException if the object is null
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void add(final Number operand) {
         this.value += operand.shortValue();
@@ -204,7 +204,7 @@ public class MutableShort extends Number implements Comparable<MutableShort>, Mu
      * Subtracts a value from the value of this instance.
      *
      * @param operand  the value to subtract, not null
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void subtract(final short operand) {
         this.value -= operand;
@@ -215,7 +215,7 @@ public class MutableShort extends Number implements Comparable<MutableShort>, Mu
      *
      * @param operand  the value to subtract, not null
      * @throws NullPointerException if the object is null
-     * @since Commons Lang 2.2
+     * @since 2.2
      */
     public void subtract(final Number operand) {
         this.value -= operand.shortValue();
diff --git a/src/main/java/org/apache/commons/lang3/text/FormattableUtils.java b/src/main/java/org/apache/commons/lang3/text/FormattableUtils.java
index 87cd84cef..dd95561e9 100644
--- a/src/main/java/org/apache/commons/lang3/text/FormattableUtils.java
+++ b/src/main/java/org/apache/commons/lang3/text/FormattableUtils.java
@@ -32,7 +32,7 @@ import org.apache.commons.lang3.Validate;
  * when using a {@code Formatter}. It is primarily concerned with numeric precision
  * and padding, and is not designed to allow generalised alternate formats.</p>
  *
- * @since Lang 3.0
+ * @since 3.0
  * @deprecated as of 3.6, use commons-text
  * <a href="https://commons.apache.org/proper/commons-text/javadocs/api-release/org/apache/commons/text/FormattableUtils.html">
  * FormattableUtils</a> instead
diff --git a/src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java b/src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java
index e84c49b11..592bf3d7f 100644
--- a/src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java
+++ b/src/main/java/org/apache/commons/lang3/tuple/ImmutablePair.java
@@ -29,7 +29,7 @@ package org.apache.commons.lang3.tuple;
  * @param <L> the left element type
  * @param <R> the right element type
  *
- * @since Lang 3.0
+ * @since 3.0
  */
 public final class ImmutablePair<L, R> extends Pair<L, R> {
 
diff --git a/src/main/java/org/apache/commons/lang3/tuple/MutablePair.java b/src/main/java/org/apache/commons/lang3/tuple/MutablePair.java
index 852edae9f..466571700 100644
--- a/src/main/java/org/apache/commons/lang3/tuple/MutablePair.java
+++ b/src/main/java/org/apache/commons/lang3/tuple/MutablePair.java
@@ -24,7 +24,7 @@ package org.apache.commons.lang3.tuple;
  * @param <L> the left element type
  * @param <R> the right element type
  *
- * @since Lang 3.0
+ * @since 3.0
  */
 public class MutablePair<L, R> extends Pair<L, R> {
 
diff --git a/src/main/java/org/apache/commons/lang3/tuple/Pair.java b/src/main/java/org/apache/commons/lang3/tuple/Pair.java
index dcf09222d..5740f4e24 100644
--- a/src/main/java/org/apache/commons/lang3/tuple/Pair.java
+++ b/src/main/java/org/apache/commons/lang3/tuple/Pair.java
@@ -36,7 +36,7 @@ import org.apache.commons.lang3.builder.CompareToBuilder;
  * @param <L> the left element type
  * @param <R> the right element type
  *
- * @since Lang 3.0
+ * @since 3.0
  */
 public abstract class Pair<L, R> implements Map.Entry<L, R>, Comparable<Pair<L, R>>, Serializable {