From 493d2b69204e7239c9ea4c75229af2afa63e8e0d Mon Sep 17 00:00:00 2001
From: Chao Xu <xuchao@google.com>
Date: Mon, 12 Oct 2015 11:18:50 -0700
Subject: [PATCH] grep sed Experimental()

---
 pkg/client/unversioned/client.go                   |  4 ++--
 pkg/client/unversioned/conditions.go               |  2 +-
 pkg/client/unversioned/daemon_sets_test.go         | 14 +++++++-------
 .../unversioned/horizontalpodautoscaler_test.go    | 12 ++++++------
 pkg/client/unversioned/ingress_test.go             | 14 +++++++-------
 pkg/client/unversioned/jobs_test.go                | 14 +++++++-------
 pkg/client/unversioned/testclient/testclient.go    |  2 +-
 pkg/controller/daemon/controller.go                |  6 +++---
 pkg/controller/deployment/deployment_controller.go |  4 ++--
 pkg/controller/job/controller.go                   |  6 +++---
 pkg/controller/namespace/namespace_controller.go   | 10 +++++-----
 pkg/controller/podautoscaler/horizontal.go         |  8 ++++----
 pkg/kubectl/cmd/apiversions.go                     |  2 +-
 pkg/kubectl/describe.go                            |  8 ++++----
 pkg/kubectl/scale.go                               |  6 +++---
 pkg/kubectl/scale_test.go                          |  2 +-
 pkg/kubectl/stop.go                                | 10 +++++-----
 test/e2e/horizontal_pod_autoscaling.go             |  4 ++--
 test/e2e/job.go                                    | 10 +++++-----
 19 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/pkg/client/unversioned/client.go b/pkg/client/unversioned/client.go
index ca3dbc8023c..ef23b692382 100644
--- a/pkg/client/unversioned/client.go
+++ b/pkg/client/unversioned/client.go
@@ -51,7 +51,7 @@ type Interface interface {
 	PersistentVolumeClaimsNamespacer
 	ComponentStatusesInterface
 	SwaggerSchemaInterface
-	Experimental() ExtensionsInterface
+	Extensions() ExtensionsInterface
 }
 
 func (c *Client) ReplicationControllers(namespace string) ReplicationControllerInterface {
@@ -243,6 +243,6 @@ func IsTimeout(err error) bool {
 	return false
 }
 
-func (c *Client) Experimental() ExtensionsInterface {
+func (c *Client) Extensions() ExtensionsInterface {
 	return c.ExtensionsClient
 }
diff --git a/pkg/client/unversioned/conditions.go b/pkg/client/unversioned/conditions.go
index 2ab51766ed6..9117a6ff36f 100644
--- a/pkg/client/unversioned/conditions.go
+++ b/pkg/client/unversioned/conditions.go
@@ -48,7 +48,7 @@ func ControllerHasDesiredReplicas(c Interface, controller *api.ReplicationContro
 func JobHasDesiredParallelism(c Interface, job *extensions.Job) wait.ConditionFunc {
 
 	return func() (bool, error) {
-		job, err := c.Experimental().Jobs(job.Namespace).Get(job.Name)
+		job, err := c.Extensions().Jobs(job.Namespace).Get(job.Name)
 		if err != nil {
 			return false, err
 		}
diff --git a/pkg/client/unversioned/daemon_sets_test.go b/pkg/client/unversioned/daemon_sets_test.go
index 1cfd8bbedfc..002ba0488fe 100644
--- a/pkg/client/unversioned/daemon_sets_test.go
+++ b/pkg/client/unversioned/daemon_sets_test.go
@@ -55,7 +55,7 @@ func TestListDaemonSets(t *testing.T) {
 			},
 		},
 	}
-	receivedDSs, err := c.Setup(t).Experimental().DaemonSets(ns).List(labels.Everything())
+	receivedDSs, err := c.Setup(t).Extensions().DaemonSets(ns).List(labels.Everything())
 	c.Validate(t, receivedDSs, err)
 
 }
@@ -80,14 +80,14 @@ func TestGetDaemonSet(t *testing.T) {
 			},
 		},
 	}
-	receivedDaemonSet, err := c.Setup(t).Experimental().DaemonSets(ns).Get("foo")
+	receivedDaemonSet, err := c.Setup(t).Extensions().DaemonSets(ns).Get("foo")
 	c.Validate(t, receivedDaemonSet, err)
 }
 
 func TestGetDaemonSetWithNoName(t *testing.T) {
 	ns := api.NamespaceDefault
 	c := &testClient{Error: true}
-	receivedPod, err := c.Setup(t).Experimental().DaemonSets(ns).Get("")
+	receivedPod, err := c.Setup(t).Extensions().DaemonSets(ns).Get("")
 	if (err != nil) && (err.Error() != nameRequiredError) {
 		t.Errorf("Expected error: %v, but got %v", nameRequiredError, err)
 	}
@@ -118,7 +118,7 @@ func TestUpdateDaemonSet(t *testing.T) {
 			},
 		},
 	}
