diff --git a/modules/monitoring/application/forms/Command/Instance/InstanceCommandForm.php b/modules/monitoring/application/forms/Command/CommandForm.php
similarity index 91%
rename from modules/monitoring/application/forms/Command/Instance/InstanceCommandForm.php
rename to modules/monitoring/application/forms/Command/CommandForm.php
index 115de29a9..4a0be0e32 100644
--- a/modules/monitoring/application/forms/Command/Instance/InstanceCommandForm.php
+++ b/modules/monitoring/application/forms/Command/CommandForm.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-namespace Icinga\Module\Monitoring\Form\Command\Instance;
+namespace Icinga\Module\Monitoring\Form\Command;
 
 use Icinga\Module\Monitoring\Backend;
 use Icinga\Module\Monitoring\Command\Transport\CommandTransport;
@@ -10,9 +10,9 @@ use Icinga\Web\Form;
 use Icinga\Web\Request;
 
 /**
- * Base class for forms that handle program-wide commands
+ * Base class for command forms
  */
-abstract class InstanceCommandForm extends Form
+abstract class CommandForm extends Form
 {
     /**
      * Monitoring backend