@@ -64,7 +64,7 @@ func (s *STIBuilder) Build() error {

 		printRequest.PullAuthentication.Password = "[filtered]"

 		glog.Infof("Using provided pull secret for pulling %s image", request.BaseImage)

 	}

-	glog.V(2).Infof("Creating a new STI builder with build request: %#v\n", printRequest)

+	glog.V(2).Infof("Creating a new S2I builder with build request: %#v\n", printRequest)

 	builder, err := sti.GetStrategy(request)

 	if err != nil {

 		return err

@@ -324,7 +324,7 @@ func TestGenerateBuildWithImageTagForSourceStrategyImageRepository(t *testing.T)

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

 	}

 	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)

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

 	}

 }

@@ -28,7 +28,7 @@ func (e GenerationError) Error() string {

 	case CouldNotDetect:

 		return "could not detect a build type from the source."

 	case NoBuilderFound:

-		return "could not find a builder to match the STI source repository."

+		return "could not find a builder to match the source-to-image source repository."

 	case InvalidDockerfile:

 		return "invalid Dockerfile. Does not contain a FROM clause."

 	case ImageNotFound: