From b29864f450976c10ba8ffbc955793b3c79595c71 Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Fri, 17 Jun 2016 19:45:20 -0400
Subject: [PATCH] Use symbols for defining guest capabilities

---
 plugins/guests/arch/plugin.rb      |  6 +++---
 plugins/guests/atomic/plugin.rb    |  6 +++---
 plugins/guests/coreos/plugin.rb    |  8 +++----
 plugins/guests/darwin/plugin.rb    | 32 ++++++++++++++--------------
 plugins/guests/debian/plugin.rb    | 12 +++++------
 plugins/guests/esxi/plugin.rb      | 12 +++++------
 plugins/guests/fedora/plugin.rb    | 10 ++++-----
 plugins/guests/freebsd/plugin.rb   | 26 +++++++++++------------
 plugins/guests/funtoo/plugin.rb    |  8 +++----
 plugins/guests/gentoo/plugin.rb    |  8 +++----
 plugins/guests/linux/plugin.rb     | 34 +++++++++++++++---------------
 plugins/guests/mint/plugin.rb      |  2 +-
 plugins/guests/netbsd/plugin.rb    | 28 ++++++++++++------------
 plugins/guests/nixos/plugin.rb     | 10 ++++-----
 plugins/guests/omnios/plugin.rb    |  8 +++----
 plugins/guests/openbsd/plugin.rb   | 28 ++++++++++++------------
 plugins/guests/photon/plugin.rb    |  8 +++----
 plugins/guests/pld/plugin.rb       |  8 +++----
 plugins/guests/redhat/plugin.rb    | 14 ++++++------
 plugins/guests/slackware/plugin.rb |  6 +++---
 plugins/guests/smartos/plugin.rb   | 24 ++++++++++-----------
 plugins/guests/solaris/plugin.rb   | 28 ++++++++++++------------
 plugins/guests/solaris11/plugin.rb | 24 ++++++++++-----------
 plugins/guests/suse/plugin.rb      | 16 +++++++-------
 plugins/guests/tinycore/plugin.rb  | 14 ++++++------
 plugins/guests/trisquel/plugin.rb  |  2 +-
 plugins/guests/ubuntu/plugin.rb    |  4 ++--
 plugins/guests/windows/plugin.rb   |  4 ++--
 28 files changed, 195 insertions(+), 195 deletions(-)

diff --git a/plugins/guests/arch/plugin.rb b/plugins/guests/arch/plugin.rb
index 4040bb382..6b678d763 100644
--- a/plugins/guests/arch/plugin.rb
+++ b/plugins/guests/arch/plugin.rb
@@ -6,17 +6,17 @@ module VagrantPlugins
       name "Arch guest"
       description "Arch guest support."
 
-      guest("arch", "linux") do
+      guest(:arch, :linux) do
         require_relative "guest"
         Guest
       end
 
