13 files changed, 38 insertions, 38 deletions
diff --git a/src/security/tpm/Makefile.inc b/src/security/tpm/Makefile.inc
index 48e70107e0..cfd93c3a76 100644
--- a/src/security/tpm/Makefile.inc
+++ b/src/security/tpm/Makefile.inc
@@ -1,12 +1,12 @@
-verstage-$(CONFIG_TPM) += tcg-1.2/tlcl.c
-verstage-$(CONFIG_TPM2) += tcg-2.0/tpm2_marshaling.c
-verstage-$(CONFIG_TPM2) += tcg-2.0/tpm2_tlcl.c
+verstage-$(CONFIG_TPM) += tcg-1.2/tss.c
+verstage-$(CONFIG_TPM2) += tcg-2.0/tss_marshaling.c
+verstage-$(CONFIG_TPM2) += tcg-2.0/tss.c
 
 ifeq ($(CONFIG_VBOOT_SEPARATE_VERSTAGE),y)
-romstage-$(CONFIG_TPM) += tcg-1.2/tlcl.c
-romstage-$(CONFIG_TPM2) += tcg-2.0/tpm2_marshaling.c
-romstage-$(CONFIG_TPM2) += tcg-2.0/tpm2_tlcl.c
+romstage-$(CONFIG_TPM) += tcg-1.2/tss.c
+romstage-$(CONFIG_TPM2) += tcg-2.0/tss_marshaling.c
+romstage-$(CONFIG_TPM2) += tcg-2.0/tss.c
 endif # CONFIG_VBOOT_SEPARATE_VERSTAGE
 
-ramstage-$(CONFIG_TPM2) += tcg-2.0/tpm2_marshaling.c
-ramstage-$(CONFIG_TPM2) += tcg-2.0/tpm2_tlcl.c
+ramstage-$(CONFIG_TPM2) += tcg-2.0/tss_marshaling.c
+ramstage-$(CONFIG_TPM2) += tcg-2.0/tss.c
diff --git a/src/security/tpm/tcg-1.2/tlcl.c b/src/security/tpm/tcg-1.2/tss.c
index c7fcfcb7d6..e0ffdea433 100644
--- a/src/security/tpm/tcg-1.2/tlcl.c
+++ b/src/security/tpm/tcg-1.2/tss.c
@@ -17,11 +17,11 @@
 #include <arch/early_variables.h>
 #include <assert.h>
 #include <string.h>
-#include <security/tpm/tpm.h>
+#include <security/tpm/tis.h>
 #include <vb2_api.h>
-#include "tlcl_internal.h"
-#include "tlcl_structures.h"
-#include "../tlcl.h"
+#include "tss_internal.h"
+#include "tss_structures.h"
+#include "../tss.h"
 
 #ifdef FOR_TEST
 #include <stdio.h>
diff --git a/src/security/tpm/tcg-1.2/tlcl_internal.h b/src/security/tpm/tcg-1.2/tss_internal.h
index 3648be622a..01912bb78e 100644
--- a/src/security/tpm/tcg-1.2/tlcl_internal.h
+++ b/src/security/tpm/tcg-1.2/tss_internal.h
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef TPM_LITE_TLCL_INTERNAL_H_
-#define TPM_LITE_TLCL_INTERNAL_H_
+#ifndef TCG_TSS_INTERNAL_H_
+#define TCG_TSS_INTERNAL_H_
 
 /*
  * These numbers derive from adding the sizes of command fields as shown in the
@@ -62,4 +62,4 @@ static inline void from_tpm_uint16(const uint8_t *buffer, uint16_t *x)
 	*x = (buffer[0] << 8) | buffer[1];
 }
 
-#endif  /* TPM_LITE_TLCL_INTERNAL_H_ */
+#endif  /* TCG_TSS_INTERNAL_H_ */
diff --git a/src/security/tpm/tcg-1.2/tlcl_structures.h b/src/security/tpm/tcg-1.2/tss_structures.h
index 880864ee50..880864ee50 100644
--- a/src/security/tpm/tcg-1.2/tlcl_structures.h
+++ b/src/security/tpm/tcg-1.2/tss_structures.h
diff --git a/src/security/tpm/tcg-2.0/tpm2_tlcl.c b/src/security/tpm/tcg-2.0/tss.c
index e111b89ae2..ae8625c0b2 100644
--- a/src/security/tpm/tcg-2.0/tpm2_tlcl.c
+++ b/src/security/tpm/tcg-2.0/tss.c
@@ -10,9 +10,9 @@
 #include <string.h>
 #include <vb2_api.h>
 
