diff --git a/bin/grav b/bin/grav
index 15cff3eaf..ea66b07df 100755
--- a/bin/grav
+++ b/bin/grav
@@ -20,7 +20,7 @@ if (!file_exists(ROOT_DIR . 'index.php')) {
 $app = new Application('Grav CLI Application', '0.1.0');
 $app->addCommands(array(
     new Grav\Console\Cli\InstallCommand(),
-    new Grav\Console\Cli\SetupCommand(),
+    new Grav\Console\Cli\SandboxCommand(),
     new Grav\Console\Cli\CleanCommand(),
     new Grav\Console\Cli\ClearCacheCommand(),
     new Grav\Console\Cli\BackupCommand(),
diff --git a/system/src/Grav/Console/Cli/SetupCommand.php b/system/src/Grav/Console/Cli/SandboxCommand.php
similarity index 96%
rename from system/src/Grav/Console/Cli/SetupCommand.php
rename to system/src/Grav/Console/Cli/SandboxCommand.php
index 44d9ec7a7..baf090874 100644
--- a/system/src/Grav/Console/Cli/SetupCommand.php
+++ b/system/src/Grav/Console/Cli/SandboxCommand.php
@@ -8,7 +8,7 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 
-class SetupCommand extends Command
+class SandboxCommand extends Command
 {
     protected $directories  = array('/cache',
                                     '/logs',
@@ -43,8 +43,8 @@ class SetupCommand extends Command
     protected function configure()
     {
         $this
-        ->setName('setup')
-        ->setDescription('Setup of a base Grav system in your webroot')
+        ->setName('sandbox')
+        ->setDescription('Setup of a base Grav system in your webroot, good for development, playing around or starting fresh')
         ->addArgument(
             'destination',
             InputArgument::REQUIRED,
@@ -56,10 +56,7 @@ class SetupCommand extends Command
             InputOption::VALUE_NONE,
             'Symlink the base grav system'
         )
-        ->setHelp(<<<EOT
-The <info>setup</info> command help create a development environment that uses symbolic links to link the core of grav to the git cloned repository
-EOT
-        );
+        ->setHelp("The <info>sandbox</info> command help create a development environment that can optionally use symbolic links to link the core of grav to the git cloned repository.\nGood for development, playing around or starting fresh");
         $this->source = getcwd();
     }