@@ -54,8 +54,8 @@ func TestGraph(t *testing.T) {

 		},

 		Parameters: build.BuildParameters{

 			Strategy: build.BuildStrategy{

-				Type: build.STIBuildStrategyType,

-				STIStrategy: &build.STIBuildStrategy{

+				Type: build.SourceBuildStrategyType,

+				SourceStrategy: &build.SourceBuildStrategy{

 					From: &kapi.ObjectReference{Kind: "ImageStreamTag", Name: "test:base-image"},

 				},

 			},

@@ -71,7 +71,7 @@ func fuzzInternalObject(t *testing.T, forVersion string, item runtime.Object, se

 				j.From.Kind = specs[c.Intn(len(specs))]

 			}

 		},

-		func(j *build.STIBuildStrategy, c fuzz.Continue) {

+		func(j *build.SourceBuildStrategy, c fuzz.Continue) {

 			c.FuzzNoCustom(j)

 			j.From.Kind = "ImageStreamTag"

 			j.From.Name = "image:tag"

@@ -169,8 +169,8 @@ type BuildStrategy struct {

 	// DockerStrategy holds the parameters to the Docker build strategy.

 	DockerStrategy *DockerBuildStrategy `json:"dockerStrategy,omitempty"`

-	// STIStrategy holds the parameters to the STI build strategy.

-	STIStrategy *STIBuildStrategy `json:"stiStrategy,omitempty"`

+	// SourceStrategy holds the parameters to the STI build strategy.

+	SourceStrategy *SourceBuildStrategy `json:"stiStrategy,omitempty"`

 	// CustomStrategy holds the parameters to the Custom build strategy.

 	CustomStrategy *CustomBuildStrategy `json:"customStrategy,omitempty"`

@@ -184,9 +184,9 @@ const (

 	// DockerBuildStrategyType performs builds using a Dockerfile.

 	DockerBuildStrategyType BuildStrategyType = "Docker"

-	// STIBuildStrategyType performs builds build using Source To Images with a Git repository

+	// SourceBuildStrategyType performs builds build using Source To Images with a Git repository

 	// and a builder image.

-	STIBuildStrategyType BuildStrategyType = "STI"

+	SourceBuildStrategyType BuildStrategyType = "STI"

 	// CustomBuildStrategyType performs builds using the custom builder Docker image.

 	CustomBuildStrategyType BuildStrategyType = "Custom"

@@ -235,8 +235,8 @@ type DockerBuildStrategy struct {

 	PullSecretName string `json:"pullSecretName,omitempty"`

 }

-// STIBuildStrategy defines input parameters specific to an STI build.

-type STIBuildStrategy struct {

+// SourceBuildStrategy defines input parameters specific to an STI build.

+type SourceBuildStrategy struct {

 	// From is reference to an ImageStream, ImageStreamTag, or ImageStreamImage from which

 	// the docker image should be pulled

 	From *kapi.ObjectReference `json:"from,omitempty"`

@@ -58,7 +58,7 @@ func init() {

 			}

 			return nil

 		},

-		func(in *newer.STIBuildStrategy, out *STIBuildStrategy, s conversion.Scope) error {

+		func(in *newer.SourceBuildStrategy, out *SourceBuildStrategy, s conversion.Scope) error {

 			if in.From != nil {

 				switch in.From.Kind {

 				case "ImageStreamImage":

@@ -96,7 +96,7 @@ func init() {

 			out.Clean = !in.Incremental

 			return s.Convert(&in.Env, &out.Env, 0)

 		},

-		func(in *STIBuildStrategy, out *newer.STIBuildStrategy, s conversion.Scope) error {

+		func(in *SourceBuildStrategy, out *newer.SourceBuildStrategy, s conversion.Scope) error {

 			out.Scripts = in.Scripts

 			out.Incremental = !in.Clean

 			out.PullSecretName = in.PullSecretName

@@ -12,13 +12,13 @@ import (

 var Convert = knewer.Scheme.Convert

-func TestSTIBuildStrategyOldToNewConversion(t *testing.T) {

-	var actual newer.STIBuildStrategy

+func TestSourceBuildStrategyOldToNewConversion(t *testing.T) {

+	var actual newer.SourceBuildStrategy

-	oldVersion := older.STIBuildStrategy{

+	oldVersion := older.SourceBuildStrategy{

 		BuilderImage: "testimage",

 	}

-	actual = newer.STIBuildStrategy{}

+	actual = newer.SourceBuildStrategy{}

 	err := Convert(&oldVersion, &actual)

 	if err != nil {

 		t.Fatalf("unexpected error: %v", err)

@@ -31,7 +31,7 @@ func TestSTIBuildStrategyOldToNewConversion(t *testing.T) {

 	}

 	// default (ImageStream/ImageRepository) Kind

-	oldVersion = older.STIBuildStrategy{

+	oldVersion = older.SourceBuildStrategy{

 		Clean: true,

 		From: &kolder.ObjectReference{

 			Name:      "name",

@@ -39,7 +39,7 @@ func TestSTIBuildStrategyOldToNewConversion(t *testing.T) {

 		},

 		Tag: "tag",

 	}

-	actual = newer.STIBuildStrategy{}

+	actual = newer.SourceBuildStrategy{}

 	err = Convert(&oldVersion, &actual)

 	if err != nil {

 		t.Fatalf("unexpected error: %v", err)

@@ -58,7 +58,7 @@ func TestSTIBuildStrategyOldToNewConversion(t *testing.T) {

 	}

 	// check Kind==ImageStream

-	oldVersion = older.STIBuildStrategy{

+	oldVersion = older.SourceBuildStrategy{

 		From: &kolder.ObjectReference{

 			Kind:      "ImageStream",

 			Name:      "name",

@@ -66,7 +66,7 @@ func TestSTIBuildStrategyOldToNewConversion(t *testing.T) {

 		},

 		Tag: "tag",

 	}

-	actual = newer.STIBuildStrategy{}

+	actual = newer.SourceBuildStrategy{}

 	err = Convert(&oldVersion, &actual)

 	if err != nil {

 		t.Fatalf("unexpected error: %v", err)

@@ -82,7 +82,7 @@ func TestSTIBuildStrategyOldToNewConversion(t *testing.T) {

 	}

 	// check Kind==ImageRepository

-	oldVersion = older.STIBuildStrategy{

+	oldVersion = older.SourceBuildStrategy{

 		From: &kolder.ObjectReference{

 			Kind:      "ImageRepository",

 			Name:      "name",

@@ -90,7 +90,7 @@ func TestSTIBuildStrategyOldToNewConversion(t *testing.T) {

 		},

 		Tag: "tag",

 	}

-	actual = newer.STIBuildStrategy{}

+	actual = newer.SourceBuildStrategy{}

 	err = Convert(&oldVersion, &actual)

 	if err != nil {

 		t.Fatalf("unexpected error: %v", err)

@@ -106,30 +106,30 @@ func TestSTIBuildStrategyOldToNewConversion(t *testing.T) {

 	}

 	// check default to tag to latest

-	oldVersion = older.STIBuildStrategy{

+	oldVersion = older.SourceBuildStrategy{

 		From: &kolder.ObjectReference{

 			Name:      "name",

 			Namespace: "namespace",

 		},

 	}

-	actual = newer.STIBuildStrategy{}

+	actual = newer.SourceBuildStrategy{}

 	err = Convert(&oldVersion, &actual)

 	if actual.From.Name != "name:latest" {

 		t.Errorf("expected %v, actual %v", "name:latest", actual.From.Name)

 	}

 }

-func TestSTIBuildStrategyNewToOldConversion(t *testing.T) {

-	var actual older.STIBuildStrategy

+func TestSourceBuildStrategyNewToOldConversion(t *testing.T) {

+	var actual older.SourceBuildStrategy

-	newVersion := newer.STIBuildStrategy{

+	newVersion := newer.SourceBuildStrategy{

 		From: &knewer.ObjectReference{

 			Kind:      "DockerImage",

 			Name:      "name",

 			Namespace: "namespace",

 		},

 	}

-	actual = older.STIBuildStrategy{}

+	actual = older.SourceBuildStrategy{}

 	err := Convert(&newVersion, &actual)

 	if err != nil {

 		t.Fatalf("unexpected error: %v", err)

@@ -145,14 +145,14 @@ func TestSTIBuildStrategyNewToOldConversion(t *testing.T) {

 	}

 	// ImageStreamTag, convert to ImageStream+tag

-	newVersion = newer.STIBuildStrategy{

+	newVersion = newer.SourceBuildStrategy{

 		From: &knewer.ObjectReference{

 			Kind:      "ImageStreamTag",

 			Name:      "name:tag",

 			Namespace: "namespace",

 		},

 	}

-	actual = older.STIBuildStrategy{}

+	actual = older.SourceBuildStrategy{}

 	err = Convert(&newVersion, &actual)

 	if err != nil {

 		t.Fatalf("unexpected error: %v", err)

@@ -171,7 +171,7 @@ func TestSTIBuildStrategyNewToOldConversion(t *testing.T) {

 	}

 	// ImageStreamImage, convert to ImageStream+tag

-	newVersion = newer.STIBuildStrategy{

+	newVersion = newer.SourceBuildStrategy{

 		From: &knewer.ObjectReference{

 			Kind:      "ImageStreamImage",

 			Name:      "name@id",

@@ -179,7 +179,7 @@ func TestSTIBuildStrategyNewToOldConversion(t *testing.T) {

 		},

 	}

-	actual = older.STIBuildStrategy{}

+	actual = older.SourceBuildStrategy{}

 	err = Convert(&newVersion, &actual)

 	if err != nil {

 		t.Fatalf("unexpected error: %v", err)

@@ -198,14 +198,14 @@ func TestSTIBuildStrategyNewToOldConversion(t *testing.T) {

 	}

 	// ImageStream, unchanged

-	newVersion = newer.STIBuildStrategy{

+	newVersion = newer.SourceBuildStrategy{

 		From: &knewer.ObjectReference{

 			Kind:      "ImageStream",

 			Name:      "name",

 			Namespace: "namespace",

 		},

 	}

-	actual = older.STIBuildStrategy{}

+	actual = older.SourceBuildStrategy{}

 	err = Convert(&newVersion, &actual)

 	if err != nil {

 		t.Fatalf("unexpected error: %v", err)

@@ -224,13 +224,13 @@ func TestSTIBuildStrategyNewToOldConversion(t *testing.T) {

 	}

 	// ImageStream(default), unchanged

-	newVersion = newer.STIBuildStrategy{

+	newVersion = newer.SourceBuildStrategy{

 		From: &knewer.ObjectReference{

 			Name:      "name",

 			Namespace: "namespace",

 		},

 	}

-	actual = older.STIBuildStrategy{}

+	actual = older.SourceBuildStrategy{}

 	err = Convert(&newVersion, &actual)

 	if err != nil {

 		t.Fatalf("unexpected error: %v", err)

@@ -165,8 +165,8 @@ type BuildStrategy struct {

 	// DockerStrategy holds the parameters to the Docker build strategy.

 	DockerStrategy *DockerBuildStrategy `json:"dockerStrategy,omitempty"`

-	// STIStrategy holds the parameters to the STI build strategy.

-	STIStrategy *STIBuildStrategy `json:"stiStrategy,omitempty"`

+	// SourceStrategy holds the parameters to the STI build strategy.

+	SourceStrategy *SourceBuildStrategy `json:"stiStrategy,omitempty"`

 	// CustomStrategy holds the parameters to the Custom build strategy

 	CustomStrategy *CustomBuildStrategy `json:"customStrategy,omitempty"`

@@ -180,9 +180,9 @@ const (

 	// DockerBuildStrategyType performs builds using a Dockerfile.

 	DockerBuildStrategyType BuildStrategyType = "Docker"

-	// STIBuildStrategyType performs builds build using Source To Images with a Git repository

+	// SourceBuildStrategyType performs builds build using Source To Images with a Git repository

 	// and a builder image.

-	STIBuildStrategyType BuildStrategyType = "STI"

+	SourceBuildStrategyType BuildStrategyType = "STI"

 	// CustomBuildStrategyType performs builds using custom builder Docker image.

 	CustomBuildStrategyType BuildStrategyType = "Custom"

@@ -255,8 +255,8 @@ type DockerBuildStrategy struct {

 	PullSecretName string `json:"pullSecretName,omitempty"`

 }

-// STIBuildStrategy defines input parameters specific to an STI build.

-type STIBuildStrategy struct {

+// SourceBuildStrategy defines input parameters specific to an STI build.

+type SourceBuildStrategy struct {

 	// BuilderImage is the image used to execute the build.

 	// Deprecated: will be removed in v1beta3, use Image.

 	BuilderImage string `json:"builderImage,omitempty"`

@@ -13,7 +13,7 @@ import (

 func init() {

 	err := kapi.Scheme.AddDefaultingFuncs(

-		func(obj *STIBuildStrategy) {

+		func(obj *SourceBuildStrategy) {

 			if obj.From != nil && len(obj.From.Kind) == 0 {

 				obj.From.Kind = "ImageStreamTag"

 			}

@@ -121,10 +121,12 @@ func init() {

 		},

 		func(in *newer.BuildParameters, out *BuildSpec, s conversion.Scope) error {

-			err := s.DefaultConvert(&in.Strategy, &out.Strategy, conversion.IgnoreMissingFields)

-			if err != nil {

+			if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {

 				return err

 			}

+			if in.Strategy.Type == newer.SourceBuildStrategyType {

+				out.Strategy.Type = SourceBuildStrategyType

+			}

 			if err := s.Convert(&in.Source, &out.Source, 0); err != nil {

 				return err

 			}

@@ -140,10 +142,12 @@ func init() {

 			return nil

 		},

 		func(in *BuildSpec, out *newer.BuildParameters, s conversion.Scope) error {

-			err := s.DefaultConvert(&in.Strategy, &out.Strategy, conversion.IgnoreMissingFields)

-			if err != nil {

+			if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {

 				return err

 			}

+			if in.Strategy.Type == SourceBuildStrategyType {

+				out.Strategy.Type = newer.SourceBuildStrategyType

+			}

 			if err := s.Convert(&in.Source, &out.Source, 0); err != nil {

 				return err

 			}

@@ -160,10 +164,12 @@ func init() {

 		},

 		func(in *newer.BuildParameters, out *BuildConfigSpec, s conversion.Scope) error {

-			err := s.DefaultConvert(&in.Strategy, &out.Strategy, conversion.IgnoreMissingFields)

-			if err != nil {

+			if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {

 				return err

 			}

+			if in.Strategy.Type == newer.SourceBuildStrategyType {

+				out.Strategy.Type = SourceBuildStrategyType

+			}

 			if err := s.Convert(&in.Source, &out.Source, 0); err != nil {

 				return err

 			}

@@ -179,10 +185,12 @@ func init() {

 			return nil

 		},

 		func(in *BuildConfigSpec, out *newer.BuildParameters, s conversion.Scope) error {

-			err := s.DefaultConvert(&in.Strategy, &out.Strategy, conversion.IgnoreMissingFields)

-			if err != nil {

+			if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {

 				return err

 			}

+			if in.Strategy.Type == SourceBuildStrategyType {

+				out.Strategy.Type = newer.SourceBuildStrategyType

+			}

 			if err := s.Convert(&in.Source, &out.Source, 0); err != nil {

 				return err

 			}

@@ -198,7 +206,7 @@ func init() {

 			return nil

 		},

-		func(in *newer.STIBuildStrategy, out *STIBuildStrategy, s conversion.Scope) error {

+		func(in *newer.SourceBuildStrategy, out *SourceBuildStrategy, s conversion.Scope) error {

 			if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {

 				return err

 			}

@@ -208,7 +216,7 @@ func init() {

 			}

 			return nil

 		},

-		func(in *STIBuildStrategy, out *newer.STIBuildStrategy, s conversion.Scope) error {

+		func(in *SourceBuildStrategy, out *newer.SourceBuildStrategy, s conversion.Scope) error {

 			if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {

 				return err

 			}

@@ -171,8 +171,8 @@ type BuildStrategy struct {

 	// DockerStrategy holds the parameters to the Docker build strategy.

 	DockerStrategy *DockerBuildStrategy `json:"dockerStrategy,omitempty"`

-	// STIStrategy holds the parameters to the STI build strategy.

-	STIStrategy *STIBuildStrategy `json:"stiStrategy,omitempty"`

+	// SourceStrategy holds the parameters to the Source build strategy.

+	SourceStrategy *SourceBuildStrategy `json:"sourceStrategy,omitempty"`

 	// CustomStrategy holds the parameters to the Custom build strategy

 	CustomStrategy *CustomBuildStrategy `json:"customStrategy,omitempty"`

@@ -186,9 +186,9 @@ const (

 	// DockerBuildStrategyType performs builds using a Dockerfile.

 	DockerBuildStrategyType BuildStrategyType = "Docker"

-	// STIBuildStrategyType performs builds build using Source To Images with a Git repository

+	// SourceBuildStrategyType performs builds build using Source To Images with a Git repository

 	// and a builder image.

-	STIBuildStrategyType BuildStrategyType = "STI"

+	SourceBuildStrategyType BuildStrategyType = "Source"

 	// CustomBuildStrategyType performs builds using custom builder Docker image.

 	CustomBuildStrategyType BuildStrategyType = "Custom"

@@ -231,8 +231,8 @@ type DockerBuildStrategy struct {

 	NoCache bool `json:"noCache,omitempty"`

 }

-// STIBuildStrategy defines input parameters specific to an STI build.

-type STIBuildStrategy struct {

+// SourceBuildStrategy defines input parameters specific to an Source build.

+type SourceBuildStrategy struct {

 	// From is reference to an ImageStream, ImageStreamTag, or ImageStreamImage from which

 	// the docker image should be pulled

 	From *kapi.ObjectReference `json:"from,omitempty"`

@@ -245,10 +245,10 @@ type STIBuildStrategy struct {

 	// Additional environment variables you want to pass into a builder container

 	Env []kapi.EnvVar `json:"env,omitempty"`

-	// Scripts is the location of STI scripts

+	// Scripts is the location of Source scripts

 	Scripts string `json:"scripts,omitempty"`

-	// Incremental flag forces the STI build to do incremental builds if true.

+	// Incremental flag forces the Source build to do incremental builds if true.

 	Incremental bool `json:"incremental,omitempty"`

 }

@@ -161,11 +161,11 @@ func validateStrategy(strategy *buildapi.BuildStrategy) fielderrors.ValidationEr

 	case len(strategy.Type) == 0:

 		allErrs = append(allErrs, fielderrors.NewFieldRequired("type"))

-	case strategy.Type == buildapi.STIBuildStrategyType:

-		if strategy.STIStrategy == nil {

+	case strategy.Type == buildapi.SourceBuildStrategyType:

+		if strategy.SourceStrategy == nil {

 			allErrs = append(allErrs, fielderrors.NewFieldRequired("stiStrategy"))

 		} else {

-			allErrs = append(allErrs, validateSTIStrategy(strategy.STIStrategy).Prefix("stiStrategy")...)

+			allErrs = append(allErrs, validateSourceStrategy(strategy.SourceStrategy).Prefix("stiStrategy")...)

 		}

 	case strategy.Type == buildapi.DockerBuildStrategyType:

 		// DockerStrategy is currently optional, initialize it to a default state if it's not set.

@@ -185,7 +185,7 @@ func validateStrategy(strategy *buildapi.BuildStrategy) fielderrors.ValidationEr

 	return allErrs

 }

-func validateSTIStrategy(strategy *buildapi.STIBuildStrategy) fielderrors.ValidationErrorList {

+func validateSourceStrategy(strategy *buildapi.SourceBuildStrategy) fielderrors.ValidationErrorList {

 	allErrs := fielderrors.ValidationErrorList{}

 	if strategy.From == nil || len(strategy.From.Name) == 0 {

 		allErrs = append(allErrs, fielderrors.NewFieldRequired("from"))

@@ -342,8 +342,8 @@ func TestValidateBuildParameters(t *testing.T) {

 					},

 				},

 				Strategy: buildapi.BuildStrategy{

-					Type:        buildapi.STIBuildStrategyType,

-					STIStrategy: &buildapi.STIBuildStrategy{},

+					Type:           buildapi.SourceBuildStrategyType,

+					SourceStrategy: &buildapi.SourceBuildStrategy{},

 				},

 				Output: buildapi.BuildOutput{

 					DockerImageReference: "repository/data",

@@ -398,8 +398,8 @@ func TestValidateBuildParametersSuccess(t *testing.T) {

 					},

 				},

 				Strategy: buildapi.BuildStrategy{

-					Type: buildapi.STIBuildStrategyType,

-					STIStrategy: &buildapi.STIBuildStrategy{

+					Type: buildapi.SourceBuildStrategyType,

+					SourceStrategy: &buildapi.SourceBuildStrategy{

 						From: &kapi.ObjectReference{

 							Name: "reponame",

 						},

@@ -39,15 +39,15 @@ func NewSTIBuilder(client DockerClient, dockerSocket string, authCfg docker.Auth

 func (s *STIBuilder) Build() error {

 	tag := s.build.Parameters.Output.DockerImageReference

 	request := &stiapi.Request{

-		BaseImage:     s.build.Parameters.Strategy.STIStrategy.From.Name,

+		BaseImage:     s.build.Parameters.Strategy.SourceStrategy.From.Name,

 		DockerConfig:  &stiapi.DockerConfig{Endpoint: s.dockerSocket},

 		Source:        s.build.Parameters.Source.Git.URI,

 		ContextDir:    s.build.Parameters.Source.ContextDir,

 		DockerCfgPath: os.Getenv(dockercfg.PullAuthType),

 		Tag:           tag,

-		ScriptsURL:    s.build.Parameters.Strategy.STIStrategy.Scripts,

+		ScriptsURL:    s.build.Parameters.Strategy.SourceStrategy.Scripts,

 		Environment:   getBuildEnvVars(s.build),

-		Incremental:   s.build.Parameters.Strategy.STIStrategy.Incremental,

+		Incremental:   s.build.Parameters.Strategy.SourceStrategy.Incremental,

 	}

 	if s.build.Parameters.Revision != nil && s.build.Parameters.Revision.Git != nil &&

@@ -20,8 +20,8 @@ func getBuildEnvVars(build *buildapi.Build) map[string]string {

 		build.Parameters.Revision.Git.Commit != "" {

 		envVars["OPENSHIFT_BUILD_COMMIT"] = build.Parameters.Revision.Git.Commit

 	}

-	if build.Parameters.Strategy.Type == buildapi.STIBuildStrategyType {

-		userEnv := build.Parameters.Strategy.STIStrategy.Env

+	if build.Parameters.Strategy.Type == buildapi.SourceBuildStrategyType {

+		userEnv := build.Parameters.Strategy.SourceStrategy.Env

 		for _, v := range userEnv {

 			envVars[v.Name] = v.Value

 		}

@@ -39,7 +39,7 @@ type BuildControllerFactory struct {

 	KubeClient          kclient.Interface

 	BuildUpdater        buildclient.BuildUpdater

 	DockerBuildStrategy *strategy.DockerBuildStrategy

-	STIBuildStrategy    *strategy.STIBuildStrategy

+	SourceBuildStrategy    *strategy.SourceBuildStrategy

 	CustomBuildStrategy *strategy.CustomBuildStrategy

 	// Stop may be set to allow controllers created by this factory to be terminated.

 	Stop <-chan struct{}

@@ -60,7 +60,7 @@ func (factory *BuildControllerFactory) Create() controller.RunnableController {

 		PodManager:        client,

 		BuildStrategy: &typeBasedFactoryStrategy{

 			DockerBuildStrategy: factory.DockerBuildStrategy,

-			STIBuildStrategy:    factory.STIBuildStrategy,

+			SourceBuildStrategy:    factory.SourceBuildStrategy,

 			CustomBuildStrategy: factory.CustomBuildStrategy,

 		},

 		Recorder: eventBroadcaster.NewRecorder(kapi.EventSource{Component: "build-controller"}),

@@ -213,7 +213,7 @@ func (pe *podEnumerator) Get(index int) interface{} {

 type typeBasedFactoryStrategy struct {

 	DockerBuildStrategy *strategy.DockerBuildStrategy

-	STIBuildStrategy    *strategy.STIBuildStrategy

+	SourceBuildStrategy    *strategy.SourceBuildStrategy

 	CustomBuildStrategy *strategy.CustomBuildStrategy

 }

@@ -223,8 +223,8 @@ func (f *typeBasedFactoryStrategy) CreateBuildPod(build *buildapi.Build) (*kapi.

 	switch build.Parameters.Strategy.Type {

 	case buildapi.DockerBuildStrategyType:

 		pod, err = f.DockerBuildStrategy.CreateBuildPod(build)

-	case buildapi.STIBuildStrategyType:

-		pod, err = f.STIBuildStrategy.CreateBuildPod(build)

+	case buildapi.SourceBuildStrategyType:

+		pod, err = f.SourceBuildStrategy.CreateBuildPod(build)

 	case buildapi.CustomBuildStrategyType:

 		pod, err = f.CustomBuildStrategy.CreateBuildPod(build)

 	default:

@@ -12,8 +12,8 @@ import (

 	cmdutil "github.com/openshift/origin/pkg/cmd/util"

 )

-// STIBuildStrategy creates STI(source to image) builds

-type STIBuildStrategy struct {

+// SourceBuildStrategy creates STI(source to image) builds

+type SourceBuildStrategy struct {

 	Image                string

 	TempDirectoryCreator TempDirectoryCreator

 	// Codec is the codec to use for encoding the output pod.

@@ -36,7 +36,7 @@ var STITempDirectoryCreator = &tempDirectoryCreator{}

 // CreateBuildPod creates a pod that will execute the STI build

 // TODO: Make the Pod definition configurable

-func (bs *STIBuildStrategy) CreateBuildPod(build *buildapi.Build) (*kapi.Pod, error) {

+func (bs *SourceBuildStrategy) CreateBuildPod(build *buildapi.Build) (*kapi.Pod, error) {

 	data, err := bs.Codec.Encode(build)

 	if err != nil {

 		return nil, err

@@ -48,7 +48,7 @@ func (bs *STIBuildStrategy) CreateBuildPod(build *buildapi.Build) (*kapi.Pod, er

 		{Name: "BUILD_LOGLEVEL", Value: fmt.Sprintf("%d", cmdutil.GetLogLevel())},

 	}

-	strategy := build.Parameters.Strategy.STIStrategy

+	strategy := build.Parameters.Strategy.SourceStrategy

 	if len(strategy.Env) > 0 {

 		mergeTrustedEnvWithoutDuplicates(strategy.Env, &containerEnv)

 	}

@@ -19,7 +19,7 @@ func (t *FakeTempDirCreator) CreateTempDirectory() (string, error) {

 }

 func TestSTICreateBuildPod(t *testing.T) {

-	strategy := &STIBuildStrategy{

+	strategy := &SourceBuildStrategy{

 		Image:                "sti-test-image",

 		TempDirectoryCreator: &FakeTempDirCreator{},

 		Codec:                v1beta1.Codec,

@@ -113,8 +113,8 @@ func mockSTIBuild() *buildapi.Build {

 				SourceSecretName: "fooSecret",

 			},

 			Strategy: buildapi.BuildStrategy{

-				Type: buildapi.STIBuildStrategyType,

-				STIStrategy: &buildapi.STIBuildStrategy{

+				Type: buildapi.SourceBuildStrategyType,

+				SourceStrategy: &buildapi.SourceBuildStrategy{

 					From: &kapi.ObjectReference{

 						Kind: "DockerImage",

 						Name: "repository/sti-builder",

@@ -162,13 +162,13 @@ func (g *BuildGenerator) generateBuildFromConfig(ctx kapi.Context, bc *buildapi.

 	// reference to a valid image so we can run the build.  Builds do not consume ImageStream references,

 	// only image specs.

 	switch {

-	case build.Parameters.Strategy.Type == buildapi.STIBuildStrategyType &&

-		build.Parameters.Strategy.STIStrategy.From != nil:

-		image, err := g.resolveImageStreamReference(ctx, build.Parameters.Strategy.STIStrategy.From, build.Config.Namespace)

+	case build.Parameters.Strategy.Type == buildapi.SourceBuildStrategyType &&

+		build.Parameters.Strategy.SourceStrategy.From != nil:

+		image, err := g.resolveImageStreamReference(ctx, build.Parameters.Strategy.SourceStrategy.From, build.Config.Namespace)

 		if err != nil {

 			return nil, err

 		}

-		build.Parameters.Strategy.STIStrategy.From = &kapi.ObjectReference{

+		build.Parameters.Strategy.SourceStrategy.From = &kapi.ObjectReference{

 			Kind: "DockerImage",

 			Name: image,

 		}

@@ -35,7 +35,7 @@ func TestInstantiate(t *testing.T) {

 	/*

 		generator := BuildGenerator{Client: Client{

 			GetBuildConfigFunc: func(ctx kapi.Context, name string) (*buildapi.BuildConfig, error) {

-				return mockBuildConfig(mockSource(), mockSTIStrategyForImageRepository(), mockOutput()), nil

+				return mockBuildConfig(mockSource(), mockSourceStrategyForImageRepository(), mockOutput()), nil

 			},

 			UpdateBuildConfigFunc: func(ctx kapi.Context, buildConfig *buildapi.BuildConfig) error {

 				return nil

@@ -58,7 +58,7 @@ func TestInstantiateRetry(t *testing.T) {

 	instantiationCalls := 0

 	generator := BuildGenerator{Client: Client{

 		GetBuildConfigFunc: func(ctx kapi.Context, name string) (*buildapi.BuildConfig, error) {

-			return mockBuildConfig(mockSource(), mockSTIStrategyForImageRepository(), mockOutput()), nil

+			return mockBuildConfig(mockSource(), mockSourceStrategyForImageRepository(), mockOutput()), nil

 		},

 		UpdateBuildConfigFunc: func(ctx kapi.Context, buildConfig *buildapi.BuildConfig) error {

 			instantiationCalls++

@@ -257,9 +257,9 @@ func TestGenerateBuildFromConfig(t *testing.T) {

 	}

 }

-func TestGenerateBuildWithImageTagForSTIStrategyImageRepository(t *testing.T) {

+func TestGenerateBuildWithImageTagForSourceStrategyImageRepository(t *testing.T) {

 	source := mockSource()

-	strategy := mockSTIStrategyForImageRepository()

+	strategy := mockSourceStrategyForImageRepository()

 	output := mockOutput()

 	bc := &buildapi.BuildConfig{

 		ObjectMeta: kapi.ObjectMeta{

@@ -323,8 +323,8 @@ func TestGenerateBuildWithImageTagForSTIStrategyImageRepository(t *testing.T) {

 	if err != nil {

 		t.Fatalf("Unexpected error %v", err)

 	}

-	if build.Parameters.Strategy.STIStrategy.From.Name != newImage {

-		t.Errorf("STI base image value %s does not match expected value %s", build.Parameters.Strategy.STIStrategy.From.Name, newImage)

+	if build.Parameters.Strategy.SourceStrategy.From.Name != newImage {

+		t.Errorf("STI base image value %s does not match expected value %s", build.Parameters.Strategy.SourceStrategy.From.Name, newImage)

 	}

 }

@@ -630,7 +630,7 @@ func TestSubstituteImageCustomBaseMatchEnvNil(t *testing.T) {

 }

 func TestGetNextBuildName(t *testing.T) {

-	bc := mockBuildConfig(mockSource(), mockSTIStrategyForImageRepository(), mockOutput())

+	bc := mockBuildConfig(mockSource(), mockSourceStrategyForImageRepository(), mockOutput())

 	if expected, actual := bc.Name+"-1", getNextBuildName(bc); expected != actual {

 		t.Errorf("Wrong buildName, expected %s, got %s", expected, actual)

 	}

@@ -773,10 +773,10 @@ func mockCustomStrategyForDockerImage() buildapi.BuildStrategy {

 	}

 }

-func mockSTIStrategyForImageRepository() buildapi.BuildStrategy {

+func mockSourceStrategyForImageRepository() buildapi.BuildStrategy {

 	return buildapi.BuildStrategy{

-		Type: buildapi.STIBuildStrategyType,

-		STIStrategy: &buildapi.STIBuildStrategy{

+		Type: buildapi.SourceBuildStrategyType,

+		SourceStrategy: &buildapi.SourceBuildStrategy{

 			From: &kapi.ObjectReference{

 				Kind:      "ImageStreamTag",

 				Name:      imageRepoName + ":" + tagName,

@@ -846,7 +846,7 @@ func mockBuild(source buildapi.BuildSource, strategy buildapi.BuildStrategy, out

 func mockBuildGenerator() *BuildGenerator {

 	return &BuildGenerator{Client: Client{

 		GetBuildConfigFunc: func(ctx kapi.Context, name string) (*buildapi.BuildConfig, error) {

-			return mockBuildConfig(mockSource(), mockSTIStrategyForImageRepository(), mockOutput()), nil

+			return mockBuildConfig(mockSource(), mockSourceStrategyForImageRepository(), mockOutput()), nil

 		},

 		UpdateBuildConfigFunc: func(ctx kapi.Context, buildConfig *buildapi.BuildConfig) error {

 			return nil

@@ -80,7 +80,7 @@ func TestCreateInstantiate(t *testing.T) {

 	rest := InstantiateREST{&BuildGenerator{Client: Client{

 		GetBuildConfigFunc: func(ctx kapi.Context, name string) (*buildapi.BuildConfig, error) {

-			return mockBuildConfig(mockSource(), mockSTIStrategyForImageRepository(), mockOutput()), nil

+			return mockBuildConfig(mockSource(), mockSourceStrategyForImageRepository(), mockOutput()), nil

 		},

 		UpdateBuildConfigFunc: func(ctx kapi.Context, buildConfig *buildapi.BuildConfig) error {

 			return nil

@@ -129,8 +129,8 @@ func TestEtcdCreateBuild(t *testing.T) {

 				},

 			},

 			Strategy: api.BuildStrategy{

-				Type: api.STIBuildStrategyType,

-				STIStrategy: &api.STIBuildStrategy{

+				Type: api.SourceBuildStrategyType,

+				SourceStrategy: &api.SourceBuildStrategy{

 					From: &kapi.ObjectReference{

 						Name: "builder/image",

 					},

@@ -185,8 +185,8 @@ func TestEtcdCreateBuildUsingImage(t *testing.T) {

 				},

 			},

 			Strategy: api.BuildStrategy{

-				Type: api.STIBuildStrategyType,

-				STIStrategy: &api.STIBuildStrategy{

+				Type: api.SourceBuildStrategyType,

+				SourceStrategy: &api.SourceBuildStrategy{

 					From: &kapi.ObjectReference{

 						Kind: "DockerImage",

 						Name: "builder/image",

@@ -417,8 +417,8 @@ func TestEtcdCreateBuildConfig(t *testing.T) {

 				},

 			},

 			Strategy: api.BuildStrategy{

-				Type: api.STIBuildStrategyType,

-				STIStrategy: &api.STIBuildStrategy{

+				Type: api.SourceBuildStrategyType,

+				SourceStrategy: &api.SourceBuildStrategy{

 					From: &kapi.ObjectReference{

 						Name: "builder/image",

 					},

@@ -472,8 +472,8 @@ func TestEtcdCreateBuildConfigUsingImage(t *testing.T) {

 				},

 			},

 			Strategy: api.BuildStrategy{

-				Type: api.STIBuildStrategyType,

-				STIStrategy: &api.STIBuildStrategy{

+				Type: api.SourceBuildStrategyType,

+				SourceStrategy: &api.SourceBuildStrategy{

 					From: &kapi.ObjectReference{

 						Kind: "DockerImage",

 						Name: "builder/image",

@@ -16,8 +16,8 @@ func GetBuildPodName(build *buildapi.Build) string {

 // with the BuildStrategy of a BuildConfig.

 func GetImageStreamForStrategy(config *buildapi.BuildConfig) *kapi.ObjectReference {

 	switch config.Parameters.Strategy.Type {

-	case buildapi.STIBuildStrategyType:

-		return config.Parameters.Strategy.STIStrategy.From

+	case buildapi.SourceBuildStrategyType:

+		return config.Parameters.Strategy.SourceStrategy.From

 	case buildapi.DockerBuildStrategyType:

 		return config.Parameters.Strategy.DockerStrategy.From

 	case buildapi.CustomBuildStrategyType:

@@ -20,7 +20,7 @@ func (*okBuildConfigGetter) Get(namespace, name string) (*api.BuildConfig, error

 		Parameters: api.BuildParameters{

 			Strategy: api.BuildStrategy{

 				Type: "STI",

-				STIStrategy: &api.STIBuildStrategy{

+				SourceStrategy: &api.SourceBuildStrategy{

 					From: &kapi.ObjectReference{

 						Kind: "DockerImage",

 						Name: "repository/builder-image",

@@ -257,7 +257,7 @@ func TestInvokeWebhookOK(t *testing.T) {

 		Parameters: api.BuildParameters{

 			Strategy: api.BuildStrategy{

 				Type: "STI",

-				STIStrategy: &api.STIBuildStrategy{

+				SourceStrategy: &api.SourceBuildStrategy{

 					From: &kapi.ObjectReference{

 						Kind: "DockerImage",

 						Name: "repository/builder-image",

@@ -15,7 +15,7 @@ import (

 var mockBuildStrategy = api.BuildStrategy{

 	Type: "STI",

-	STIStrategy: &api.STIBuildStrategy{

+	SourceStrategy: &api.SourceBuildStrategy{

 		From: &kapi.ObjectReference{

 			Name: "repository/image",

 		},

@@ -40,7 +40,7 @@ func (c *okBuildConfigGetter) Get(namespace, name string) (*api.BuildConfig, err

 var mockBuildStrategy = api.BuildStrategy{

 	Type: "STI",

-	STIStrategy: &api.STIBuildStrategy{

+	SourceStrategy: &api.SourceBuildStrategy{

 		From: &kapi.ObjectReference{

 			Kind: "DockerImage",

 			Name: "repository/image",

@@ -150,13 +150,21 @@ type BuildConfigDescriber struct {

 	host string

 }

+// TODO: remove when internal SourceBuildStrategyType is refactored to "Source"

+func describeStrategy(strategyType buildapi.BuildStrategyType) buildapi.BuildStrategyType {

+	if strategyType == buildapi.SourceBuildStrategyType {

+		strategyType = buildapi.BuildStrategyType("Source")

+	}

+	return strategyType

+}

+

 func describeBuildParameters(p buildapi.BuildParameters, out *tabwriter.Writer) {

-	formatString(out, "Strategy", p.Strategy.Type)

+	formatString(out, "Strategy", describeStrategy(p.Strategy.Type))

 	switch p.Strategy.Type {

 	case buildapi.DockerBuildStrategyType:

 		describeDockerStrategy(p.Strategy.DockerStrategy, out)

-	case buildapi.STIBuildStrategyType:

-		describeSTIStrategy(p.Strategy.STIStrategy, out)

+	case buildapi.SourceBuildStrategyType:

+		describeSourceStrategy(p.Strategy.SourceStrategy, out)

 	case buildapi.CustomBuildStrategyType:

 		describeCustomStrategy(p.Strategy.CustomStrategy, out)

 	}

@@ -202,7 +210,7 @@ func describeBuildParameters(p buildapi.BuildParameters, out *tabwriter.Writer)

 	}

 }

-func describeSTIStrategy(s *buildapi.STIBuildStrategy, out *tabwriter.Writer) {

+func describeSourceStrategy(s *buildapi.SourceBuildStrategy, out *tabwriter.Writer) {

 	if s.From != nil && len(s.From.Name) != 0 {

 		if len(s.From.Namespace) != 0 {

 			formatString(out, "Image Reference", fmt.Sprintf("%s %s/%s", s.From.Kind, s.From.Namespace, s.From.Name))

@@ -189,7 +189,7 @@ func printTemplateList(list *templateapi.TemplateList, w io.Writer) error {

 }

 func printBuild(build *buildapi.Build, w io.Writer) error {

-	_, err := fmt.Fprintf(w, "%s\t%s\t%s\t%s\n", build.Name, build.Parameters.Strategy.Type, build.Status, buildutil.GetBuildPodName(build))

+	_, err := fmt.Fprintf(w, "%s\t%s\t%s\t%s\n", build.Name, describeStrategy(build.Parameters.Strategy.Type), build.Status, buildutil.GetBuildPodName(build))

 	return err

 }

@@ -204,10 +204,10 @@ func printBuildList(buildList *buildapi.BuildList, w io.Writer) error {

 func printBuildConfig(bc *buildapi.BuildConfig, w io.Writer) error {

 	if bc.Parameters.Strategy.Type == buildapi.CustomBuildStrategyType {

-		_, err := fmt.Fprintf(w, "%s\t%v\t%s\n", bc.Name, bc.Parameters.Strategy.Type, bc.Parameters.Strategy.CustomStrategy.From.Name)

+		_, err := fmt.Fprintf(w, "%s\t%v\t%s\n", bc.Name, describeStrategy(bc.Parameters.Strategy.Type), bc.Parameters.Strategy.CustomStrategy.From.Name)

 		return err

 	}

-	_, err := fmt.Fprintf(w, "%s\t%v\t%s\n", bc.Name, bc.Parameters.Strategy.Type, bc.Parameters.Source.Git.URI)

+	_, err := fmt.Fprintf(w, "%s\t%v\t%s\n", bc.Name, describeStrategy(bc.Parameters.Strategy.Type), bc.Parameters.Source.Git.URI)

 	return err

 }

@@ -198,7 +198,7 @@ func describeBuildInPipeline(build *buildapi.BuildConfig, baseImage graph.ImageT

 			return "docker build; no source set"

 		}

 		return fmt.Sprintf("docker build of %s", source)

-	case buildapi.STIBuildStrategyType:

+	case buildapi.SourceBuildStrategyType:

 		source, ok := describeSourceInPipeline(&build.Parameters.Source)

 		if !ok {

 			return fmt.Sprintf("unconfigured source build %s", build.Name)

@@ -804,7 +804,7 @@ func (c *MasterConfig) RunBuildController() {

 			// TODO: this will be set to --storage-version (the internal schema we use)

 			Codec: v1beta1.Codec,

 		},

-		STIBuildStrategy: &buildstrategy.STIBuildStrategy{

+		SourceBuildStrategy: &buildstrategy.SourceBuildStrategy{

 			Image:                stiImage,

 			TempDirectoryCreator: buildstrategy.STITempDirectoryCreator,

 			// TODO: this will be set to --storage-version (the internal schema we use)

@@ -150,8 +150,8 @@ func (s *BuildStrategyRef) BuildStrategy() (*buildapi.BuildStrategy, []buildapi.

 	}

 	return &buildapi.BuildStrategy{

-		Type: buildapi.STIBuildStrategyType,

-		STIStrategy: &buildapi.STIBuildStrategy{

+		Type: buildapi.SourceBuildStrategyType,

+		SourceStrategy: &buildapi.SourceBuildStrategy{

 			From: s.Base.ObjectReference(),

 		},

 	}, s.Base.BuildTriggers()

@@ -309,7 +309,7 @@ func NewTestBuildOpenshift(t *testing.T) *testBuildOpenshift {

 			Image: "test-docker-builder",

 			Codec: latest.Codec,