diff --git a/src/main/java/org/apache/commons/codec/binary/Base16.java b/src/main/java/org/apache/commons/codec/binary/Base16.java
index f237908136..1cf1590b6c 100644
--- a/src/main/java/org/apache/commons/codec/binary/Base16.java
+++ b/src/main/java/org/apache/commons/codec/binary/Base16.java
@@ -22,7 +22,7 @@
 import org.apache.commons.codec.CodecPolicy;
 
 /**
- * Provides Base32 encoding and decoding as defined by <a href="https://tools.ietf.org/html/rfc4648#section-8">RFC 4648 - 8. Base 16 Encoding</a>.
+ * Provides Base16 encoding and decoding as defined by <a href="https://tools.ietf.org/html/rfc4648#section-8">RFC 4648 - 8. Base 16 Encoding</a>.
  *
  * <p>
  * This class is thread-safe.
diff --git a/src/main/java/org/apache/commons/codec/binary/Base16OutputStream.java b/src/main/java/org/apache/commons/codec/binary/Base16OutputStream.java
index 2fceb9f432..b05d226169 100644
--- a/src/main/java/org/apache/commons/codec/binary/Base16OutputStream.java
+++ b/src/main/java/org/apache/commons/codec/binary/Base16OutputStream.java
@@ -22,9 +22,9 @@
 import org.apache.commons.codec.CodecPolicy;
 
 /**
- * Provides Hex encoding in a streaming fashion (unlimited size).
+ * Provides Base16 encoding in a streaming fashion (unlimited size).
  * <p>
- * The default behavior of the HexOutputStream is to ENCODE, whereas the default behavior of the
+ * The default behavior of the Base16OutputStream is to ENCODE, whereas the default behavior of the
  * {@link Base16InputStream} is to DECODE. But this behavior can be overridden by using a different constructor.
  * </p>
  *
@@ -33,7 +33,7 @@
 public class Base16OutputStream extends BaseNCodecOutputStream {
 
     /**
-     * Constructs a Base16OutputStream such that all data written is Hex-encoded to the original provided OutputStream.
+     * Constructs a Base16OutputStream such that all data written is Base16-encoded to the original provided OutputStream.
      *
      * @param outputStream OutputStream to wrap.
      */
@@ -42,7 +42,7 @@ public Base16OutputStream(final OutputStream outputStream) {
     }
 
     /**
-     * Constructs a Base16OutputStream such that all data written is either Hex-encoded or Hex-decoded to the
+     * Constructs a Base16OutputStream such that all data written is either Base16-encoded or Base16-decoded to the
      * original provided OutputStream.
      *
      * @param outputStream OutputStream to wrap.
@@ -53,7 +53,7 @@ public Base16OutputStream(final OutputStream outputStream, final boolean doEncod
     }
 
     /**
-     * Constructs a Base16OutputStream such that all data written is either Hex-encoded or Hex-decoded to the
+     * Constructs a Base16OutputStream such that all data written is either Base16-encoded or Base16-decoded to the
      * original provided OutputStream.
      *
      * @param outputStream OutputStream to wrap.
@@ -65,7 +65,7 @@ public Base16OutputStream(final OutputStream outputStream, final boolean doEncod
     }
 
     /**
-     * Constructs a Base16OutputStream such that all data written is either Hex-encoded or Hex-decoded to the
+     * Constructs a Base16OutputStream such that all data written is either Base16-encoded or Base16-decoded to the
      * original provided OutputStream.
      *
      * @param outputStream OutputStream to wrap.
diff --git a/src/main/java/org/apache/commons/codec/binary/package-info.java b/src/main/java/org/apache/commons/codec/binary/package-info.java
index d35cf8c0ae..087f59e60d 100644
--- a/src/main/java/org/apache/commons/codec/binary/package-info.java
+++ b/src/main/java/org/apache/commons/codec/binary/package-info.java
@@ -16,6 +16,6 @@
  */
 
 /**
- * Base64, Base32, Binary, and Hexadecimal String encoding and decoding.
+ * Base64, Base32, Base16, BaseN, Binary, and Hexadecimal String encoding and decoding.
  */
 package org.apache.commons.codec.binary;