diff --git a/hack/boilerplate/boilerplate.codegen.go.txt b/hack/boilerplate/boilerplate.generatego.txt
similarity index 100%
rename from hack/boilerplate/boilerplate.codegen.go.txt
rename to hack/boilerplate/boilerplate.generatego.txt
diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
index 0276665c9..7adc3c44d 100755
--- a/hack/update-codegen.sh
+++ b/hack/update-codegen.sh
@@ -180,7 +180,7 @@ gen-deepcopy() {
   prefixed_inputs=( "${deepcopy_inputs[@]/#/$module_name/}" )
   joined=$( IFS=$','; echo "${prefixed_inputs[*]}" )
   "$deepcopygen" \
-    --go-header-file hack/boilerplate/boilerplate.codegen.go.txt \
+    --go-header-file hack/boilerplate/boilerplate.generatego.txt \
     --input-dirs "$joined" \
     --output-file-base zz_generated.deepcopy \
     --bounding-dirs "${module_name}"
@@ -195,7 +195,7 @@ gen-clientsets() {
   prefixed_inputs=( "${client_inputs[@]/#/$module_name/}" )
   joined=$( IFS=$','; echo "${prefixed_inputs[*]}" )
   "$clientgen" \
-    --go-header-file hack/boilerplate/boilerplate.codegen.go.txt \
+    --go-header-file hack/boilerplate/boilerplate.generatego.txt \
     --clientset-name versioned \
     --input-base "" \
     --input "$joined" \
@@ -209,7 +209,7 @@ gen-listers() {
   prefixed_inputs=( "${client_inputs[@]/#/$module_name/}" )
   joined=$( IFS=$','; echo "${prefixed_inputs[*]}" )
   "$listergen" \
-    --go-header-file hack/boilerplate/boilerplate.codegen.go.txt \
+    --go-header-file hack/boilerplate/boilerplate.generatego.txt \
     --input-dirs "$joined" \
     --output-package "${client_package}"/listers
   copyfiles "${client_subpackage}/listers" "*.go"
@@ -221,7 +221,7 @@ gen-informers() {
   prefixed_inputs=( "${client_inputs[@]/#/$module_name/}" )
   joined=$( IFS=$','; echo "${prefixed_inputs[*]}" )
   "$informergen" \
-    --go-header-file hack/boilerplate/boilerplate.codegen.go.txt \
+    --go-header-file hack/boilerplate/boilerplate.generatego.txt \
     --input-dirs "$joined" \
     --versioned-clientset-package "${client_package}"/clientset/versioned \
     --listers-package "${client_package}"/listers \
@@ -236,7 +236,7 @@ gen-defaulters() {
   prefixed_inputs=( "${defaulter_inputs[@]/#/$module_name/}" )
   joined=$( IFS=$','; echo "${prefixed_inputs[*]}" )
   "$defaultergen" \
-    --go-header-file hack/boilerplate/boilerplate.codegen.go.txt \
+    --go-header-file hack/boilerplate/boilerplate.generatego.txt \
     --input-dirs "$joined" \
     -O zz_generated.defaults
   for dir in "${defaulter_inputs[@]}"; do
@@ -251,7 +251,7 @@ gen-conversions() {
   prefixed_inputs=( "${conversion_inputs[@]/#/$module_name/}" )
   joined=$( IFS=$','; echo "${prefixed_inputs[*]}" )
   "$conversiongen" \
-    --go-header-file hack/boilerplate/boilerplate.codegen.go.txt \
+    --go-header-file hack/boilerplate/boilerplate.generatego.txt \
     --input-dirs "$joined" \
     -O zz_generated.conversion
   for dir in "${conversion_inputs[@]}"; do
diff --git a/hack/verify_boilerplate.py b/hack/verify_boilerplate.py
index d16c1f3af..f199fd5af 100755
--- a/hack/verify_boilerplate.py
+++ b/hack/verify_boilerplate.py
@@ -65,6 +65,10 @@ def file_passes(filename, refs, regexs):  # pylint: disable=too-many-locals
     except IOError:
         return False
 
+    if "zz_generate" in filename:
+        # Skip all zz_generate files
+        return True
+
     basename = os.path.basename(filename)
     extension = file_extension(filename)
     if extension != "":
@@ -123,7 +127,7 @@ SKIPPED_DIRS = [
 # even when generated by bazel we will complain about some generated files
 # not having the headers. since they're just generated, ignore them
 IGNORE_HEADERS = [
-    '// Code generated by go-bindata.',
+    '// Code generated by',
     '// +skip_license_check',
     '# +skip_license_check',
 ]