10 files changed, 17 insertions, 17 deletions
diff --git a/firmware/lib/include/rollback_index.h b/firmware/lib/include/secdata_tpm.h
index cfa7a265..6e31e71c 100644
--- a/firmware/lib/include/rollback_index.h
+++ b/firmware/lib/include/secdata_tpm.h
@@ -2,12 +2,12 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
- * Functions for querying, manipulating and locking rollback indices
+ * Functions for querying, manipulating and locking secure data spaces
  * stored in the TPM NVRAM.
  */
 
-#ifndef VBOOT_REFERENCE_ROLLBACK_INDEX_H_
-#define VBOOT_REFERENCE_ROLLBACK_INDEX_H_
+#ifndef VBOOT_REFERENCE_SECDATA_TPM_H_
+#define VBOOT_REFERENCE_SECDATA_TPM_H_
 
 #include "2return_codes.h"
 #include "2sysincludes.h"
@@ -170,4 +170,4 @@ uint32_t SafeWrite(uint32_t index, const void *data, uint32_t length);
  */
 vb2_error_t SetVirtualDevMode(int val);
 
-#endif  /* VBOOT_REFERENCE_ROLLBACK_INDEX_H_ */
+#endif  /* VBOOT_REFERENCE_SECDATA_TPM_H_ */
diff --git a/firmware/lib/mocked_rollback_index.c b/firmware/lib/mocked_secdata_tpm.c
index 324660ff..4271f768 100644
--- a/firmware/lib/mocked_rollback_index.c
+++ b/firmware/lib/mocked_secdata_tpm.c
@@ -2,12 +2,12 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
- * Functions for querying, manipulating and locking rollback indices
+ * Functions for querying, manipulating and locking secure data spaces
  * stored in the TPM NVRAM.
  */
 
 #include "utility.h"
-#include "rollback_index.h"
+#include "secdata_tpm.h"
 #include "tss_constants.h"
 
 vb2_error_t SetVirtualDevMode(int val)
diff --git a/firmware/lib/rollback_index.c b/firmware/lib/secdata_tpm.c
index b273d23d..5ddb16cd 100644
--- a/firmware/lib/rollback_index.c
+++ b/firmware/lib/secdata_tpm.c
@@ -2,14 +2,14 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
- * Functions for querying, manipulating and locking rollback indices
+ * Functions for querying, manipulating and locking secure data spaces
  * stored in the TPM NVRAM.
  */
 
 #include "2sysincludes.h"
 #include "2common.h"
 #include "2crc8.h"
-#include "rollback_index.h"
+#include "secdata_tpm.h"
 #include "tlcl.h"
 #include "tss_constants.h"
 #include "vboot_api.h"
@@ -17,7 +17,7 @@
 #define RETURN_ON_FAILURE(tpm_command) do { \
 		uint32_t result_; \
 		if ((result_ = (tpm_command)) != TPM_SUCCESS) { \
-			VB2_DEBUG("Rollback: %08x returned by " #tpm_command \
+			VB2_DEBUG("TPM: 0x%x returned by " #tpm_command \
 				  "\n", (int)result_); \
 			return result_; \
 		} \
diff --git a/firmware/lib/tpm2_lite/tlcl.c b/firmware/lib/tpm2_lite/tlcl.c
index 02d1a91b..37034c99 100644
--- a/firmware/lib/tpm2_lite/tlcl.c
+++ b/firmware/lib/tpm2_lite/tlcl.c
@@ -7,7 +7,7 @@
  */
 
 #include "2common.h"
-#include "rollback_index.h"
+#include "secdata_tpm.h"
 #include "2sysincludes.h"
 #include "tlcl.h"
 #include "tpm2_marshaling.h"
diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c
index dbaf93f3..eb05109b 100644
--- a/firmware/lib/vboot_api_kernel.c
+++ b/firmware/lib/vboot_api_kernel.c
@@ -14,7 +14,7 @@
 #include "2sysincludes.h"
 #include "ec_sync.h"
 #include "load_kernel_fw.h"
-#include "rollback_index.h"
+#include "secdata_tpm.h"
 #include "utility.h"
 #include "vb2_common.h"
 #include "vboot_api.h"
diff --git a/firmware/lib/vboot_kernel.c b/firmware/lib/vboot_kernel.c
index e2ca910f..e2075e22 100644
--- a/firmware/lib/vboot_kernel.c
+++ b/firmware/lib/vboot_kernel.c
@@ -17,7 +17,7 @@
 #include "cgptlib_internal.h"
 #include "gpt_misc.h"
 #include "load_kernel_fw.h"
-#include "rollback_index.h"
+#include "secdata_tpm.h"
 #include "utility.h"
 #include "vb2_common.h"
 #include "vboot_api.h"
diff --git a/firmware/lib/vboot_ui.c b/firmware/lib/vboot_ui.c
index 22035952..35dafe97 100644
--- a/firmware/lib/vboot_ui.c
+++ b/firmware/lib/vboot_ui.c
@@ -13,7 +13,7 @@
 #include "2secdata.h"
 #include "ec_sync.h"
 #include "load_kernel_fw.h"
-#include "rollback_index.h"
+#include "secdata_tpm.h"
 #include "tlcl.h"
 #include "utility.h"
 #include "vb2_common.h"
diff --git a/firmware/lib/vboot_ui_common.c b/firmware/lib/vboot_ui_common.c
index 4255deb0..376e1a67 100644
--- a/firmware/lib/vboot_ui_common.c
+++ b/firmware/lib/vboot_ui_common.c
@@ -6,7 +6,7 @@
  */
 
 #include "2common.h"
-#include "rollback_index.h"
+#include "secdata_tpm.h"
 #include "2sysincludes.h"
 #include "vboot_api.h"
 #include "vboot_kernel.h"
diff --git a/firmware/lib/vboot_ui_menu.c b/firmware/lib/vboot_ui_menu.c
index 24b7de8f..58349ca3 100644
--- a/firmware/lib/vboot_ui_menu.c
+++ b/firmware/lib/vboot_ui_menu.c
@@ -13,7 +13,7 @@
 #include "2sysincludes.h"
 #include "ec_sync.h"
 #include "load_kernel_fw.h"
-#include "rollback_index.h"
+#include "secdata_tpm.h"
 #include "utility.h"
 #include "vb2_common.h"
 #include "vboot_api.h"
diff --git a/firmware/linktest/main.c b/firmware/linktest/main.c
index 75dda291..bc120c3d 100644
--- a/firmware/linktest/main.c
+++ b/firmware/linktest/main.c
@@ -6,7 +6,7 @@
 #include "2sysincludes.h"
 #include "cgptlib.h"
 #include "load_kernel_fw.h"
-#include "rollback_index.h"
+#include "secdata_tpm.h"
 #include "tlcl.h"
 #include "vboot_common.h"
 #include "vboot_kernel.h"
@@ -22,7 +22,7 @@ int main(void)
 	/* load_kernel_fw.h */
 	LoadKernel(0, 0);
 
-	/* rollback_index.h */
+	/* secdata_tpm.h */
 	RollbackKernelRead(0);
 	RollbackKernelWrite(0);
 	RollbackKernelLock(0);