diff --git a/pkg/apis/pipeline/v1beta1/param_conversion.go b/pkg/apis/pipeline/v1beta1/param_conversion.go
index 9844b15b2d6..17fdbae2093 100644
--- a/pkg/apis/pipeline/v1beta1/param_conversion.go
+++ b/pkg/apis/pipeline/v1beta1/param_conversion.go
@@ -48,26 +48,26 @@ func (p *ParamSpec) convertFrom(ctx context.Context, source v1.ParamSpec) {
 
 func (p Param) convertTo(ctx context.Context, sink *v1.Param) {
 	sink.Name = p.Name
-	newValue := v1.ArrayOrString{}
+	newValue := v1.ParamValue{}
 	p.Value.convertTo(ctx, &newValue)
 	sink.Value = newValue
 }
 
 func (p *Param) convertFrom(ctx context.Context, source v1.Param) {
 	p.Name = source.Name
-	newValue := ArrayOrString{}
+	newValue := ParamValue{}
 	newValue.convertFrom(ctx, source.Value)
 	p.Value = newValue
 }
 
-func (aos ArrayOrString) convertTo(ctx context.Context, sink *v1.ArrayOrString) {
+func (aos ArrayOrString) convertTo(ctx context.Context, sink *v1.ParamValue) {
 	sink.Type = v1.ParamType(aos.Type)
 	sink.StringVal = aos.StringVal
 	sink.ArrayVal = aos.ArrayVal
 	sink.ObjectVal = aos.ObjectVal
 }
 
-func (aos *ArrayOrString) convertFrom(ctx context.Context, source v1.ArrayOrString) {
+func (aos *ArrayOrString) convertFrom(ctx context.Context, source v1.ParamValue) {
 	aos.Type = ParamType(source.Type)
 	aos.StringVal = source.StringVal
 	aos.ArrayVal = source.ArrayVal
diff --git a/pkg/apis/pipeline/v1beta1/pipeline_conversion.go b/pkg/apis/pipeline/v1beta1/pipeline_conversion.go
index fd324b1e056..d2630e07cb4 100644
--- a/pkg/apis/pipeline/v1beta1/pipeline_conversion.go
+++ b/pkg/apis/pipeline/v1beta1/pipeline_conversion.go
@@ -258,7 +258,7 @@ func (pr PipelineResult) convertTo(ctx context.Context, sink *v1.PipelineResult)
 	sink.Name = pr.Name
 	sink.Type = v1.ResultsType(pr.Type)
 	sink.Description = pr.Description
-	newValue := v1.ArrayOrString{}
+	newValue := v1.ParamValue{}
 	pr.Value.convertTo(ctx, &newValue)
 	sink.Value = newValue
 }
@@ -267,7 +267,7 @@ func (pr *PipelineResult) convertFrom(ctx context.Context, source v1.PipelineRes
 	pr.Name = source.Name
 	pr.Type = ResultsType(source.Type)
 	pr.Description = source.Description
-	newValue := ArrayOrString{}
+	newValue := ParamValue{}
 	newValue.convertFrom(ctx, source.Value)
 	pr.Value = newValue
 }
diff --git a/pkg/apis/pipeline/v1beta1/pipeline_conversion_test.go b/pkg/apis/pipeline/v1beta1/pipeline_conversion_test.go
index f6c3e4f7239..f1c98fe1a02 100644
--- a/pkg/apis/pipeline/v1beta1/pipeline_conversion_test.go
+++ b/pkg/apis/pipeline/v1beta1/pipeline_conversion_test.go
@@ -104,13 +104,13 @@ func TestPipelineConversion(t *testing.T) {
 					RunAfter: []string{"task-1"},
 					Params: []v1beta1.Param{{
 						Name: "param-task-1",
-						Value: v1beta1.ArrayOrString{
+						Value: v1beta1.ParamValue{
 							ArrayVal: []string{"value-task-1"},
 						},
 					}},
 					Matrix: []v1beta1.Param{{
 						Name: "a-param",
-						Value: v1beta1.ArrayOrString{
+						Value: v1beta1.ParamValue{
 							Type:     v1beta1.ParamTypeArray,
 							ArrayVal: []string{"$(params.baz)", "and", "$(params.foo-is-baz)"},
 						},
@@ -127,7 +127,7 @@ func TestPipelineConversion(t *testing.T) {
 					Type:        v1beta1.ParamTypeString,
 					Description: "My first pipeline param",
 					Properties:  map[string]v1beta1.PropertySpec{"foo": {Type: v1beta1.ParamTypeString}},
-					Default:     v1beta1.NewArrayOrString("bar"),
+					Default:     v1beta1.NewStructuredValues("bar"),
 				}},
 				Workspaces: []v1beta1.WorkspacePipelineDeclaration{{
 					Name:        "workspace",
@@ -138,7 +138,7 @@ func TestPipelineConversion(t *testing.T) {
 					Name:        "my-pipeline-result",
 					Type:        v1beta1.ResultsTypeObject,
 					Description: "this is my pipeline result",
-					Value:       *v1beta1.NewArrayOrString("foo.bar"),
+					Value:       *v1beta1.NewStructuredValues("foo.bar"),
 				}},
 				Finally: []v1beta1.PipelineTask{{
 					Name:    "final-task",
diff --git a/pkg/apis/pipeline/v1beta1/taskrun_validation_test.go b/pkg/apis/pipeline/v1beta1/taskrun_validation_test.go
index 7029c243eb1..fa3d729ec6d 100644
--- a/pkg/apis/pipeline/v1beta1/taskrun_validation_test.go
+++ b/pkg/apis/pipeline/v1beta1/taskrun_validation_test.go
@@ -97,7 +97,7 @@ func TestTaskRun_Validate(t *testing.T) {
 			Spec: v1beta1.TaskRunSpec{
 				Params: []v1beta1.Param{{
 					Name: "task-words",
-					Value: v1beta1.ArrayOrString{
+					Value: v1beta1.ParamValue{
 						ArrayVal: []string{"hello", "task run"},
 					},
 				}},
@@ -119,7 +119,7 @@ func TestTaskRun_Validate(t *testing.T) {
 			Spec: v1beta1.TaskRunSpec{
 				Params: []v1beta1.Param{{
 					Name: "task-words",
-					Value: v1beta1.ArrayOrString{
+					Value: v1beta1.ParamValue{
 						ArrayVal: []string{"hello", "task run"},
 					},
 				}},
@@ -150,7 +150,7 @@ func TestTaskRun_Validate(t *testing.T) {
 			Spec: v1beta1.TaskRunSpec{
 				Params: []v1beta1.Param{{
 					Name: "task-words",
-					Value: v1beta1.ArrayOrString{
+					Value: v1beta1.ParamValue{
 						ArrayVal: []string{"hello", "task run"},
 					},
 				}},
@@ -184,7 +184,7 @@ func TestTaskRun_Validate(t *testing.T) {
 			Spec: v1beta1.TaskRunSpec{
 				Params: []v1beta1.Param{{
 					Name: "task-words",
-					Value: v1beta1.ArrayOrString{
+					Value: v1beta1.ParamValue{
 						ArrayVal: []string{"hello", "task run"},
 					},
 				}},