-#include "tpm2_tlcl_structures.h"
-#include "tpm2_marshaling.h"
-#include "../tpm.h"
+#include "tss_structures.h"
+#include "tss_marshaling.h"
+#include "../tis.h"
 #include "../antirollback.h"
 
 /*
diff --git a/src/security/tpm/tcg-2.0/tpm2_marshaling.c b/src/security/tpm/tcg-2.0/tss_marshaling.c
index 3ce09a4f8d..b1d666362b 100644
--- a/src/security/tpm/tcg-2.0/tpm2_marshaling.c
+++ b/src/security/tpm/tcg-2.0/tss_marshaling.c
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "tpm2_marshaling.h"
+#include "tss_marshaling.h"
 
 static uint16_t tpm_tag CAR_GLOBAL;  /* Depends on the command type. */
 
diff --git a/src/security/tpm/tcg-2.0/tpm2_marshaling.h b/src/security/tpm/tcg-2.0/tss_marshaling.h
index 5802044378..d34756d566 100644
--- a/src/security/tpm/tcg-2.0/tpm2_marshaling.h
+++ b/src/security/tpm/tcg-2.0/tss_marshaling.h
@@ -3,11 +3,11 @@
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
-#ifndef __SRC_LIB_TPM2_MARSHALING_H
-#define __SRC_LIB_TPM2_MARSHALING_H
+#ifndef TCG2_TSS_MARSHALING_H_
+#define TCG2_TSS_MARSHALING_H_
 
 #include <commonlib/iobuf.h>
-#include "tpm2_tlcl_structures.h"
+#include "tss_structures.h"
 
 /* The below functions are used to serialize/deserialize TPM2 commands. */
 
