diff --git a/cmd/kops/rollingupdatecluster.go b/cmd/kops/rollingupdatecluster.go
index 049b9505f9..c18cfe24bf 100644
--- a/cmd/kops/rollingupdatecluster.go
+++ b/cmd/kops/rollingupdatecluster.go
@@ -48,18 +48,18 @@ var (
 	Note: terraform users will need run the following commands all from the same directory "kops update cluster --target=terraform" then "terraform plan" then "terraform apply"
 	prior to running "kops rolling-update cluster"
 
-	Use KOPS_FEATURE_FLAGS="+DrainAndValidateRollingUpdate" to use beta code that drains the nodes
+	Use export KOPS_FEATURE_FLAGS="+DrainAndValidateRollingUpdate" to use beta code that drains the nodes
 	and validates the cluster.  New flags for Drain and Validation operations will be shown when
 	the environment variable is set.`))
 
 	rollingupdate_example = templates.Examples(i18n.T(`
 		# Roll the currently selected kops cluster
-		kops rollingupdate cluster --yes
+		kops rolling-update cluster --yes
 
 		# Roll the k8s-cluster.example.com kops cluster
 		# use the new drain an validate functionality
-		KOPS_FEATURE_FLAGS="+DrainAndValidateRollingUpdate"
-		kops rollingupdate cluster k8s-cluster.example.com --yes \
+		export KOPS_FEATURE_FLAGS="+DrainAndValidateRollingUpdate"
+		kops rolling-update cluster k8s-cluster.example.com --yes \
 		  --fail-on-validate-error="false" \
 		  --master-interval=8m \
 		  --node-interval=8m
@@ -68,8 +68,8 @@ var (
 		# Roll the k8s-cluster.example.com kops cluster
 		# only roll the node instancegroup
 		# use the new drain an validate functionality
-		KOPS_FEATURE_FLAGS="+DrainAndValidateRollingUpdate"
-		kops rollingupdate cluster k8s-cluster.example.com --yes \
+		export KOPS_FEATURE_FLAGS="+DrainAndValidateRollingUpdate"
+		kops rolling-update cluster k8s-cluster.example.com --yes \
 		  --fail-on-validate-error="false" \
 		  --node-interval 8m \
 		  --instance-group nodes
diff --git a/cmd/kops/upgrade.go b/cmd/kops/upgrade.go
index 78b9476d96..ac34866f69 100644
--- a/cmd/kops/upgrade.go
+++ b/cmd/kops/upgrade.go
@@ -25,7 +25,7 @@ import (
 var (
 	upgrade_long = templates.LongDesc(i18n.T(`
 	Automates checking for and applying Kubernetes updates. This upgrades a cluster to the latest recommended
-	production ready k8s version. After this command is run usekops update cluder, and kops rollingupdate cluster
+	production ready k8s version. After this command is run usekops update cluder, and kops rolling-update cluster
 	to finish a cluster upgrade.
 	`))
 
diff --git a/docs/cli/kops_rolling-update.md b/docs/cli/kops_rolling-update.md
index 7e6e0d2bf0..e6a0dc8c3c 100644
--- a/docs/cli/kops_rolling-update.md
+++ b/docs/cli/kops_rolling-update.md
@@ -11,18 +11,18 @@ To perform rolling update, you need to update the cloud resources first with "ko
 
 Note: terraform users will need run the following commands all from the same directory "kops update cluster --target=terraform" then "terraform plan" then "terraform apply" prior to running "kops rolling-update cluster" 
 
-Use KOPS FEATURE FLAGS="+DrainAndValidateRollingUpdate" to use beta code that drains the nodes and validates the cluster.  New flags for Drain and Validation operations will be shown when the environment variable is set.
+Use export KOPS FEATURE FLAGS="+DrainAndValidateRollingUpdate" to use beta code that drains the nodes and validates the cluster.  New flags for Drain and Validation operations will be shown when the environment variable is set.
 
 ### Examples
 
 ```
   # Roll the currently selected kops cluster
-  kops rollingupdate cluster --yes
+  kops rolling-update cluster --yes
   
   # Roll the k8s-cluster.example.com kops cluster
   # use the new drain an validate functionality
-  KOPS_FEATURE_FLAGS="+DrainAndValidateRollingUpdate"
-  kops rollingupdate cluster k8s-cluster.example.com --yes \
+  export KOPS_FEATURE_FLAGS="+DrainAndValidateRollingUpdate"
+  kops rolling-update cluster k8s-cluster.example.com --yes \
   --fail-on-validate-error="false" \
   --master-interval=8m \
   --node-interval=8m
@@ -31,8 +31,8 @@ Use KOPS FEATURE FLAGS="+DrainAndValidateRollingUpdate" to use beta code that dr
   # Roll the k8s-cluster.example.com kops cluster
   # only roll the node instancegroup
   # use the new drain an validate functionality
-  KOPS_FEATURE_FLAGS="+DrainAndValidateRollingUpdate"
-  kops rollingupdate cluster k8s-cluster.example.com --yes \
+  export KOPS_FEATURE_FLAGS="+DrainAndValidateRollingUpdate"
+  kops rolling-update cluster k8s-cluster.example.com --yes \
   --fail-on-validate-error="false" \
   --node-interval 8m \
   --instance-group nodes
diff --git a/docs/cli/kops_rolling-update_cluster.md b/docs/cli/kops_rolling-update_cluster.md
index 3fb2f531dc..8458a324b6 100644
--- a/docs/cli/kops_rolling-update_cluster.md
+++ b/docs/cli/kops_rolling-update_cluster.md
@@ -11,7 +11,7 @@ To perform rolling update, you need to update the cloud resources first with "ko
 
 Note: terraform users will need run the following commands all from the same directory "kops update cluster --target=terraform" then "terraform plan" then "terraform apply" prior to running "kops rolling-update cluster" 
 
-Use KOPS FEATURE FLAGS="+DrainAndValidateRollingUpdate" to use beta code that drains the nodes and validates the cluster.  New flags for Drain and Validation operations will be shown when the environment variable is set.
+Use export KOPS FEATURE FLAGS="+DrainAndValidateRollingUpdate" to use beta code that drains the nodes and validates the cluster.  New flags for Drain and Validation operations will be shown when the environment variable is set.
 
 ```
 kops rolling-update cluster
@@ -21,12 +21,12 @@ kops rolling-update cluster
 
 ```
   # Roll the currently selected kops cluster
-  kops rollingupdate cluster --yes
+  kops rolling-update cluster --yes
   
   # Roll the k8s-cluster.example.com kops cluster
   # use the new drain an validate functionality
-  KOPS_FEATURE_FLAGS="+DrainAndValidateRollingUpdate"
-  kops rollingupdate cluster k8s-cluster.example.com --yes \
+  export KOPS_FEATURE_FLAGS="+DrainAndValidateRollingUpdate"
+  kops rolling-update cluster k8s-cluster.example.com --yes \
   --fail-on-validate-error="false" \
   --master-interval=8m \
   --node-interval=8m
@@ -35,8 +35,8 @@ kops rolling-update cluster
   # Roll the k8s-cluster.example.com kops cluster
   # only roll the node instancegroup
   # use the new drain an validate functionality
-  KOPS_FEATURE_FLAGS="+DrainAndValidateRollingUpdate"
-  kops rollingupdate cluster k8s-cluster.example.com --yes \
+  export KOPS_FEATURE_FLAGS="+DrainAndValidateRollingUpdate"
+  kops rolling-update cluster k8s-cluster.example.com --yes \
   --fail-on-validate-error="false" \
   --node-interval 8m \
   --instance-group nodes
diff --git a/docs/cli/kops_upgrade.md b/docs/cli/kops_upgrade.md
index edd26fcdcd..f69214a840 100644
--- a/docs/cli/kops_upgrade.md
+++ b/docs/cli/kops_upgrade.md
@@ -5,7 +5,7 @@ Upgrade a kubernetes cluster.
 ### Synopsis
 
 
-Automates checking for and applying Kubernetes updates. This upgrades a cluster to the latest recommended production ready k8s version. After this command is run usekops update cluder, and kops rollingupdate cluster to finish a cluster upgrade.
+Automates checking for and applying Kubernetes updates. This upgrades a cluster to the latest recommended production ready k8s version. After this command is run usekops update cluder, and kops rolling-update cluster to finish a cluster upgrade.
 
 ### Examples
 
diff --git a/docs/cli/kops_upgrade_cluster.md b/docs/cli/kops_upgrade_cluster.md
index 0105ebf3c7..913bb75cd8 100644
--- a/docs/cli/kops_upgrade_cluster.md
+++ b/docs/cli/kops_upgrade_cluster.md
@@ -5,7 +5,7 @@ Upgrade a kubernetes cluster.
 ### Synopsis
 
 
-Automates checking for and applying Kubernetes updates. This upgrades a cluster to the latest recommended production ready k8s version. After this command is run usekops update cluder, and kops rollingupdate cluster to finish a cluster upgrade.
+Automates checking for and applying Kubernetes updates. This upgrades a cluster to the latest recommended production ready k8s version. After this command is run usekops update cluder, and kops rolling-update cluster to finish a cluster upgrade.
 
 ```
 kops upgrade cluster