diff --git a/pkg/kubectl/polymorphichelpers/BUILD b/pkg/kubectl/polymorphichelpers/BUILD
index fd6d8722c3..273a1ae01c 100644
--- a/pkg/kubectl/polymorphichelpers/BUILD
+++ b/pkg/kubectl/polymorphichelpers/BUILD
@@ -70,10 +70,6 @@ go_test(
     ],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/apis/apps:go_default_library",
-        "//pkg/apis/batch:go_default_library",
-        "//pkg/apis/core:go_default_library",
-        "//pkg/apis/extensions:go_default_library",
         "//pkg/controller:go_default_library",
         "//staging/src/k8s.io/api/apps/v1:go_default_library",
         "//staging/src/k8s.io/api/apps/v1beta1:go_default_library",
diff --git a/pkg/kubectl/polymorphichelpers/canbeautoscaled.go b/pkg/kubectl/polymorphichelpers/canbeautoscaled.go
index 6009f2b573..1c32ddd2c3 100644
--- a/pkg/kubectl/polymorphichelpers/canbeautoscaled.go
+++ b/pkg/kubectl/polymorphichelpers/canbeautoscaled.go
@@ -19,16 +19,35 @@ package polymorphichelpers
 import (
 	"fmt"
 
+	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/kubernetes/pkg/apis/apps"
-	api "k8s.io/kubernetes/pkg/apis/core"
-	"k8s.io/kubernetes/pkg/apis/extensions"
+	appsv1 "k8s.io/kubernetes/pkg/apis/apps"
+	extensionsv1 "k8s.io/kubernetes/pkg/apis/extensions"
 )
 
 func canBeAutoscaled(kind schema.GroupKind) error {
 	switch kind {
-	case api.Kind("ReplicationController"), extensions.Kind("ReplicaSet"),
-		extensions.Kind("Deployment"), apps.Kind("Deployment"), apps.Kind("ReplicaSet"):
+	case
+		schema.GroupKind{
+			Group: corev1.GroupName,
+			Kind:  "ReplicationController",
+		},
+		schema.GroupKind{
+			Group: appsv1.GroupName,
+			Kind:  "Deployment",
+		},
+		schema.GroupKind{
+			Group: appsv1.GroupName,
+			Kind:  "ReplicaSet",
+		},
+		schema.GroupKind{
+			Group: extensionsv1.GroupName,
+			Kind:  "Deployment",
+		},
+		schema.GroupKind{
+			Group: extensionsv1.GroupName,
+			Kind:  "ReplicaSet",
+		}:
 		// nothing to do here
 	default:
 		return fmt.Errorf("cannot autoscale a %v", kind)
diff --git a/pkg/kubectl/polymorphichelpers/canbeautoscaled_test.go b/pkg/kubectl/polymorphichelpers/canbeautoscaled_test.go
index c2f0e8a027..d25f25a5f3 100644
--- a/pkg/kubectl/polymorphichelpers/canbeautoscaled_test.go
+++ b/pkg/kubectl/polymorphichelpers/canbeautoscaled_test.go
@@ -20,7 +20,6 @@ import (
 	"testing"
 
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	api "k8s.io/kubernetes/pkg/apis/core"
 )
 
 func TestCanBeAutoscaled(t *testing.T) {
@@ -29,11 +28,17 @@ func TestCanBeAutoscaled(t *testing.T) {
 		expectErr bool
 	}{
 		{
-			kind:      api.Kind("ReplicationController"),
+			kind: schema.GroupKind{
+				Group: "",
+				Kind:  "ReplicationController",
+			},
 			expectErr: false,
 		},
 		{
-			kind:      api.Kind("Node"),
+			kind: schema.GroupKind{
+				Group: "",
+				Kind:  "Node",
+			},
 			expectErr: true,
 		},
 	}
diff --git a/pkg/kubectl/polymorphichelpers/canbeexposed.go b/pkg/kubectl/polymorphichelpers/canbeexposed.go
index af4463fe99..d1e2cd8815 100644
--- a/pkg/kubectl/polymorphichelpers/canbeexposed.go
+++ b/pkg/kubectl/polymorphichelpers/canbeexposed.go
@@ -19,17 +19,44 @@ package polymorphichelpers
 import (
 	"fmt"
 
+	appsv1 "k8s.io/api/apps/v1"
+	corev1 "k8s.io/api/core/v1"
+	extensionsv1 "k8s.io/api/extensions/v1beta1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/kubernetes/pkg/apis/apps"
-	api "k8s.io/kubernetes/pkg/apis/core"
-	"k8s.io/kubernetes/pkg/apis/extensions"
 )
 
 // Check whether the kind of resources could be exposed
 func canBeExposed(kind schema.GroupKind) error {
 	switch kind {
-	case api.Kind("ReplicationController"), api.Kind("Service"), api.Kind("Pod"),
-		extensions.Kind("Deployment"), apps.Kind("Deployment"), extensions.Kind("ReplicaSet"), apps.Kind("ReplicaSet"):
+	case
+		schema.GroupKind{
+			Group: corev1.GroupName,
+			Kind:  "ReplicationController",
+		},
+		schema.GroupKind{
+			Group: corev1.GroupName,
+			Kind:  "Service",
+		},
+		schema.GroupKind{
+			Group: corev1.GroupName,
+			Kind:  "Pod",
+		},
+		schema.GroupKind{
+			Group: appsv1.GroupName,
+			Kind:  "Deployment",
+		},
+		schema.GroupKind{
+			Group: appsv1.GroupName,
+			Kind:  "ReplicaSet",
+		},
+		schema.GroupKind{
+			Group: extensionsv1.GroupName,
+			Kind:  "Deployment",
+		},
+		schema.GroupKind{
+			Group: extensionsv1.GroupName,
+			Kind:  "ReplicaSet",
+		}:
 		// nothing to do here
 	default:
 		return fmt.Errorf("cannot expose a %s", kind)
diff --git a/pkg/kubectl/polymorphichelpers/canbeexposed_test.go b/pkg/kubectl/polymorphichelpers/canbeexposed_test.go
index b9e8d492dc..49d35137d2 100644
--- a/pkg/kubectl/polymorphichelpers/canbeexposed_test.go
+++ b/pkg/kubectl/polymorphichelpers/canbeexposed_test.go
@@ -20,7 +20,6 @@ import (
 	"testing"
 
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	api "k8s.io/kubernetes/pkg/apis/core"
 )
 
 func TestCanBeExposed(t *testing.T) {
@@ -29,11 +28,17 @@ func TestCanBeExposed(t *testing.T) {
 		expectErr bool
 	}{
 		{
-			kind:      api.Kind("ReplicationController"),
+			kind: schema.GroupKind{
+				Group: "",
+				Kind:  "ReplicationController",
+			},
 			expectErr: false,
 		},
 		{
-			kind:      api.Kind("Node"),
+			kind: schema.GroupKind{
+				Group: "",
+				Kind:  "Node",
+			},
 			expectErr: true,
 		},
 	}
diff --git a/pkg/kubectl/polymorphichelpers/helpers_test.go b/pkg/kubectl/polymorphichelpers/helpers_test.go
index 21f8af20d1..91e582f8aa 100644
--- a/pkg/kubectl/polymorphichelpers/helpers_test.go
+++ b/pkg/kubectl/polymorphichelpers/helpers_test.go
@@ -29,7 +29,6 @@ import (
 	"k8s.io/apimachinery/pkg/watch"
 	fakeexternal "k8s.io/client-go/kubernetes/fake"
 	testcore "k8s.io/client-go/testing"
-	api "k8s.io/kubernetes/pkg/apis/core"
 	"k8s.io/kubernetes/pkg/controller"
 )
 
@@ -119,18 +118,18 @@ func TestGetFirstPod(t *testing.T) {
 			watching: []watch.Event{
 				{
 					Type: watch.Modified,
-					Object: &api.Pod{
+					Object: &corev1.Pod{
 						ObjectMeta: metav1.ObjectMeta{
 							Name:              "pod-1",
 							Namespace:         metav1.NamespaceDefault,
 							CreationTimestamp: metav1.Date(2016, time.April, 1, 1, 0, 0, 0, time.UTC),
 							Labels:            map[string]string{"test": "selector"},
 						},
-						Status: api.PodStatus{
-							Conditions: []api.PodCondition{
+						Status: corev1.PodStatus{
+							Conditions: []corev1.PodCondition{
 								{
-									Status: api.ConditionTrue,
-									Type:   api.PodReady,
+									Status: corev1.ConditionTrue,
+									Type:   corev1.PodReady,
 								},
 							},
 						},
diff --git a/pkg/kubectl/polymorphichelpers/logsforobject_test.go b/pkg/kubectl/polymorphichelpers/logsforobject_test.go
index a90e7d5e03..0ec99f9477 100644
--- a/pkg/kubectl/polymorphichelpers/logsforobject_test.go
+++ b/pkg/kubectl/polymorphichelpers/logsforobject_test.go
@@ -21,16 +21,16 @@ import (
 	"testing"
 	"time"
 
+	apps "k8s.io/api/apps/v1"
+	batch "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
+	extensions "k8s.io/api/extensions/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/diff"
 	fakeexternal "k8s.io/client-go/kubernetes/fake"
 	testclient "k8s.io/client-go/testing"
-	"k8s.io/kubernetes/pkg/apis/apps"
-	"k8s.io/kubernetes/pkg/apis/batch"
-	"k8s.io/kubernetes/pkg/apis/extensions"
 )
 
 var (
diff --git a/pkg/kubectl/polymorphichelpers/mapbasedselectorforobject_test.go b/pkg/kubectl/polymorphichelpers/mapbasedselectorforobject_test.go
index 59bf5dec44..8e9b9be318 100644
--- a/pkg/kubectl/polymorphichelpers/mapbasedselectorforobject_test.go
+++ b/pkg/kubectl/polymorphichelpers/mapbasedselectorforobject_test.go
@@ -19,10 +19,10 @@ package polymorphichelpers
 import (
 	"testing"
 
+	api "k8s.io/api/core/v1"
+	extensions "k8s.io/api/extensions/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	api "k8s.io/kubernetes/pkg/apis/core"
-	"k8s.io/kubernetes/pkg/apis/extensions"
 )
 
 func TestMapBasedSelectorForObject(t *testing.T) {
diff --git a/pkg/kubectl/polymorphichelpers/objectpauser_test.go b/pkg/kubectl/polymorphichelpers/objectpauser_test.go
index 9ce0dbb304..9340772e4b 100644
--- a/pkg/kubectl/polymorphichelpers/objectpauser_test.go
+++ b/pkg/kubectl/polymorphichelpers/objectpauser_test.go
@@ -20,8 +20,8 @@ import (
 	"bytes"
 	"testing"
 
+	extensions "k8s.io/api/extensions/v1beta1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/kubernetes/pkg/apis/extensions"
 )
 
 func TestDefaultObjectPauser(t *testing.T) {
diff --git a/pkg/kubectl/polymorphichelpers/objectresumer_test.go b/pkg/kubectl/polymorphichelpers/objectresumer_test.go
index 6488f335f9..f275a40beb 100644
--- a/pkg/kubectl/polymorphichelpers/objectresumer_test.go
+++ b/pkg/kubectl/polymorphichelpers/objectresumer_test.go
@@ -20,8 +20,8 @@ import (
 	"bytes"
 	"testing"
 
+	extensions "k8s.io/api/extensions/v1beta1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/kubernetes/pkg/apis/extensions"
 )
 
 func TestDefaultObjectResumer(t *testing.T) {
diff --git a/pkg/kubectl/polymorphichelpers/portsforobject_test.go b/pkg/kubectl/polymorphichelpers/portsforobject_test.go
index b1ebb6fe4a..672f0811d3 100644
--- a/pkg/kubectl/polymorphichelpers/portsforobject_test.go
+++ b/pkg/kubectl/polymorphichelpers/portsforobject_test.go
@@ -21,9 +21,9 @@ import (
 
 	"reflect"
 
+	api "k8s.io/api/core/v1"
+	extensions "k8s.io/api/extensions/v1beta1"
 	"k8s.io/apimachinery/pkg/runtime"
-	api "k8s.io/kubernetes/pkg/apis/core"
-	"k8s.io/kubernetes/pkg/apis/extensions"
 )
 
 func TestPortsForObject(t *testing.T) {
diff --git a/pkg/kubectl/polymorphichelpers/protocolsforobject_test.go b/pkg/kubectl/polymorphichelpers/protocolsforobject_test.go
index 76c00bdcdb..d586c8f96f 100644
--- a/pkg/kubectl/polymorphichelpers/protocolsforobject_test.go
+++ b/pkg/kubectl/polymorphichelpers/protocolsforobject_test.go
@@ -21,9 +21,9 @@ import (
 
 	"reflect"
 
+	api "k8s.io/api/core/v1"
+	extensions "k8s.io/api/extensions/v1beta1"
 	"k8s.io/apimachinery/pkg/runtime"
-	api "k8s.io/kubernetes/pkg/apis/core"
-	"k8s.io/kubernetes/pkg/apis/extensions"
 )
 
 func TestProtocolsForObject(t *testing.T) {