diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8
--- a/sbin/ipfw/ipfw.8
+++ b/sbin/ipfw/ipfw.8
@@ -1,5 +1,5 @@
 .\"
-.Dd April 18, 2025
+.Dd December 4, 2025
 .Dt IPFW 8
 .Os
 .Sh NAME
@@ -1669,7 +1669,7 @@
 .Pq Cm dstopt ,
 IPSec authentication headers
 .Pq Cm ah ,
-and IPsec encapsulated security payload headers
+and IPsec encapsulating security payload headers
 .Pq Cm esp .
 .It Cm fib Ar fibnum
 Matches a packet that has been tagged to use
diff --git a/sbin/ipfw/ipv6.c b/sbin/ipfw/ipv6.c
--- a/sbin/ipfw/ipv6.c
+++ b/sbin/ipfw/ipv6.c
@@ -289,7 +289,7 @@
 		sep = ',';
 	}
 	if (cmd->arg1 & EXT_ESP) {
-		bprintf(bp, "%cencapsulated security payload", sep);
+		bprintf(bp, "%cencapsulating security payload", sep);
 	}
 }
 
diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8
--- a/sbin/ping/ping.8
+++ b/sbin/ping/ping.8
@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd September 15, 2023
+.Dd December 4, 2025
 .Dt PING 8
 .Os
 .Sh NAME
@@ -534,7 +534,7 @@
 .Ss Experimental options only for IPv6 target
 .Bl -tag -width indent
 .It Fl E
-Enables transport-mode IPsec encapsulated security payload.
+Enables transport-mode IPsec encapsulating security payload.
 .It Fl Z
 Enables transport-mode IPsec authentication header.
 .El
diff --git a/sys/netipsec/esp.h b/sys/netipsec/esp.h
--- a/sys/netipsec/esp.h
+++ b/sys/netipsec/esp.h
@@ -32,7 +32,7 @@
  */
 
 /*
- * RFC1827/2406 Encapsulated Security Payload.
+ * RFC 1827 & RFC 2406: Encapsulating Security Payload.
  */
 
 #ifndef _NETIPSEC_ESP_H_