@@ -43,4 +43,4 @@ int tpm_marshal_command(TPM_CC command, void *tpm_command_body,
  */
 struct tpm2_response *tpm_unmarshal_response(TPM_CC command, struct ibuf *ib);
 
-#endif // __SRC_LIB_TPM2_MARSHALING_H
+#endif // TCG2_TSS_MARSHALING_H_
diff --git a/src/security/tpm/tcg-2.0/tpm2_tlcl_structures.h b/src/security/tpm/tcg-2.0/tss_structures.h
index acd9e74aec..389f15df4b 100644
--- a/src/security/tpm/tcg-2.0/tpm2_tlcl_structures.h
+++ b/src/security/tpm/tcg-2.0/tss_structures.h
@@ -4,8 +4,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef __SRC_LIB_TPM2_TLCL_STRUCTURES_H
-#define __SRC_LIB_TPM2_TLCL_STRUCTURES_H
+#ifndef TCG2_TSS_STRUCTURES_H_
+#define TCG2_TSS_STRUCTURES_H_
 
 /*
  * This file includes a subset of definitions of TPM protocol version 2.x
@@ -15,7 +15,7 @@
 #include <compiler.h>
 #include <types.h>
 
-#include "../tlcl.h"
+#include "../tss.h"
 
 /* This should be plenty for what firmware needs. */
 #define TPM_BUFFER_SIZE 256
@@ -370,4 +370,4 @@ struct tpm2_hierarchy_control_cmd {
 	TPMI_YES_NO state;
 };
 
-#endif // __SRC_LIB_TPM2_TLCL_STRUCTURES_H
+#endif // TCG2_TSS_STRUCTURES_H_
diff --git a/src/security/tpm/tpm.h b/src/security/tpm/tis.h
index 32a44c17eb..6906ce33ec 100644
--- a/src/security/tpm/tpm.h
+++ b/src/security/tpm/tis.h
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  */
 
-#ifndef TPM_H_
-#define TPM_H_
+#ifndef TIS_H_
+#define TIS_H_
 
 #include <stddef.h>
 #include <stdint.h>
@@ -99,4 +99,4 @@ void init_tpm(int s3resume);
  */
 int tis_plat_irq_status(void);
 
-#endif /* TPM_H_ */
+#endif /* TIS_H_ */
diff --git a/src/security/tpm/tlcl.h b/src/security/tpm/tss.h
index 8dd5d80685..8f3f1cbff5 100644
--- a/src/security/tpm/tlcl.h
+++ b/src/security/tpm/tss.h
@@ -9,8 +9,8 @@
  * A low-level library for interfacing to TPM hardware or an emulator.
  */
 
-#ifndef TPM_LITE_TLCL_H_
-#define TPM_LITE_TLCL_H_
+#ifndef TSS_H_
+#define TSS_H_
 #include <stdint.h>
 #include <types.h>
 
@@ -174,4 +174,4 @@ uint32_t tlcl_cr50_enable_nvcommits(void);
 uint32_t tlcl_cr50_enable_update(uint16_t timeout_ms,
 				 uint8_t *num_restored_headers);
 
-#endif  /* TPM_LITE_TLCL_H_ */
+#endif  /* TSS_H_ */
diff --git a/src/security/tpm/tpm_error_messages.h b/src/security/tpm/tss_error_messages.h
index ac7cd4e859..d5978609c7 100644
--- a/src/security/tpm/tpm_error_messages.h
+++ b/src/security/tpm/tss_error_messages.h
@@ -9,8 +9,8 @@
  * Version 1.2 Level 2 Revision 103 26 October 2006 Draft.
  */
 
-#ifndef TPM_ERROR_MESSAGES_H
-#define TPM_ERROR_MESSAGES_H
+#ifndef TSS_ERROR_MESSAGES_H_
+#define TSS_ERROR_MESSAGES_H_
 
 #define TPM_E_BASE 0x0
 #define TPM_E_NON_FATAL 0x800
@@ -252,4 +252,4 @@ because the ordinal required resources that have not been tested"},
 time-out period"},
 };
 
-#endif				/* TPM_ERROR_MESSAGES_H */
+#endif				/* TSS_ERROR_MESSAGES_H_ */
diff --git a/src/security/vboot/secdata_mock.c b/src/security/vboot/secdata_mock.c
index ff8e98e43f..4ea53558f9 100644
--- a/src/security/vboot/secdata_mock.c
+++ b/src/security/vboot/secdata_mock.c
@@ -34,7 +34,7 @@
 
 #include <security/tpm/antirollback.h>
 #include <stdlib.h>
-#include <security/tpm/tlcl.h>
+#include <security/tpm/tss.h>
 #include <vb2_api.h>
 
 uint32_t tpm_extend_pcr(struct vb2_context *ctx, int pcr,
diff --git a/src/security/vboot/secdata_tpm.c b/src/security/vboot/secdata_tpm.c
index 2dc11bd2dc..04162b0578 100644
--- a/src/security/vboot/secdata_tpm.c
+++ b/src/security/vboot/secdata_tpm.c
@@ -35,7 +35,7 @@
 #include <security/tpm/antirollback.h>
 #include <stdlib.h>
 #include <string.h>
-#include <security/tpm/tlcl.h>
+#include <security/tpm/tss.h>
 #include <vb2_api.h>
 #include <console/console.h>