diff --git a/types/oscal/profile/profile.go b/types/oscal/profile/profile.go
index 85a4dc4d..d0fa06a3 100644
--- a/types/oscal/profile/profile.go
+++ b/types/oscal/profile/profile.go
@@ -95,7 +95,7 @@ type Group struct {
 type Modify struct {
 
 	// A parameter setting, to be propagated to points of insertion
-	Settings []Set `xml:"set,omitempty" json:"settings,omitempty"`
+	ParameterSettings []SetParameter `xml:"set-parameter,omitempty" json:"parameter-settings,omitempty"`
 	// An Alter element specifies changes to be made to an included control when a profile is resolved.
 	Alterations []Alter `xml:"alter,omitempty" json:"alterations,omitempty"`
 }
@@ -123,7 +123,7 @@ type Exclude struct {
 }
 
 // A parameter setting, to be propagated to points of insertion
-type Set struct {
+type SetParameter struct {
 
 	// Indicates the value of the 'id' flag on a target parameter; i.e. which parameter to set
 	ParamId string `xml:"param-id,attr,omitempty" json:"paramId,omitempty"`
diff --git a/types/oscal/system_security_plan/system_security_plan.go b/types/oscal/system_security_plan/system_security_plan.go
index 07e413d3..2046638d 100644
--- a/types/oscal/system_security_plan/system_security_plan.go
+++ b/types/oscal/system_security_plan/system_security_plan.go
@@ -490,7 +490,7 @@ type ImplementedRequirement struct {
 	// A reference to one or more roles with responsibility for performing a function relative to the control.
 	ResponsibleRoles []ResponsibleRole `xml:"responsible-role,omitempty" json:"responsible-roles,omitempty"`
 	// Identifies the parameter that will be filled in by the enclosed value element.
-	SetParams []SetParam `xml:"set-param,omitempty" json:"set-params,omitempty"`
+	ParameterSettings []SetParameter `xml:"set-parameter,omitempty" json:"parameter-settings,omitempty"`
 	// Identifies which statements within a control are addressed.
 	Statements []Statement `xml:"statement,omitempty" json:"statements,omitempty"`
 }
@@ -550,11 +550,11 @@ type ByComponent struct {
 	// A reference to one or more roles with responsibility for performing a function relative to the control.
 	ResponsibleRoles []ResponsibleRole `xml:"responsible-role,omitempty" json:"responsible-roles,omitempty"`
 	// Identifies the parameter that will be filled in by the enclosed value element.
-	SetParams []SetParam `xml:"set-param,omitempty" json:"set-params,omitempty"`
+	ParameterSettings []SetParameter `xml:"set-parameter,omitempty" json:"parameter-settings,omitempty"`
 }
 
 // Identifies the parameter that will be filled in by the enclosed value element.
-type SetParam struct {
+type SetParameter struct {
 
 	// Points to a parameter within a control, to which the contained value will be assigned.
 	ParamId string `xml:"param-id,attr,omitempty" json:"paramId,omitempty"`