-	receivedDaemonSet, err := c.Setup(t).Experimental().DaemonSets(ns).Update(requestDaemonSet)
+	receivedDaemonSet, err := c.Setup(t).Extensions().DaemonSets(ns).Update(requestDaemonSet)
 	c.Validate(t, receivedDaemonSet, err)
 }
 
@@ -146,7 +146,7 @@ func TestUpdateDaemonSetUpdateStatus(t *testing.T) {
 			},
 		},
 	}
-	receivedDaemonSet, err := c.Setup(t).Experimental().DaemonSets(ns).UpdateStatus(requestDaemonSet)
+	receivedDaemonSet, err := c.Setup(t).Extensions().DaemonSets(ns).UpdateStatus(requestDaemonSet)
 	c.Validate(t, receivedDaemonSet, err)
 }
 
@@ -156,7 +156,7 @@ func TestDeleteDaemon(t *testing.T) {
 		Request:  testRequest{Method: "DELETE", Path: testapi.Extensions.ResourcePath(getDSResourceName(), ns, "foo"), Query: buildQueryValues(nil)},
 		Response: Response{StatusCode: 200},
 	}
-	err := c.Setup(t).Experimental().DaemonSets(ns).Delete("foo")
+	err := c.Setup(t).Extensions().DaemonSets(ns).Delete("foo")
 	c.Validate(t, nil, err)
 }
 
@@ -183,6 +183,6 @@ func TestCreateDaemonSet(t *testing.T) {
 			},
 		},
 	}
-	receivedDaemonSet, err := c.Setup(t).Experimental().DaemonSets(ns).Create(requestDaemonSet)
+	receivedDaemonSet, err := c.Setup(t).Extensions().DaemonSets(ns).Create(requestDaemonSet)
 	c.Validate(t, receivedDaemonSet, err)
 }
diff --git a/pkg/client/unversioned/horizontalpodautoscaler_test.go b/pkg/client/unversioned/horizontalpodautoscaler_test.go
index 3595cd15d56..e98409ee2ab 100644
--- a/pkg/client/unversioned/horizontalpodautoscaler_test.go
+++ b/pkg/client/unversioned/horizontalpodautoscaler_test.go
@@ -49,7 +49,7 @@ func TestHorizontalPodAutoscalerCreate(t *testing.T) {
 		Response: Response{StatusCode: 200, Body: &horizontalPodAutoscaler},
 	}
 
-	response, err := c.Setup(t).Experimental().HorizontalPodAutoscalers(ns).Create(&horizontalPodAutoscaler)
+	response, err := c.Setup(t).Extensions().HorizontalPodAutoscalers(ns).Create(&horizontalPodAutoscaler)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
@@ -74,7 +74,7 @@ func TestHorizontalPodAutoscalerGet(t *testing.T) {
 		Response: Response{StatusCode: 200, Body: horizontalPodAutoscaler},
 	}
 
-	response, err := c.Setup(t).Experimental().HorizontalPodAutoscalers(ns).Get("abc")
+	response, err := c.Setup(t).Extensions().HorizontalPodAutoscalers(ns).Get("abc")
 	c.Validate(t, response, err)
 }
 
@@ -99,7 +99,7 @@ func TestHorizontalPodAutoscalerList(t *testing.T) {
 		},
 		Response: Response{StatusCode: 200, Body: horizontalPodAutoscalerList},
 	}
-	response, err := c.Setup(t).Experimental().HorizontalPodAutoscalers(ns).List(labels.Everything(), fields.Everything())
+	response, err := c.Setup(t).Extensions().HorizontalPodAutoscalers(ns).List(labels.Everything(), fields.Everything())
 	c.Validate(t, response, err)
 }
 
@@ -116,7 +116,7 @@ func TestHorizontalPodAutoscalerUpdate(t *testing.T) {
 		Request:  testRequest{Method: "PUT", Path: testapi.Extensions.ResourcePath(getHorizontalPodAutoscalersResoureName(), ns, "abc"), Query: buildQueryValues(nil)},
 		Response: Response{StatusCode: 200, Body: horizontalPodAutoscaler},
 	}
-	response, err := c.Setup(t).Experimental().HorizontalPodAutoscalers(ns).Update(horizontalPodAutoscaler)
+	response, err := c.Setup(t).Extensions().HorizontalPodAutoscalers(ns).Update(horizontalPodAutoscaler)
 	c.Validate(t, response, err)
 }
 
