diff --git a/staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh b/staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh
index 36d706103ad..9c98ebf4d3a 100755
--- a/staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh
+++ b/staging/src/k8s.io/apiextensions-apiserver/hack/update-codegen.sh
@@ -40,7 +40,7 @@ function cleanup {
 trap cleanup EXIT
 
 echo "Building client-gen"
-CLIENTGEN="${PWD}/client-gen-binary"
+CLIENTGEN="${PWD}/client-gen"
 go build -o "${CLIENTGEN}" ${CODEGEN_PKG}/cmd/client-gen
 
 PREFIX=k8s.io/apiextensions-apiserver/pkg/apis
diff --git a/staging/src/k8s.io/code-generator/cmd/conversion-gen/generators/conversion.go b/staging/src/k8s.io/code-generator/cmd/conversion-gen/generators/conversion.go
index 257fa0a5cb7..3c16a85bfda 100644
--- a/staging/src/k8s.io/code-generator/cmd/conversion-gen/generators/conversion.go
+++ b/staging/src/k8s.io/code-generator/cmd/conversion-gen/generators/conversion.go
@@ -193,7 +193,6 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
 
 	packages := generator.Packages{}
 	header := append([]byte(fmt.Sprintf("// +build !%s\n\n", arguments.GeneratedBuildTag)), boilerplate...)
-	header = append(header, []byte("\n// This file was autogenerated by conversion-gen. Do not edit it manually!\n\n")...)
 
 	// Accumulate pre-existing conversion functions.
 	// TODO: This is too ad-hoc.  We need a better way.
diff --git a/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/packages.go b/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/packages.go
index 2a6ef2eeb56..2cc0372f89e 100644
--- a/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/packages.go
+++ b/staging/src/k8s.io/code-generator/cmd/informer-gen/generators/packages.go
@@ -62,12 +62,6 @@ func DefaultNameSystem() string {
 	return "public"
 }
 
-// generatedBy returns information about the arguments used to invoke
-// lister-gen.
-func generatedBy() string {
-	return fmt.Sprintf("\n// This file was automatically generated by informer-gen\n\n")
-}
-
 // objectMetaForPackage returns the type of ObjectMeta used by package p.
 func objectMetaForPackage(p *types.Package) (*types.Type, bool, error) {
 	generatingForPackage := false
@@ -111,8 +105,6 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
 		glog.Fatalf("Failed loading boilerplate: %v", err)
 	}
 
-	boilerplate = append(boilerplate, []byte(generatedBy())...)
-
 	customArgs, ok := arguments.CustomArgs.(*informergenargs.CustomArgs)
 	if !ok {
 		glog.Fatalf("Wrong CustomArgs type: %T", arguments.CustomArgs)
diff --git a/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/lister.go b/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/lister.go
index 3da8d2ddd32..cde6e2f770a 100644
--- a/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/lister.go
+++ b/staging/src/k8s.io/code-generator/cmd/lister-gen/generators/lister.go
@@ -62,12 +62,6 @@ func DefaultNameSystem() string {
 	return "public"
 }
 
-// generatedBy returns information about the arguments used to invoke
-// lister-gen.
-func generatedBy() string {
-	return fmt.Sprintf("\n// This file was automatically generated by lister-gen\n\n")
-}
-
 // Packages makes the client package definition.
 func Packages(context *generator.Context, arguments *args.GeneratorArgs) generator.Packages {
 	boilerplate, err := arguments.LoadGoBoilerplate()
@@ -75,8 +69,6 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat
 		glog.Fatalf("Failed loading boilerplate: %v", err)
 	}
 
-	boilerplate = append(boilerplate, []byte(generatedBy())...)
-
 	var packageList generator.Packages
 	for _, inputDir := range arguments.InputDirs {
 		p := context.Universe.Package(inputDir)
diff --git a/staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh b/staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh
index 39d1d352c54..04fcb9861c5 100755
--- a/staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh
+++ b/staging/src/k8s.io/kube-aggregator/hack/update-codegen.sh
@@ -40,7 +40,7 @@ function cleanup {
 trap cleanup EXIT
 
 echo "Building client-gen"
-CLIENTGEN="${PWD}/client-gen-binary"
+CLIENTGEN="${PWD}/client-gen"
 
 go build -o "${CLIENTGEN}" ${CODEGEN_PKG}/cmd/client-gen
 
diff --git a/staging/src/k8s.io/metrics/hack/update-codegen.sh b/staging/src/k8s.io/metrics/hack/update-codegen.sh
index 5d24971e162..bb55d738806 100755
--- a/staging/src/k8s.io/metrics/hack/update-codegen.sh
+++ b/staging/src/k8s.io/metrics/hack/update-codegen.sh
@@ -29,7 +29,7 @@ function cleanup {
 trap cleanup EXIT
 
 echo "Building client-gen"
-CLIENTGEN="${PWD}/client-gen-binary"
+CLIENTGEN="${PWD}/client-gen"
 go build -o "${CLIENTGEN}" ${CODEGEN_PKG}/cmd/client-gen
 
 PREFIX=k8s.io/metrics/pkg/apis