diff --git a/cmd/kube-controller-manager/app/BUILD b/cmd/kube-controller-manager/app/BUILD
index 25a8765d283..54c1597bd49 100644
--- a/cmd/kube-controller-manager/app/BUILD
+++ b/cmd/kube-controller-manager/app/BUILD
@@ -59,7 +59,6 @@ go_library(
         "//pkg/controller/job:go_default_library",
         "//pkg/controller/namespace:go_default_library",
         "//pkg/controller/node:go_default_library",
-        "//pkg/controller/petset:go_default_library",
         "//pkg/controller/podautoscaler:go_default_library",
         "//pkg/controller/podautoscaler/metrics:go_default_library",
         "//pkg/controller/podgc:go_default_library",
@@ -69,6 +68,7 @@ go_library(
         "//pkg/controller/route:go_default_library",
         "//pkg/controller/service:go_default_library",
         "//pkg/controller/serviceaccount:go_default_library",
+        "//pkg/controller/statefulset:go_default_library",
         "//pkg/controller/volume/attachdetach:go_default_library",
         "//pkg/controller/volume/persistentvolume:go_default_library",
         "//pkg/quota/install:go_default_library",
diff --git a/cmd/kube-controller-manager/app/apps.go b/cmd/kube-controller-manager/app/apps.go
index 6f778f223f4..e5b13862664 100644
--- a/cmd/kube-controller-manager/app/apps.go
+++ b/cmd/kube-controller-manager/app/apps.go
@@ -22,7 +22,7 @@ package app
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	statefulset "k8s.io/kubernetes/pkg/controller/statefulset"
+	"k8s.io/kubernetes/pkg/controller/statefulset"
 )
 
 func startStatefulSetController(ctx ControllerContext) (bool, error) {
diff --git a/pkg/controller/BUILD b/pkg/controller/BUILD
index 4fed427d070..9dd866b3ae4 100644
--- a/pkg/controller/BUILD
+++ b/pkg/controller/BUILD
@@ -92,7 +92,6 @@ filegroup(
         "//pkg/controller/job:all-srcs",
         "//pkg/controller/namespace:all-srcs",
         "//pkg/controller/node:all-srcs",
-        "//pkg/controller/petset:all-srcs",
         "//pkg/controller/podautoscaler:all-srcs",
         "//pkg/controller/podgc:all-srcs",
         "//pkg/controller/replicaset:all-srcs",
@@ -101,6 +100,7 @@ filegroup(
         "//pkg/controller/route:all-srcs",
         "//pkg/controller/service:all-srcs",
         "//pkg/controller/serviceaccount:all-srcs",
+        "//pkg/controller/statefulset:all-srcs",
         "//pkg/controller/volume/attachdetach:all-srcs",
         "//pkg/controller/volume/persistentvolume:all-srcs",
     ],
diff --git a/pkg/controller/statefulset/BUILD b/pkg/controller/statefulset/BUILD
index 52ba89e5eee..08cb490b72e 100644
--- a/pkg/controller/statefulset/BUILD
+++ b/pkg/controller/statefulset/BUILD
@@ -14,9 +14,9 @@ go_library(
         "fakes.go",
         "identity_mappers.go",
         "iterator.go",
-        "pet.go",
-        "pet_set.go",
-        "pet_set_utils.go",
+        "stateful_set.go",
+        "stateful_set_utils.go",
+        "statefulpod.go",
     ],
     tags = ["automanaged"],
     deps = [
@@ -50,8 +50,8 @@ go_test(
     srcs = [
         "identity_mappers_test.go",
         "iterator_test.go",
-        "pet_set_test.go",
-        "pet_test.go",
+        "stateful_set_test.go",
+        "statefulpod_test.go",
     ],
     library = ":go_default_library",
     tags = ["automanaged"],
diff --git a/test/e2e/BUILD b/test/e2e/BUILD
index 9f7cba5af35..40c2a1481c0 100644
--- a/test/e2e/BUILD
+++ b/test/e2e/BUILD
@@ -80,7 +80,6 @@ go_library(
         "pd.go",
         "persistent_volumes.go",
         "persistent_volumes-disruptive.go",
-        "petset.go",
         "pod_gc.go",
         "pods.go",
         "portforward.go",
@@ -100,6 +99,7 @@ go_library(
         "service_latency.go",
         "serviceloadbalancers.go",
         "ssh.go",
+        "statefulset.go",
         "third-party.go",
         "ubernetes_lite.go",
         "util_iperf.go",
@@ -145,9 +145,9 @@ go_library(
         "//pkg/controller/deployment/util:go_default_library",
         "//pkg/controller/endpoint:go_default_library",
         "//pkg/controller/job:go_default_library",
-        "//pkg/controller/petset:go_default_library",
         "//pkg/controller/replicaset:go_default_library",
         "//pkg/controller/replication:go_default_library",
+        "//pkg/controller/statefulset:go_default_library",
         "//pkg/fields:go_default_library",
         "//pkg/kubectl:go_default_library",
         "//pkg/kubectl/cmd/util:go_default_library",