@@ -19,7 +19,7 @@ func convert_v1_BuildConfig_To_api_BuildConfig(in *BuildConfig, out *newer.Build

 	// strip off any default imagechange triggers where the buildconfig's

 	// "from" is not an ImageStreamTag, because those triggers

 	// will never be invoked.

-	imageRef := buildutil.GetImageStreamForStrategy(out.Spec.Strategy)

+	imageRef := buildutil.GetInputReference(out.Spec.Strategy)

 	hasIST := imageRef != nil && imageRef.Kind == "ImageStreamTag"

 	for _, trigger := range out.Spec.Triggers {

 		if trigger.Type != newer.ImageChangeBuildTriggerType {

@@ -20,7 +20,7 @@ func convert_v1beta3_BuildConfig_To_api_BuildConfig(in *BuildConfig, out *newer.

 	// strip off any default imagechange triggers where the buildconfig's

 	// "from" is not an ImageStreamTag, because those triggers

 	// will never be invoked.

-	imageRef := buildutil.GetImageStreamForStrategy(out.Spec.Strategy)

+	imageRef := buildutil.GetInputReference(out.Spec.Strategy)

 	hasIST := imageRef != nil && imageRef.Kind == "ImageStreamTag"

 	for _, trigger := range out.Spec.Triggers {

 		if trigger.Type != newer.ImageChangeBuildTriggerType {

@@ -64,7 +64,7 @@ func ValidateBuildConfig(config *buildapi.BuildConfig) field.ErrorList {

 	fromRefs := map[string]struct{}{}

 	specPath := field.NewPath("spec")

 	triggersPath := specPath.Child("triggers")

-	buildFrom := buildutil.GetImageStreamForStrategy(config.Spec.Strategy)

+	buildFrom := buildutil.GetInputReference(config.Spec.Strategy)

 	for i, trg := range config.Spec.Triggers {

 		allErrs = append(allErrs, validateTrigger(&trg, buildFrom, triggersPath.Index(i))...)

 		if trg.Type != buildapi.ImageChangeBuildTriggerType || trg.ImageChange == nil {

@@ -72,7 +72,7 @@ func (c *ImageChangeController) HandleImageRepo(repo *imageapi.ImageStream) erro

 			if trigger.ImageChange.From != nil {

 				from = trigger.ImageChange.From

 			} else {

-				from = buildutil.GetImageStreamForStrategy(config.Spec.Strategy)

+				from = buildutil.GetInputReference(config.Spec.Strategy)

 			}

 			if from == nil || from.Kind != "ImageStreamTag" {

@@ -143,7 +143,7 @@ func findImageChangeTrigger(bc *buildapi.BuildConfig, ref *kapi.ObjectReference)

 		imageChange := trigger.ImageChange

 		triggerRef := imageChange.From

 		if triggerRef == nil {

-			triggerRef = buildutil.GetImageStreamForStrategy(bc.Spec.Strategy)

+			triggerRef = buildutil.GetInputReference(bc.Spec.Strategy)

 			if triggerRef == nil || triggerRef.Kind != "ImageStreamTag" {

 				continue

 			}

@@ -288,7 +288,7 @@ func (g *BuildGenerator) updateImageTriggers(ctx kapi.Context, bc *buildapi.Buil

 		triggerImageRef := trigger.ImageChange.From

 		if triggerImageRef == nil {

-			triggerImageRef = buildutil.GetImageStreamForStrategy(bc.Spec.Strategy)

+			triggerImageRef = buildutil.GetInputReference(bc.Spec.Strategy)

 		}

 		if triggerImageRef == nil {

 			glog.Warningf("Could not get ImageStream reference for default ImageChangeTrigger on BuildConfig %s/%s", bc.Namespace, bc.Name)

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

 		var sourceImageSpec string

 		// if the imagesource matches the strategy from, and we have a trigger for the strategy from,

 		// use the imageid from the trigger rather than resolving it.

-		if strategyFrom := buildutil.GetImageStreamForStrategy(bc.Spec.Strategy); reflect.DeepEqual(sourceImage.From, *strategyFrom) &&

+		if strategyFrom := buildutil.GetInputReference(bc.Spec.Strategy); reflect.DeepEqual(sourceImage.From, *strategyFrom) &&

 			strategyImageChangeTrigger != nil {

 			sourceImageSpec = strategyImageChangeTrigger.LastTriggeredImageID

 		} else {

@@ -299,7 +299,7 @@ func TestInstantiateWithImageTrigger(t *testing.T) {

 			if bc.Spec.Triggers[i].Type == buildapi.ImageChangeBuildTriggerType {

 				from := bc.Spec.Triggers[i].ImageChange.From

 				if from == nil {

-					from = buildutil.GetImageStreamForStrategy(bc.Spec.Strategy)

+					from = buildutil.GetInputReference(bc.Spec.Strategy)

 				}

 				if bc.Spec.Triggers[i].ImageChange.LastTriggeredImageID != ("ref@" + from.Name) {

 					t.Errorf("%s: expected LastTriggeredImageID for trigger at %d to be %s. Got: %s", tc.name, i, "ref@"+from.Name, bc.Spec.Triggers[i].ImageChange.LastTriggeredImageID)

@@ -94,7 +94,7 @@ func AddInputEdges(g osgraph.MutableUniqueGraph, node *buildgraph.BuildConfigNod

 	if in := buildgraph.EnsureSourceRepositoryNode(g, node.BuildConfig.Spec.Source); in != nil {

 		g.AddEdge(in, node, BuildInputEdgeKind)

 	}

-	inputImage := buildutil.GetImageStreamForStrategy(node.BuildConfig.Spec.Strategy)

+	inputImage := buildutil.GetInputReference(node.BuildConfig.Spec.Strategy)

 	if input := imageRefNode(g, inputImage, node.BuildConfig); input != nil {

 		g.AddEdge(input, node, BuildInputImageEdgeKind)

 	}

@@ -108,7 +108,7 @@ func AddTriggerEdges(g osgraph.MutableUniqueGraph, node *buildgraph.BuildConfigN

 		}

 		from := trigger.ImageChange.From

 		if trigger.ImageChange.From == nil {

-			from = buildutil.GetImageStreamForStrategy(node.BuildConfig.Spec.Strategy)

+			from = buildutil.GetInputReference(node.BuildConfig.Spec.Strategy)

 		}

 		triggerNode := imageRefNode(g, from, node.BuildConfig)

 		g.AddEdge(triggerNode, node, BuildTriggerImageEdgeKind)

@@ -30,9 +30,9 @@ func GetBuildName(pod *kapi.Pod) string {

 	return pod.Annotations[buildapi.BuildAnnotation]

 }

-// GetImageStreamForStrategy returns the ImageStream[Tag/Image] ObjectReference associated

-// with the BuildStrategy.

-func GetImageStreamForStrategy(strategy buildapi.BuildStrategy) *kapi.ObjectReference {

+// GetInputReference returns the From ObjectReference associated with the

+// BuildStrategy.

+func GetInputReference(strategy buildapi.BuildStrategy) *kapi.ObjectReference {

 	switch {

 	case strategy.SourceStrategy != nil:

 		return &strategy.SourceStrategy.From

@@ -672,7 +672,7 @@ Outer:

 // strategyTrigger returns a synthetic ImageChangeTrigger that represents the image stream tag the build strategy

 // points to, or nil if no such strategy trigger is possible (if the build doesn't point to an ImageStreamTag).

 func strategyTrigger(config *buildapi.BuildConfig) *ImageChangeTrigger {

-	if from := buildutil.GetImageStreamForStrategy(config.Spec.Strategy); from != nil {

+	if from := buildutil.GetInputReference(config.Spec.Strategy); from != nil {

 		if from.Kind == "ImageStreamTag" {

 			// normalize the strategy object reference

 			from.Namespace = defaultNamespace(from.Namespace, config.Namespace)

@@ -1128,7 +1128,7 @@ func (c *AppConfig) run(acceptors app.Acceptors) (*AppResult, error) {

 func (c *AppConfig) checkCircularReferences(objects app.Objects) error {

 	for _, obj := range objects {

 		if bc, ok := obj.(*buildapi.BuildConfig); ok {

-			input := buildutil.GetImageStreamForStrategy(bc.Spec.Strategy)

+			input := buildutil.GetInputReference(bc.Spec.Strategy)

 			if bc.Spec.Output.To != nil && input != nil &&

 				reflect.DeepEqual(input, bc.Spec.Output.To) {

 				ns := input.Namespace

@@ -495,7 +495,7 @@ func addBuildsToGraph(g graph.Graph, builds *buildapi.BuildList) {

 // to the image specified by strategy.from, as long as the image is managed by

 // OpenShift.

 func addBuildStrategyImageReferencesToGraph(g graph.Graph, strategy buildapi.BuildStrategy, predecessor gonum.Node) {

-	from := buildutil.GetImageStreamForStrategy(strategy)

+	from := buildutil.GetInputReference(strategy)

 	if from == nil {

 		glog.V(4).Infof("Unable to determine 'from' reference - skipping")

 		return