@@ -485,7 +485,7 @@ oc get buildConfigs

 oc get bc

 oc get builds

-[[ $(oc describe buildConfigs ruby-sample-build --api-version=v1beta3 | grep --text "Webhook Github"  | grep -F "${API_SCHEME}://${API_HOST}:${API_PORT}/osapi/v1beta3/namespaces/default/buildconfigs/ruby-sample-build/webhooks/secret101/github") ]]

+[[ $(oc describe buildConfigs ruby-sample-build --api-version=v1beta3 | grep --text "Webhook GitHub"  | grep -F "${API_SCHEME}://${API_HOST}:${API_PORT}/osapi/v1beta3/namespaces/default/buildconfigs/ruby-sample-build/webhooks/secret101/github") ]]

 [[ $(oc describe buildConfigs ruby-sample-build --api-version=v1beta3 | grep --text "Webhook Generic" | grep -F "${API_SCHEME}://${API_HOST}:${API_PORT}/osapi/v1beta3/namespaces/default/buildconfigs/ruby-sample-build/webhooks/secret101/generic") ]]

 oc start-build --list-webhooks='all' ruby-sample-build

 [[ $(oc start-build --list-webhooks='all' ruby-sample-build | grep --text "generic") ]]

@@ -922,13 +922,13 @@ func deepCopy_api_BuildStrategy(in buildapi.BuildStrategy, out *buildapi.BuildSt

 func deepCopy_api_BuildTriggerPolicy(in buildapi.BuildTriggerPolicy, out *buildapi.BuildTriggerPolicy, c *conversion.Cloner) error {

 	out.Type = in.Type

-	if in.GithubWebHook != nil {

-		out.GithubWebHook = new(buildapi.WebHookTrigger)

-		if err := deepCopy_api_WebHookTrigger(*in.GithubWebHook, out.GithubWebHook, c); err != nil {

+	if in.GitHubWebHook != nil {

+		out.GitHubWebHook = new(buildapi.WebHookTrigger)

+		if err := deepCopy_api_WebHookTrigger(*in.GitHubWebHook, out.GitHubWebHook, c); err != nil {

 			return err

 		}

 	} else {

-		out.GithubWebHook = nil

+		out.GitHubWebHook = nil

 	}

 	if in.GenericWebHook != nil {

 		out.GenericWebHook = new(buildapi.WebHookTrigger)

@@ -922,13 +922,13 @@ func deepCopy_v1_BuildStrategy(in buildapiv1.BuildStrategy, out *buildapiv1.Buil

 func deepCopy_v1_BuildTriggerPolicy(in buildapiv1.BuildTriggerPolicy, out *buildapiv1.BuildTriggerPolicy, c *conversion.Cloner) error {

 	out.Type = in.Type

-	if in.GithubWebHook != nil {

-		out.GithubWebHook = new(buildapiv1.WebHookTrigger)

-		if err := deepCopy_v1_WebHookTrigger(*in.GithubWebHook, out.GithubWebHook, c); err != nil {

+	if in.GitHubWebHook != nil {

+		out.GitHubWebHook = new(buildapiv1.WebHookTrigger)

+		if err := deepCopy_v1_WebHookTrigger(*in.GitHubWebHook, out.GitHubWebHook, c); err != nil {

 			return err

 		}

 	} else {

-		out.GithubWebHook = nil

+		out.GitHubWebHook = nil

 	}

 	if in.GenericWebHook != nil {

 		out.GenericWebHook = new(buildapiv1.WebHookTrigger)

@@ -930,13 +930,13 @@ func deepCopy_v1beta3_BuildStrategy(in buildapiv1beta3.BuildStrategy, out *build

 func deepCopy_v1beta3_BuildTriggerPolicy(in buildapiv1beta3.BuildTriggerPolicy, out *buildapiv1beta3.BuildTriggerPolicy, c *conversion.Cloner) error {

 	out.Type = in.Type

-	if in.GithubWebHook != nil {

-		out.GithubWebHook = new(buildapiv1beta3.WebHookTrigger)

-		if err := deepCopy_v1beta3_WebHookTrigger(*in.GithubWebHook, out.GithubWebHook, c); err != nil {

+	if in.GitHubWebHook != nil {

+		out.GitHubWebHook = new(buildapiv1beta3.WebHookTrigger)

+		if err := deepCopy_v1beta3_WebHookTrigger(*in.GitHubWebHook, out.GitHubWebHook, c); err != nil {

 			return err

 		}

 	} else {

-		out.GithubWebHook = nil

+		out.GitHubWebHook = nil

 	}

 	if in.GenericWebHook != nil {

 		out.GenericWebHook = new(buildapiv1beta3.WebHookTrigger)

@@ -326,8 +326,8 @@ type BuildTriggerPolicy struct {

 	// Type is the type of build trigger

 	Type BuildTriggerType `json:"type,omitempty"`

-	// GithubWebHook contains the parameters for a GitHub webhook type of trigger

-	GithubWebHook *WebHookTrigger `json:"github,omitempty"`

+	// GitHubWebHook contains the parameters for a GitHub webhook type of trigger

+	GitHubWebHook *WebHookTrigger `json:"github,omitempty"`

 	// GenericWebHook contains the parameters for a Generic webhook type of trigger

 	GenericWebHook *WebHookTrigger `json:"generic,omitempty"`

@@ -340,17 +340,17 @@ type BuildTriggerPolicy struct {

 type BuildTriggerType string

 const (

-	// GithubWebHookBuildTriggerType represents a trigger that launches builds on

+	// GitHubWebHookBuildTriggerType represents a trigger that launches builds on

 	// GitHub webhook invocations

-	GithubWebHookBuildTriggerType BuildTriggerType = "github"

+	GitHubWebHookBuildTriggerType BuildTriggerType = "GitHub"

 	// GenericWebHookBuildTriggerType represents a trigger that launches builds on

 	// generic webhook invocations

-	GenericWebHookBuildTriggerType BuildTriggerType = "generic"

+	GenericWebHookBuildTriggerType BuildTriggerType = "Generic"

 	// ImageChangeBuildTriggerType represents a trigger that launches builds on

 	// availability of a new version of an image

-	ImageChangeBuildTriggerType BuildTriggerType = "imageChange"

+	ImageChangeBuildTriggerType BuildTriggerType = "ImageChange"

 )

 // BuildList is a collection of Builds.

@@ -338,6 +338,21 @@ func convert_v1_ImageChangeTrigger_To_api_ImageChangeTrigger(in *ImageChangeTrig

 	return nil

 }

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

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

+		return err

+	}

+	switch in.Type {

+	case ImageChangeBuildTriggerTypeDeprecated:

+		out.Type = newer.ImageChangeBuildTriggerType

+	case GenericWebHookBuildTriggerTypeDeprecated:

+		out.Type = newer.GenericWebHookBuildTriggerType

+	case GitHubWebHookBuildTriggerTypeDeprecated:

+		out.Type = newer.GitHubWebHookBuildTriggerType

+	}

+	return nil

+}

+

 func init() {

 	err := kapi.Scheme.AddDefaultingFuncs(

 		func(obj *SourceBuildStrategy) {

@@ -388,6 +403,7 @@ func init() {

 		convert_v1_BuildOutput_To_api_BuildOutput,

 		convert_api_ImageChangeTrigger_To_v1_ImageChangeTrigger,

 		convert_v1_ImageChangeTrigger_To_api_ImageChangeTrigger,

+		convert_v1_BuildTriggerPolicy_To_api_BuildTriggerPolicy,

 	)

 	// Add field conversion funcs.

@@ -4,7 +4,6 @@ import (

 	"testing"

 	knewer "github.com/GoogleCloudPlatform/kubernetes/pkg/api"

-	/*kolder "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1"*/

 	newer "github.com/openshift/origin/pkg/build/api"

 	older "github.com/openshift/origin/pkg/build/api/v1"

@@ -26,3 +25,48 @@ func TestImageChangeTriggerDefaultValueConversion(t *testing.T) {

 		t.Errorf("expected %v, actual %v", &newer.ImageChangeTrigger{}, nil)

 	}

 }

+

+func TestBuildTriggerPolicyOldToNewConversion(t *testing.T) {

+	testCases := map[string]struct {

+		Olds                     []older.BuildTriggerType

+		ExpectedBuildTriggerType newer.BuildTriggerType

+	}{

+		"ImageChange": {

+			Olds: []older.BuildTriggerType{

+				older.ImageChangeBuildTriggerType,

+				older.ImageChangeBuildTriggerTypeDeprecated,

+			},

+			ExpectedBuildTriggerType: newer.ImageChangeBuildTriggerType,

+		},

+		"Generic": {

+			Olds: []older.BuildTriggerType{

+				older.GenericWebHookBuildTriggerType,

+				older.GenericWebHookBuildTriggerTypeDeprecated,

+			},

+			ExpectedBuildTriggerType: newer.GenericWebHookBuildTriggerType,

+		},

+		"GitHub": {

+			Olds: []older.BuildTriggerType{

+				older.GitHubWebHookBuildTriggerType,

+				older.GitHubWebHookBuildTriggerTypeDeprecated,

+			},

+			ExpectedBuildTriggerType: newer.GitHubWebHookBuildTriggerType,

+		},

+	}

+	for s, testCase := range testCases {

+		expected := testCase.ExpectedBuildTriggerType

+		for _, old := range testCase.Olds {

+			var actual newer.BuildTriggerPolicy

+			oldVersion := older.BuildTriggerPolicy{

+				Type: old,

+			}

+			err := Convert(&oldVersion, &actual)

+			if err != nil {

+				t.Fatalf("%s (%s -> %s): unexpected error: %v", s, old, expected, err)

+			}

+			if actual.Type != testCase.ExpectedBuildTriggerType {

+				t.Errorf("%s (%s -> %s): expected %v, actual %v", s, old, expected, expected, actual.Type)

+			}

+		}

+	}

+}

@@ -321,8 +321,8 @@ type BuildTriggerPolicy struct {

 	// Type is the type of build trigger

 	Type BuildTriggerType `json:"type,omitempty" description:"type of build trigger"`

-	// GithubWebHook contains the parameters for a GitHub webhook type of trigger

-	GithubWebHook *WebHookTrigger `json:"github,omitempty" description:"parameters for a GitHub webhook type of trigger"`

+	// GitHubWebHook contains the parameters for a GitHub webhook type of trigger

+	GitHubWebHook *WebHookTrigger `json:"github,omitempty" description:"parameters for a GitHub webhook type of trigger"`

 	// GenericWebHook contains the parameters for a Generic webhook type of trigger

 	GenericWebHook *WebHookTrigger `json:"generic,omitempty" description:"parameters for a Generic webhook type of trigger"`

@@ -335,17 +335,20 @@ type BuildTriggerPolicy struct {

 type BuildTriggerType string

 const (

-	// GithubWebHookBuildTriggerType represents a trigger that launches builds on

+	// GitHubWebHookBuildTriggerType represents a trigger that launches builds on

 	// GitHub webhook invocations

-	GithubWebHookBuildTriggerType BuildTriggerType = "github"

+	GitHubWebHookBuildTriggerType           BuildTriggerType = "GitHub"

+	GitHubWebHookBuildTriggerTypeDeprecated BuildTriggerType = "github"

 	// GenericWebHookBuildTriggerType represents a trigger that launches builds on

 	// generic webhook invocations

-	GenericWebHookBuildTriggerType BuildTriggerType = "generic"

+	GenericWebHookBuildTriggerType           BuildTriggerType = "Generic"

+	GenericWebHookBuildTriggerTypeDeprecated BuildTriggerType = "generic"

 	// ImageChangeBuildTriggerType represents a trigger that launches builds on

 	// availability of a new version of an image

-	ImageChangeBuildTriggerType BuildTriggerType = "imageChange"

+	ImageChangeBuildTriggerType           BuildTriggerType = "ImageChange"

+	ImageChangeBuildTriggerTypeDeprecated BuildTriggerType = "imageChange"

 )

 // BuildList is a collection of Builds.

@@ -338,6 +338,36 @@ func convert_v1beta3_ImageChangeTrigger_To_api_ImageChangeTrigger(in *ImageChang

 	return nil

 }

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

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

+		return err

+	}

+	switch in.Type {

+	case newer.ImageChangeBuildTriggerType:

+		out.Type = ImageChangeBuildTriggerType

+	case newer.GenericWebHookBuildTriggerType:

+		out.Type = GenericWebHookBuildTriggerType

+	case newer.GitHubWebHookBuildTriggerType:

+		out.Type = GitHubWebHookBuildTriggerType

+	}

+	return nil

+}

+

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

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

+		return err

+	}

+	switch in.Type {

+	case ImageChangeBuildTriggerType:

+		out.Type = newer.ImageChangeBuildTriggerType

+	case GenericWebHookBuildTriggerType:

+		out.Type = newer.GenericWebHookBuildTriggerType

+	case GitHubWebHookBuildTriggerType:

+		out.Type = newer.GitHubWebHookBuildTriggerType

+	}

+	return nil

+}

+

 func init() {

 	err := kapi.Scheme.AddDefaultingFuncs(

 		func(obj *SourceBuildStrategy) {

@@ -383,6 +413,8 @@ func init() {

 		convert_v1beta3_BuildOutput_To_api_BuildOutput,

 		convert_api_ImageChangeTrigger_To_v1beta3_ImageChangeTrigger,

 		convert_v1beta3_ImageChangeTrigger_To_api_ImageChangeTrigger,

+		convert_api_BuildTriggerPolicy_To_v1beta3_BuildTriggerPolicy,

+		convert_v1beta3_BuildTriggerPolicy_To_api_BuildTriggerPolicy,

 	)

 	// Add field conversion funcs.

@@ -1,11 +1,90 @@

 package v1beta3_test

 import (

-/*	"testing"

+	"testing"

 	knewer "github.com/GoogleCloudPlatform/kubernetes/pkg/api"

-	kolder "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta3"

 	newer "github.com/openshift/origin/pkg/build/api"

-	older "github.com/openshift/origin/pkg/build/api/v1beta3"*/

+	older "github.com/openshift/origin/pkg/build/api/v1beta3"

 )

+

+var Convert = knewer.Scheme.Convert

+

+func TestBuildTriggerPolicyOldToNewConversion(t *testing.T) {

+	testCases := map[string]struct {

+		Olds                     []older.BuildTriggerType

+		ExpectedBuildTriggerType newer.BuildTriggerType

+	}{

+		"ImageChange": {

+			Olds: []older.BuildTriggerType{

+				older.ImageChangeBuildTriggerType,

+				older.BuildTriggerType(newer.ImageChangeBuildTriggerType),

+			},

+			ExpectedBuildTriggerType: newer.ImageChangeBuildTriggerType,

+		},

+		"Generic": {

+			Olds: []older.BuildTriggerType{

+				older.GenericWebHookBuildTriggerType,

+				older.BuildTriggerType(newer.GenericWebHookBuildTriggerType),

+			},

+			ExpectedBuildTriggerType: newer.GenericWebHookBuildTriggerType,

+		},

+		"GitHub": {

+			Olds: []older.BuildTriggerType{

+				older.GitHubWebHookBuildTriggerType,

+				older.BuildTriggerType(newer.GitHubWebHookBuildTriggerType),

+			},

+			ExpectedBuildTriggerType: newer.GitHubWebHookBuildTriggerType,

+		},

+	}

+	for s, testCase := range testCases {

+		expected := testCase.ExpectedBuildTriggerType

+		for _, old := range testCase.Olds {

+			var actual newer.BuildTriggerPolicy

+			oldVersion := older.BuildTriggerPolicy{

+				Type: old,

+			}

+			err := Convert(&oldVersion, &actual)

+			if err != nil {

+				t.Fatalf("%s (%s -> %s): unexpected error: %v", s, old, expected, err)

+			}

+			if actual.Type != testCase.ExpectedBuildTriggerType {

+				t.Errorf("%s (%s -> %s): expected %v, actual %v", s, old, expected, expected, actual.Type)

+			}

+		}

+	}

+}

+

+func TestBuildTriggerPolicyNewToOldConversion(t *testing.T) {

+	testCases := map[string]struct {

+		New                      newer.BuildTriggerType

+		ExpectedBuildTriggerType older.BuildTriggerType

+	}{

+		"ImageChange": {

+			New: newer.ImageChangeBuildTriggerType,

+			ExpectedBuildTriggerType: older.ImageChangeBuildTriggerType,

+		},

+		"Generic": {

+			New: newer.GenericWebHookBuildTriggerType,

+			ExpectedBuildTriggerType: older.GenericWebHookBuildTriggerType,

+		},

+		"GitHub": {

+			New: newer.GitHubWebHookBuildTriggerType,

+			ExpectedBuildTriggerType: older.GitHubWebHookBuildTriggerType,

+		},

+	}

+	for s, testCase := range testCases {

+		var actual older.BuildTriggerPolicy

+		newVersion := newer.BuildTriggerPolicy{

+			Type: testCase.New,

+		}

+		err := Convert(&newVersion, &actual)

+		if err != nil {

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

+		}

+		if actual.Type != testCase.ExpectedBuildTriggerType {

+			t.Errorf("%s: expected %v, actual %v", s, testCase.ExpectedBuildTriggerType, actual.Type)

+		}

+	}

+}

@@ -321,8 +321,8 @@ type BuildTriggerPolicy struct {

 	// Type is the type of build trigger

 	Type BuildTriggerType `json:"type,omitempty"`

-	// GithubWebHook contains the parameters for a GitHub webhook type of trigger

-	GithubWebHook *WebHookTrigger `json:"github,omitempty"`

+	// GitHubWebHook contains the parameters for a GitHub webhook type of trigger

+	GitHubWebHook *WebHookTrigger `json:"github,omitempty"`

 	// GenericWebHook contains the parameters for a Generic webhook type of trigger

 	GenericWebHook *WebHookTrigger `json:"generic,omitempty"`

@@ -335,9 +335,9 @@ type BuildTriggerPolicy struct {

 type BuildTriggerType string

 const (

-	// GithubWebHookBuildTriggerType represents a trigger that launches builds on

+	// GitHubWebHookBuildTriggerType represents a trigger that launches builds on

 	// GitHub webhook invocations

-	GithubWebHookBuildTriggerType BuildTriggerType = "github"

+	GitHubWebHookBuildTriggerType BuildTriggerType = "github"

 	// GenericWebHookBuildTriggerType represents a trigger that launches builds on

 	// generic webhook invocations

@@ -235,20 +235,13 @@ func validateTrigger(trigger *buildapi.BuildTriggerPolicy) fielderrors.Validatio

 		return allErrs

 	}

-	// Ensure that only parameters for the trigger's type are present

-	triggerPresence := map[buildapi.BuildTriggerType]bool{

-		buildapi.GithubWebHookBuildTriggerType:  trigger.GithubWebHook != nil,

-		buildapi.GenericWebHookBuildTriggerType: trigger.GenericWebHook != nil,

-	}

-	allErrs = append(allErrs, validateTriggerPresence(triggerPresence, trigger.Type)...)

-

 	// Validate each trigger type

 	switch trigger.Type {

-	case buildapi.GithubWebHookBuildTriggerType:

-		if trigger.GithubWebHook == nil {

+	case buildapi.GitHubWebHookBuildTriggerType:

+		if trigger.GitHubWebHook == nil {

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

 		} else {

-			allErrs = append(allErrs, validateWebHook(trigger.GithubWebHook).Prefix("github")...)

+			allErrs = append(allErrs, validateWebHook(trigger.GitHubWebHook).Prefix("github")...)

 		}

 	case buildapi.GenericWebHookBuildTriggerType:

 		if trigger.GenericWebHook == nil {

@@ -260,16 +253,8 @@ func validateTrigger(trigger *buildapi.BuildTriggerPolicy) fielderrors.Validatio

 		if trigger.ImageChange == nil {

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

 		}

-	}

-	return allErrs

-}

-

-func validateTriggerPresence(params map[buildapi.BuildTriggerType]bool, t buildapi.BuildTriggerType) fielderrors.ValidationErrorList {

-	allErrs := fielderrors.ValidationErrorList{}

-	for triggerType, present := range params {

-		if triggerType != t && present {

-			allErrs = append(allErrs, fielderrors.NewFieldInvalid(string(triggerType), "", "triggerType wasn't found"))

-		}

+	default:

+		allErrs = append(allErrs, fielderrors.NewFieldInvalid("type", trigger.Type, "invalid trigger type"))

 	}

 	return allErrs

 }

@@ -544,61 +544,67 @@ func TestValidateTrigger(t *testing.T) {

 			trigger:  buildapi.BuildTriggerPolicy{},

 			expected: []*fielderrors.ValidationError{fielderrors.NewFieldRequired("type")},

 		},

-		"github type with no github webhook": {

-			trigger:  buildapi.BuildTriggerPolicy{Type: buildapi.GithubWebHookBuildTriggerType},

+		"trigger with unknown type": {

+			trigger: buildapi.BuildTriggerPolicy{

+				Type: "UnknownTriggerType",

+			},

+			expected: []*fielderrors.ValidationError{fielderrors.NewFieldInvalid("type", "", "")},

+		},

+		"GitHub type with no github webhook": {

+			trigger:  buildapi.BuildTriggerPolicy{Type: buildapi.GitHubWebHookBuildTriggerType},

 			expected: []*fielderrors.ValidationError{fielderrors.NewFieldRequired("github")},

 		},

-		"github trigger with no secret": {

+		"GitHub trigger with no secret": {

 			trigger: buildapi.BuildTriggerPolicy{

-				Type:          buildapi.GithubWebHookBuildTriggerType,

-				GithubWebHook: &buildapi.WebHookTrigger{},

+				Type:          buildapi.GitHubWebHookBuildTriggerType,

+				GitHubWebHook: &buildapi.WebHookTrigger{},

 			},

 			expected: []*fielderrors.ValidationError{fielderrors.NewFieldRequired("github.secret")},

 		},

-		"github trigger with generic webhook": {

+		"GitHub trigger with generic webhook": {

 			trigger: buildapi.BuildTriggerPolicy{

-				Type: buildapi.GithubWebHookBuildTriggerType,

+				Type: buildapi.GitHubWebHookBuildTriggerType,

 				GenericWebHook: &buildapi.WebHookTrigger{

 					Secret: "secret101",

 				},

 			},

-			expected: []*fielderrors.ValidationError{fielderrors.NewFieldInvalid("generic", "", "long description")},

+			expected: []*fielderrors.ValidationError{fielderrors.NewFieldRequired("github")},

 		},

-		"generic trigger with no generic webhook": {

+		"Generic trigger with no generic webhook": {

 			trigger:  buildapi.BuildTriggerPolicy{Type: buildapi.GenericWebHookBuildTriggerType},

 			expected: []*fielderrors.ValidationError{fielderrors.NewFieldRequired("generic")},

 		},

-		"generic trigger with no secret": {

+		"Generic trigger with no secret": {

 			trigger: buildapi.BuildTriggerPolicy{

 				Type:           buildapi.GenericWebHookBuildTriggerType,

 				GenericWebHook: &buildapi.WebHookTrigger{},

 			},

 			expected: []*fielderrors.ValidationError{fielderrors.NewFieldRequired("generic.secret")},

 		},

-		"generic trigger with github webhook": {

+		"Generic trigger with github webhook": {

 			trigger: buildapi.BuildTriggerPolicy{

 				Type: buildapi.GenericWebHookBuildTriggerType,

-				GithubWebHook: &buildapi.WebHookTrigger{

+				GitHubWebHook: &buildapi.WebHookTrigger{

 					Secret: "secret101",

 				},

 			},

-			expected: []*fielderrors.ValidationError{fielderrors.NewFieldInvalid("github", "", "long github description")},

+			expected: []*fielderrors.ValidationError{fielderrors.NewFieldRequired("generic")},

 		},

-		"imageChange trigger without params": {

+		"ImageChange trigger without params": {

 			trigger: buildapi.BuildTriggerPolicy{

 				Type: buildapi.ImageChangeBuildTriggerType,

 			},

 			expected: []*fielderrors.ValidationError{fielderrors.NewFieldRequired("imageChange")},

 		},

-		"valid github trigger": {

+		"valid GitHub trigger": {

 			trigger: buildapi.BuildTriggerPolicy{

-				Type: buildapi.GithubWebHookBuildTriggerType,

-				GithubWebHook: &buildapi.WebHookTrigger{

+				Type: buildapi.GitHubWebHookBuildTriggerType,

+				GitHubWebHook: &buildapi.WebHookTrigger{

 					Secret: "secret101",

 				},

 			},

 		},

-		"valid generic trigger": {

+		"valid Generic trigger": {

 			trigger: buildapi.BuildTriggerPolicy{

 				Type: buildapi.GenericWebHookBuildTriggerType,

 				GenericWebHook: &buildapi.WebHookTrigger{

@@ -606,7 +612,7 @@ func TestValidateTrigger(t *testing.T) {

 				},

 			},

 		},

-		"valid imageChange trigger": {

+		"valid ImageChange trigger": {

 			trigger: buildapi.BuildTriggerPolicy{

 				Type: buildapi.ImageChangeBuildTriggerType,

 				ImageChange: &buildapi.ImageChangeTrigger{

@@ -614,7 +620,7 @@ func TestValidateTrigger(t *testing.T) {

 				},

 			},

 		},

-		"valid imageChange trigger with empty fields": {

+		"valid ImageChange trigger with empty fields": {

 			trigger: buildapi.BuildTriggerPolicy{

 				Type:        buildapi.ImageChangeBuildTriggerType,

 				ImageChange: &buildapi.ImageChangeTrigger{},

@@ -629,6 +635,14 @@ func TestValidateTrigger(t *testing.T) {

 			}

 			continue

 		}

+		if len(errors) != 1 {

+			t.Errorf("%s: Expected one validation error, got %d", desc, len(errors))

+			for i, err := range errors {

+				validationError := err.(*fielderrors.ValidationError)

+				t.Errorf("  %d. %v", i+1, validationError)

+			}

+			continue

+		}

 		err := errors[0]

 		validationError := err.(*fielderrors.ValidationError)

 		if validationError.Type != test.expected[0].Type {

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

 		},

 		Triggers: []api.BuildTriggerPolicy{

 			{

-				Type: api.GithubWebHookBuildTriggerType,

-				GithubWebHook: &api.WebHookTrigger{

+				Type: api.GitHubWebHookBuildTriggerType,

+				GitHubWebHook: &api.WebHookTrigger{

 					Secret: "secret101",

 				},

 			},

@@ -35,13 +35,13 @@ type pushEvent struct {

 // Extract services webhooks from github.com

 func (p *WebHook) Extract(buildCfg *api.BuildConfig, secret, path string, req *http.Request) (revision *api.SourceRevision, proceed bool, err error) {

-	trigger, ok := webhook.FindTriggerPolicy(api.GithubWebHookBuildTriggerType, buildCfg)

+	trigger, ok := webhook.FindTriggerPolicy(api.GitHubWebHookBuildTriggerType, buildCfg)

 	if !ok {

 		err = webhook.ErrHookNotEnabled

 		return

 	}

 	glog.V(4).Infof("Checking if the provided secret for BuildConfig %s/%s matches", buildCfg.Namespace, buildCfg.Name)

-	if trigger.GithubWebHook.Secret != secret {

+	if trigger.GitHubWebHook.Secret != secret {

 		err = webhook.ErrSecretMismatch

 		return

 	}

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

 	return &api.BuildConfig{

 		Triggers: []api.BuildTriggerPolicy{

 			{

-				Type: api.GithubWebHookBuildTriggerType,

-				GithubWebHook: &api.WebHookTrigger{

+				Type: api.GitHubWebHookBuildTriggerType,

+				GitHubWebHook: &api.WebHookTrigger{

 					Secret: "secret101",

 				},

 			},

@@ -210,8 +210,8 @@ func setup(t *testing.T, filename, eventType string) *testContext {

 		buildCfg: &api.BuildConfig{

 			Triggers: []api.BuildTriggerPolicy{

 				{

-					Type: api.GithubWebHookBuildTriggerType,

-					GithubWebHook: &api.WebHookTrigger{

+					Type: api.GitHubWebHookBuildTriggerType,

+					GitHubWebHook: &api.WebHookTrigger{

 						Secret: "secret101",

 					},

 				},

@@ -74,8 +74,8 @@ func (c *buildConfigs) WebHookURL(name string, trigger *buildapi.BuildTriggerPol

 		switch {

 		case trigger.GenericWebHook != nil:

 			return c.r.Get().Namespace(c.ns).Resource("buildConfigHooks").Name(name).Suffix(trigger.GenericWebHook.Secret, "generic").URL(), nil

-		case trigger.GithubWebHook != nil:

-			return c.r.Get().Namespace(c.ns).Resource("buildConfigHooks").Name(name).Suffix(trigger.GithubWebHook.Secret, "github").URL(), nil

+		case trigger.GitHubWebHook != nil:

+			return c.r.Get().Namespace(c.ns).Resource("buildConfigHooks").Name(name).Suffix(trigger.GitHubWebHook.Secret, "github").URL(), nil

 		default:

 			return nil, ErrTriggerIsNotAWebHook

 		}

@@ -83,8 +83,8 @@ func (c *buildConfigs) WebHookURL(name string, trigger *buildapi.BuildTriggerPol

 	switch {

 	case trigger.GenericWebHook != nil:

 		return c.r.Get().Namespace(c.ns).Resource("buildConfigs").Name(name).SubResource("webhooks").Suffix(trigger.GenericWebHook.Secret, "generic").URL(), nil

-	case trigger.GithubWebHook != nil:

-		return c.r.Get().Namespace(c.ns).Resource("buildConfigs").Name(name).SubResource("webhooks").Suffix(trigger.GithubWebHook.Secret, "github").URL(), nil

+	case trigger.GitHubWebHook != nil:

+		return c.r.Get().Namespace(c.ns).Resource("buildConfigs").Name(name).SubResource("webhooks").Suffix(trigger.GitHubWebHook.Secret, "github").URL(), nil

 	default:

 		return nil, ErrTriggerIsNotAWebHook

 	}

@@ -33,8 +33,8 @@ func (c *FakeBuildConfigs) WebHookURL(name string, trigger *buildapi.BuildTrigge

 	switch {

 	case trigger.GenericWebHook != nil:

 		return url.Parse(fmt.Sprintf("http://localhost/buildConfigHooks/%s/%s/generic", name, trigger.GenericWebHook.Secret))

-	case trigger.GithubWebHook != nil:

-		return url.Parse(fmt.Sprintf("http://localhost/buildConfigHooks/%s/%s/github", name, trigger.GithubWebHook.Secret))

+	case trigger.GitHubWebHook != nil:

+		return url.Parse(fmt.Sprintf("http://localhost/buildConfigHooks/%s/%s/github", name, trigger.GitHubWebHook.Secret))

 	default:

 		return nil, client.ErrTriggerIsNotAWebHook

 	}

@@ -189,7 +189,7 @@ func RunListBuildWebHooks(f *clientcmd.Factory, out, errOut io.Writer, name stri

 			if prefix {

 				hookType = "generic "

 			}

-		case t.GithubWebHook != nil && github:

+		case t.GitHubWebHook != nil && github:

 			if prefix {

 				hookType = "github "

 			}

@@ -129,9 +129,9 @@ func webhookURL(c *buildapi.BuildConfig, cli client.BuildConfigsNamespacer) map[

 	for _, trigger := range c.Triggers {

 		whTrigger := ""

 		switch trigger.Type {

-		case "github":

-			whTrigger = trigger.GithubWebHook.Secret

-		case "generic":

+		case buildapi.GitHubWebHookBuildTriggerType:

+			whTrigger = trigger.GitHubWebHook.Secret

+		case buildapi.GenericWebHookBuildTriggerType:

 			whTrigger = trigger.GenericWebHook.Secret

 		}

 		if len(whTrigger) == 0 {

@@ -118,8 +118,8 @@ func (r *SourceRef) BuildSource() (*buildapi.BuildSource, []buildapi.BuildTrigge

 			ContextDir: r.ContextDir,

 		}, []buildapi.BuildTriggerPolicy{

 			{

-				Type: buildapi.GithubWebHookBuildTriggerType,

-				GithubWebHook: &buildapi.WebHookTrigger{

+				Type: buildapi.GitHubWebHookBuildTriggerType,

+				GitHubWebHook: &buildapi.WebHookTrigger{

 					Secret: generateSecret(20),

 				},

 			},

@@ -124,8 +124,8 @@ func mockBuildConfig() *buildapi.BuildConfig {

 		},

 		Triggers: []buildapi.BuildTriggerPolicy{

 			{

-				Type: buildapi.GithubWebHookBuildTriggerType,

-				GithubWebHook: &buildapi.WebHookTrigger{

+				Type: buildapi.GitHubWebHookBuildTriggerType,

+				GitHubWebHook: &buildapi.WebHookTrigger{

 					Secret: "secret101",

 				},

 			},

@@ -288,8 +288,8 @@ func mockBuildConfigImageParms(imageName, imageStream, imageTag string) *buildap

 		},

 		Triggers: []buildapi.BuildTriggerPolicy{

 			{

-				Type: buildapi.GithubWebHookBuildTriggerType,

-				GithubWebHook: &buildapi.WebHookTrigger{

+				Type: buildapi.GitHubWebHookBuildTriggerType,

+				GitHubWebHook: &buildapi.WebHookTrigger{

 					Secret: "secret101",

 				},

 			},

@@ -329,8 +329,8 @@ func mockBuildConfigImageStreamParms(imageName, imageStream, imageTag string) *b

 		},

 		Triggers: []buildapi.BuildTriggerPolicy{

 			{

-				Type: buildapi.GithubWebHookBuildTriggerType,

-				GithubWebHook: &buildapi.WebHookTrigger{

+				Type: buildapi.GitHubWebHookBuildTriggerType,

+				GitHubWebHook: &buildapi.WebHookTrigger{

 					Secret: "secret101",

 				},

 			},