@@ -143,7 +143,7 @@ func TestHorizontalPodAutoscalerDelete(t *testing.T) {
 		Request:  testRequest{Method: "DELETE", Path: testapi.Extensions.ResourcePath(getHorizontalPodAutoscalersResoureName(), ns, "foo"), Query: buildQueryValues(nil)},
 		Response: Response{StatusCode: 200},
 	}
-	err := c.Setup(t).Experimental().HorizontalPodAutoscalers(ns).Delete("foo", nil)
+	err := c.Setup(t).Extensions().HorizontalPodAutoscalers(ns).Delete("foo", nil)
 	c.Validate(t, nil, err)
 }
 
@@ -155,6 +155,6 @@ func TestHorizontalPodAutoscalerWatch(t *testing.T) {
 			Query:  url.Values{"resourceVersion": []string{}}},
 		Response: Response{StatusCode: 200},
 	}
-	_, err := c.Setup(t).Experimental().HorizontalPodAutoscalers(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), "")
+	_, err := c.Setup(t).Extensions().HorizontalPodAutoscalers(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), "")
 	c.Validate(t, nil, err)
 }
diff --git a/pkg/client/unversioned/ingress_test.go b/pkg/client/unversioned/ingress_test.go
index 9df5ccd4b6e..a8a5e35fe05 100644
--- a/pkg/client/unversioned/ingress_test.go
+++ b/pkg/client/unversioned/ingress_test.go
@@ -56,7 +56,7 @@ func TestListIngress(t *testing.T) {
 			},
 		},
 	}
-	receivedIngressList, err := c.Setup(t).Experimental().Ingress(ns).List(labels.Everything(), fields.Everything())
+	receivedIngressList, err := c.Setup(t).Extensions().Ingress(ns).List(labels.Everything(), fields.Everything())
 	c.Validate(t, receivedIngressList, err)
 }
 
@@ -84,14 +84,14 @@ func TestGetIngress(t *testing.T) {
 			},
 		},
 	}
-	receivedIngress, err := c.Setup(t).Experimental().Ingress(ns).Get("foo")
+	receivedIngress, err := c.Setup(t).Extensions().Ingress(ns).Get("foo")
 	c.Validate(t, receivedIngress, err)
 }
 
 func TestGetIngressWithNoName(t *testing.T) {
 	ns := api.NamespaceDefault
 	c := &testClient{Error: true}
-	receivedIngress, err := c.Setup(t).Experimental().Ingress(ns).Get("")
+	receivedIngress, err := c.Setup(t).Extensions().Ingress(ns).Get("")
 	if (err != nil) && (err.Error() != nameRequiredError) {
 		t.Errorf("Expected error: %v, but got %v", nameRequiredError, err)
 	}
@@ -130,7 +130,7 @@ func TestUpdateIngress(t *testing.T) {
 			},
 		},
 	}
-	receivedIngress, err := c.Setup(t).Experimental().Ingress(ns).Update(requestIngress)
+	receivedIngress, err := c.Setup(t).Extensions().Ingress(ns).Update(requestIngress)
 	c.Validate(t, receivedIngress, err)
 }
 
@@ -176,7 +176,7 @@ func TestUpdateIngressStatus(t *testing.T) {
 			},
 		},
 	}
-	receivedIngress, err := c.Setup(t).Experimental().Ingress(ns).UpdateStatus(requestIngress)
+	receivedIngress, err := c.Setup(t).Extensions().Ingress(ns).UpdateStatus(requestIngress)
 	c.Validate(t, receivedIngress, err)
 }
 
@@ -190,7 +190,7 @@ func TestDeleteIngress(t *testing.T) {
 		},
 		Response: Response{StatusCode: 200},
 	}
-	err := c.Setup(t).Experimental().Ingress(ns).Delete("foo", nil)
+	err := c.Setup(t).Extensions().Ingress(ns).Delete("foo", nil)
 	c.Validate(t, nil, err)
 }
 
@@ -225,6 +225,6 @@ func TestCreateIngress(t *testing.T) {
 			},
 		},
 	}
-	receivedIngress, err := c.Setup(t).Experimental().Ingress(ns).Create(requestIngress)
+	receivedIngress, err := c.Setup(t).Extensions().Ingress(ns).Create(requestIngress)
 	c.Validate(t, receivedIngress, err)
 }
diff --git a/pkg/client/unversioned/jobs_test.go b/pkg/client/unversioned/jobs_test.go
index 439b6673a6f..2677e6525d1 100644
--- a/pkg/client/unversioned/jobs_test.go
+++ b/pkg/client/unversioned/jobs_test.go
@@ -56,7 +56,7 @@ func TestListJobs(t *testing.T) {
 			},
 		},
 	}
-	receivedJobList, err := c.Setup(t).Experimental().Jobs(ns).List(labels.Everything(), fields.Everything())
+	receivedJobList, err := c.Setup(t).Extensions().Jobs(ns).List(labels.Everything(), fields.Everything())
 	c.Validate(t, receivedJobList, err)
 }
 
