diff --git a/src/libpts/tcg/tcg_pts_attr_simple_comp_evid.c b/src/libpts/tcg/tcg_pts_attr_simple_comp_evid.c
index 213d5f409..b2798d0bd 100644
--- a/src/libpts/tcg/tcg_pts_attr_simple_comp_evid.c
+++ b/src/libpts/tcg/tcg_pts_attr_simple_comp_evid.c
@@ -446,7 +446,7 @@ METHOD(tcg_pts_attr_simple_comp_evid_t, get_qualifier, pts_qualifier_t,
 	return this->qualifier;
 }
 
-METHOD(tcg_pts_attr_simple_comp_evid_t, get_comp_funct_name, pts_ita_funct_comp_name_t,
+METHOD(tcg_pts_attr_simple_comp_evid_t, get_comp_funct_name, pts_funct_comp_name_t,
 	private_tcg_pts_attr_simple_comp_evid_t *this)
 {
 	return this->name;
@@ -557,7 +557,6 @@ pa_tnc_attr_t *tcg_pts_attr_simple_comp_evid_create(tcg_pts_attr_simple_comp_evi
 		},
 		.vendor_id = PEN_TCG,
 		.type = TCG_PTS_SIMPLE_COMP_EVID,
-		.pcr_info_included = params.pcr_info_included,
 		.flags = params.flags,
 		.depth = params.depth,
 		.comp_vendor_id = params.vendor_id,
diff --git a/src/libpts/tcg/tcg_pts_attr_simple_comp_evid.h b/src/libpts/tcg/tcg_pts_attr_simple_comp_evid.h
index ff846fc8b..f72429c0c 100644
--- a/src/libpts/tcg/tcg_pts_attr_simple_comp_evid.h
+++ b/src/libpts/tcg/tcg_pts_attr_simple_comp_evid.h
@@ -68,7 +68,7 @@ struct tcg_pts_attr_simple_comp_evid_params_t {
 	u_int32_t depth;
 	u_int32_t vendor_id;
 	pts_qualifier_t qualifier;
-	pts_ita_funct_comp_name_t name;
+	pts_funct_comp_name_t name;
 	u_int32_t extended_pcr;
 	pts_meas_algorithms_t hash_algorithm;
 	pts_pcr_transform_t transformation;
@@ -137,7 +137,7 @@ struct tcg_pts_attr_simple_comp_evid_t {
 	 *
 	 * @return					Component Functional Name
 	 */
-	pts_ita_funct_comp_name_t (*get_comp_funct_name)(tcg_pts_attr_simple_comp_evid_t *this);
+	pts_funct_comp_name_t (*get_comp_funct_name)(tcg_pts_attr_simple_comp_evid_t *this);
 	
 	/**
 	 * Get Measurement Type