diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile
index 9a62ffbb0f..6cffc58c12 100644
--- a/vagrant/Vagrantfile
+++ b/vagrant/Vagrantfile
@@ -66,20 +66,20 @@ Vagrant.configure(2) do |config|
     end
   end
 
-  # Build support nodes
+  # Build control nodes
   (1..3).each do |i|
-    config.vm.define "support0#{i}" do |support|
-      support.vm.hostname = "support0#{i}.local"
-      support.vm.provision :shell, path: "bootstrap.sh"
-      support.vm.synced_folder "storage/support/", "/data/host", create:"True"
-      support.vm.synced_folder "storage/shared/", "/data/shared", create:"True"
-      support.vm.synced_folder ".", "/vagrant", disabled: true
-      support.vm.provider "virtualbox" do |vb|
+    config.vm.define "control0#{i}" do |control|
+      control.vm.hostname = "control0#{i}.local"
+      control.vm.provision :shell, path: "bootstrap.sh"
+      control.vm.synced_folder "storage/control/", "/data/host", create:"True"
+      control.vm.synced_folder "storage/shared/", "/data/shared", create:"True"
+      control.vm.synced_folder ".", "/vagrant", disabled: true
+      control.vm.provider "virtualbox" do |vb|
         vb.memory = 2048
       end
-      support.hostmanager.aliases = "support0#{i}"
+      control.hostmanager.aliases = "control0#{i}"
 
-      # TODO: Here we bind local port 8080 to Horizon on support01 only.
+      # TODO: Here we bind local port 8080 to Horizon on control01 only.
       # TODO: Once we implement Horizon behind a VIP, this obviously needs to
       # be changed.
       #if i < 2 then