diff --git a/src/tpm2/Manufacture.c b/src/tpm2/Manufacture.c
index c4aeb3f0..db506677 100644
--- a/src/tpm2/Manufacture.c
+++ b/src/tpm2/Manufacture.c
@@ -129,7 +129,8 @@ TPM_Manufacture(
         return -1;
     }                                      // libtpms added end
     // default configuration for PCR
-    PCRSimStart();
+    PCRManufacture();
+
     // initialize pre-installed hierarchy data
     // This should happen after NV is initialized because hierarchy data is
     // stored in NV.
diff --git a/src/tpm2/PCR.c b/src/tpm2/PCR.c
index 5531dc5d..60d0631c 100644
--- a/src/tpm2/PCR.c
+++ b/src/tpm2/PCR.c
@@ -238,13 +238,12 @@ PCRGetAuthPolicy(TPMI_DH_PCR   handle,  // IN: PCR handle
 	    return TPM_ALG_NULL;
 	}
 }
-/* 8.7.2.7 PCRSimStart() */
-/* This function is used to initialize the policies when a TPM is manufactured. This function would
-   only be called in a manufacturing environment or in a TPM simulator. */
-void
-PCRSimStart(
-	    void
-	    )
+
+//*** PCRManufacture()
+// This function is used to initialize the policies when a TPM is manufactured.
+// This function would only be called in a manufacturing environment or in
+// a TPM simulator.
+void PCRManufacture(void)
 {
     UINT32 i;
 #if defined NUM_POLICY_PCR_GROUP && NUM_POLICY_PCR_GROUP > 0
diff --git a/src/tpm2/PCR_fp.h b/src/tpm2/PCR_fp.h
index 2e6bd641..189f453f 100644
--- a/src/tpm2/PCR_fp.h
+++ b/src/tpm2/PCR_fp.h
@@ -122,10 +122,12 @@ TPMI_ALG_HASH
 PCRGetAuthPolicy(TPMI_DH_PCR   handle,  // IN: PCR handle
 		 TPM2B_DIGEST* policy   // OUT: policy of PCR
 		 );
-void
-PCRSimStart(
-	    void
-	    );
+
+//*** PCRManufacture()
+// This function is used to initialize the policies when a TPM is manufactured.
+// This function would only be called in a manufacturing environment or in
+// a TPM simulator.
+void PCRManufacture(void);
 
 //*** PcrIsAllocated()
 // This function indicates if a PCR number for the particular hash algorithm