diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go
index 56f39fce6b..dee5b3aeb6 100644
--- a/cmd/integration/integration.go
+++ b/cmd/integration/integration.go
@@ -136,7 +136,7 @@ func startComponents(firstManifestURL, secondManifestURL string) (string, string
 
 	// TODO: caesarxuchao: hacky way to specify version of Experimental client.
 	// We will fix this by supporting multiple group versions in Config
-	cl.ExtensionsClient = client.NewExperimentalOrDie(&client.Config{Host: apiServer.URL, Version: testapi.Extensions.GroupAndVersion()})
+	cl.ExtensionsClient = client.NewExtensionsOrDie(&client.Config{Host: apiServer.URL, Version: testapi.Extensions.GroupAndVersion()})
 
 	storageVersions := make(map[string]string)
 	etcdStorage, err := master.NewEtcdStorage(etcdClient, latest.GroupOrDie("").InterfacesFor, testapi.Default.GroupAndVersion(), etcdtest.PathPrefix())
@@ -986,7 +986,7 @@ func main() {
 	kubeClient := client.NewOrDie(&client.Config{Host: apiServerURL, Version: testapi.Default.GroupAndVersion()})
 	// TODO: caesarxuchao: hacky way to specify version of Experimental client.
 	// We will fix this by supporting multiple group versions in Config
-	kubeClient.ExtensionsClient = client.NewExperimentalOrDie(&client.Config{Host: apiServerURL, Version: testapi.Extensions.GroupAndVersion()})
+	kubeClient.ExtensionsClient = client.NewExtensionsOrDie(&client.Config{Host: apiServerURL, Version: testapi.Extensions.GroupAndVersion()})
 
 	// Run tests in parallel
 	testFuncs := []testFunc{
diff --git a/pkg/client/unversioned/client_test.go b/pkg/client/unversioned/client_test.go
index 7b0ff6ad7f..843e4ee302 100644
--- a/pkg/client/unversioned/client_test.go
+++ b/pkg/client/unversioned/client_test.go
@@ -95,7 +95,7 @@ func (c *testClient) Setup(t *testing.T) *testClient {
 		if len(version) == 0 {
 			version = testapi.Extensions.Version()
 		}
-		c.ExtensionsClient = NewExperimentalOrDie(&Config{
+		c.ExtensionsClient = NewExtensionsOrDie(&Config{
 			Host:    c.server.URL,
 			Version: version,
 		})
diff --git a/pkg/client/unversioned/helper.go b/pkg/client/unversioned/helper.go
index 85aaed57ab..3e938ea4cd 100644
--- a/pkg/client/unversioned/helper.go
+++ b/pkg/client/unversioned/helper.go
@@ -150,7 +150,7 @@ func New(c *Config) (*Client, error) {
 		return &Client{RESTClient: client, ExtensionsClient: nil}, nil
 	}
 	experimentalConfig := *c
-	experimentalClient, err := NewExperimental(&experimentalConfig)
+	experimentalClient, err := NewExtensions(&experimentalConfig)
 	if err != nil {
 		return nil, err
 	}