diff --git a/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
index 20044dff1..50b87aed5 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/LocalCommandFile.php
@@ -7,9 +7,9 @@ use Exception;
 use RuntimeException;
 use Icinga\Application\Logger;
 use Icinga\Exception\ConfigurationError;
-use Icinga\Module\Monitoring\Command\Exception\CommandTransportException;
 use Icinga\Module\Monitoring\Command\IcingaCommand;
 use Icinga\Module\Monitoring\Command\Renderer\IcingaCommandFileCommandRenderer;
+use Icinga\Module\Monitoring\Exception\CommandTransportException;
 use Icinga\Util\File;
 
 /**
diff --git a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
index 2edf00ae0..383970b76 100644
--- a/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
+++ b/modules/monitoring/library/Monitoring/Command/Transport/RemoteCommandFile.php
@@ -6,9 +6,9 @@ namespace Icinga\Module\Monitoring\Command\Transport;
 use Icinga\Application\Logger;
 use Icinga\Data\ResourceFactory;
 use Icinga\Exception\ConfigurationError;
-use Icinga\Module\Monitoring\Command\Exception\CommandTransportException;
 use Icinga\Module\Monitoring\Command\IcingaCommand;
 use Icinga\Module\Monitoring\Command\Renderer\IcingaCommandFileCommandRenderer;
+use Icinga\Module\Monitoring\Exception\CommandTransportException;
 
 /**
  * A remote Icinga command file
diff --git a/modules/monitoring/library/Monitoring/Command/Exception/CommandTransportException.php b/modules/monitoring/library/Monitoring/Exception/CommandTransportException.php
similarity index 62%
rename from modules/monitoring/library/Monitoring/Command/Exception/CommandTransportException.php
rename to modules/monitoring/library/Monitoring/Exception/CommandTransportException.php
index 2b4e63bb5..6ffe4677d 100644
--- a/modules/monitoring/library/Monitoring/Command/Exception/CommandTransportException.php
+++ b/modules/monitoring/library/Monitoring/Exception/CommandTransportException.php
@@ -1,13 +1,13 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-namespace Icinga\Module\Monitoring\Command\Exception;
+namespace Icinga\Module\Monitoring\Exception;
 
 use Icinga\Exception\IcingaException;
 
 /**
  * Exception thrown if a command was not sent
  */
-class TransportException extends IcingaException
+class CommandTransportException extends IcingaException
 {
 }