diff --git a/lib/private/diagnostics/dummyeventlogger.php b/lib/private/diagnostics/nulleventlogger.php
similarity index 92%
rename from lib/private/diagnostics/dummyeventlogger.php
rename to lib/private/diagnostics/nulleventlogger.php
index f1386d2e88..fd71ee9e11 100644
--- a/lib/private/diagnostics/dummyeventlogger.php
+++ b/lib/private/diagnostics/nulleventlogger.php
@@ -13,7 +13,7 @@ use OCP\Diagnostics\IEventLogger;
 /**
  * Dummy event logger that doesn't actually log anything
  */
-class DummyEventLogger implements IEventLogger {
+class NullEventLogger implements IEventLogger {
 	/**
 	 * Mark the start of an event
 	 *
diff --git a/lib/private/diagnostics/dummyquerylogger.php b/lib/private/diagnostics/nullquerylogger.php
similarity index 91%
rename from lib/private/diagnostics/dummyquerylogger.php
rename to lib/private/diagnostics/nullquerylogger.php
index 1617b204e9..8467b4dd26 100644
--- a/lib/private/diagnostics/dummyquerylogger.php
+++ b/lib/private/diagnostics/nullquerylogger.php
@@ -10,7 +10,7 @@ namespace OC\Diagnostics;
 
 use OCP\Diagnostics\IQueryLogger;
 
-class DummyQueryLogger implements IQueryLogger {
+class NullQueryLogger implements IQueryLogger {
 	/**
 	 * @param string $sql
 	 * @param array $params
diff --git a/lib/private/server.php b/lib/private/server.php
index 496c26e250..f7ffee484e 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -6,7 +6,7 @@ use OC\AppFramework\Http\Request;
 use OC\AppFramework\Db\Db;
 use OC\AppFramework\Utility\SimpleContainer;
 use OC\Cache\UserCache;
-use OC\Diagnostics\DummyQueryLogger;
+use OC\Diagnostics\NullQueryLogger;
 use OC\Diagnostics\EventLogger;
 use OC\Diagnostics\QueryLogger;
 use OC\Security\CertificateManager;
@@ -15,7 +15,7 @@ use OC\Files\Node\Root;
 use OC\Files\View;
 use OC\Security\Crypto;
 use OC\Security\SecureRandom;
-use OC\Diagnostics\DummyEventLogger;
+use OC\Diagnostics\NullEventLogger;
 use OCP\IServerContainer;
 use OCP\ISession;
 use OC\Tagging\TagMapper;
@@ -229,14 +229,14 @@ class Server extends SimpleContainer implements IServerContainer {
 			if (defined('DEBUG') and DEBUG) {
 				return new EventLogger();
 			} else {
-				return new DummyEventLogger();
+				return new NullEventLogger();
 			}
 		});
 		$this->registerService('QueryLogger', function ($c) {
 			if (defined('DEBUG') and DEBUG) {
 				return new QueryLogger();
 			} else {
-				return new DummyQueryLogger();
+				return new NullQueryLogger();
 			}
 		});
 	}