-      guest_capability("arch", "change_host_name") do
+      guest_capability(:arch, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("arch", "configure_networks") do
+      guest_capability(:arch, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
diff --git a/plugins/guests/atomic/plugin.rb b/plugins/guests/atomic/plugin.rb
index ea0f5e454..ba40183a3 100644
--- a/plugins/guests/atomic/plugin.rb
+++ b/plugins/guests/atomic/plugin.rb
@@ -6,17 +6,17 @@ module VagrantPlugins
       name "Atomic Host guest"
       description "Atomic Host guest support."
 
-      guest("atomic", "fedora") do
+      guest(:atomic, :fedora) do
         require_relative "guest"
         Guest
       end
 
-      guest_capability("atomic", "change_host_name") do
+      guest_capability(:atomic, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("atomic", "docker_daemon_running") do
+      guest_capability(:atomic, :docker_daemon_running) do
         require_relative "cap/docker"
         Cap::Docker
       end
diff --git a/plugins/guests/coreos/plugin.rb b/plugins/guests/coreos/plugin.rb
index a81c047a0..9ac64915c 100644
--- a/plugins/guests/coreos/plugin.rb
+++ b/plugins/guests/coreos/plugin.rb
@@ -6,22 +6,22 @@ module VagrantPlugins
       name "CoreOS guest"
       description "CoreOS guest support."
 
-      guest("coreos", "linux") do
+      guest(:coreos, :linux) do
         require_relative "guest"
         Guest
       end
 
-      guest_capability("coreos", "change_host_name") do
+      guest_capability(:coreos, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("coreos", "configure_networks") do
+      guest_capability(:coreos, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
 
-      guest_capability("coreos", "docker_daemon_running") do
+      guest_capability(:coreos, :docker_daemon_running) do
         require_relative "cap/docker"
         Cap::Docker
       end
diff --git a/plugins/guests/darwin/plugin.rb b/plugins/guests/darwin/plugin.rb
index 83f92110c..157cdd7e9 100644
--- a/plugins/guests/darwin/plugin.rb
+++ b/plugins/guests/darwin/plugin.rb
@@ -6,82 +6,82 @@ module VagrantPlugins
       name "Darwin guest"
       description "Darwin guest support."
 
-      guest("darwin")  do
+      guest(:darwin)  do
         require_relative "guest"
         Guest
       end
 
-      guest_capability("darwin", "change_host_name") do
+      guest_capability(:darwin, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("darwin", "choose_addressable_ip_addr") do
+      guest_capability(:darwin, :choose_addressable_ip_addr) do
         require_relative "cap/choose_addressable_ip_addr"
         Cap::ChooseAddressableIPAddr
       end
 
-      guest_capability("darwin", "configure_networks") do
+      guest_capability(:darwin, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
 
-      guest_capability("darwin", "halt") do
+      guest_capability(:darwin, :halt) do
         require_relative "cap/halt"
         Cap::Halt
       end
 
-      guest_capability("darwin", "insert_public_key") do
+      guest_capability(:darwin, :insert_public_key) do
         require_relative "cap/insert_public_key"
         Cap::InsertPublicKey
       end
 
-      guest_capability("darwin", "mount_nfs_folder") do
+      guest_capability(:darwin, :mount_nfs_folder) do
         require_relative "cap/mount_nfs_folder"
         Cap::MountNFSFolder
       end
 
-      guest_capability("darwin", "mount_smb_shared_folder") do
+      guest_capability(:darwin, :mount_smb_shared_folder) do
         require_relative "cap/mount_smb_shared_folder"
         Cap::MountSMBSharedFolder
       end
 
-      guest_capability("darwin", "mount_vmware_shared_folder") do
+      guest_capability(:darwin, :mount_vmware_shared_folder) do
         require_relative "cap/mount_vmware_shared_folder"
         Cap::MountVmwareSharedFolder
       end
 
-      guest_capability("darwin", "remove_public_key") do
+      guest_capability(:darwin, :remove_public_key) do
         require_relative "cap/remove_public_key"
         Cap::RemovePublicKey
       end
 
-      guest_capability("darwin", "rsync_installed") do
+      guest_capability(:darwin, :rsync_installed) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("darwin", "rsync_command") do
+      guest_capability(:darwin, :rsync_command) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("darwin", "rsync_post") do
+      guest_capability(:darwin, :rsync_post) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("darwin", "rsync_pre") do
+      guest_capability(:darwin, :rsync_pre) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("darwin", "shell_expand_guest_path") do
+      guest_capability(:darwin, :shell_expand_guest_path) do
         require_relative "cap/shell_expand_guest_path"
         Cap::ShellExpandGuestPath
       end
 
-      guest_capability("darwin", "verify_vmware_hgfs") do
+      guest_capability(:darwin, :verify_vmware_hgfs) do
         require_relative "cap/verify_vmware_hgfs"
         Cap::VerifyVmwareHgfs
       end
diff --git a/plugins/guests/debian/plugin.rb b/plugins/guests/debian/plugin.rb
index bcfdad05c..84be3c975 100644
--- a/plugins/guests/debian/plugin.rb
+++ b/plugins/guests/debian/plugin.rb
@@ -6,32 +6,32 @@ module VagrantPlugins
       name "Debian guest"
       description "Debian guest support."
 
-      guest("debian", "linux") do
+      guest(:debian, :linux) do
         require_relative "guest"
         Guest
       end
 
-      guest_capability("debian", "configure_networks") do
+      guest_capability(:debian, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
 
-      guest_capability("debian", "change_host_name") do
+      guest_capability(:debian, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("debian", "nfs_client_install") do
+      guest_capability(:debian, :nfs_client_install) do
         require_relative "cap/nfs_client"
         Cap::NFSClient
       end
 
-      guest_capability("debian", "rsync_install") do
+      guest_capability(:debian, :rsync_install) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("debian", "smb_install") do
+      guest_capability(:debian, :smb_install) do
         require_relative "cap/smb"
         Cap::SMB
       end
diff --git a/plugins/guests/esxi/plugin.rb b/plugins/guests/esxi/plugin.rb
index 58456c7e8..04367bc22 100644
--- a/plugins/guests/esxi/plugin.rb
+++ b/plugins/guests/esxi/plugin.rb
@@ -6,27 +6,27 @@ module VagrantPlugins
       name "ESXi guest."
       description "ESXi guest support."
 
-      guest("esxi")  do
-        require File.expand_path("../guest", __FILE__)
+      guest(:esxi)  do
+        require_relative "guest"
         Guest
       end
 
-      guest_capability("esxi", "change_host_name") do
+      guest_capability(:esxi, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("esxi", "configure_networks") do
+      guest_capability(:esxi, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
 
-      guest_capability("esxi", "mount_nfs_folder") do
+      guest_capability(:esxi, :mount_nfs_folder) do
         require_relative "cap/mount_nfs_folder"
         Cap::MountNFSFolder
       end
 
-      guest_capability("esxi", "halt") do
+      guest_capability(:esxi, :halt) do
         require_relative "cap/halt"
         Cap::Halt
       end
diff --git a/plugins/guests/fedora/plugin.rb b/plugins/guests/fedora/plugin.rb
index d838f0a4a..acb39548d 100644
--- a/plugins/guests/fedora/plugin.rb
+++ b/plugins/guests/fedora/plugin.rb
@@ -6,27 +6,27 @@ module VagrantPlugins
       name "Fedora guest"
       description "Fedora guest support."
 
-      guest("fedora", "redhat") do
+      guest(:fedora, :redhat) do
         require_relative "guest"
         Guest
       end
 
-      guest_capability("fedora", "change_host_name") do
+      guest_capability(:fedora, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("fedora", "configure_networks") do
+      guest_capability(:fedora, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
 
-      guest_capability("fedora", "network_scripts_dir") do
+      guest_capability(:fedora, :network_scripts_dir) do
         require_relative "cap/network_scripts_dir"
         Cap::NetworkScriptsDir
       end
 
-      guest_capability("fedora", "flavor") do
+      guest_capability(:fedora, :flavor) do
         require_relative "cap/flavor"
         Cap::Flavor
       end
diff --git a/plugins/guests/freebsd/plugin.rb b/plugins/guests/freebsd/plugin.rb
index 14b5e9ef9..158513dbb 100644
--- a/plugins/guests/freebsd/plugin.rb
+++ b/plugins/guests/freebsd/plugin.rb
@@ -6,67 +6,67 @@ module VagrantPlugins
       name "FreeBSD guest"
       description "FreeBSD guest support."
 
-      guest("freebsd")  do
+      guest(:freebsd) do
         require_relative "guest"
         Guest
       end
 
-      guest_capability("freebsd", "change_host_name") do
+      guest_capability(:freebsd, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("freebsd", "configure_networks") do
+      guest_capability(:freebsd, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
 
-      guest_capability("freebsd", "halt") do
+      guest_capability(:freebsd, :halt) do
         require_relative "cap/halt"
         Cap::Halt
       end
 
-      guest_capability("freebsd", "insert_public_key") do
+      guest_capability(:freebsd, :insert_public_key) do
         require_relative "cap/insert_public_key"
         Cap::InsertPublicKey
       end
 
-      guest_capability("freebsd", "mount_nfs_folder") do
+      guest_capability(:freebsd, :mount_nfs_folder) do
         require_relative "cap/mount_nfs_folder"
         Cap::MountNFSFolder
       end
 
-      guest_capability("freebsd", "remove_public_key") do
+      guest_capability(:freebsd, :remove_public_key) do
         require_relative "cap/remove_public_key"
         Cap::RemovePublicKey
       end
 
-      guest_capability("freebsd", "rsync_install") do
+      guest_capability(:freebsd, :rsync_install) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("freebsd", "rsync_installed") do
+      guest_capability(:freebsd, :rsync_installed) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("freebsd", "rsync_command") do
+      guest_capability(:freebsd, :rsync_command) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("freebsd", "rsync_post") do
+      guest_capability(:freebsd, :rsync_post) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("freebsd", "rsync_pre") do
+      guest_capability(:freebsd, :rsync_pre) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("freebsd", "shell_expand_guest_path") do
+      guest_capability(:freebsd, :shell_expand_guest_path) do
         require_relative "cap/shell_expand_guest_path"
         Cap::ShellExpandGuestPath
       end
diff --git a/plugins/guests/funtoo/plugin.rb b/plugins/guests/funtoo/plugin.rb
index 7e3227df5..59f76da98 100644
--- a/plugins/guests/funtoo/plugin.rb
+++ b/plugins/guests/funtoo/plugin.rb
@@ -6,17 +6,17 @@ module VagrantPlugins
       name "Funtoo guest"
       description "Funtoo guest support."
 
-      guest("funtoo", "linux") do
-        require File.expand_path("../guest", __FILE__)
+      guest(:funtoo, :linux) do
+        require_relative "guest"
         Guest
       end
 
-      guest_capability("funtoo", "change_host_name") do
+      guest_capability(:funtoo, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("funtoo", "configure_networks") do
+      guest_capability(:funtoo, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
diff --git a/plugins/guests/gentoo/plugin.rb b/plugins/guests/gentoo/plugin.rb
index 2054f81cd..25c655f4f 100644
--- a/plugins/guests/gentoo/plugin.rb
+++ b/plugins/guests/gentoo/plugin.rb
@@ -6,17 +6,17 @@ module VagrantPlugins
       name "Gentoo guest"
       description "Gentoo guest support."
 
-      guest("gentoo", "linux") do
-        require File.expand_path("../guest", __FILE__)
+      guest(:gentoo, :linux) do
+        require_relative "guest"
         Guest
       end
 
-      guest_capability("gentoo", "change_host_name") do
+      guest_capability(:gentoo, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("gentoo", "configure_networks") do
+      guest_capability(:gentoo, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
diff --git a/plugins/guests/linux/plugin.rb b/plugins/guests/linux/plugin.rb
index b8456de5d..285c3ffdb 100644
--- a/plugins/guests/linux/plugin.rb
+++ b/plugins/guests/linux/plugin.rb
@@ -6,88 +6,88 @@ module VagrantPlugins
       name "Linux guest."
       description "Linux guest support."
 
-      guest("linux")  do
+      guest(:linux) do
         require_relative "guest"
         Guest
       end
 
-      guest_capability("linux", "choose_addressable_ip_addr") do
+      guest_capability(:linux, :choose_addressable_ip_addr) do
         require_relative "cap/choose_addressable_ip_addr"
         Cap::ChooseAddressableIPAddr
       end
 
-      guest_capability("linux", "halt") do
+      guest_capability(:linux, :halt) do
         require_relative "cap/halt"
         Cap::Halt
       end
 
-      guest_capability("linux", "insert_public_key") do
+      guest_capability(:linux, :insert_public_key) do
         require_relative "cap/insert_public_key"
         Cap::InsertPublicKey
       end
 
-      guest_capability("linux", "shell_expand_guest_path") do
+      guest_capability(:linux, :shell_expand_guest_path) do
         require_relative "cap/shell_expand_guest_path"
         Cap::ShellExpandGuestPath
       end
 
-      guest_capability("linux", "mount_nfs_folder") do
+      guest_capability(:linux, :mount_nfs_folder) do
         require_relative "cap/mount_nfs"
         Cap::MountNFS
       end
 
-      guest_capability("linux", "mount_smb_shared_folder") do
+      guest_capability(:linux, :mount_smb_shared_folder) do
         require_relative "cap/mount_smb_shared_folder"
         Cap::MountSMBSharedFolder
       end
 
-      guest_capability("linux", "mount_virtualbox_shared_folder") do
+      guest_capability(:linux, :mount_virtualbox_shared_folder) do
         require_relative "cap/mount_virtualbox_shared_folder"
         Cap::MountVirtualBoxSharedFolder
       end
 
-      guest_capability("linux", "nfs_client_installed") do
+      guest_capability(:linux, :nfs_client_installed) do
         require_relative "cap/nfs_client"
         Cap::NFSClient
       end
 
       # For the Docker provider
-      guest_capability("linux", "port_open_check") do
+      guest_capability(:linux, :port_open_check) do
         require_relative "cap/port"
         Cap::Port
       end
 
-      guest_capability("linux", "read_ip_address") do
+      guest_capability(:linux, :read_ip_address) do
         require_relative "cap/read_ip_address"
         Cap::ReadIPAddress
       end
 
-      guest_capability("linux", "remove_public_key") do
+      guest_capability(:linux, :remove_public_key) do
         require_relative "cap/remove_public_key"
         Cap::RemovePublicKey
       end
 
-      guest_capability("linux", "rsync_installed") do
+      guest_capability(:linux, :rsync_installed) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("linux", "rsync_command") do
+      guest_capability(:linux, :rsync_command) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("linux", "rsync_post") do
+      guest_capability(:linux, :rsync_post) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("linux", "rsync_pre") do
+      guest_capability(:linux, :rsync_pre) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("linux", "unmount_virtualbox_shared_folder") do
+      guest_capability(:linux, :unmount_virtualbox_shared_folder) do
         require_relative "cap/mount_virtualbox_shared_folder"
         Cap::MountVirtualBoxSharedFolder
       end
diff --git a/plugins/guests/mint/plugin.rb b/plugins/guests/mint/plugin.rb
index 83bbca677..f7d49ceca 100644
--- a/plugins/guests/mint/plugin.rb
+++ b/plugins/guests/mint/plugin.rb
@@ -6,7 +6,7 @@ module VagrantPlugins
       name "Mint guest"
       description "Mint guest support."
 
-      guest("mint", "ubuntu") do
+      guest(:mint, :ubuntu) do
         require_relative "guest"
         Guest
       end
diff --git a/plugins/guests/netbsd/plugin.rb b/plugins/guests/netbsd/plugin.rb
index 9636c6630..1af36eab0 100644
--- a/plugins/guests/netbsd/plugin.rb
+++ b/plugins/guests/netbsd/plugin.rb
@@ -6,67 +6,67 @@ module VagrantPlugins
       name "NetBSD guest"
       description "NetBSD guest support."
 
-      guest("netbsd") do
-        require File.expand_path("../guest", __FILE__)
+      guest(:netbsd) do
+        require_relative "guest"
         Guest
       end
 
-      guest_capability("netbsd", "change_host_name") do
+      guest_capability(:netbsd, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("netbsd", "configure_networks") do
+      guest_capability(:netbsd, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
 
-      guest_capability("netbsd", "halt") do
+      guest_capability(:netbsd, :halt) do
         require_relative "cap/halt"
         Cap::Halt
       end
 
-      guest_capability("netbsd", "insert_public_key") do
+      guest_capability(:netbsd, :insert_public_key) do
         require_relative "cap/insert_public_key"
         Cap::InsertPublicKey
       end
 
-      guest_capability("netbsd", "mount_nfs_folder") do
+      guest_capability(:netbsd, :mount_nfs_folder) do
         require_relative "cap/mount_nfs_folder"
         Cap::MountNFSFolder
       end
 
-      guest_capability("netbsd", "remove_public_key") do
+      guest_capability(:netbsd, :remove_public_key) do
         require_relative "cap/remove_public_key"
         Cap::RemovePublicKey
       end
 
-      guest_capability("netbsd", "rsync_install") do
+      guest_capability(:netbsd, :rsync_install) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("netbsd", "rsync_installed") do
+      guest_capability(:netbsd, :rsync_installed) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("netbsd", "rsync_command") do
+      guest_capability(:netbsd, :rsync_command) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("netbsd", "rsync_post") do
+      guest_capability(:netbsd, :rsync_post) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("netbsd", "rsync_pre") do
+      guest_capability(:netbsd, :rsync_pre) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("netbsd", "shell_expand_guest_path") do
+      guest_capability(:netbsd, :shell_expand_guest_path) do
         require_relative "cap/shell_expand_guest_path"
         Cap::ShellExpandGuestPath
       end
diff --git a/plugins/guests/nixos/plugin.rb b/plugins/guests/nixos/plugin.rb
index 3aceceeb7..9f8138d4e 100644
--- a/plugins/guests/nixos/plugin.rb
+++ b/plugins/guests/nixos/plugin.rb
@@ -6,22 +6,22 @@ module VagrantPlugins
       name "NixOS guest"
       description "NixOS guest support."
 
-      guest("nixos", "linux") do
-        require File.expand_path("../guest", __FILE__)
+      guest(:nixos, :linux) do
+        require_relative "guest"
         Guest
       end
 
-      guest_capability("nixos", "configure_networks") do
+      guest_capability(:nixos, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
 
-      guest_capability("nixos", "change_host_name") do
+      guest_capability(:nixos, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("nixos", "nfs_client_installed") do
+      guest_capability(:nixos, :nfs_client_installed) do
         require_relative "cap/nfs_client"
         Cap::NFSClient
       end
diff --git a/plugins/guests/omnios/plugin.rb b/plugins/guests/omnios/plugin.rb
index 8437276db..a92e5a3ef 100644
--- a/plugins/guests/omnios/plugin.rb
+++ b/plugins/guests/omnios/plugin.rb
@@ -6,22 +6,22 @@ module VagrantPlugins
       name "OmniOS guest."
       description "OmniOS guest support."
 
-      guest("omnios", "solaris")  do
+      guest(:omnios, :solaris) do
         require_relative "guest"
         Guest
       end
 
-      guest_capability("omnios", "change_host_name") do
+      guest_capability(:omnios, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("omnios", "mount_nfs_folder") do
+      guest_capability(:omnios, :mount_nfs_folder) do
         require_relative "cap/mount_nfs_folder"
         Cap::MountNFSFolder
       end
 
-      guest_capability("omnios", "rsync_install") do
+      guest_capability(:omnios, :rsync_install) do
         require_relative "cap/rsync"
         Cap::RSync
       end
diff --git a/plugins/guests/openbsd/plugin.rb b/plugins/guests/openbsd/plugin.rb
index a1ddfe9c1..6ea442cd1 100644
--- a/plugins/guests/openbsd/plugin.rb
+++ b/plugins/guests/openbsd/plugin.rb
@@ -6,67 +6,67 @@ module VagrantPlugins
       name "OpenBSD guest"
       description "OpenBSD guest support."
 
-      guest("openbsd") do
-        require File.expand_path("../guest", __FILE__)
+      guest(:openbsd) do
+        require_relative "guest"
         Guest
       end
 
-      guest_capability("openbsd", "change_host_name") do
+      guest_capability(:openbsd, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("openbsd", "configure_networks") do
+      guest_capability(:openbsd, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
 
-      guest_capability("openbsd", "halt") do
+      guest_capability(:openbsd, :halt) do
         require_relative "cap/halt"
         Cap::Halt
       end
 
-      guest_capability("openbsd", "insert_public_key") do
+      guest_capability(:openbsd, :insert_public_key) do
         require_relative "cap/insert_public_key"
         Cap::InsertPublicKey
       end
 
-      guest_capability("openbsd", "mount_nfs_folder") do
+      guest_capability(:openbsd, :mount_nfs_folder) do
         require_relative "cap/mount_nfs_folder"
         Cap::MountNFSFolder
       end
 
-      guest_capability("openbsd", "remove_public_key") do
+      guest_capability(:openbsd, :remove_public_key) do
         require_relative "cap/remove_public_key"
         Cap::RemovePublicKey
       end
 
-      guest_capability("openbsd", "rsync_install") do
+      guest_capability(:openbsd, :rsync_install) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("openbsd", "rsync_installed") do
+      guest_capability(:openbsd, :rsync_installed) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("openbsd", "rsync_command") do
+      guest_capability(:openbsd, :rsync_command) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("openbsd", "rsync_post") do
+      guest_capability(:openbsd, :rsync_post) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("openbsd", "rsync_pre") do
+      guest_capability(:openbsd, :rsync_pre) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("openbsd", "shell_expand_guest_path") do
+      guest_capability(:openbsd, :shell_expand_guest_path) do
         require_relative "cap/shell_expand_guest_path"
         Cap::ShellExpandGuestPath
       end
diff --git a/plugins/guests/photon/plugin.rb b/plugins/guests/photon/plugin.rb
index 47542dc86..6ca981312 100644
--- a/plugins/guests/photon/plugin.rb
+++ b/plugins/guests/photon/plugin.rb
@@ -6,22 +6,22 @@ module VagrantPlugins
       name "VMware Photon guest"
       description "VMware Photon guest support."
 
-      guest("photon", "linux") do
+      guest(:photon, :linux) do
         require_relative "guest"
         Guest
       end
 
-      guest_capability("photon", "change_host_name") do
+      guest_capability(:photon, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("photon", "configure_networks") do
+      guest_capability(:photon, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
 
-      guest_capability("photon", "docker_daemon_running") do
+      guest_capability(:photon, :docker_daemon_running) do
         require_relative "cap/docker"
         Cap::Docker
       end
diff --git a/plugins/guests/pld/plugin.rb b/plugins/guests/pld/plugin.rb
index 45e105c17..958249059 100644
--- a/plugins/guests/pld/plugin.rb
+++ b/plugins/guests/pld/plugin.rb
@@ -6,22 +6,22 @@ module VagrantPlugins
       name "PLD Linux guest"
       description "PLD Linux guest support."
 
-      guest("pld", "redhat") do
+      guest(:pld, :redhat) do
         require_relative "guest"
         Guest
       end
 
-      guest_capability("pld", "change_host_name") do
+      guest_capability(:pld, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("pld", "network_scripts_dir") do
+      guest_capability(:pld, :network_scripts_dir) do
         require_relative "cap/network_scripts_dir"
         Cap::NetworkScriptsDir
       end
 
-      guest_capability("pld", "flavor") do
+      guest_capability(:pld, :flavor) do
         require_relative "cap/flavor"
         Cap::Flavor
       end
diff --git a/plugins/guests/redhat/plugin.rb b/plugins/guests/redhat/plugin.rb
index c7f7d1b97..8ea37baf4 100644
--- a/plugins/guests/redhat/plugin.rb
+++ b/plugins/guests/redhat/plugin.rb
@@ -6,37 +6,37 @@ module VagrantPlugins
       name "Red Hat Enterprise Linux guest"
       description "Red Hat Enterprise Linux guest support."
 
-      guest("redhat", "linux") do
+      guest(:redhat, :linux) do
         require_relative "guest"
         Guest
       end
 
-      guest_capability("redhat", "change_host_name") do
+      guest_capability(:redhat, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("redhat", "configure_networks") do
+      guest_capability(:redhat, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
 
-      guest_capability("redhat", "flavor") do
+      guest_capability(:redhat, :flavor) do
         require_relative "cap/flavor"
         Cap::Flavor
       end
 
-      guest_capability("redhat", "network_scripts_dir") do
+      guest_capability(:redhat, :network_scripts_dir) do
         require_relative "cap/network_scripts_dir"
         Cap::NetworkScriptsDir
       end
 
-      guest_capability("redhat", "nfs_client_install") do
+      guest_capability(:redhat, :nfs_client_install) do
         require_relative "cap/nfs_client"
         Cap::NFSClient
       end
 
-      guest_capability("redhat", "rsync_install") do
+      guest_capability(:redhat, :rsync_install) do
         require_relative "cap/rsync"
         Cap::RSync
       end
diff --git a/plugins/guests/slackware/plugin.rb b/plugins/guests/slackware/plugin.rb
index f118a1a85..91c233194 100644
--- a/plugins/guests/slackware/plugin.rb
+++ b/plugins/guests/slackware/plugin.rb
@@ -6,17 +6,17 @@ module VagrantPlugins
       name "Slackware guest"
       description "Slackware guest support."
 
-      guest("slackware", "linux") do
+      guest(:slackware, :linux) do
         require_relative "guest"
         Guest
       end
 
-      guest_capability("slackware", "change_host_name") do
+      guest_capability(:slackware, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("slackware", "configure_networks") do
+      guest_capability(:slackware, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
diff --git a/plugins/guests/smartos/plugin.rb b/plugins/guests/smartos/plugin.rb
index bc515588d..0ed34941f 100644
--- a/plugins/guests/smartos/plugin.rb
+++ b/plugins/guests/smartos/plugin.rb
@@ -6,52 +6,52 @@ module VagrantPlugins
       name "SmartOS guest."
       description "SmartOS guest support."
 
-      config("smartos") do
-        require File.expand_path("../config", __FILE__)
+      config(:smartos) do
+        require_relative "config"
         Config
       end
 
-      guest("smartos")  do
-        require File.expand_path("../guest", __FILE__)
+      guest(:smartos)  do
+        require_relative "guest"
         Guest
       end
 
-      guest_capability("smartos", "change_host_name") do
+      guest_capability(:smartos, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("smartos", "configure_networks") do
+      guest_capability(:smartos, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
 
-      guest_capability("smartos", "halt") do
+      guest_capability(:smartos, :halt) do
         require_relative "cap/halt"
         Cap::Halt
       end
 
-      guest_capability("smartos", "mount_nfs_folder") do
+      guest_capability(:smartos, :mount_nfs_folder) do
         require_relative "cap/mount_nfs"
         Cap::MountNFS
       end
 
-      guest_capability("smartos", "rsync_installed") do
+      guest_capability(:smartos, :rsync_installed) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("smartos", "rsync_command") do
+      guest_capability(:smartos, :rsync_command) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("smartos", "rsync_post") do
+      guest_capability(:smartos, :rsync_post) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("smartos", "rsync_pre") do
+      guest_capability(:smartos, :rsync_pre) do
         require_relative "cap/rsync"
         Cap::RSync
       end
diff --git a/plugins/guests/solaris/plugin.rb b/plugins/guests/solaris/plugin.rb
index 9f2b315ce..83c373100 100644
--- a/plugins/guests/solaris/plugin.rb
+++ b/plugins/guests/solaris/plugin.rb
@@ -6,62 +6,62 @@ module VagrantPlugins
       name "Solaris guest."
       description "Solaris guest support."
 
-      config("solaris") do
-        require File.expand_path("../config", __FILE__)
+      config(:solaris) do
+        require_relative "config"
         Config
       end
 
-      guest("solaris")  do
-        require File.expand_path("../guest", __FILE__)
+      guest(:solaris)  do
+        require_relative "guest"
         Guest
       end
 
-      guest_capability("solaris", "change_host_name") do
+      guest_capability(:solaris, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("solaris", "configure_networks") do
+      guest_capability(:solaris, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
 
-      guest_capability("solaris", "insert_public_key") do
+      guest_capability(:solaris, :insert_public_key) do
         require_relative "cap/insert_public_key"
         Cap::InsertPublicKey
       end
 
-      guest_capability("solaris", "halt") do
+      guest_capability(:solaris, :halt) do
         require_relative "cap/halt"
         Cap::Halt
       end
 
-      guest_capability("solaris", "mount_virtualbox_shared_folder") do
+      guest_capability(:solaris, :mount_virtualbox_shared_folder) do
         require_relative "cap/mount_virtualbox_shared_folder"
         Cap::MountVirtualBoxSharedFolder
       end
 
-      guest_capability("solaris", "remove_public_key") do
+      guest_capability(:solaris, :remove_public_key) do
         require_relative "cap/remove_public_key"
         Cap::RemovePublicKey
       end
 
-      guest_capability("solaris", "rsync_installed") do
+      guest_capability(:solaris, :rsync_installed) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("solaris", "rsync_command") do
+      guest_capability(:solaris, :rsync_command) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("solaris", "rsync_post") do
+      guest_capability(:solaris, :rsync_post) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("solaris", "rsync_pre") do
+      guest_capability(:solaris, :rsync_pre) do
         require_relative "cap/rsync"
         Cap::RSync
       end
diff --git a/plugins/guests/solaris11/plugin.rb b/plugins/guests/solaris11/plugin.rb
index 1a5d07451..fa94ef598 100644
--- a/plugins/guests/solaris11/plugin.rb
+++ b/plugins/guests/solaris11/plugin.rb
@@ -10,52 +10,52 @@ module VagrantPlugins
       name "Solaris 11 guest."
       description "Solaris 11 guest support."
 
-      config("solaris11") do
-        require File.expand_path("../config", __FILE__)
+      config(:solaris11) do
+        require_relative "config"
         Config
       end
 
-      guest("solaris11")  do
-        require File.expand_path("../guest", __FILE__)
+      guest(:solaris11) do
+        require_relative "guest"
         Guest
       end
 
-      guest_capability("solaris11", "change_host_name") do
+      guest_capability(:solaris11, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("solaris11", "configure_networks") do
+      guest_capability(:solaris11, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
 
-      guest_capability("solaris11", "halt") do
+      guest_capability(:solaris11, :halt) do
         require_relative "cap/halt"
         Cap::Halt
       end
 
-      guest_capability("solaris11", "mount_virtualbox_shared_folder") do
+      guest_capability(:solaris11, :mount_virtualbox_shared_folder) do
         require_relative "cap/mount_virtualbox_shared_folder"
         Cap::MountVirtualBoxSharedFolder
       end
 
-      guest_capability("solaris11", "rsync_installed") do
+      guest_capability(:solaris11, :rsync_installed) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("solaris11", "rsync_pre") do
+      guest_capability(:solaris11, :rsync_pre) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("solaris11", "insert_public_key") do
+      guest_capability(:solaris11, :insert_public_key) do
         require_relative "cap/insert_public_key"
         Cap::InsertPublicKey
       end
 
-      guest_capability("solaris11", "remove_public_key") do
+      guest_capability(:solaris11, :remove_public_key) do
         require_relative "cap/remove_public_key"
         Cap::RemovePublicKey
       end
diff --git a/plugins/guests/suse/plugin.rb b/plugins/guests/suse/plugin.rb
index 58dcb6e90..ac3ace288 100644
--- a/plugins/guests/suse/plugin.rb
+++ b/plugins/guests/suse/plugin.rb
@@ -6,42 +6,42 @@ module VagrantPlugins
       name "SUSE guest"
       description "SUSE guest support."
 
-      guest("suse", "linux") do
+      guest(:suse, :linux) do
         require_relative "guest"
         Guest
       end
 
-      guest_capability("suse", "change_host_name") do
+      guest_capability(:suse, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("suse", "configure_networks") do
+      guest_capability(:suse, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
 
-      guest_capability("suse", "halt") do
+      guest_capability(:suse, :halt) do
         require_relative "cap/halt"
         Cap::Halt
       end
 
-      guest_capability("suse", "network_scripts_dir") do
+      guest_capability(:suse, :network_scripts_dir) do
         require_relative "cap/network_scripts_dir"
         Cap::NetworkScriptsDir
       end
 
-      guest_capability("suse", "nfs_client_install") do
+      guest_capability(:suse, :nfs_client_install) do
         require_relative "cap/nfs_client"
         Cap::NFSClient
       end
 
-      guest_capability("suse", "rsync_install") do
+      guest_capability(:suse, :rsync_install) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("suse", "rsync_installed") do
+      guest_capability(:suse, :rsync_installed) do
         require_relative "cap/rsync"
         Cap::RSync
       end
diff --git a/plugins/guests/tinycore/plugin.rb b/plugins/guests/tinycore/plugin.rb
index 3598d7d9b..f2b1e61b2 100644
--- a/plugins/guests/tinycore/plugin.rb
+++ b/plugins/guests/tinycore/plugin.rb
@@ -6,32 +6,32 @@ module VagrantPlugins
       name "TinyCore Linux guest."
       description "TinyCore Linux guest support."
 
-      guest("tinycore", "linux")  do
-        require File.expand_path("../guest", __FILE__)
+      guest(:tinycore, :linux) do
+        require_relative "guest"
         Guest
       end
 
-      guest_capability("tinycore", "configure_networks") do
+      guest_capability(:tinycore, :configure_networks) do
         require_relative "cap/configure_networks"
         Cap::ConfigureNetworks
       end
 
-      guest_capability("tinycore", "change_host_name") do
+      guest_capability(:tinycore, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
 
-      guest_capability("tinycore", "halt") do
+      guest_capability(:tinycore, :halt) do
         require_relative "cap/halt"
         Cap::Halt
       end
 
-      guest_capability("tinycore", "rsync_install") do
+      guest_capability(:tinycore, :rsync_install) do
         require_relative "cap/rsync"
         Cap::RSync
       end
 
-      guest_capability("tinycore", "mount_nfs_folder") do
+      guest_capability(:tinycore, :mount_nfs_folder) do
         require_relative "cap/mount_nfs"
         Cap::MountNFS
       end
diff --git a/plugins/guests/trisquel/plugin.rb b/plugins/guests/trisquel/plugin.rb
index 4c1431746..d49deff25 100644
--- a/plugins/guests/trisquel/plugin.rb
+++ b/plugins/guests/trisquel/plugin.rb
@@ -6,7 +6,7 @@ module VagrantPlugins
       name "Trisquel guest"
       description "Trisquel guest support."
 
-      guest("trisquel", "ubuntu") do
+      guest(:trisquel, :ubuntu) do
         require_relative "guest"
         Guest
       end
diff --git a/plugins/guests/ubuntu/plugin.rb b/plugins/guests/ubuntu/plugin.rb
index 7a30be6d1..d83e9ed58 100644
--- a/plugins/guests/ubuntu/plugin.rb
+++ b/plugins/guests/ubuntu/plugin.rb
@@ -6,12 +6,12 @@ module VagrantPlugins
       name "Ubuntu guest"
       description "Ubuntu guest support."
 
-      guest("ubuntu", "debian") do
+      guest(:ubuntu, :debian) do
         require_relative "guest"
         Guest
       end
 
-      guest_capability("ubuntu", "change_host_name") do
+      guest_capability(:ubuntu, :change_host_name) do
         require_relative "cap/change_host_name"
         Cap::ChangeHostName
       end
diff --git a/plugins/guests/windows/plugin.rb b/plugins/guests/windows/plugin.rb
index d22dc2743..d4c5af98b 100644
--- a/plugins/guests/windows/plugin.rb
+++ b/plugins/guests/windows/plugin.rb
@@ -8,12 +8,12 @@ module VagrantPlugins
       name "Windows guest."
       description "Windows guest support."
 
-      config("windows") do
+      config(:windows) do
         require_relative "config"
         Config
       end
 
-      guest("windows")  do
+      guest(:windows)  do
         require_relative "guest"
         init!
         Guest