diff --git a/pkg/expapi/validation/validation_test.go b/pkg/expapi/validation/validation_test.go
index e7a8f72f4ef..9397e63ebc9 100644
--- a/pkg/expapi/validation/validation_test.go
+++ b/pkg/expapi/validation/validation_test.go
@@ -38,7 +38,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
 				},
 				MinCount: 1,
 				MaxCount: 5,
-				Target:   expapi.TargetConsumption{api.ResourceCPU, resource.MustParse("0.8")},
+				Target:   expapi.TargetConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("0.8")},
 			},
 		},
 	}
@@ -60,7 +60,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
 				},
 				MinCount: -1,
 				MaxCount: 5,
-				Target:   expapi.TargetConsumption{api.ResourceCPU, resource.MustParse("0.8")},
+				Target:   expapi.TargetConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("0.8")},
 			},
 		},
 		"must be bigger or equal to minCount": {
@@ -74,7 +74,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
 				},
 				MinCount: 7,
 				MaxCount: 5,
-				Target:   expapi.TargetConsumption{api.ResourceCPU, resource.MustParse("0.8")},
+				Target:   expapi.TargetConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("0.8")},
 			},
 		},
 		"invalid value": {
@@ -88,7 +88,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
 				},
 				MinCount: 1,
 				MaxCount: 5,
-				Target:   expapi.TargetConsumption{api.ResourceCPU, resource.MustParse("-0.8")},
+				Target:   expapi.TargetConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("-0.8")},
 			},
 		},
 		"resource not supported": {
@@ -102,7 +102,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
 				},
 				MinCount: 1,
 				MaxCount: 5,
-				Target:   expapi.TargetConsumption{api.ResourceName("NotSupportedResource"), resource.MustParse("0.8")},
+				Target:   expapi.TargetConsumption{Resource: api.ResourceName("NotSupportedResource"), Quantity: resource.MustParse("0.8")},
 			},
 		},
 		"required value": {
@@ -113,7 +113,7 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) {
 			Spec: expapi.HorizontalPodAutoscalerSpec{
 				MinCount: 1,
 				MaxCount: 5,
-				Target:   expapi.TargetConsumption{api.ResourceCPU, resource.MustParse("0.8")},
+				Target:   expapi.TargetConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("0.8")},
 			},
 		},
 	}
diff --git a/pkg/proxy/iptables/proxier.go b/pkg/proxy/iptables/proxier.go
index 7a5e38564e6..bf8fd6e08a4 100644
--- a/pkg/proxy/iptables/proxier.go
+++ b/pkg/proxy/iptables/proxier.go
@@ -240,14 +240,14 @@ func (proxier *Proxier) OnServiceUpdate(allServices []api.Service) {
 
 		// if ClusterIP is "None" or empty, skip proxying
 		if !api.IsServiceIPSet(service) {
-			glog.V(3).Infof("Skipping service %s due to portal IP = %q", types.NamespacedName{service.Namespace, service.Name}, service.Spec.ClusterIP)
+			glog.V(3).Infof("Skipping service %s due to portal IP = %q", types.NamespacedName{Namespace: service.Namespace, Name: service.Name}, service.Spec.ClusterIP)
 			continue
 		}
 
 		for i := range service.Spec.Ports {
 			servicePort := &service.Spec.Ports[i]
 
-			serviceName := proxy.ServicePortName{types.NamespacedName{service.Namespace, service.Name}, servicePort.Name}
+			serviceName := proxy.ServicePortName{NamespacedName: types.NamespacedName{Namespace: service.Namespace, Name: service.Name}, Port: servicePort.Name}
 			activeServices[serviceName] = true
 			info, exists := proxier.serviceMap[serviceName]
 			if exists && proxier.sameConfig(info, service, servicePort) {
@@ -318,7 +318,7 @@ func (proxier *Proxier) OnEndpointsUpdate(allEndpoints []api.Endpoints) {
 		}
 
 		for portname := range portsToEndpoints {
-			svcPort := proxy.ServicePortName{types.NamespacedName{svcEndpoints.Namespace, svcEndpoints.Name}, portname}
+			svcPort := proxy.ServicePortName{NamespacedName: types.NamespacedName{Namespace: svcEndpoints.Namespace, Name: svcEndpoints.Name}, Port: portname}
 			state, exists := proxier.serviceMap[svcPort]
 			if !exists || state == nil {
 				state = newServiceInfo(svcPort)
diff --git a/pkg/registry/event/rest.go b/pkg/registry/event/rest.go
index 14d1a06164d..8f5e2df558f 100644
--- a/pkg/registry/event/rest.go
+++ b/pkg/registry/event/rest.go
@@ -67,7 +67,7 @@ func (eventStrategy) AllowUnconditionalUpdate() bool {
 }
 
 func MatchEvent(label labels.Selector, field fields.Selector) generic.Matcher {
-	return &generic.SelectionPredicate{label, field, getAttrs}
+	return &generic.SelectionPredicate{Label: label, Field: field, GetAttrs: getAttrs}
 }
 
 func getAttrs(obj runtime.Object) (objLabels labels.Set, objFields fields.Set, err error) {
diff --git a/pkg/registry/horizontalpodautoscaler/etcd/etcd_test.go b/pkg/registry/horizontalpodautoscaler/etcd/etcd_test.go
index ba26671d568..8a114b83a3b 100644
--- a/pkg/registry/horizontalpodautoscaler/etcd/etcd_test.go
+++ b/pkg/registry/horizontalpodautoscaler/etcd/etcd_test.go
@@ -65,7 +65,7 @@ func validNewHorizontalPodAutoscaler(name string) *expapi.HorizontalPodAutoscale
 			},
 			MinCount: 1,
 			MaxCount: 5,
-			Target:   expapi.TargetConsumption{api.ResourceCPU, resource.MustParse("0.8")},
+			Target:   expapi.TargetConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("0.8")},
 		},
 	}
 }