diff --git a/cluster/saltbase/salt/kubelet/default b/cluster/saltbase/salt/kubelet/default
index 2b3f868494f..dc22a04bfe0 100644
--- a/cluster/saltbase/salt/kubelet/default
+++ b/cluster/saltbase/salt/kubelet/default
@@ -17,8 +17,8 @@
 
 {% set config = "--config=/etc/kubernetes/manifests" -%}
 {% set hostname_override = "" -%}
-{% if grains.minion_ip is defined -%}
-  {% set hostname_override = " --hostname_override=" + grains.minion_ip -%}
+{% if grains.hostname_override is defined -%}
+  {% set hostname_override = " --hostname_override=" + grains.hostname_override -%}
 {% endif -%}
 
 {% set cluster_dns = "" %}
diff --git a/cluster/vagrant/provision-minion.sh b/cluster/vagrant/provision-minion.sh
index 618c79d5ce6..41d3679f320 100755
--- a/cluster/vagrant/provision-minion.sh
+++ b/cluster/vagrant/provision-minion.sh
@@ -72,7 +72,7 @@ grains:
   roles:
     - kubernetes-pool
   cbr-cidr: '$(echo "$CONTAINER_SUBNET" | sed -e "s/'/''/g")'
-  minion_ip: '$(echo "$MINION_IP" | sed -e "s/'/''/g")'
+  hostname_override: '$(echo "$MINION_IP" | sed -e "s/'/''/g")'
 EOF
 
 # we will run provision to update code each time we test, so we do not want to do salt install each time
diff --git a/cluster/vsphere/templates/salt-minion.sh b/cluster/vsphere/templates/salt-minion.sh
index 7741ea5158a..5324362c917 100755
--- a/cluster/vsphere/templates/salt-minion.sh
+++ b/cluster/vsphere/templates/salt-minion.sh
@@ -37,7 +37,7 @@ echo "master: $KUBE_MASTER" > /etc/salt/minion.d/master.conf
 #
 cat <<EOF >/etc/salt/minion.d/grains.conf
 grains:
-  minion_ip: $(ip route get 1.1.1.1 | awk '{print $7}')
+  hostname_override: $(ip route get 1.1.1.1 | awk '{print $7}')
   roles:
     - kubernetes-pool
     - kubernetes-pool-vsphere
diff --git a/docs/salt.md b/docs/salt.md
index 3616127ed29..5425d6e95d3 100644
--- a/docs/salt.md
+++ b/docs/salt.md
@@ -65,7 +65,7 @@ Key | Value
 `etcd_servers` | (Optional) Comma-delimited list of IP addresses the kube-apiserver and kubelet use to reach etcd.  Uses the IP of the first machine in the kubernetes_master role, or 127.0.0.1 on GCE.
 `hostnamef` | (Optional) The full host name of the machine, i.e. uname -n
 `node_ip` | (Optional) The IP address to use to address this node
-`minion_ip` | (Optional) Mapped to the kubelet hostname_override, K8S TODO - change this name
+`hostname_override` | (Optional) Mapped to the kubelet hostname_override
 `network_mode` | (Optional) Networking model to use among nodes: *openvswitch*
 `networkInterfaceName` | (Optional) Networking interface to use to bind addresses, default value *eth0*
 `publicAddressOverride` | (Optional) The IP address the kube-apiserver should use to bind against for external read-only access