diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go
index 7a7e7aecd63..2e66881f9c8 100644
--- a/cmd/kube-controller-manager/app/controllermanager.go
+++ b/cmd/kube-controller-manager/app/controllermanager.go
@@ -35,12 +35,12 @@ import (
 	"k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
 	clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"
 	"k8s.io/kubernetes/pkg/cloudprovider"
-	"k8s.io/kubernetes/pkg/controller/autoscaler"
-	"k8s.io/kubernetes/pkg/controller/autoscaler/metrics"
 	"k8s.io/kubernetes/pkg/controller/endpoint"
 	"k8s.io/kubernetes/pkg/controller/namespace"
 	"k8s.io/kubernetes/pkg/controller/node"
 	"k8s.io/kubernetes/pkg/controller/persistentvolume"
+	"k8s.io/kubernetes/pkg/controller/podautoscaler"
+	"k8s.io/kubernetes/pkg/controller/podautoscaler/metrics"
 	replicationControllerPkg "k8s.io/kubernetes/pkg/controller/replication"
 	"k8s.io/kubernetes/pkg/controller/resourcequota"
 	"k8s.io/kubernetes/pkg/controller/route"
@@ -248,7 +248,7 @@ func (s *CMServer) Run(_ []string) error {
 	namespaceController.Run()
 
 	if s.EnableHorizontalPodAutoscaler {
-		horizontalPodAutoscalerController := autoscalercontroller.New(kubeClient, metrics.NewHeapsterMetricsClient(kubeClient))
+		horizontalPodAutoscalerController := podautoscaler.NewHorizontalController(kubeClient, metrics.NewHeapsterMetricsClient(kubeClient))
 		horizontalPodAutoscalerController.Run(s.HorizontalPodAutoscalerSyncPeriod)
 	}
 
diff --git a/pkg/controller/autoscaler/horizontalpodautoscaler_controller.go b/pkg/controller/podautoscaler/horizontal.go
similarity index 91%
rename from pkg/controller/autoscaler/horizontalpodautoscaler_controller.go
rename to pkg/controller/podautoscaler/horizontal.go
index 11e98ccadca..b2421651731 100644
--- a/pkg/controller/autoscaler/horizontalpodautoscaler_controller.go
+++ b/pkg/controller/podautoscaler/horizontal.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package autoscalercontroller
+package podautoscaler
 
 import (
 	"fmt"
@@ -24,7 +24,7 @@ import (
 	"github.com/golang/glog"
 	"k8s.io/kubernetes/pkg/api"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
-	"k8s.io/kubernetes/pkg/controller/autoscaler/metrics"
+	"k8s.io/kubernetes/pkg/controller/podautoscaler/metrics"
 	"k8s.io/kubernetes/pkg/expapi"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
@@ -40,7 +40,7 @@ const (
 	tolerance = 0.1
 )
 
-type HorizontalPodAutoscalerController struct {
+type HorizontalController struct {
 	client        client.Interface
 	metricsClient metrics.MetricsClient
 }
@@ -48,14 +48,14 @@ type HorizontalPodAutoscalerController struct {
 var downscaleForbiddenWindow, _ = time.ParseDuration("20m")
 var upscaleForbiddenWindow, _ = time.ParseDuration("3m")
 
-func New(client client.Interface, metricsClient metrics.MetricsClient) *HorizontalPodAutoscalerController {
-	return &HorizontalPodAutoscalerController{
+func NewHorizontalController(client client.Interface, metricsClient metrics.MetricsClient) *HorizontalController {
+	return &HorizontalController{
 		client:        client,
 		metricsClient: metricsClient,
 	}
 }
 
-func (a *HorizontalPodAutoscalerController) Run(syncPeriod time.Duration) {
+func (a *HorizontalController) Run(syncPeriod time.Duration) {
 	go util.Until(func() {
 		if err := a.reconcileAutoscalers(); err != nil {
 			glog.Errorf("Couldn't reconcile horizontal pod autoscalers: %v", err)
@@ -63,7 +63,7 @@ func (a *HorizontalPodAutoscalerController) Run(syncPeriod time.Duration) {
 	}, syncPeriod, util.NeverStop)
 }
 
-func (a *HorizontalPodAutoscalerController) reconcileAutoscalers() error {
+func (a *HorizontalController) reconcileAutoscalers() error {
 	ns := api.NamespaceAll
 	list, err := a.client.Experimental().HorizontalPodAutoscalers(ns).List(labels.Everything(), fields.Everything())
 	if err != nil {
diff --git a/pkg/controller/autoscaler/horizontalpodautoscaler_controller_test.go b/pkg/controller/podautoscaler/horizontal_test.go
similarity index 96%
rename from pkg/controller/autoscaler/horizontalpodautoscaler_controller_test.go
rename to pkg/controller/podautoscaler/horizontal_test.go
index bdffbbb18ba..6e921b0cb17 100644
--- a/pkg/controller/autoscaler/horizontalpodautoscaler_controller_test.go
+++ b/pkg/controller/podautoscaler/horizontal_test.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2014 The Kubernetes Authors All rights reserved.
+Copyright 2015 The Kubernetes Authors All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package autoscalercontroller
+package podautoscaler
 
 import (
 	"fmt"
@@ -27,7 +27,7 @@ import (
 	"k8s.io/kubernetes/pkg/api/resource"
 	"k8s.io/kubernetes/pkg/api/testapi"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
-	"k8s.io/kubernetes/pkg/controller/autoscaler/metrics"
+	"k8s.io/kubernetes/pkg/controller/podautoscaler/metrics"
 	"k8s.io/kubernetes/pkg/expapi"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/util"
@@ -182,7 +182,7 @@ func TestSyncEndpointsItemsPreserveNoSelector(t *testing.T) {
 	}}
 	fake := fakeMetricsClient{consumption: &fakeRC}
 
-	hpaController := New(kubeClient, &fake)
+	hpaController := NewHorizontalController(kubeClient, &fake)
 
 	err := hpaController.reconcileAutoscalers()
 	if err != nil {
diff --git a/pkg/controller/autoscaler/metrics/metrics_client.go b/pkg/controller/podautoscaler/metrics/metrics_client.go
similarity index 100%
rename from pkg/controller/autoscaler/metrics/metrics_client.go
rename to pkg/controller/podautoscaler/metrics/metrics_client.go
diff --git a/pkg/controller/autoscaler/metrics/metrics_client_test.go b/pkg/controller/podautoscaler/metrics/metrics_client_test.go
similarity index 100%
rename from pkg/controller/autoscaler/metrics/metrics_client_test.go
rename to pkg/controller/podautoscaler/metrics/metrics_client_test.go