diff --git a/SetAlgorithmSet_fp.h b/SetAlgorithmSet_fp.h
index f4d98f1..df9d189 100644
--- a/SetAlgorithmSet_fp.h
+++ b/SetAlgorithmSet_fp.h
@@ -4,8 +4,8 @@
 
 // THIS CODE IS GENERATED - DO NOT MODIFY!
 
-#ifndef TPM2_SETALGORITHMSET_FP_H
-#define TPM2_SETALGORITHMSET_FP_H
+#ifndef TPM2_SETALGORITHMSET_FP_H_
+#define TPM2_SETALGORITHMSET_FP_H_
 
 #include "tpm_generated.h"
 
@@ -17,24 +17,24 @@
 // Executes SetAlgorithmSet with request handles and parameters from |in|.
 TPM_RC TPM2_SetAlgorithmSet(SetAlgorithmSet_In* in);
 
-// Initializes handle fields in |target| from |req_handles|. Unmarshals
+// Initializes handle fields in |target| from |request_handles|. Unmarshals
 // parameter fields in |target| from |buffer|.
 TPM_RC SetAlgorithmSet_In_Unmarshal(SetAlgorithmSet_In* target,
-                                    TPM_HANDLE req_handles[],
+                                    TPM_HANDLE request_handles[],
                                     BYTE** buffer,
                                     INT32* size);
 
-// Unmarshals any request parameters starting at |req_parameter_buffer|.
+// Unmarshals any request parameters starting at |request_parameter_buffer|.
 // Executes command. Marshals any response handles and parameters to the
-// global response buffer and computes |*res_handle_buffer_size| and
-// |*res_parameter_buffer_size|. If |tag| == TPM_ST_SESSIONS, marshals
+// global response buffer and computes |*response_handle_buffer_size| and
+// |*response_parameter_buffer_size|. If |tag| == TPM_ST_SESSIONS, marshals
 // parameter_size indicating the size of the parameter area. parameter_size
 // field is located between the handle area and parameter area.
 TPM_RC Exec_SetAlgorithmSet(TPMI_ST_COMMAND_TAG tag,
-                            BYTE** req_parameter_buffer,
-                            INT32* req_parameter_buffer_size,
-                            TPM_HANDLE req_handles[],
-                            UINT32* res_handle_buffer_size,
-                            UINT32* res_parameter_buffer_size);
+                            BYTE** request_parameter_buffer,
+                            INT32* request_parameter_buffer_size,
+                            TPM_HANDLE request_handles[],
+                            UINT32* response_handle_buffer_size,
+                            UINT32* response_parameter_buffer_size);
 
 #endif  // TPM2_SETALGORITHMSET_FP_H