@@ -84,14 +84,14 @@ func TestGetJob(t *testing.T) {
 			},
 		},
 	}
-	receivedJob, err := c.Setup(t).Experimental().Jobs(ns).Get("foo")
+	receivedJob, err := c.Setup(t).Extensions().Jobs(ns).Get("foo")
 	c.Validate(t, receivedJob, err)
 }
 
 func TestGetJobWithNoName(t *testing.T) {
 	ns := api.NamespaceDefault
 	c := &testClient{Error: true}
-	receivedJob, err := c.Setup(t).Experimental().Jobs(ns).Get("")
+	receivedJob, err := c.Setup(t).Extensions().Jobs(ns).Get("")
 	if (err != nil) && (err.Error() != nameRequiredError) {
 		t.Errorf("Expected error: %v, but got %v", nameRequiredError, err)
 	}
@@ -130,7 +130,7 @@ func TestUpdateJob(t *testing.T) {
 			},
 		},
 	}
-	receivedJob, err := c.Setup(t).Experimental().Jobs(ns).Update(requestJob)
+	receivedJob, err := c.Setup(t).Extensions().Jobs(ns).Update(requestJob)
 	c.Validate(t, receivedJob, err)
 }
 
@@ -168,7 +168,7 @@ func TestUpdateJobStatus(t *testing.T) {
 			},
 		},
 	}
-	receivedJob, err := c.Setup(t).Experimental().Jobs(ns).UpdateStatus(requestJob)
+	receivedJob, err := c.Setup(t).Extensions().Jobs(ns).UpdateStatus(requestJob)
 	c.Validate(t, receivedJob, err)
 }
 
@@ -182,7 +182,7 @@ func TestDeleteJob(t *testing.T) {
 		},
 		Response: Response{StatusCode: 200},
 	}
-	err := c.Setup(t).Experimental().Jobs(ns).Delete("foo", nil)
+	err := c.Setup(t).Extensions().Jobs(ns).Delete("foo", nil)
 	c.Validate(t, nil, err)
 }
 
@@ -217,6 +217,6 @@ func TestCreateJob(t *testing.T) {
 			},
 		},
 	}
-	receivedJob, err := c.Setup(t).Experimental().Jobs(ns).Create(requestJob)
+	receivedJob, err := c.Setup(t).Extensions().Jobs(ns).Create(requestJob)
 	c.Validate(t, receivedJob, err)
 }
diff --git a/pkg/client/unversioned/testclient/testclient.go b/pkg/client/unversioned/testclient/testclient.go
index 5b06c6d56ac..fe0e2fdcd75 100644
--- a/pkg/client/unversioned/testclient/testclient.go
+++ b/pkg/client/unversioned/testclient/testclient.go
@@ -268,7 +268,7 @@ func (c *Fake) Namespaces() client.NamespaceInterface {
 	return &FakeNamespaces{Fake: c}
 }
 
-func (c *Fake) Experimental() client.ExtensionsInterface {
+func (c *Fake) Extensions() client.ExtensionsInterface {
 	return &FakeExperimental{c}
 }
 
diff --git a/pkg/controller/daemon/controller.go b/pkg/controller/daemon/controller.go
index ed4ac29fe26..9105846ddf6 100644
--- a/pkg/controller/daemon/controller.go
+++ b/pkg/controller/daemon/controller.go
@@ -97,10 +97,10 @@ func NewDaemonSetsController(kubeClient client.Interface, resyncPeriod controlle
 	dsc.dsStore.Store, dsc.dsController = framework.NewInformer(
 		&cache.ListWatch{
 			ListFunc: func() (runtime.Object, error) {
-				return dsc.kubeClient.Experimental().DaemonSets(api.NamespaceAll).List(labels.Everything())
+				return dsc.kubeClient.Extensions().DaemonSets(api.NamespaceAll).List(labels.Everything())
 			},
 			WatchFunc: func(rv string) (watch.Interface, error) {
-				return dsc.kubeClient.Experimental().DaemonSets(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), rv)
+				return dsc.kubeClient.Extensions().DaemonSets(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), rv)
 			},
 		},
 		&extensions.DaemonSet{},
@@ -460,7 +460,7 @@ func (dsc *DaemonSetsController) updateDaemonSetStatus(ds *extensions.DaemonSet)
 		}
 	}
 
-	err = storeDaemonSetStatus(dsc.kubeClient.Experimental().DaemonSets(ds.Namespace), ds, desiredNumberScheduled, currentNumberScheduled, numberMisscheduled)
+	err = storeDaemonSetStatus(dsc.kubeClient.Extensions().DaemonSets(ds.Namespace), ds, desiredNumberScheduled, currentNumberScheduled, numberMisscheduled)
 	if err != nil {
 		glog.Errorf("Error storing status for daemon set %+v: %v", ds, err)
 	}
