diff --git a/application/clicommands/AutocompleteCommand.php b/application/clicommands/AutocompleteCommand.php
index 0328138d2..b41b59fd8 100644
--- a/application/clicommands/AutocompleteCommand.php
+++ b/application/clicommands/AutocompleteCommand.php
@@ -11,7 +11,7 @@ use Icinga\Cli\Loader;
  * The autocomplete command shows help for a given command, module and also for a
  * given module's command or a specific command's action.
  *
- * Usage: icingaweb autocomplete [<module>] [<command> [<action>]]
+ * Usage: icingacli autocomplete [<module>] [<command> [<action>]]
  */
 class AutocompleteCommand extends Command
 {
@@ -36,7 +36,7 @@ class AutocompleteCommand extends Command
      * The help command shows help for a given command, module and also for a
      * given module's command or a specific command's action.
      *
-     * Usage: icingaweb autocomplete [<module>] [<command> [<action>]]
+     * Usage: icingacli autocomplete [<module>] [<command> [<action>]]
      */
     public function completeAction()
     {
diff --git a/application/clicommands/HelpCommand.php b/application/clicommands/HelpCommand.php
index 907b6da19..1d8362f8e 100644
--- a/application/clicommands/HelpCommand.php
+++ b/application/clicommands/HelpCommand.php
@@ -12,7 +12,7 @@ use Icinga\Cli\Documentation;
  * The help command shows help for a given command, module and also for a
  * given module's command or a specific command's action.
  *
- * Usage: icingaweb help [<module>] [<command> [<action>]]
+ * Usage: icingacli help [<module>] [<command> [<action>]]
  */
 class HelpCommand extends Command
 {
@@ -24,7 +24,7 @@ class HelpCommand extends Command
      * The help command shows help for a given command, module and also for a
      * given module's command or a specific command's action.
      *
-     * Usage: icingaweb help [<module>] [<command> [<action>]]
+     * Usage: icingacli help [<module>] [<command> [<action>]]
      */
     public function showAction()
     {
diff --git a/application/clicommands/ModuleCommand.php b/application/clicommands/ModuleCommand.php
index 5396317b1..cf4477ce9 100644
--- a/application/clicommands/ModuleCommand.php
+++ b/application/clicommands/ModuleCommand.php
@@ -9,7 +9,7 @@ use Icinga\Cli\Command;
  *
  * The module command allows you to handle your IcingaWeb modules
  *
- * Usage: icingaweb module [<action>] [<modulename>]
+ * Usage: icingacli module [<action>] [<modulename>]
  */
 class ModuleCommand extends Command
 {
@@ -27,7 +27,7 @@ class ModuleCommand extends Command
      * even --installed) as a command parameter. If you enable --verbose even
      * more details will be shown
      *
-     * Usage: icingaweb module list [installed] [--verbose]
+     * Usage: icingacli module list [installed] [--verbose]
      */
     public function listAction()
     {
@@ -82,7 +82,7 @@ class ModuleCommand extends Command
     /**
      * Enable a given module
      *
-     * Usage: icingaweb module enable <module-name>
+     * Usage: icingacli module enable <module-name>
      */
     public function enableAction()
     {
@@ -98,7 +98,7 @@ class ModuleCommand extends Command
     /**
      * Disable a given module
      *
-     * Usage: icingaweb module disable <module-name>
+     * Usage: icingacli module disable <module-name>
      */
     public function disableAction()
     {
@@ -117,7 +117,7 @@ class ModuleCommand extends Command
      * Asks each enabled module for all available restriction names and
      * descriptions and shows a quick overview
      *
-     * Usage: icingaweb module restrictions
+     * Usage: icingacli module restrictions
      */
     public function restrictionsAction()
     {
@@ -141,7 +141,7 @@ class ModuleCommand extends Command
      * Asks each enabled module for it's available permission names and
      * descriptions and shows a quick overview
      *
-     * Usage: icingaweb module permissions
+     * Usage: icingacli module permissions
      */
     public function permissionsAction()
     {
@@ -165,7 +165,7 @@ class ModuleCommand extends Command
      * Does a lookup against your configured IcingaWeb app stores and tries to
      * find modules matching your search string
      *
-     * Usage: icingaweb module search <search-string>
+     * Usage: icingacli module search <search-string>
      */
     public function searchAction()
     {
@@ -177,8 +177,8 @@ class ModuleCommand extends Command
      *
      * Downloads a given module or installes a module from a given archive
      *
-     * Usage: icingaweb module install <module-name>
-     *        icingaweb module install </path/to/archive.tar.gz>
+     * Usage: icingacli module install <module-name>
+     *        icingacli module install </path/to/archive.tar.gz>
      */
     public function installAction()
     {
@@ -191,7 +191,7 @@ class ModuleCommand extends Command
      * Removes the given module from your disk. Module configuration will be
      * preserved
      *
-     * Usage: icingaweb module remove <module-name>
+     * Usage: icingacli module remove <module-name>
      */
     public function removeAction()
     {
@@ -204,7 +204,7 @@ class ModuleCommand extends Command
      * Removes the given module from your disk. Also wipes configuration files
      * and other data stored and/or generated by this module
      *
-     * Usage: icingaweb module remove <module-name>
+     * Usage: icingacli module remove <module-name>
      */
     public function purgeAction()
     {
diff --git a/library/Icinga/Cli/Documentation.php b/library/Icinga/Cli/Documentation.php
index 80d1d63d0..e0a27d47f 100644
--- a/library/Icinga/Cli/Documentation.php
+++ b/library/Icinga/Cli/Documentation.php
@@ -32,7 +32,7 @@ class Documentation
 
     public function globalUsage()
     {
-        $d = "USAGE: icingaweb [module] <command> [action] [options]\n\n"
+        $d = "USAGE: icingacli [module] <command> [action] [options]\n\n"
            . "Available commands:\n\n";
         foreach ($this->loader->listCommands() as $command) {
             if ($command !== 'autocomplete') {
@@ -55,8 +55,8 @@ class Documentation
             . "  --benchmark  Show benchmark summary\n"
             . "  --watch [s]  Refresh output each <s> seconds (default: 5)\n"
             ;
-        $d .= "\nShow help on a specific command : icingaweb help <command>"
-            . "\nShow help on a specific module  : icingaweb help <module>"
+        $d .= "\nShow help on a specific command : icingacli help <command>"
+            . "\nShow help on a specific module  : icingacli help <module>"
             . "\n";
         return $d;
     }
@@ -73,12 +73,12 @@ class Documentation
             $obj = $this->loader->getModuleCommandInstance($module, $command);
         }
         if ($command === null) {
-            $d = "USAGE: icingaweb $module <command> [<action>] [options]\n\n"
+            $d = "USAGE: icingacli $module <command> [<action>] [options]\n\n"
                . "Available commands:\n\n";
             foreach ($commands as $command) {
                 $d .= '  ' . $command . "\n";
             }
-            $d .= "\nShow help on a specific command: icingaweb help $module <command>\n";
+            $d .= "\nShow help on a specific command: icingacli help $module <command>\n";
         } elseif ($action === null) {
             $d .= $this->showCommandActions($obj, $command);
         } else {
@@ -100,7 +100,7 @@ class Documentation
                 $this->getMethodTitle($command, $action)
             );
         }
-        $d .= "\nShow help on a specific action: icingaweb help $name <action>\n";
+        $d .= "\nShow help on a specific action: icingacli help $name <action>\n";
         return $d;
     }
 
diff --git a/modules/monitoring/application/clicommands/ConferenceCommand.php b/modules/monitoring/application/clicommands/ConferenceCommand.php
index 962850420..ad8343f40 100644
--- a/modules/monitoring/application/clicommands/ConferenceCommand.php
+++ b/modules/monitoring/application/clicommands/ConferenceCommand.php
@@ -19,7 +19,7 @@ class ConferenceCommand extends Command
      * Use this command in case you feel that you should be friendly. Should
      * be executed as follows:
      *
-     * icingaweb monitoring conference welcome --watch 1
+     * icingacli monitoring conference welcome --watch 1
      */
     public function welcomeAction()
     {
diff --git a/modules/monitoring/application/clicommands/ListCommand.php b/modules/monitoring/application/clicommands/ListCommand.php
index 7fb93b4c7..a07601871 100644
--- a/modules/monitoring/application/clicommands/ListCommand.php
+++ b/modules/monitoring/application/clicommands/ListCommand.php
@@ -114,7 +114,7 @@ class ListCommand extends Command
      *
      * USAGE
      *
-     * icingaweb monitoring list [<type>] [options]
+     * icingacli monitoring list [<type>] [options]
      *
      * OPTIONS
      *
@@ -131,9 +131,9 @@ class ListCommand extends Command
      *
      * EXAMPLES
      *
-     *   icingaweb monitoring list --unhandled
-     *   icingaweb monitoring list --host local* --service *disk*
-     *   icingaweb monitoring list --format '$host$: $service$'
+     *   icingacli monitoring list --unhandled
+     *   icingacli monitoring list --host local* --service *disk*
+     *   icingacli monitoring list --format '$host$: $service$'
      */
     public function statusAction()
     {
diff --git a/modules/monitoring/application/clicommands/NrpeCommand.php b/modules/monitoring/application/clicommands/NrpeCommand.php
index 0d49c37a2..d196d29fd 100644
--- a/modules/monitoring/application/clicommands/NrpeCommand.php
+++ b/modules/monitoring/application/clicommands/NrpeCommand.php
@@ -22,11 +22,11 @@ class NrpeCommand extends Command
      *
      * USAGE
      *
-     * icingaweb monitoring nrpe <host> <command> [--ssl] [nrpe options]
+     * icingacli monitoring nrpe <host> <command> [--ssl] [nrpe options]
      *
      * EXAMPLE
      *
-     * icingaweb monitoring nrpe 127.0.0.1 CheckMEM --ssl --MaxWarn 80% \
+     * icingacli monitoring nrpe 127.0.0.1 CheckMEM --ssl --MaxWarn 80% \
      *   --MaxCrit 90% --type physical
      */
     public function checkAction()
diff --git a/modules/translation/application/clicommands/CompileCommand.php b/modules/translation/application/clicommands/CompileCommand.php
index 59b2580ea..be4f6b4f9 100644
--- a/modules/translation/application/clicommands/CompileCommand.php
+++ b/modules/translation/application/clicommands/CompileCommand.php
@@ -53,12 +53,12 @@ class CompileCommand extends TranslationCommand
      *
      * USAGE:
      *
-     *   icingaweb translation compile icinga <locale>
+     *   icingacli translation compile icinga <locale>
      *
      * EXAMPLES:
      *
-     *   icingaweb translation compile icinga de_DE
-     *   icingaweb translation compile icinga fr_FR
+     *   icingacli translation compile icinga de_DE
+     *   icingacli translation compile icinga fr_FR
      */
     public function icingaAction()
     {
@@ -75,12 +75,12 @@ class CompileCommand extends TranslationCommand
      *
      * USAGE:
      *
-     *   icingaweb translation compile <module> <locale>
+     *   icingacli translation compile <module> <locale>
      *
      * EXAMPLES:
      *
-     *   icingaweb translation compile monitoring de_DE
-     *   icingaweb trnslations compile monitoring de_DE
+     *   icingacli translation compile monitoring de_DE
+     *   icingacli trnslations compile monitoring de_DE
      */
     public function moduleAction()
     {
diff --git a/modules/translation/application/clicommands/RefreshCommand.php b/modules/translation/application/clicommands/RefreshCommand.php
index 54a8bacce..9da6cc9e5 100644
--- a/modules/translation/application/clicommands/RefreshCommand.php
+++ b/modules/translation/application/clicommands/RefreshCommand.php
@@ -53,12 +53,12 @@ class RefreshCommand extends TranslationCommand
      *
      * USAGE:
      *
-     *   icingaweb translation refresh icinga <locale>
+     *   icingacli translation refresh icinga <locale>
      *
      * EXAMPLES:
      *
-     *   icingaweb translation refresh icinga de_DE
-     *   icingaweb translation refresh icinga fr_FR
+     *   icingacli translation refresh icinga de_DE
+     *   icingacli translation refresh icinga fr_FR
      */
     public function icingaAction()
     {
@@ -75,12 +75,12 @@ class RefreshCommand extends TranslationCommand
      *
      * USAGE:
      *
-     *   icingaweb translation refresh module <module> <locale>
+     *   icingacli translation refresh module <module> <locale>
      *
      * EXAMPLES:
      *
-     *   icingaweb translation refresh module monitoring de_DE
-     *   icingaweb translation refresh module monitoring fr_FR
+     *   icingacli translation refresh module monitoring de_DE
+     *   icingacli translation refresh module monitoring fr_FR
      */
     public function moduleAction()
     {