diff --git a/pkg/build/registry/etcd/etcd.go b/pkg/build/registry/etcd/etcd.go
index 622ced0f7856..719a8cdb6bf3 100644
--- a/pkg/build/registry/etcd/etcd.go
+++ b/pkg/build/registry/etcd/etcd.go
@@ -7,7 +7,6 @@ import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/tools"
-	ktools "github.com/GoogleCloudPlatform/kubernetes/pkg/tools"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"
 
 	kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
@@ -61,7 +60,7 @@ func (r *Etcd) ListBuilds(ctx kapi.Context, selector labels.Selector) (*api.Buil
 
 // WatchBuilds begins watching for new, changed, or deleted Builds.
 func (r *Etcd) WatchBuilds(ctx kapi.Context, label, field labels.Selector, resourceVersion string) (watch.Interface, error) {
-	version, err := ktools.ParseWatchResourceVersion(resourceVersion, "build")
+	version, err := tools.ParseWatchResourceVersion(resourceVersion, "build")
 	if err != nil {
 		return nil, err
 	}
@@ -196,7 +195,7 @@ func (r *Etcd) DeleteBuildConfig(ctx kapi.Context, id string) error {
 
 // WatchBuildConfigs begins watching for new, changed, or deleted BuildConfigs.
 func (r *Etcd) WatchBuildConfigs(ctx kapi.Context, label, field labels.Selector, resourceVersion string) (watch.Interface, error) {
-	version, err := ktools.ParseWatchResourceVersion(resourceVersion, "buildConfig")
+	version, err := tools.ParseWatchResourceVersion(resourceVersion, "buildConfig")
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/deploy/registry/etcd/etcd.go b/pkg/deploy/registry/etcd/etcd.go
index 848cc1f0d08d..bfa2d9bea633 100644
--- a/pkg/deploy/registry/etcd/etcd.go
+++ b/pkg/deploy/registry/etcd/etcd.go
@@ -10,7 +10,6 @@ import (
 	kubeetcd "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/etcd"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/tools"
-	ktools "github.com/GoogleCloudPlatform/kubernetes/pkg/tools"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"
 
 	"github.com/openshift/origin/pkg/deploy/api"
@@ -112,7 +111,7 @@ func (r *Etcd) DeleteDeployment(ctx kapi.Context, id string) error {
 
 // WatchDeployments begins watching for new, changed, or deleted Deployments.
 func (r *Etcd) WatchDeployments(ctx kapi.Context, label, field labels.Selector, resourceVersion string) (watch.Interface, error) {
-	version, err := ktools.ParseWatchResourceVersion(resourceVersion, "deployment")
+	version, err := tools.ParseWatchResourceVersion(resourceVersion, "deployment")
 	if err != nil {
 		return nil, err
 	}
@@ -154,7 +153,7 @@ func (r *Etcd) ListDeploymentConfigs(ctx kapi.Context, label, field labels.Selec
 
 // WatchDeploymentConfigs begins watching for new, changed, or deleted DeploymentConfigs.
 func (r *Etcd) WatchDeploymentConfigs(ctx kapi.Context, label, field labels.Selector, resourceVersion string) (watch.Interface, error) {
-	version, err := ktools.ParseWatchResourceVersion(resourceVersion, "deploymentConfig")
+	version, err := tools.ParseWatchResourceVersion(resourceVersion, "deploymentConfig")
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/route/registry/etcd/etcd.go b/pkg/route/registry/etcd/etcd.go
index a1bc0a9ce880..3b28e33b5075 100644
--- a/pkg/route/registry/etcd/etcd.go
+++ b/pkg/route/registry/etcd/etcd.go
@@ -8,7 +8,6 @@ import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
 	kubeetcd "github.com/GoogleCloudPlatform/kubernetes/pkg/registry/etcd"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/tools"
-	ktools "github.com/GoogleCloudPlatform/kubernetes/pkg/tools"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"
 
 	"github.com/openshift/origin/pkg/route/api"
@@ -107,7 +106,7 @@ func (registry *Etcd) WatchRoutes(ctx kapi.Context, label, field labels.Selector
 		return nil, fmt.Errorf("label selectors are not supported on routes yet")
 	}
 
-	version, err := ktools.ParseWatchResourceVersion(resourceVersion, "pod")
+	version, err := tools.ParseWatchResourceVersion(resourceVersion, "pod")
 	if err != nil {
 		return nil, err
 	}