diff --git a/pkg/controller/deployment/deployment_controller.go b/pkg/controller/deployment/deployment_controller.go
index 0760539f755..aca9f3afe2f 100644
--- a/pkg/controller/deployment/deployment_controller.go
+++ b/pkg/controller/deployment/deployment_controller.go
@@ -45,7 +45,7 @@ func New(client client.Interface) *DeploymentController {
 
 	return &DeploymentController{
 		client:        client,
-		expClient:     client.Experimental(),
+		expClient:     client.Extensions(),
 		eventRecorder: eventBroadcaster.NewRecorder(api.EventSource{Component: "deployment-controller"}),
 	}
 }
@@ -275,5 +275,5 @@ func (d *DeploymentController) scaleRC(rc *api.ReplicationController, newScale i
 
 func (d *DeploymentController) updateDeployment(deployment *extensions.Deployment) (*extensions.Deployment, error) {
 	// TODO: Using client for now, update to use store when it is ready.
-	return d.client.Experimental().Deployments(deployment.ObjectMeta.Namespace).Update(deployment)
+	return d.client.Extensions().Deployments(deployment.ObjectMeta.Namespace).Update(deployment)
 }
diff --git a/pkg/controller/job/controller.go b/pkg/controller/job/controller.go
index 783c12bdc0a..ca997b64d82 100644
--- a/pkg/controller/job/controller.go
+++ b/pkg/controller/job/controller.go
@@ -86,10 +86,10 @@ func NewJobController(kubeClient client.Interface, resyncPeriod controller.Resyn
 	jm.jobStore.Store, jm.jobController = framework.NewInformer(
 		&cache.ListWatch{
 			ListFunc: func() (runtime.Object, error) {
-				return jm.kubeClient.Experimental().Jobs(api.NamespaceAll).List(labels.Everything(), fields.Everything())
+				return jm.kubeClient.Extensions().Jobs(api.NamespaceAll).List(labels.Everything(), fields.Everything())
 			},
 			WatchFunc: func(rv string) (watch.Interface, error) {
-				return jm.kubeClient.Experimental().Jobs(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), rv)
+				return jm.kubeClient.Extensions().Jobs(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), rv)
 			},
 		},
 		&extensions.Job{},
@@ -431,7 +431,7 @@ func (jm *JobController) manageJob(activePods []*api.Pod, succeeded int, job *ex
 }
 
 func (jm *JobController) updateJobStatus(job *extensions.Job) error {
-	_, err := jm.kubeClient.Experimental().Jobs(job.Namespace).UpdateStatus(job)
+	_, err := jm.kubeClient.Extensions().Jobs(job.Namespace).UpdateStatus(job)
 	return err
 }
 
diff --git a/pkg/controller/namespace/namespace_controller.go b/pkg/controller/namespace/namespace_controller.go
index 4388c6d825d..a2bac2bf530 100644
--- a/pkg/controller/namespace/namespace_controller.go
+++ b/pkg/controller/namespace/namespace_controller.go
@@ -194,23 +194,23 @@ func deleteAllContent(kubeClient client.Interface, experimentalMode bool, namesp
 	}
 	// If experimental mode, delete all experimental resources for the namespace.
 	if experimentalMode {
-		err = deleteHorizontalPodAutoscalers(kubeClient.Experimental(), namespace)
+		err = deleteHorizontalPodAutoscalers(kubeClient.Extensions(), namespace)
 		if err != nil {
 			return estimate, err
 		}
-		err = deleteDaemonSets(kubeClient.Experimental(), namespace)
+		err = deleteDaemonSets(kubeClient.Extensions(), namespace)
 		if err != nil {
 			return estimate, err
 		}
-		err = deleteJobs(kubeClient.Experimental(), namespace)
+		err = deleteJobs(kubeClient.Extensions(), namespace)
 		if err != nil {
 			return estimate, err
 		}
-		err = deleteDeployments(kubeClient.Experimental(), namespace)
+		err = deleteDeployments(kubeClient.Extensions(), namespace)
 		if err != nil {
 			return estimate, err
 		}
-		err = deleteIngress(kubeClient.Experimental(), namespace)
+		err = deleteIngress(kubeClient.Extensions(), namespace)
 		if err != nil {
 			return estimate, err
 		}
diff --git a/pkg/controller/podautoscaler/horizontal.go b/pkg/controller/podautoscaler/horizontal.go
index 13f703a7be6..3071feddc1d 100644
--- a/pkg/controller/podautoscaler/horizontal.go
+++ b/pkg/controller/podautoscaler/horizontal.go
@@ -71,7 +71,7 @@ func (a *HorizontalController) Run(syncPeriod time.Duration) {
 func (a *HorizontalController) reconcileAutoscaler(hpa extensions.HorizontalPodAutoscaler) error {
 	reference := fmt.Sprintf("%s/%s/%s", hpa.Spec.ScaleRef.Kind, hpa.Spec.ScaleRef.Namespace, hpa.Spec.ScaleRef.Name)
 
-	scale, err := a.client.Experimental().Scales(hpa.Spec.ScaleRef.Namespace).Get(hpa.Spec.ScaleRef.Kind, hpa.Spec.ScaleRef.Name)
+	scale, err := a.client.Extensions().Scales(hpa.Spec.ScaleRef.Namespace).Get(hpa.Spec.ScaleRef.Kind, hpa.Spec.ScaleRef.Name)
 	if err != nil {
 		a.eventRecorder.Event(&hpa, "FailedGetScale", err.Error())
 		return fmt.Errorf("failed to query scale subresource for %s: %v", reference, err)
@@ -125,7 +125,7 @@ func (a *HorizontalController) reconcileAutoscaler(hpa extensions.HorizontalPodA
 
 	if rescale {
 		scale.Spec.Replicas = desiredReplicas
-		_, err = a.client.Experimental().Scales(hpa.Namespace).Update(hpa.Spec.ScaleRef.Kind, scale)
+		_, err = a.client.Extensions().Scales(hpa.Namespace).Update(hpa.Spec.ScaleRef.Kind, scale)
 		if err != nil {
 			a.eventRecorder.Eventf(&hpa, "FailedRescale", "New size: %d; error: %v", desiredReplicas, err.Error())
 			return fmt.Errorf("failed to rescale %s: %v", reference, err)
@@ -147,7 +147,7 @@ func (a *HorizontalController) reconcileAutoscaler(hpa extensions.HorizontalPodA
 		hpa.Status.LastScaleTimestamp = &now
 	}
 
-	_, err = a.client.Experimental().HorizontalPodAutoscalers(hpa.Namespace).UpdateStatus(&hpa)
+	_, err = a.client.Extensions().HorizontalPodAutoscalers(hpa.Namespace).UpdateStatus(&hpa)
 	if err != nil {
 		a.eventRecorder.Event(&hpa, "FailedUpdateStatus", err.Error())
 		return fmt.Errorf("failed to update status for %s: %v", hpa.Name, err)
@@ -157,7 +157,7 @@ func (a *HorizontalController) reconcileAutoscaler(hpa extensions.HorizontalPodA
 
 func (a *HorizontalController) reconcileAutoscalers() error {
 	ns := api.NamespaceAll
-	list, err := a.client.Experimental().HorizontalPodAutoscalers(ns).List(labels.Everything(), fields.Everything())
+	list, err := a.client.Extensions().HorizontalPodAutoscalers(ns).List(labels.Everything(), fields.Everything())
 	if err != nil {
 		return fmt.Errorf("error listing nodes: %v", err)
 	}
diff --git a/pkg/kubectl/cmd/apiversions.go b/pkg/kubectl/cmd/apiversions.go
index bc7cfc70f4d..fd5a4faa73b 100644
--- a/pkg/kubectl/cmd/apiversions.go
+++ b/pkg/kubectl/cmd/apiversions.go
@@ -58,7 +58,7 @@ func RunApiVersions(f *cmdutil.Factory, w io.Writer) error {
 	}
 
 	var expAPIVersions *unversioned.APIVersions
-	expAPIVersions, err = client.Experimental().ServerAPIVersions()
+	expAPIVersions, err = client.Extensions().ServerAPIVersions()
 
 	fmt.Fprintf(w, "Available Server Api Versions: %#v\n", *apiVersions)
 	if err == nil {
diff --git a/pkg/kubectl/describe.go b/pkg/kubectl/describe.go
index 17e74ba9e9a..8fc9b3dca02 100644
--- a/pkg/kubectl/describe.go
+++ b/pkg/kubectl/describe.go
@@ -870,7 +870,7 @@ type JobDescriber struct {
 }
 
 func (d *JobDescriber) Describe(namespace, name string) (string, error) {
-	job, err := d.client.Experimental().Jobs(namespace).Get(name)
+	job, err := d.client.Extensions().Jobs(namespace).Get(name)
 	if err != nil {
 		return "", err
 	}
@@ -910,7 +910,7 @@ type DaemonSetDescriber struct {
 }
 
 func (d *DaemonSetDescriber) Describe(namespace, name string) (string, error) {
-	dc := d.Experimental().DaemonSets(namespace)
+	dc := d.Extensions().DaemonSets(namespace)
 	pc := d.Pods(namespace)
 
 	daemon, err := dc.Get(name)
@@ -1241,7 +1241,7 @@ type HorizontalPodAutoscalerDescriber struct {
 }
 
 func (d *HorizontalPodAutoscalerDescriber) Describe(namespace, name string) (string, error) {
-	hpa, err := d.client.Experimental().HorizontalPodAutoscalers(namespace).Get(name)
+	hpa, err := d.client.Extensions().HorizontalPodAutoscalers(namespace).Get(name)
 	if err != nil {
 		return "", err
 	}
@@ -1407,7 +1407,7 @@ type DeploymentDescriber struct {
 }
 
 func (dd *DeploymentDescriber) Describe(namespace, name string) (string, error) {
-	d, err := dd.Experimental().Deployments(namespace).Get(name)
+	d, err := dd.Extensions().Deployments(namespace).Get(name)
 	if err != nil {
 		return "", err
 	}
diff --git a/pkg/kubectl/scale.go b/pkg/kubectl/scale.go
index f6f10c3028e..1080e2bc56f 100644
--- a/pkg/kubectl/scale.go
+++ b/pkg/kubectl/scale.go
@@ -202,7 +202,7 @@ func (scaler *ReplicationControllerScaler) Scale(namespace, name string, newSize
 
 // ScaleSimple is responsible for updating job's parallelism.
 func (scaler *JobScaler) ScaleSimple(namespace, name string, preconditions *ScalePrecondition, newSize uint) error {
-	job, err := scaler.c.Experimental().Jobs(namespace).Get(name)
+	job, err := scaler.c.Extensions().Jobs(namespace).Get(name)
 	if err != nil {
 		return ControllerScaleError{ControllerScaleGetFailure, "Unknown", err}
 	}
@@ -213,7 +213,7 @@ func (scaler *JobScaler) ScaleSimple(namespace, name string, preconditions *Scal
 	}
 	parallelism := int(newSize)
 	job.Spec.Parallelism = &parallelism
-	if _, err := scaler.c.Experimental().Jobs(namespace).Update(job); err != nil {
+	if _, err := scaler.c.Extensions().Jobs(namespace).Update(job); err != nil {
 		if errors.IsInvalid(err) {
 			return ControllerScaleError{ControllerScaleUpdateInvalidFailure, job.ResourceVersion, err}
 		}
@@ -239,7 +239,7 @@ func (scaler *JobScaler) Scale(namespace, name string, newSize uint, preconditio
 		return err
 	}
 	if waitForReplicas != nil {
-		job, err := scaler.c.Experimental().Jobs(namespace).Get(name)
+		job, err := scaler.c.Extensions().Jobs(namespace).Get(name)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/kubectl/scale_test.go b/pkg/kubectl/scale_test.go
index b308c371802..8bf64e70b07 100644
--- a/pkg/kubectl/scale_test.go
+++ b/pkg/kubectl/scale_test.go
@@ -83,7 +83,7 @@ type ErrorExtensionsClient struct {
 	invalid bool
 }
 
-func (c *ErrorExtensionsClient) Experimental() client.ExtensionsInterface {
+func (c *ErrorExtensionsClient) Extensions() client.ExtensionsInterface {
 	return &ErrorJobClient{testclient.FakeExperimental{&c.Fake}, c.invalid}
 }
 
diff --git a/pkg/kubectl/stop.go b/pkg/kubectl/stop.go
index e717fb8b48a..9113331267b 100644
--- a/pkg/kubectl/stop.go
+++ b/pkg/kubectl/stop.go
@@ -182,7 +182,7 @@ func (reaper *ReplicationControllerReaper) Stop(namespace, name string, timeout
 }
 
 func (reaper *DaemonSetReaper) Stop(namespace, name string, timeout time.Duration, gracePeriod *api.DeleteOptions) (string, error) {
-	ds, err := reaper.Experimental().DaemonSets(namespace).Get(name)
+	ds, err := reaper.Extensions().DaemonSets(namespace).Get(name)
 	if err != nil {
 		return "", err
 	}
@@ -197,13 +197,13 @@ func (reaper *DaemonSetReaper) Stop(namespace, name string, timeout time.Duratio
 	// force update to avoid version conflict
 	ds.ResourceVersion = ""
 
-	if ds, err = reaper.Experimental().DaemonSets(namespace).Update(ds); err != nil {
+	if ds, err = reaper.Extensions().DaemonSets(namespace).Update(ds); err != nil {
 		return "", err
 	}
 
 	// Wait for the daemon set controller to kill all the daemon pods.
 	if err := wait.Poll(reaper.pollInterval, reaper.timeout, func() (bool, error) {
-		updatedDS, err := reaper.Experimental().DaemonSets(namespace).Get(name)
+		updatedDS, err := reaper.Extensions().DaemonSets(namespace).Get(name)
 		if err != nil {
 			return false, nil
 		}
@@ -212,14 +212,14 @@ func (reaper *DaemonSetReaper) Stop(namespace, name string, timeout time.Duratio
 		return "", err
 	}
 
-	if err := reaper.Experimental().DaemonSets(namespace).Delete(name); err != nil {
+	if err := reaper.Extensions().DaemonSets(namespace).Delete(name); err != nil {
 		return "", err
 	}
 	return fmt.Sprintf("%s stopped", name), nil
 }
 
 func (reaper *JobReaper) Stop(namespace, name string, timeout time.Duration, gracePeriod *api.DeleteOptions) (string, error) {
-	jobs := reaper.Experimental().Jobs(namespace)
+	jobs := reaper.Extensions().Jobs(namespace)
 	scaler, err := ScalerFor("Job", *reaper)
 	if err != nil {
 		return "", err
diff --git a/test/e2e/horizontal_pod_autoscaling.go b/test/e2e/horizontal_pod_autoscaling.go
index 896e28a9547..1eb1e8c47f7 100644
--- a/test/e2e/horizontal_pod_autoscaling.go
+++ b/test/e2e/horizontal_pod_autoscaling.go
@@ -169,7 +169,7 @@ func createCPUHorizontalPodAutoscaler(rc *ResourceConsumer, cpu string) {
 			Target:      extensions.ResourceConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse(cpu)},
 		},
 	}
-	_, errHPA := rc.framework.Client.Experimental().HorizontalPodAutoscalers(rc.framework.Namespace.Name).Create(hpa)
+	_, errHPA := rc.framework.Client.Extensions().HorizontalPodAutoscalers(rc.framework.Namespace.Name).Create(hpa)
 	expectNoError(errHPA)
 }
 
@@ -192,6 +192,6 @@ func createMemoryHorizontalPodAutoscaler(rc *ResourceConsumer, memory string) {
 			Target:      extensions.ResourceConsumption{Resource: api.ResourceMemory, Quantity: resource.MustParse(memory + "M")},
 		},
 	}
-	_, errHPA := rc.framework.Client.Experimental().HorizontalPodAutoscalers(rc.framework.Namespace.Name).Create(hpa)
+	_, errHPA := rc.framework.Client.Extensions().HorizontalPodAutoscalers(rc.framework.Namespace.Name).Create(hpa)
 	expectNoError(errHPA)
 }
diff --git a/test/e2e/job.go b/test/e2e/job.go
index 712202a39b9..cc7578547b1 100644
--- a/test/e2e/job.go
+++ b/test/e2e/job.go
@@ -97,7 +97,7 @@ var _ = Describe("Job", func() {
 
 		By("Ensuring job shows many failures")
 		err = wait.Poll(poll, jobTimeout, func() (bool, error) {
-			curr, err := f.Client.Experimental().Jobs(f.Namespace.Name).Get(job.Name)
+			curr, err := f.Client.Extensions().Jobs(f.Namespace.Name).Get(job.Name)
 			if err != nil {
 				return false, err
 			}
@@ -176,7 +176,7 @@ var _ = Describe("Job", func() {
 		Expect(err).NotTo(HaveOccurred())
 
 		By("Ensuring job was deleted")
-		_, err = f.Client.Experimental().Jobs(f.Namespace.Name).Get(job.Name)
+		_, err = f.Client.Extensions().Jobs(f.Namespace.Name).Get(job.Name)
 		Expect(err).To(HaveOccurred())
 		Expect(errors.IsNotFound(err)).To(BeTrue())
 	})
@@ -224,11 +224,11 @@ func newTestJob(behavior, name string, rPol api.RestartPolicy, parallelism, comp
 }
 
 func createJob(c *client.Client, ns string, job *extensions.Job) (*extensions.Job, error) {
-	return c.Experimental().Jobs(ns).Create(job)
+	return c.Extensions().Jobs(ns).Create(job)
 }
 
 func deleteJob(c *client.Client, ns, name string) error {
-	return c.Experimental().Jobs(ns).Delete(name, api.NewDeleteOptions(0))
+	return c.Extensions().Jobs(ns).Delete(name, api.NewDeleteOptions(0))
 }
 
 // Wait for all pods to become Running.  Only use when pods will run for a long time, or it will be racy.
@@ -252,7 +252,7 @@ func waitForAllPodsRunning(c *client.Client, ns, jobName string, parallelism int
 // Wait for job to reach completions.
 func waitForJobFinish(c *client.Client, ns, jobName string, completions int) error {
 	return wait.Poll(poll, jobTimeout, func() (bool, error) {
-		curr, err := c.Experimental().Jobs(ns).Get(jobName)
+		curr, err := c.Extensions().Jobs(ns).Get(jobName)
 		if err != nil {
 			return false, err
 		}