diff --git a/webdav_storage/src/WebDav.php b/webdav_storage/src/WebDav.php
index 4502b935..c22ae5db 100644
--- a/webdav_storage/src/WebDav.php
+++ b/webdav_storage/src/WebDav.php
@@ -3,9 +3,9 @@
 namespace Friendica\Addon\webdav_storage\src;
 
 use Exception;
-use Friendica\Model\Storage\IWritableStorage;
-use Friendica\Model\Storage\ReferenceStorageException;
-use Friendica\Model\Storage\StorageException;
+use Friendica\Core\Storage\Capability\ICanWriteToStorage;
+use Friendica\Core\Storage\Exception\ReferenceStorageException;
+use Friendica\Core\Storage\Exception\StorageException;
 use Friendica\Network\HTTPClientOptions;
 use Friendica\Network\IHTTPClient;
 use Friendica\Util\Strings;
@@ -14,7 +14,7 @@ use Psr\Log\LoggerInterface;
 /**
  * A WebDav Backend Storage class
  */
-class WebDav implements IWritableStorage
+class WebDav implements ICanWriteToStorage
 {
 	const NAME = 'WebDav';
 
@@ -253,7 +253,7 @@ class WebDav implements IWritableStorage
 	/**
 	 * {@inheritDoc}
 	 */
-	public function __toString()
+	public function __toString(): string
 	{
 		return self::getName();
 	}
diff --git a/webdav_storage/src/WebDavConfig.php b/webdav_storage/src/WebDavConfig.php
index f1a0aa4a..9c8561d7 100644
--- a/webdav_storage/src/WebDavConfig.php
+++ b/webdav_storage/src/WebDavConfig.php
@@ -4,14 +4,14 @@ namespace Friendica\Addon\webdav_storage\src;
 
 use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\L10n;
-use Friendica\Model\Storage\IStorageConfiguration;
+use Friendica\Core\Storage\Capability\ICanConfigureStorage;
 use Friendica\Network\HTTPClientOptions;
 use Friendica\Network\IHTTPClient;
 
 /**
  * The WebDav Backend Storage configuration class
  */
-class WebDavConfig implements IStorageConfiguration
+class WebDavConfig implements ICanConfigureStorage
 {
 	const NAME = 'WebDav';
 
diff --git a/webdav_storage/tests/WebDavTest.php.bak b/webdav_storage/tests/WebDavTest.php.bak
index 5c94ba30..9c3ff82d 100644
--- a/webdav_storage/tests/WebDavTest.php.bak
+++ b/webdav_storage/tests/WebDavTest.php.bak
@@ -5,7 +5,7 @@ namespace Friendica\Addon\webdav_storage\tests;
 use Friendica\Addon\webdav_storage\src\WebDav;
 use Friendica\DI;
 use Friendica\Factory\HTTPClientFactory;
-use Friendica\Test\src\Model\Storage\StorageTest;
+use Friendica\Test\src\Core\Storage\StorageTest;
 use Friendica\Util\Logger\VoidLogger;
 
 /// @todo remove when constant is moved to a class constant