diff --git a/pkg/registry/BUILD b/pkg/registry/BUILD
index 0a8ac4e278..f66843f6d3 100644
--- a/pkg/registry/BUILD
+++ b/pkg/registry/BUILD
@@ -43,7 +43,6 @@ filegroup(
         "//pkg/registry/certificates/rest:all-srcs",
         "//pkg/registry/core/componentstatus:all-srcs",
         "//pkg/registry/core/configmap:all-srcs",
-        "//pkg/registry/core/controller:all-srcs",
         "//pkg/registry/core/endpoint:all-srcs",
         "//pkg/registry/core/event:all-srcs",
         "//pkg/registry/core/limitrange:all-srcs",
@@ -54,6 +53,7 @@ filegroup(
         "//pkg/registry/core/pod:all-srcs",
         "//pkg/registry/core/podtemplate:all-srcs",
         "//pkg/registry/core/rangeallocation:all-srcs",
+        "//pkg/registry/core/replicationcontroller:all-srcs",
         "//pkg/registry/core/resourcequota:all-srcs",
         "//pkg/registry/core/rest:all-srcs",
         "//pkg/registry/core/secret:all-srcs",
diff --git a/pkg/registry/core/replicationcontroller/BUILD b/pkg/registry/core/replicationcontroller/BUILD
index 982688a326..4de16e3683 100644
--- a/pkg/registry/core/replicationcontroller/BUILD
+++ b/pkg/registry/core/replicationcontroller/BUILD
@@ -58,7 +58,7 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//pkg/registry/core/controller/storage:all-srcs",
+        "//pkg/registry/core/replicationcontroller/storage:all-srcs",
     ],
     tags = ["automanaged"],
 )
diff --git a/pkg/registry/core/replicationcontroller/storage/BUILD b/pkg/registry/core/replicationcontroller/storage/BUILD
index f673170ef9..1f85c41ac1 100644
--- a/pkg/registry/core/replicationcontroller/storage/BUILD
+++ b/pkg/registry/core/replicationcontroller/storage/BUILD
@@ -41,7 +41,7 @@ go_library(
         "//pkg/genericapiserver/registry/generic:go_default_library",
         "//pkg/genericapiserver/registry/generic/registry:go_default_library",
         "//pkg/genericapiserver/registry/rest:go_default_library",
-        "//pkg/registry/core/controller:go_default_library",
+        "//pkg/registry/core/replicationcontroller:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/api/errors",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/labels",
diff --git a/pkg/registry/core/rest/BUILD b/pkg/registry/core/rest/BUILD
index 3e55d0bfb5..cbd7c9cf03 100644
--- a/pkg/registry/core/rest/BUILD
+++ b/pkg/registry/core/rest/BUILD
@@ -33,7 +33,6 @@ go_library(
         "//pkg/master/ports:go_default_library",
         "//pkg/registry/core/componentstatus:go_default_library",
         "//pkg/registry/core/configmap/storage:go_default_library",
-        "//pkg/registry/core/controller/storage:go_default_library",
         "//pkg/registry/core/endpoint:go_default_library",
         "//pkg/registry/core/endpoint/storage:go_default_library",
         "//pkg/registry/core/event/storage:go_default_library",
@@ -45,6 +44,7 @@ go_library(
         "//pkg/registry/core/pod/storage:go_default_library",
         "//pkg/registry/core/podtemplate/storage:go_default_library",
         "//pkg/registry/core/rangeallocation:go_default_library",
+        "//pkg/registry/core/replicationcontroller/storage:go_default_library",
         "//pkg/registry/core/resourcequota/storage:go_default_library",
         "//pkg/registry/core/secret/storage:go_default_library",
         "//pkg/registry/core/service:go_default_library",
diff --git a/pkg/registry/extensions/controller/storage/BUILD b/pkg/registry/extensions/controller/storage/BUILD
index c272bcddac..908ef8febd 100644
--- a/pkg/registry/extensions/controller/storage/BUILD
+++ b/pkg/registry/extensions/controller/storage/BUILD
@@ -37,8 +37,8 @@ go_library(
         "//pkg/apis/extensions/validation:go_default_library",
         "//pkg/genericapiserver/registry/generic:go_default_library",
         "//pkg/genericapiserver/registry/rest:go_default_library",
-        "//pkg/registry/core/controller:go_default_library",
-        "//pkg/registry/core/controller/storage:go_default_library",
+        "//pkg/registry/core/replicationcontroller:go_default_library",
+        "//pkg/registry/core/replicationcontroller/storage:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/api/errors",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",