diff --git a/contrib/ansible/README.md b/contrib/ansible/README.md
index d5ba1ed7772..acaeea82ae0 100644
--- a/contrib/ansible/README.md
+++ b/contrib/ansible/README.md
@@ -8,7 +8,7 @@ can be real hardware, VMs, things in a public cloud, etc.
 
 * Record the IP address of which machine you want to be your master
 * Record the IP address of the machine you want to be your etcd server (often same as master)
-* Record the IP addresses of the machines you want to be your minions. (master can be a minion)
+* Record the IP addresses of the machines you want to be your nodes. (master can be a node)
 
 Stick the system information into the 'inventory' file.
 
diff --git a/contrib/ansible/cluster.yml b/contrib/ansible/cluster.yml
index 984c4b090ec..e951d91617b 100644
--- a/contrib/ansible/cluster.yml
+++ b/contrib/ansible/cluster.yml
@@ -19,11 +19,11 @@
         - masters
 
 # install kubernetes on the nodes
-- hosts: minions
+- hosts: nodes
   sudo: yes
   roles:
         - common
         - kubernetes
-        - minion
+        - node
   tags:
-        - minions
+        - nodes
diff --git a/contrib/ansible/inventory b/contrib/ansible/inventory
index 07af7a61b30..7b43d91c3e6 100644
--- a/contrib/ansible/inventory
+++ b/contrib/ansible/inventory
@@ -1,10 +1,10 @@
-[masters]
-10.0.0.1
-
 [etcd]
 10.0.0.2
 
-[minions]
+[masters]
+10.0.0.1
+
+[nodes]
 10.0.0.3
 10.0.0.4
 10.0.0.5
diff --git a/contrib/ansible/roles/etcd/tasks/firewalld.yml b/contrib/ansible/roles/etcd/tasks/firewalld.yml
index 8d730fd2e47..dc2978c314b 100644
--- a/contrib/ansible/roles/etcd/tasks/firewalld.yml
+++ b/contrib/ansible/roles/etcd/tasks/firewalld.yml
@@ -1,7 +1,7 @@
 ---
 - name: Open firewalld port for etcd
   firewalld: port={{ item }}/tcp permanent=false state=enabled
-  # in case this is also a minion where firewalld turned off
+  # in case this is also a node where firewalld turned off
   ignore_errors: yes
   with_items:
         - 2379
@@ -9,7 +9,7 @@
 
 - name: Save firewalld port for etcd
   firewalld: port={{ item }}/tcp permanent=true state=enabled
-  # in case this is also a minion where firewalld turned off
+  # in case this is also a node where firewalld turned off
   ignore_errors: yes
   with_items:
         - 2379
diff --git a/contrib/ansible/roles/master/tasks/firewalld.yml b/contrib/ansible/roles/master/tasks/firewalld.yml
index 752094dc997..ffb7b65fbee 100644
--- a/contrib/ansible/roles/master/tasks/firewalld.yml
+++ b/contrib/ansible/roles/master/tasks/firewalld.yml
@@ -1,10 +1,10 @@
 ---
 - name: Open firewalld port for apiserver
   firewalld: port=8080/tcp permanent=false state=enabled
-  # in case this is also a minion with firewalld turned off
+  # in case this is also a node with firewalld turned off
   ignore_errors: yes
 
 - name: Save firewalld port for apiserver
   firewalld: port=8080/tcp permanent=true state=enabled
-  # in case this is also a minion with firewalld turned off
+  # in case this is also a node with firewalld turned off
   ignore_errors: yes
diff --git a/contrib/ansible/roles/master/templates/apiserver.j2 b/contrib/ansible/roles/master/templates/apiserver.j2
index 875db079f3d..82114506754 100644
--- a/contrib/ansible/roles/master/templates/apiserver.j2
+++ b/contrib/ansible/roles/master/templates/apiserver.j2
@@ -10,7 +10,7 @@ KUBE_API_ADDRESS="--address=0.0.0.0"
 # The port on the local server to listen on.
 # KUBE_API_PORT="--port=8080"
 
-# Port minions listen on
+# Port nodes listen on
 # KUBELET_PORT="--kubelet_port=10250"
 
 # Address range to use for services
diff --git a/contrib/ansible/roles/minion/files/proxy b/contrib/ansible/roles/node/files/proxy
similarity index 100%
rename from contrib/ansible/roles/minion/files/proxy
rename to contrib/ansible/roles/node/files/proxy
diff --git a/contrib/ansible/roles/minion/handlers/main.yml b/contrib/ansible/roles/node/handlers/main.yml
similarity index 100%
rename from contrib/ansible/roles/minion/handlers/main.yml
rename to contrib/ansible/roles/node/handlers/main.yml
diff --git a/contrib/ansible/roles/minion/tasks/firewalld.yml b/contrib/ansible/roles/node/tasks/firewalld.yml
similarity index 100%
rename from contrib/ansible/roles/minion/tasks/firewalld.yml
rename to contrib/ansible/roles/node/tasks/firewalld.yml
diff --git a/contrib/ansible/roles/minion/tasks/iptables.yml b/contrib/ansible/roles/node/tasks/iptables.yml
similarity index 100%
rename from contrib/ansible/roles/minion/tasks/iptables.yml
rename to contrib/ansible/roles/node/tasks/iptables.yml
diff --git a/contrib/ansible/roles/minion/tasks/main.yml b/contrib/ansible/roles/node/tasks/main.yml
similarity index 100%
rename from contrib/ansible/roles/minion/tasks/main.yml
rename to contrib/ansible/roles/node/tasks/main.yml
diff --git a/contrib/ansible/roles/minion/templates/kubelet.j2 b/contrib/ansible/roles/node/templates/kubelet.j2
similarity index 92%
rename from contrib/ansible/roles/minion/templates/kubelet.j2
rename to contrib/ansible/roles/node/templates/kubelet.j2
index d1edc84cb56..1dc96df5393 100644
--- a/contrib/ansible/roles/minion/templates/kubelet.j2
+++ b/contrib/ansible/roles/node/templates/kubelet.j2
@@ -1,5 +1,5 @@
 ###
-# kubernetes kubelet (minion) config
+# kubernetes kubelet (node) config
 
 # The address for the info server to serve on (set to 0.0.0.0 or "" for all interfaces)
 KUBELET_ADDRESS="--address=0.0.0.0"