diff --git a/cmd/genconversion/conversion.go b/cmd/genconversion/conversion.go
index d1f1cbf2a99..45130f3f3af 100644
--- a/cmd/genconversion/conversion.go
+++ b/cmd/genconversion/conversion.go
@@ -29,7 +29,7 @@ import (
 	_ "k8s.io/kubernetes/pkg/api/v1"
 	_ "k8s.io/kubernetes/pkg/apis/extensions"
 	_ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
-	pkg_runtime "k8s.io/kubernetes/pkg/runtime"
+	kruntime "k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/util/sets"
 
 	"github.com/golang/glog"
@@ -89,7 +89,7 @@ func main() {
 	}
 
 	versionPath := pkgPath(group, version)
-	generator := pkg_runtime.NewConversionGenerator(api.Scheme.Raw(), versionPath)
+	generator := kruntime.NewConversionGenerator(api.Scheme.Raw(), versionPath)
 	apiShort := generator.AddImport(path.Join(pkgBase, "api"))
 	generator.AddImport(path.Join(pkgBase, "api/resource"))
 	// TODO(wojtek-t): Change the overwrites to a flag.
diff --git a/cmd/gendeepcopy/deep_copy.go b/cmd/gendeepcopy/deep_copy.go
index 0360df3e576..49417022459 100644
--- a/cmd/gendeepcopy/deep_copy.go
+++ b/cmd/gendeepcopy/deep_copy.go
@@ -29,7 +29,7 @@ import (
 	_ "k8s.io/kubernetes/pkg/api/v1"
 	_ "k8s.io/kubernetes/pkg/apis/extensions"
 	_ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
-	pkg_runtime "k8s.io/kubernetes/pkg/runtime"
+	kruntime "k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/util/sets"
 
 	"github.com/golang/glog"
@@ -109,7 +109,7 @@ func main() {
 	}
 
 	versionPath := pkgPath(group, version)
-	generator := pkg_runtime.NewDeepCopyGenerator(api.Scheme.Raw(), versionPath, sets.NewString("k8s.io/kubernetes"))
+	generator := kruntime.NewDeepCopyGenerator(api.Scheme.Raw(), versionPath, sets.NewString("k8s.io/kubernetes"))
 	generator.AddImport(path.Join(pkgBase, "api"))
 
 	if len(*overwrites) > 0 {
diff --git a/cmd/genswaggertypedocs/swagger_type_docs.go b/cmd/genswaggertypedocs/swagger_type_docs.go
index afdbf78b68c..d88781d8e71 100644
--- a/cmd/genswaggertypedocs/swagger_type_docs.go
+++ b/cmd/genswaggertypedocs/swagger_type_docs.go
@@ -22,7 +22,7 @@ import (
 	"os"
 	"runtime"
 
-	pkg_runtime "k8s.io/kubernetes/pkg/runtime"
+	kruntime "k8s.io/kubernetes/pkg/runtime"
 
 	"github.com/golang/glog"
 	flag "github.com/spf13/pflag"
@@ -54,10 +54,10 @@ func main() {
 		funcOut = file
 	}
 
-	docsForTypes := pkg_runtime.ParseDocumentationFrom(*typeSrc)
+	docsForTypes := kruntime.ParseDocumentationFrom(*typeSrc)
 
 	if *verify == true {
-		rc, err := pkg_runtime.VerifySwaggerDocsExist(docsForTypes, funcOut)
+		rc, err := kruntime.VerifySwaggerDocsExist(docsForTypes, funcOut)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Error in verification process: %s\n", err)
 		}
@@ -65,7 +65,7 @@ func main() {
 	}
 
 	if docsForTypes != nil && len(docsForTypes) > 0 {
-		if err := pkg_runtime.WriteSwaggerDocFunc(docsForTypes, funcOut); err != nil {
+		if err := kruntime.WriteSwaggerDocFunc(docsForTypes, funcOut); err != nil {
 			fmt.Fprintf(os.Stderr, "Error when writing swagger documentation functions: %s\n", err)
 			os.Exit(-1)
 		}