diff --git a/lib/vagrant/commands/box.rb b/lib/vagrant/commands/box.rb
index cb77b076b..fbfcaea95 100644
--- a/lib/vagrant/commands/box.rb
+++ b/lib/vagrant/commands/box.rb
@@ -4,7 +4,7 @@ module Vagrant
     # and remove boxes. This single command, given an array, determines
     # which action to take and calls the respective action method
     # (see {box_add} and {box_remove})
-    class Box < Base
+    class BoxCommand < Base
       Base.subcommand "box", self
       description "Box commands"
 
diff --git a/lib/vagrant/commands/box/add.rb b/lib/vagrant/commands/box/add.rb
index 6545dd578..30fdf6235 100644
--- a/lib/vagrant/commands/box/add.rb
+++ b/lib/vagrant/commands/box/add.rb
@@ -4,9 +4,9 @@ module Vagrant
     # and remove boxes. This single command, given an array, determines
     # which action to take and calls the respective action method
     # (see {box_add} and {box_remove})
-    class Box
-      class Add < Base
-        Box.subcommand "add", self
+    module Box
+      class Add < BoxCommand
+        BoxCommand.subcommand "add", self
         description "Add a box"
 
         def execute(args)