diff --git a/lib/private/debug/dummyeventlogger.php b/lib/private/diagnostics/dummyeventlogger.php
similarity index 85%
rename from lib/private/debug/dummyeventlogger.php
rename to lib/private/diagnostics/dummyeventlogger.php
index 7aa4c21b6743d15f28563fbcffee280505f2bbe0..f1386d2e88c663920730c361a12fc8ca1fb243d7 100644
--- a/lib/private/debug/dummyeventlogger.php
+++ b/lib/private/diagnostics/dummyeventlogger.php
@@ -6,9 +6,9 @@
  * See the COPYING-README file.
  */
 
-namespace OC\Debug;
+namespace OC\Diagnostics;
 
-use OCP\Debug\IEventLogger;
+use OCP\Diagnostics\IEventLogger;
 
 /**
  * Dummy event logger that doesn't actually log anything
@@ -32,7 +32,7 @@ class DummyEventLogger implements IEventLogger {
 	}
 
 	/**
-	 * @return \OCP\Debug\IEvent[]
+	 * @return \OCP\Diagnostics\IEvent[]
 	 */
 	public function getEvents(){
 		return array();
diff --git a/lib/private/debug/dummyquerylogger.php b/lib/private/diagnostics/dummyquerylogger.php
similarity index 83%
rename from lib/private/debug/dummyquerylogger.php
rename to lib/private/diagnostics/dummyquerylogger.php
index 0c2664e4001bc5257a03f788cc4a952b0948e8d4..1617b204e90a7dd620eb60566d72b0b963146dac 100644
--- a/lib/private/debug/dummyquerylogger.php
+++ b/lib/private/diagnostics/dummyquerylogger.php
@@ -6,9 +6,9 @@
  * See the COPYING-README file.
  */
 
-namespace OC\Debug;
+namespace OC\Diagnostics;
 
-use OCP\Debug\IQueryLogger;
+use OCP\Diagnostics\IQueryLogger;
 
 class DummyQueryLogger implements IQueryLogger {
 	/**
@@ -23,7 +23,7 @@ class DummyQueryLogger implements IQueryLogger {
 	}
 
 	/**
-	 * @return \OCP\Debug\IQuery[]
+	 * @return \OCP\Diagnostics\IQuery[]
 	 */
 	public function getQueries() {
 		return array();
diff --git a/lib/private/debug/event.php b/lib/private/diagnostics/event.php
similarity index 95%
rename from lib/private/debug/event.php
rename to lib/private/diagnostics/event.php
index b03fdeabc14f13d85274b3b6c8b96fa8141c47e4..063c0c49dc282ce993a64ed253c1a395de968de0 100644
--- a/lib/private/debug/event.php
+++ b/lib/private/diagnostics/event.php
@@ -6,9 +6,9 @@
  * See the COPYING-README file.
  */
 
-namespace OC\Debug;
+namespace OC\Diagnostics;
 
-use OCP\Debug\IEvent;
+use OCP\Diagnostics\IEvent;
 
 class Event implements IEvent {
 	/**
diff --git a/lib/private/debug/eventlogger.php b/lib/private/diagnostics/eventlogger.php
similarity index 82%
rename from lib/private/debug/eventlogger.php
rename to lib/private/diagnostics/eventlogger.php
index 2127a624ed5750c55a5f5c002eb22de05792ed87..46084a1d4966f705d84bab5728a1bed3fb32f507 100644
--- a/lib/private/debug/eventlogger.php
+++ b/lib/private/diagnostics/eventlogger.php
@@ -6,13 +6,13 @@
  * See the COPYING-README file.
  */
 
-namespace OC\Debug;
+namespace OC\Diagnostics;
 
-use OCP\Debug\IEventLogger;
+use OCP\Diagnostics\IEventLogger;
 
 class EventLogger implements IEventLogger {
 	/**
-	 * @var \OC\Debug\Event[]
+	 * @var \OC\Diagnostics\Event[]
 	 */
 	private $events = array();
 
@@ -28,7 +28,7 @@ class EventLogger implements IEventLogger {
 	}
 
 	/**
-	 * @return \OCP\Debug\IEvent[]
+	 * @return \OCP\Diagnostics\IEvent[]
 	 */
 	public function getEvents() {
 		return $this->events;
diff --git a/lib/private/debug/query.php b/lib/private/diagnostics/query.php
similarity index 93%
rename from lib/private/debug/query.php
rename to lib/private/diagnostics/query.php
index 351c7d9daca52615cb6747966886426cfbdd29a2..d50d759263627c1fd8ba0a3f69445a9e452c4c09 100644
--- a/lib/private/debug/query.php
+++ b/lib/private/diagnostics/query.php
@@ -6,9 +6,9 @@
  * See the COPYING-README file.
  */
 
-namespace OC\Debug;
+namespace OC\Diagnostics;
 
-use OCP\Debug\IQuery;
+use OCP\Diagnostics\IQuery;
 
 class Query implements IQuery {
 	private $sql;
diff --git a/lib/private/debug/querylogger.php b/lib/private/diagnostics/querylogger.php
similarity index 83%
rename from lib/private/debug/querylogger.php
rename to lib/private/diagnostics/querylogger.php
index 990188da9755ffb5d13f30de261275b91f7b7709..1f80f907173d96c5246b679dcb3370bd4c683812 100644
--- a/lib/private/debug/querylogger.php
+++ b/lib/private/diagnostics/querylogger.php
@@ -6,18 +6,18 @@
  * See the COPYING-README file.
  */
 
-namespace OC\Debug;
+namespace OC\Diagnostics;
 
-use OCP\Debug\IQueryLogger;
+use OCP\Diagnostics\IQueryLogger;
 
 class QueryLogger implements IQueryLogger {
 	/**
-	 * @var \OC\Debug\Query
+	 * @var \OC\Diagnostics\Query
 	 */
 	protected $activeQuery;
 
 	/**
-	 * @var \OC\Debug\Query[]
+	 * @var \OC\Diagnostics\Query[]
 	 */
 	protected $queries = array();
 
@@ -39,7 +39,7 @@ class QueryLogger implements IQueryLogger {
 	}
 
 	/**
-	 * @return \OCP\Debug\IQuery[]
+	 * @return \OCP\Diagnostics\IQuery[]
 	 */
 	public function getQueries() {
 		return $this->queries;
diff --git a/lib/private/server.php b/lib/private/server.php
index c0b94a5b4c34a9030eb5b575a088dd2725a41f73..7b8ed2cabf5dc77739111fb3e70a82c9946d7e1e 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -6,16 +6,16 @@ use OC\AppFramework\Http\Request;
 use OC\AppFramework\Db\Db;
 use OC\AppFramework\Utility\SimpleContainer;
 use OC\Cache\UserCache;
-use OC\Debug\DummyQueryLogger;
-use OC\Debug\EventLogger;
-use OC\Debug\QueryLogger;
+use OC\Diagnostics\DummyQueryLogger;
+use OC\Diagnostics\EventLogger;
+use OC\Diagnostics\QueryLogger;
 use OC\Security\CertificateManager;
 use OC\DB\ConnectionWrapper;
 use OC\Files\Node\Root;
 use OC\Files\View;
 use OC\Security\Crypto;
 use OC\Security\SecureRandom;
-use OC\Debug\DummyEventLogger;
+use OC\Diagnostics\DummyEventLogger;
 use OCP\IServerContainer;
 use OCP\ISession;
 use OC\Tagging\TagMapper;
@@ -583,7 +583,7 @@ class Server extends SimpleContainer implements IServerContainer {
 	 *
 	 * The returned logger only logs data when debug mode is enabled
 	 *
-	 * @return \OCP\Debug\IEventLogger
+	 * @return \OCP\Diagnostics\IEventLogger
 	 */
 	function getEventLogger() {
 		return $this->query('EventLogger');
@@ -594,9 +594,9 @@ class Server extends SimpleContainer implements IServerContainer {
 	 *
 	 * The returned logger only logs data when debug mode is enabled
 	 *
-	 * @return \OCP\Debug\IQueryLogger
+	 * @return \OCP\Diagnostics\IQueryLogger
 	 */
 	function getQueryLogger() {
-		return $this->query('EventLogger');
+		return $this->query('QueryLogger');
 	}
 }
diff --git a/lib/public/debug/ievent.php b/lib/public/diagnostics/ievent.php
similarity index 94%
rename from lib/public/debug/ievent.php
rename to lib/public/diagnostics/ievent.php
index 1cebb274e5857c47b1e793709cb340a15bce7fa5..a2a3461f68ad5502d4c457bf8cbc4f76086690ca 100644
--- a/lib/public/debug/ievent.php
+++ b/lib/public/diagnostics/ievent.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-namespace OCP\Debug;
+namespace OCP\Diagnostics;
 
 interface IEvent {
 	/**
diff --git a/lib/public/debug/ieventlogger.php b/lib/public/diagnostics/ieventlogger.php
similarity index 88%
rename from lib/public/debug/ieventlogger.php
rename to lib/public/diagnostics/ieventlogger.php
index 7a7bff521db0d9558fa8c5cb4114ecbf271d67db..fa5880bfea697b9689e7c8c3b870b358329776da 100644
--- a/lib/public/debug/ieventlogger.php
+++ b/lib/public/diagnostics/ieventlogger.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-namespace OCP\Debug;
+namespace OCP\Diagnostics;
 
 interface IEventLogger {
 	/**
@@ -25,7 +25,7 @@ interface IEventLogger {
 	public function end($id);
 
 	/**
-	 * @return \OCP\Debug\IEvent[]
+	 * @return \OCP\Diagnostics\IEvent[]
 	 */
 	public function getEvents();
 }
diff --git a/lib/public/debug/iquery.php b/lib/public/diagnostics/iquery.php
similarity index 93%
rename from lib/public/debug/iquery.php
rename to lib/public/diagnostics/iquery.php
index 070c4d6119645d6aa6c04070c9529bb7a7c2eca3..f1111e069bb4e185b9fe3cc90832f179d2a81b85 100644
--- a/lib/public/debug/iquery.php
+++ b/lib/public/diagnostics/iquery.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-namespace OCP\Debug;
+namespace OCP\Diagnostics;
 
 interface IQuery {
 	/**
diff --git a/lib/public/debug/iquerylogger.php b/lib/public/diagnostics/iquerylogger.php
similarity index 88%
rename from lib/public/debug/iquerylogger.php
rename to lib/public/diagnostics/iquerylogger.php
index fe8eae089dad49409a0124174fa718c24d4682f8..0fba9eb8b10a81e74c5904b9ebd764c6b7bd3741 100644
--- a/lib/public/debug/iquerylogger.php
+++ b/lib/public/diagnostics/iquerylogger.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-namespace OCP\Debug;
+namespace OCP\Diagnostics;
 
 use Doctrine\DBAL\Logging\SQLLogger;
 
@@ -21,7 +21,7 @@ interface IQueryLogger extends SQLLogger {
 	public function stopQuery();
 
 	/**
-	 * @return \OCP\Debug\IQuery[]
+	 * @return \OCP\Diagnostics\IQuery[]
 	 */
 	public function getQueries();
 }
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index 97ff74385a299d012c56d03d87e5afd0202dbec3..55c2c89b710acc5ac7e907c83015e05421910c81 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -252,7 +252,7 @@ interface IServerContainer {
 	/**
 	 * Get the active event logger
 	 *
-	 * @return \OCP\Debug\IEventLogger
+	 * @return \OCP\Diagnostics\IEventLogger
 	 */
 	function getEventLogger();
 
@@ -261,7 +261,7 @@ interface IServerContainer {
 	 *
 	 * The returned logger only logs data when debug mode is enabled
 	 *
-	 * @return \OCP\Debug\IQueryLogger
+	 * @return \OCP\Diagnostics\IQueryLogger
 	 */
 	function getQueryLogger();
 }