diff --git a/lib/private/memcache/factory.php b/lib/private/memcache/factory.php
index 6e9aaa11d8..5e3d857006 100644
--- a/lib/private/memcache/factory.php
+++ b/lib/private/memcache/factory.php
@@ -29,7 +29,7 @@ namespace OC\Memcache;
 use \OCP\ICacheFactory;
 
 class Factory implements ICacheFactory {
-	const NULL_CACHE = '\\OC\\Memcache\\Null';
+	const NULL_CACHE = '\\OC\\Memcache\\NullCache';
 
 	/**
 	 * @var string $globalPrefix
@@ -70,7 +70,7 @@ class Factory implements ICacheFactory {
 		}
 		if (!($lockingCacheClass && $lockingCacheClass::isAvailable())) {
 			// dont fallback since the fallback might not be suitable for storing lock
-			$lockingCacheClass = '\OC\Memcache\Null';
+			$lockingCacheClass = '\OC\Memcache\NullCache';
 		}
 		$this->localCacheClass = $localCacheClass;
 		$this->distributedCacheClass = $distributedCacheClass;
diff --git a/lib/private/memcache/null.php b/lib/private/memcache/nullcache.php
similarity index 96%
rename from lib/private/memcache/null.php
rename to lib/private/memcache/nullcache.php
index 982f7edc80..77eadba4eb 100644
--- a/lib/private/memcache/null.php
+++ b/lib/private/memcache/nullcache.php
@@ -22,7 +22,7 @@
 
 namespace OC\Memcache;
 
-class Null extends Cache implements \OCP\IMemcache {
+class NullCache extends Cache implements \OCP\IMemcache {
 	public function get($key) {
 		return null;
 	}
diff --git a/lib/private/server.php b/lib/private/server.php
index 8113080977..6e4f1517c1 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -46,7 +46,6 @@ use OC\Lock\MemcacheLockingProvider;
 use OC\Lock\NoopLockingProvider;
 use OC\Mail\Mailer;
 use OC\Memcache\ArrayCache;
-use OC\Memcache\Null as NullCache;
 use OC\Http\Client\ClientService;
 use OC\Security\CertificateManager;
 use OC\Files\Node\Root;
@@ -57,7 +56,6 @@ use OC\Security\SecureRandom;
 use OC\Diagnostics\NullEventLogger;
 use OC\Security\TrustedDomainHelper;
 use OCP\IServerContainer;
-use OCP\ISession;
 use OC\Tagging\TagMapper;
 
 /**
@@ -429,7 +427,7 @@ class Server extends SimpleContainer implements IServerContainer {
 				/** @var \OC\Memcache\Factory $memcacheFactory */
 				$memcacheFactory = $c->getMemCacheFactory();
 				$memcache = $memcacheFactory->createLocking('lock');
-				if (!($memcache instanceof \OC\Memcache\Null)) {
+				if (!($memcache instanceof \OC\Memcache\NullCache)) {
 					return new MemcacheLockingProvider($memcache);
 				}
 			}