diff --git a/src/bacnet/bacdef.h b/src/bacnet/bacdef.h
index 358830b0..1f6ec914 100644
--- a/src/bacnet/bacdef.h
+++ b/src/bacnet/bacdef.h
@@ -108,10 +108,21 @@
     /* from 135-2016 version of the BACnet Standard */
 #define MAX_ASHRAE_OBJECT_TYPE 60
 #define MAX_BACNET_SERVICES_SUPPORTED 44
-#elif (BACNET_PROTOCOL_REVISION == 20)
-    /* Addendum 135-2016bd  */
-#define MAX_ASHRAE_OBJECT_TYPE 61
-#define MAX_BACNET_SERVICES_SUPPORTED 44
+#elif (BACNET_PROTOCOL_REVISION == 20) || (BACNET_PROTOCOL_REVISION == 21)
+    /* Addendum 135-2016bd, 135-2016be, 135-2016bi */
+#define MAX_ASHRAE_OBJECT_TYPE 63
+#define MAX_BACNET_SERVICES_SUPPORTED 47
+#elif (BACNET_PROTOCOL_REVISION == 22)
+#define MAX_ASHRAE_OBJECT_TYPE 63
+#define MAX_BACNET_SERVICES_SUPPORTED 47
+#elif (BACNET_PROTOCOL_REVISION == 23)
+    /* Addendum 135-2020cd */
+#define MAX_ASHRAE_OBJECT_TYPE 63
+#define MAX_BACNET_SERVICES_SUPPORTED 47
+#elif (BACNET_PROTOCOL_REVISION == 24)
+    /* Addendum 135-2020ca, 135-2020cc, 135-2020bv */
+#define MAX_ASHRAE_OBJECT_TYPE 65
+#define MAX_BACNET_SERVICES_SUPPORTED 47
 #else
 #error MAX_ASHRAE_OBJECT_TYPE and MAX_BACNET_SERVICES_SUPPORTED not defined!
 #endif
diff --git a/src/bacnet/bacenum.h b/src/bacnet/bacenum.h
index 1f1a0c32..69fafed1 100644
--- a/src/bacnet/bacenum.h
+++ b/src/bacnet/bacenum.h
@@ -1913,7 +1913,7 @@ typedef enum {
     ERROR_CODE_CERTIFICATE_INVALID = 201,
     ERROR_CODE_CERTIFICATE_MALFORMED = 202,
     ERROR_CODE_CERTIFICATE_REVOKED = 203,
-    ERROR_CODE_UNKNOWN_KEY2 = 204,
+    ERROR_CODE_UNKNOWN_SECURITY_KEY = 204,
     ERROR_CODE_REFERENCED_PORT_IN_ERROR = 205,
     /* Enumerated values 0-255 are reserved for definition by ASHRAE. */
     ERROR_CODE_RESERVED_MAX = 255,
diff --git a/src/bacnet/bactext.c b/src/bacnet/bactext.c
index 5ad48a5a..af35931d 100644
--- a/src/bacnet/bactext.c
+++ b/src/bacnet/bactext.c
@@ -1303,7 +1303,7 @@ INDTEXT_DATA bacnet_error_code_names[] = { { ERROR_CODE_OTHER, "other" },
     { ERROR_CODE_CERTIFICATE_INVALID, "certificate-invalid" },
     { ERROR_CODE_CERTIFICATE_MALFORMED, "certificate-malformed" },
     { ERROR_CODE_CERTIFICATE_REVOKED, "certificate-revoked" },
-    { ERROR_CODE_UNKNOWN_KEY2, "unknown-key" },
+    { ERROR_CODE_UNKNOWN_SECURITY_KEY, "unknown-security-key" },
     { ERROR_CODE_REFERENCED_PORT_IN_ERROR, "referenced-port-in-error" },
     /* Enumerated values 256-65535 may be used by others subject to */
     /* the procedures and constraints described in Clause 23. */