diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 00ff645a5..c8907366a 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -764,7 +764,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "5b968b2f191f"
+			"Rev": "829ed199f4e0"
 		},
 		{
 			"ImportPath": "k8s.io/cli-runtime",
diff --git a/docs/book/pages/reference/kustomize.md b/docs/book/pages/reference/kustomize.md
index fffba6e4a..b2347d7fb 100644
--- a/docs/book/pages/reference/kustomize.md
+++ b/docs/book/pages/reference/kustomize.md
@@ -187,7 +187,7 @@ as well as `namePrefix`'s and `nameSuffix`'s.
 | :------------ | :------ | :---------------------------------- |
 | **behavior**  | string  | Merge behavior when the Secret generator is defined in a base.  May be one of `create`, `replace`, `merge`. |
 | **env**       | string  | Single file to generate Secret data entries from.  Should be a path to a local *env* file, e.g. `path/to/file.env`, where each line of the file is a `key=value` pair.  *Each line* will appear as an entry in the Secret data field. |
-| **files**     | []string  | List of files to generate Secret data entries from. Each item should be a path to a local file, e.g. `path/to/file.config`, and the filename will appear as an entry in the ConfigMap data field with its contents as a value.  |
+| **files**     | []string  | List of files to generate Secret data entries from. Each item should be a path to a local file, e.g. `path/to/file.config`, and the filename will appear as an entry in the Secret data field with its contents as a value.  |
 | **literals**  | []string  | List of literal Secret data entries. Each item should be a key and literal value, e.g. `somekey=somevalue`, and the key/value will appear as an entry in the Secret data field.|
 | **name**      | string  | Name for the Secret.  Modified by the `namePrefix` and `nameSuffix` fields. |
 | **namespace** | string  | Namespace for the Secret.  Overridden by kustomize-wide `namespace` field.|
@@ -300,7 +300,7 @@ Definitions:
 | Name          | Type    | Desc                                |
 | :------------ | :------ | :---------------------------------- |
 | **name** | string  | Match all `image` fields with this value for the *name*|
-| **nameName** | string  | Replace the `image` field *name* with this value. |
+| **newName** | string  | Replace the `image` field *name* with this value. |
 | **newTag** | string  | Replace the `image` field *tag* with this tag value. |
 | **digest** | string  | Replace the `image` field *tag* with this digest value.  Includes the `sha256:` portion of the digest. |
 
diff --git a/go.mod b/go.mod
index 770407157..a3bfedd55 100644
--- a/go.mod
+++ b/go.mod
@@ -35,7 +35,7 @@ require (
 	golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4
 	gopkg.in/yaml.v2 v2.2.8
 	k8s.io/api v0.0.0-20200922195808-5bb35d2636ca
-	k8s.io/apimachinery v0.0.0-20200922195624-5b968b2f191f
+	k8s.io/apimachinery v0.0.0-20200922235617-829ed199f4e0
 	k8s.io/cli-runtime v0.0.0-20200915100420-3cc3835b3ec2
 	k8s.io/client-go v0.0.0-20200917000235-cba7285b7f29
 	k8s.io/component-base v0.0.0-20200911092040-c985e940ef8f
@@ -49,7 +49,7 @@ require (
 
 replace (
 	k8s.io/api => k8s.io/api v0.0.0-20200922195808-5bb35d2636ca
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200922195624-5b968b2f191f
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200922235617-829ed199f4e0
 	k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200915100420-3cc3835b3ec2
 	k8s.io/client-go => k8s.io/client-go v0.0.0-20200917000235-cba7285b7f29
 	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200904030940-4116974d9b44
diff --git a/go.sum b/go.sum
index c3fc66966..2419fbea0 100644
--- a/go.sum
+++ b/go.sum
@@ -504,7 +504,7 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 k8s.io/api v0.0.0-20200922195808-5bb35d2636ca/go.mod h1:FAsg3Y/xcbFIbnyfpgARCQ8di7NxpIRZWbawQTkHTDo=
-k8s.io/apimachinery v0.0.0-20200922195624-5b968b2f191f/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA=
+k8s.io/apimachinery v0.0.0-20200922235617-829ed199f4e0/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA=
 k8s.io/cli-runtime v0.0.0-20200915100420-3cc3835b3ec2/go.mod h1:Hma9QauilauA4Azq48kPjOcZNafcVy3yUE7iiJUT8QQ=
 k8s.io/client-go v0.0.0-20200917000235-cba7285b7f29/go.mod h1:Plj2rfLmeMYfAMuMgA/1EGuUaDxt78tvB9yfdi6fg6A=
 k8s.io/code-generator v0.0.0-20200904030940-4116974d9b44/go.mod h1:moqLn7w0t9cMs4+5CQyxnfA/HV8MF6aAVENF+WZZhgk=