diff --git a/hack/.packages b/hack/.packages
index 9950d6b31a..30a8d6dee9 100644
--- a/hack/.packages
+++ b/hack/.packages
@@ -34,7 +34,6 @@ k8s.io/kops/pkg/apis/kops/validation
 k8s.io/kops/pkg/apis/nodeup
 k8s.io/kops/pkg/apiserver
 k8s.io/kops/pkg/apiserver/cmd/server
-k8s.io/kops/pkg/apiserver/registry
 k8s.io/kops/pkg/apiserver/registry/cluster
 k8s.io/kops/pkg/apiserver/registry/instancegroup
 k8s.io/kops/pkg/assets
diff --git a/pkg/apiserver/registry/BUILD.bazel b/pkg/apiserver/registry/BUILD.bazel
deleted file mode 100644
index 5856c52cf2..0000000000
--- a/pkg/apiserver/registry/BUILD.bazel
+++ /dev/null
@@ -1,8 +0,0 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library")
-
-go_library(
-    name = "go_default_library",
-    srcs = ["registry.go"],
-    visibility = ["//visibility:public"],
-    deps = ["//vendor/k8s.io/apiserver/pkg/registry/generic/registry:go_default_library"],
-)
diff --git a/pkg/apiserver/registry/cluster/BUILD.bazel b/pkg/apiserver/registry/cluster/BUILD.bazel
index efd5496927..c4e85fc4b2 100644
--- a/pkg/apiserver/registry/cluster/BUILD.bazel
+++ b/pkg/apiserver/registry/cluster/BUILD.bazel
@@ -10,7 +10,6 @@ go_library(
     deps = [
         "//pkg/apis/kops:go_default_library",
         "//pkg/apis/kops/validation:go_default_library",
-        "//pkg/apiserver/registry:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/fields:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
diff --git a/pkg/apiserver/registry/cluster/etcd.go b/pkg/apiserver/registry/cluster/etcd.go
index 0f96bcd21f..4fe652e02d 100644
--- a/pkg/apiserver/registry/cluster/etcd.go
+++ b/pkg/apiserver/registry/cluster/etcd.go
@@ -21,11 +21,14 @@ import (
 	"k8s.io/apiserver/pkg/registry/generic"
 	genericregistry "k8s.io/apiserver/pkg/registry/generic/registry"
 	"k8s.io/kops/pkg/apis/kops"
-	"k8s.io/kops/pkg/apiserver/registry"
 )
 
+type REST struct {
+	*genericregistry.Store
+}
+
 // NewREST returns a RESTStorage object that will work against kops Clusters.
-func NewREST(scheme *runtime.Scheme, optsGetter generic.RESTOptionsGetter) (*registry.REST, error) {
+func NewREST(scheme *runtime.Scheme, optsGetter generic.RESTOptionsGetter) (*REST, error) {
 	strategy := NewStrategy(scheme)
 
 	store := &genericregistry.Store{
@@ -50,5 +53,5 @@ func NewREST(scheme *runtime.Scheme, optsGetter generic.RESTOptionsGetter) (*reg
 	if err := store.CompleteWithOptions(options); err != nil {
 		return nil, err
 	}
-	return &registry.REST{Store: store}, nil
+	return &REST{Store: store}, nil
 }
diff --git a/pkg/apiserver/registry/instancegroup/BUILD.bazel b/pkg/apiserver/registry/instancegroup/BUILD.bazel
index 535d64a4a9..7258b6d5dd 100644
--- a/pkg/apiserver/registry/instancegroup/BUILD.bazel
+++ b/pkg/apiserver/registry/instancegroup/BUILD.bazel
@@ -9,7 +9,6 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//pkg/apis/kops:go_default_library",
-        "//pkg/apiserver/registry:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/fields:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
@@ -17,6 +16,7 @@ go_library(
         "//vendor/k8s.io/apiserver/pkg/endpoints/request:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/registry/generic/registry:go_default_library",
+        "//vendor/k8s.io/apiserver/pkg/registry/rest:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/storage:go_default_library",
         "//vendor/k8s.io/apiserver/pkg/storage/names:go_default_library",
     ],
diff --git a/pkg/apiserver/registry/instancegroup/etcd.go b/pkg/apiserver/registry/instancegroup/etcd.go
index 5138856fd1..c6a813405c 100644
--- a/pkg/apiserver/registry/instancegroup/etcd.go
+++ b/pkg/apiserver/registry/instancegroup/etcd.go
@@ -20,12 +20,16 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apiserver/pkg/registry/generic"
 	genericregistry "k8s.io/apiserver/pkg/registry/generic/registry"
+	"k8s.io/apiserver/pkg/registry/rest"
 	"k8s.io/kops/pkg/apis/kops"
-	"k8s.io/kops/pkg/apiserver/registry"
 )
 
+type REST struct {
+	*genericregistry.Store
+}
+
 // NewREST returns a RESTStorage object that will work against kops InstanceGroups.
-func NewREST(scheme *runtime.Scheme, optsGetter generic.RESTOptionsGetter) (*registry.REST, error) {
+func NewREST(scheme *runtime.Scheme, optsGetter generic.RESTOptionsGetter) (*REST, error) {
 	strategy := NewStrategy(scheme)
 
 	store := &genericregistry.Store{
@@ -50,5 +54,13 @@ func NewREST(scheme *runtime.Scheme, optsGetter generic.RESTOptionsGetter) (*reg
 	if err := store.CompleteWithOptions(options); err != nil {
 		return nil, err
 	}
-	return &registry.REST{Store: store}, nil
+	return &REST{Store: store}, nil
+}
+
+// Implement ShortNamesProvider
+var _ rest.ShortNamesProvider = &REST{}
+
+// ShortNames implements the ShortNamesProvider interface. Returns a list of short names for a resource.
+func (r *REST) ShortNames() []string {
+	return []string{"ig"}
 }
diff --git a/pkg/apiserver/registry/registry.go b/pkg/apiserver/registry/registry.go
deleted file mode 100644
index 8d379acc66..0000000000
--- a/pkg/apiserver/registry/registry.go
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package registry
-
-import (
-	genericregistry "k8s.io/apiserver/pkg/registry/generic/registry"
-)
-
-// REST implements a RESTStorage for API services against etcd
-type REST struct {
-	*genericregistry.Store
-}