diff --git a/apis/management.cattle.io/v3/pipeline_types.go b/apis/management.cattle.io/v3/pipeline_types.go
index 7e496225..c1650010 100644
--- a/apis/management.cattle.io/v3/pipeline_types.go
+++ b/apis/management.cattle.io/v3/pipeline_types.go
@@ -78,7 +78,7 @@ type GithubClusterConfig struct {
 }
 
 type PipelineStatus struct {
-	State           string `json:"state,omitempty" norman:"required,options=active|inactive,default=active"`
+	PipelineState   string `json:"pipelineState,omitempty" norman:"required,options=active|inactive,default=active"`
 	NextRun         int    `json:"nextRun" yaml:"nextRun,omitempty" norman:"default=1,min=1"`
 	LastExecutionID string `json:"lastExecutionId,omitempty" yaml:"lastExecutionId,omitempty"`
 	LastRunState    string `json:"lastRunState,omitempty" yaml:"lastRunState,omitempty"`
@@ -144,11 +144,11 @@ type PipelineExecutionSpec struct {
 }
 
 type PipelineExecutionStatus struct {
-	Commit  string        `json:"commit,omitempty"`
-	State   string        `json:"state,omitempty"`
-	Started string        `json:"started,omitempty"`
-	Ended   string        `json:"ended,omitempty"`
-	Stages  []StageStatus `json:"stages,omitempty"`
+	Commit         string        `json:"commit,omitempty"`
+	ExecutionState string        `json:"executionState,omitempty"`
+	Started        string        `json:"started,omitempty"`
+	Ended          string        `json:"ended,omitempty"`
+	Stages         []StageStatus `json:"stages,omitempty"`
 }
 
 type StageStatus struct {
diff --git a/apis/management.cattle.io/v3/schema/schema.go b/apis/management.cattle.io/v3/schema/schema.go
index b13348f2..b4184af0 100644
--- a/apis/management.cattle.io/v3/schema/schema.go
+++ b/apis/management.cattle.io/v3/schema/schema.go
@@ -365,18 +365,15 @@ func alertTypes(schema *types.Schemas) *types.Schemas {
 
 func pipelineTypes(schema *types.Schemas) *types.Schemas {
 	return schema.
-		AddMapperForType(&Version, &v3.ClusterPipeline{},
-			m.DisplayName{}).
-		AddMapperForType(&Version, &v3.Pipeline{},
+		AddMapperForType(&Version, v3.ClusterPipeline{}).
+		AddMapperForType(&Version, v3.Pipeline{},
 			&m.Embed{Field: "status"},
 			m.DisplayName{}).
-		AddMapperForType(&Version, &v3.PipelineExecution{},
-			&m.Embed{Field: "status"},
-			m.DisplayName{}).
-		AddMapperForType(&Version, &v3.SourceCodeCredential{},
-			m.DisplayName{}).
-		AddMapperForType(&Version, &v3.SourceCodeRepository{}, m.DisplayName{}).
-		AddMapperForType(&Version, &v3.PipelineExecutionLog{}).
+		AddMapperForType(&Version, v3.PipelineExecution{},
+			&m.Embed{Field: "status"}).
+		AddMapperForType(&Version, v3.SourceCodeCredential{}).
+		AddMapperForType(&Version, v3.SourceCodeRepository{}).
+		AddMapperForType(&Version, v3.PipelineExecutionLog{}).
 		MustImport(&Version, v3.AuthAppInput{}).
 		MustImport(&Version, v3.AuthUserInput{}).
 		MustImportAndCustomize(&Version, v3.SourceCodeCredential{}, func(schema *types.Schema) {