diff --git a/cluster/aws/jessie/util.sh b/cluster/aws/jessie/util.sh
index f7434d6c11e..acdf61c21b5 100644
--- a/cluster/aws/jessie/util.sh
+++ b/cluster/aws/jessie/util.sh
@@ -17,7 +17,7 @@
 
 # A library of helper functions for Jessie.
 
-source "${KUBE_ROOT}/cluster/aws/ubuntu/common.sh"
+source "${KUBE_ROOT}/cluster/aws/trusty/common.sh"
 
 SSH_USER=admin
 
diff --git a/cluster/aws/options.md b/cluster/aws/options.md
index b915abef691..31a3b3ca6c2 100644
--- a/cluster/aws/options.md
+++ b/cluster/aws/options.md
@@ -76,8 +76,13 @@ If your machines don't have any ephemeral disks, this will default to the aufs d
 
 **KUBE_OS_DISTRIBUTION**
 
-The distribution to use.  Valid options: `wheezy`, `ubuntu`, `coreos`.
+The distribution to use.  Valid options: `trusty`, `vivid`, `coreos`, `wheezy`, `jessie`
 
-Defaults to wheezy (Debian Wheezy), which is the same as is used by default on GCE.
+Defaults to vivid (Ubuntu Vivid Vervet), which has a modern kernel and does not require updating or a reboot.
+
+`coreos` is also a good option.
+
+Other options may require reboots, updates or configuration, and should be used only if you have a compelling
+requirement to do so.
 
 [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/aws/options.md?pixel)]()
diff --git a/cluster/aws/ubuntu/common.sh b/cluster/aws/trusty/common.sh
similarity index 100%
rename from cluster/aws/ubuntu/common.sh
rename to cluster/aws/trusty/common.sh
diff --git a/cluster/aws/ubuntu/util.sh b/cluster/aws/trusty/util.sh
similarity index 88%
rename from cluster/aws/ubuntu/util.sh
rename to cluster/aws/trusty/util.sh
index 7961caa0f1a..25dd980b250 100644
--- a/cluster/aws/ubuntu/util.sh
+++ b/cluster/aws/trusty/util.sh
@@ -15,9 +15,7 @@
 # limitations under the License.
 
 
-# A library of helper functions for Ubuntu.
-
-source "${KUBE_ROOT}/cluster/aws/ubuntu/common.sh"
+source "${KUBE_ROOT}/cluster/aws/trusty/common.sh"
 
 # TODO: Move image detection in here once it is no longer shared with CoreOS
 
diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh
index d5232ba7139..6780ef798a6 100644
--- a/cluster/aws/util.sh
+++ b/cluster/aws/util.sh
@@ -30,8 +30,13 @@ ASG_NAME="${NODE_INSTANCE_PREFIX}-group"
 # We could allow the master disk volume id to be specified in future
 MASTER_DISK_ID=
 
+# Defaults: ubuntu -> vivid
+if [[ "${KUBE_OS_DISTRIBUTION}" == "ubuntu" ]]; then
+  KUBE_OS_DISTRIBUTION=vivid
+fi
+
 case "${KUBE_OS_DISTRIBUTION}" in
-  ubuntu|wheezy|jessie|vivid|coreos)
+  trusty|wheezy|jessie|vivid|coreos)
     source "${KUBE_ROOT}/cluster/aws/${KUBE_OS_DISTRIBUTION}/util.sh"
     ;;
   *)
@@ -221,8 +226,8 @@ function detect-security-groups {
 #   AWS_IMAGE
 function detect-image () {
 case "${KUBE_OS_DISTRIBUTION}" in
-  ubuntu|coreos)
-    detect-ubuntu-image
+  trusty|coreos)
+    detect-trusty-image
     ;;
   vivid)
     detect-vivid-image
@@ -240,12 +245,12 @@ case "${KUBE_OS_DISTRIBUTION}" in
 esac
 }
 
-# Detects the AMI to use for ubuntu (considering the region)
+# Detects the AMI to use for trusty (considering the region)
 # Used by CoreOS & Ubuntu
 #
 # Vars set:
 #   AWS_IMAGE
-function detect-ubuntu-image () {
+function detect-trusty-image () {
   # This is the ubuntu 14.04 image for <region>, amd64, hvm:ebs-ssd
   # See here: http://cloud-images.ubuntu.com/locator/ec2/ for other images
   # This will need to be updated from time to time as amis are deprecated
diff --git a/cluster/aws/vivid/util.sh b/cluster/aws/vivid/util.sh
index 63d28b14234..114903f66f3 100644
--- a/cluster/aws/vivid/util.sh
+++ b/cluster/aws/vivid/util.sh
@@ -15,9 +15,7 @@
 # limitations under the License.
 
 
-# A library of helper functions for Ubuntu.
-
-source "${KUBE_ROOT}/cluster/aws/ubuntu/common.sh"
+source "${KUBE_ROOT}/cluster/aws/trusty/common.sh"
 
 SSH_USER=ubuntu
 
diff --git a/cluster/aws/wheezy/util.sh b/cluster/aws/wheezy/util.sh
index 195542096f3..b5a61331026 100644
--- a/cluster/aws/wheezy/util.sh
+++ b/cluster/aws/wheezy/util.sh
@@ -17,7 +17,7 @@
 
 # A library of helper functions for Wheezy.
 
-source "${KUBE_ROOT}/cluster/aws/ubuntu/common.sh"
+source "${KUBE_ROOT}/cluster/aws/trusty/common.sh"
 
 SSH_USER=admin