diff --git a/plugins/commands/status/command.rb b/plugins/commands/status/command.rb
index 2d0733806..31f87494c 100644
--- a/plugins/commands/status/command.rb
+++ b/plugins/commands/status/command.rb
@@ -4,10 +4,8 @@ module VagrantPlugins
   module CommandStatus
     class Command < Vagrant.plugin("2", :command)
       def execute
-        options = {}
-
-        opts = OptionParser.new do |opts|
-          opts.banner = "Usage: vagrant status [vm-name]"
+        opts = OptionParser.new do |o|
+          o.banner = "Usage: vagrant status [machine-name]"
         end
 
         # Parse the options
@@ -16,9 +14,9 @@ module VagrantPlugins
 
         state = nil
         results = []
-        with_target_vms(argv) do |vm|
-          state = vm.state.to_s if !state
-          results << "#{vm.name.to_s.ljust(25)}#{vm.state.to_s.gsub("_", " ")}"
+        with_target_vms(argv) do |machine|
+          state = machine.state.to_s if !state
+          results << "#{machine.name.to_s.ljust(25)}#{machine.state.to_s.gsub("_", " ")}"
         end
 
         state = results.length == 1 ? state : "listing"
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 28f4600d1..699a1ab43 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -336,7 +336,7 @@ en:
           VirtualBox, moving to a new computer, etc. Please consult VirtualBox
           for how to handle this issue.
         output: |-
-          Current VM states:
+          Current machine states:
 
           %{states}