Index: head/lib/libipsec/pfkey_dump.c
===================================================================
--- head/lib/libipsec/pfkey_dump.c
+++ head/lib/libipsec/pfkey_dump.c
@@ -159,8 +159,8 @@
 #ifdef SADB_X_EALG_RC5CBC
 	{ SADB_X_EALG_RC5CBC, "rc5-cbc", },
 #endif
-#ifdef SADB_X_EALG_RIJNDAELCBC
-	{ SADB_X_EALG_RIJNDAELCBC, "rijndael-cbc", },
+#ifdef SADB_X_EALG_AESCBC
+	{ SADB_X_EALG_AESCBC, "aes-cbc", },
 #endif
 #ifdef SADB_X_EALG_TWOFISHCBC
 	{ SADB_X_EALG_TWOFISHCBC, "twofish-cbc", },
Index: head/sbin/setkey/setkey.8
===================================================================
--- head/sbin/setkey/setkey.8
+++ head/sbin/setkey/setkey.8
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 04, 2020
+.Dd June 4, 2020
 .Dt SETKEY 8
 .Os
 .\"
@@ -612,7 +612,7 @@
 .Bd -literal -offset indent
 algorithm	keylen (bits)	comment
 null		0 to 2048	rfc2410
-rijndael-cbc	128/192/256	rfc3602
+aes-cbc		128/192/256	rfc3602
 aes-ctr		160/224/288	rfc3686
 aes-gcm-16	160/224/288	rfc4106
 .Ed
Index: head/sbin/setkey/token.l
===================================================================
--- head/sbin/setkey/token.l
+++ head/sbin/setkey/token.l
@@ -159,7 +159,8 @@
 {hyphen}E	{ BEGIN S_ENCALG; return(F_ENC); }
 <S_ENCALG>null		{ yylval.num = SADB_EALG_NULL; BEGIN INITIAL; return(ALG_ENC); }
 <S_ENCALG>simple	{ yylval.num = SADB_EALG_NULL; BEGIN INITIAL; return(ALG_ENC_OLD); }
-<S_ENCALG>rijndael-cbc	{ yylval.num = SADB_X_EALG_RIJNDAELCBC; BEGIN INITIAL; return(ALG_ENC); }
+<S_ENCALG>rijndael-cbc	{ yylval.num = SADB_X_EALG_AESCBC; BEGIN INITIAL; return(ALG_ENC); }
+<S_ENCALG>aes-cbc	{ yylval.num = SADB_X_EALG_AESCBC; BEGIN INITIAL; return(ALG_ENC); }
 <S_ENCALG>aes-ctr	{ yylval.num = SADB_X_EALG_AESCTR; BEGIN INITIAL; return(ALG_ENC_SALT); }
 <S_ENCALG>aes-gcm-16	{ yylval.num = SADB_X_EALG_AESGCM16; BEGIN INITIAL; return(ALG_ENC_SALT); }
 
Index: head/sys/net/pfkeyv2.h
===================================================================
--- head/sys/net/pfkeyv2.h
+++ head/sys/net/pfkeyv2.h
@@ -383,6 +383,7 @@
 #define SADB_EALG_NULL		11
 #define SADB_X_EALG_RIJNDAELCBC	12
 #define SADB_X_EALG_AES		12
+#define	SADB_X_EALG_AESCBC	12
 #define SADB_X_EALG_AESCTR	13
 #define SADB_X_EALG_AESGCM8	18	/* RFC4106 */
 #define SADB_X_EALG_AESGCM12	19
Index: head/usr.bin/netstat/ipsec.c
===================================================================
--- head/usr.bin/netstat/ipsec.c
+++ head/usr.bin/netstat/ipsec.c
@@ -139,7 +139,7 @@
 static struct val2str ipsec_espnames[] = {
 	{ SADB_EALG_NONE, "none", },
 	{ SADB_EALG_NULL, "null", },
-	{ SADB_X_EALG_RIJNDAELCBC, "rijndael-cbc", },
+	{ SADB_X_EALG_AESCBC, "aes-cbc", },
 	{ SADB_X_EALG_AESCTR, "aes-ctr", },
 	{ SADB_X_EALG_AESGCM16, "aes-gcm-16", },
 	{ SADB_X_EALG_AESGMAC, "aes-gmac", },