diff --git a/lib/vagrant/guest/base.rb b/lib/vagrant/guest/base.rb
index 72861b085..e1704b3d0 100644
--- a/lib/vagrant/guest/base.rb
+++ b/lib/vagrant/guest/base.rb
@@ -16,7 +16,7 @@ module Vagrant
     # changes will be noted on release notes.**
     class Base
       class BaseError < Errors::VagrantError
-        error_namespace("vagrant.systems.base")
+        error_namespace("vagrant.guest.base")
       end
 
       include Vagrant::Util
diff --git a/lib/vagrant/guest/freebsd.rb b/lib/vagrant/guest/freebsd.rb
index 208a2f96a..b22598574 100644
--- a/lib/vagrant/guest/freebsd.rb
+++ b/lib/vagrant/guest/freebsd.rb
@@ -20,11 +20,11 @@ module Vagrant
 
       # Here for whenever it may be used.
       class FreeBSDError < Errors::VagrantError
-        error_namespace("vagrant.systems.freebsd")
+        error_namespace("vagrant.guest.freebsd")
       end
 
       def halt
-        vm.env.ui.info I18n.t("vagrant.systems.freebsd.attempting_halt")
+        vm.env.ui.info I18n.t("vagrant.guest.freebsd.attempting_halt")
         vm.ssh.execute do |ssh|
           ssh.exec!("sudo shutdown -p now")
         end
diff --git a/lib/vagrant/guest/linux.rb b/lib/vagrant/guest/linux.rb
index 7c370008f..3e876420d 100644
--- a/lib/vagrant/guest/linux.rb
+++ b/lib/vagrant/guest/linux.rb
@@ -22,7 +22,7 @@ module Vagrant
       end
 
       def halt
-        vm.env.ui.info I18n.t("vagrant.systems.linux.attempting_halt")
+        vm.env.ui.info I18n.t("vagrant.guest.linux.attempting_halt")
         vm.ssh.execute do |ssh|
           ssh.exec!("sudo shutdown -h now")
         end
diff --git a/lib/vagrant/guest/linux/error.rb b/lib/vagrant/guest/linux/error.rb
index d9088cf1e..b6de25061 100644
--- a/lib/vagrant/guest/linux/error.rb
+++ b/lib/vagrant/guest/linux/error.rb
@@ -2,7 +2,7 @@ module Vagrant
   module Guest
     class Linux < Vagrant::Guest::Base
       class LinuxError < Errors::VagrantError
-        error_namespace("vagrant.systems.linux")
+        error_namespace("vagrant.guest.linux")
       end
     end
   end
diff --git a/lib/vagrant/guest/solaris.rb b/lib/vagrant/guest/solaris.rb
index 9d0fddd7a..c8adf925f 100644
--- a/lib/vagrant/guest/solaris.rb
+++ b/lib/vagrant/guest/solaris.rb
@@ -25,7 +25,7 @@ module Vagrant
 
       # Here for whenever it may be used.
       class SolarisError < Errors::VagrantError
-        error_namespace("vagrant.systems.solaris")
+        error_namespace("vagrant.guest.solaris")
       end
 
       def prepare_host_only_network(net_options=nil)
@@ -61,7 +61,7 @@ module Vagrant
       #
       # does not exist in /etc/user_attr. TODO
       def halt
-        vm.env.ui.info I18n.t("vagrant.systems.solaris.attempting_halt")
+        vm.env.ui.info I18n.t("vagrant.guest.solaris.attempting_halt")
         vm.ssh.execute do |ssh|
           # Wait until the VM's state is actually powered off. If this doesn't
           # occur within a reasonable amount of time (15 seconds by default),
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index f2ee5f0b7..36885b17a 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -537,7 +537,7 @@ en:
         path_invalid: "`path` for shell provisioner does not exist on the host system: %{path}"
         upload_path_not_set: "`upload_path` must be set for the shell provisioner."
 
-    systems:
+    guest:
       base:
         unsupported_host_only: |-
           Host only networking is very distro-specific. Vagrant has support for many