diff --git a/src/tpm2/NVMarshal.c b/src/tpm2/NVMarshal.c
index 98d6d22e..74b3472c 100644
--- a/src/tpm2/NVMarshal.c
+++ b/src/tpm2/NVMarshal.c
@@ -3619,7 +3619,7 @@ static const struct _entry {
     { COMPILE_CONSTANT(CRT_FORMAT_RSA, EQ) },
     { COMPILE_CONSTANT(VENDOR_COMMAND_COUNT, EQ) },
     { COMPILE_CONSTANT(MAX_VENDOR_BUFFER_SIZE, EQ) },
-    { COMPILE_CONSTANT(TPM_MAX_DERIVATION_BITS, EQ) },
+    { COMPILE_CONSTANT(MAX_DERIVATION_BITS, EQ) },
     { COMPILE_CONSTANT(PROOF_SIZE, EQ) },
     { COMPILE_CONSTANT(HASH_COUNT, EQ) },
 };
diff --git a/src/tpm2/ObjectCommands.c b/src/tpm2/ObjectCommands.c
index f524132e..256580ca 100644
--- a/src/tpm2/ObjectCommands.c
+++ b/src/tpm2/ObjectCommands.c
@@ -485,7 +485,7 @@ TPM2_CreateLoaded(
 				      &parent->sensitive.sensitive.bits.b,
 				      &labelContext.label.b,
 				      &labelContext.context.b,
-				      TPM_MAX_DERIVATION_BITS);
+				      MAX_DERIVATION_BITS);
 	    // Clear the sensitive size so that the creation functions will not try
 	    // to use this value.
 	    in->inSensitive.sensitive.data.t.size = 0;
diff --git a/src/tpm2/TpmProfile.h b/src/tpm2/TpmProfile.h
index 2cdfaac9..fc55bbb1 100644
--- a/src/tpm2/TpmProfile.h
+++ b/src/tpm2/TpmProfile.h
@@ -315,8 +315,8 @@
 #ifndef MAX_VENDOR_BUFFER_SIZE
 #define MAX_VENDOR_BUFFER_SIZE          1024
 #endif
-#ifndef TPM_MAX_DERIVATION_BITS
-#define TPM_MAX_DERIVATION_BITS         8192
+#ifndef MAX_DERIVATION_BITS
+#define MAX_DERIVATION_BITS         8192
 #endif
 #ifndef SIZE_OF_X509_SERIAL_NUMBER
 #define SIZE_OF_X509_SERIAL_NUMBER      20