diff --git a/apps/dav/lib/CalDAV/CachedSubscription.php b/apps/dav/lib/CalDAV/CachedSubscription.php
index f42b5f97f5d6b..dc7f66e59b43f 100644
--- a/apps/dav/lib/CalDAV/CachedSubscription.php
+++ b/apps/dav/lib/CalDAV/CachedSubscription.php
@@ -28,7 +28,6 @@
 namespace OCA\DAV\CalDAV;
 
 use OCA\DAV\Exception\UnsupportedLimitOnInitialSyncException;
-use Sabre\CalDAV\Backend\BackendInterface;
 use Sabre\DAV\Exception\MethodNotAllowed;
 use Sabre\DAV\Exception\NotFound;
 use Sabre\DAV\INode;
@@ -38,7 +37,7 @@
  * Class CachedSubscription
  *
  * @package OCA\DAV\CalDAV
- * @property BackendInterface|CalDavBackend $caldavBackend
+ * @property CalDavBackend $caldavBackend
  */
 class CachedSubscription extends \Sabre\CalDAV\Calendar {
 
@@ -112,7 +111,7 @@ public function getOwner() {
 		return parent::getOwner();
 	}
 
-	
+
 	public function delete() {
 		$this->caldavBackend->deleteSubscription($this->calendarInfo['id']);
 	}
diff --git a/apps/dav/lib/CardDAV/AddressBook.php b/apps/dav/lib/CardDAV/AddressBook.php
index bca478feec12d..f08a7b4b525c0 100644
--- a/apps/dav/lib/CardDAV/AddressBook.php
+++ b/apps/dav/lib/CardDAV/AddressBook.php
@@ -38,7 +38,7 @@
  * Class AddressBook
  *
  * @package OCA\DAV\CardDAV
- * @property BackendInterface|CardDavBackend $carddavBackend
+ * @property CardDavBackend $carddavBackend
  */
 class AddressBook extends \Sabre\CardDAV\AddressBook implements IShareable {
 
diff --git a/apps/provisioning_api/lib/Controller/AUserData.php b/apps/provisioning_api/lib/Controller/AUserData.php
index bbb3abe3c24ac..e7496c6c5ed7e 100644
--- a/apps/provisioning_api/lib/Controller/AUserData.php
+++ b/apps/provisioning_api/lib/Controller/AUserData.php
@@ -66,7 +66,7 @@ abstract class AUserData extends OCSController {
 	protected $userManager;
 	/** @var IConfig */
 	protected $config;
-	/** @var IGroupManager|Manager */ // FIXME Requires a method that is not on the interface
+	/** @var Manager */
 	protected $groupManager;
 	/** @var IUserSession */
 	protected $userSession;
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index 2ddba2bb98abf..aa6617c4b6d94 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -66,7 +66,7 @@ class LoginController extends Controller {
 	private IUserManager $userManager;
 	private IConfig $config;
 	private ISession $session;
-	/** @var IUserSession|Session */
+	/** @var Session */
 	private $userSession;
 	private IURLGenerator $urlGenerator;
 	private Defaults $defaults;
diff --git a/lib/private/Collaboration/Resources/Collection.php b/lib/private/Collaboration/Resources/Collection.php
index 2e67c041566fd..e34c38a80cd3b 100644
--- a/lib/private/Collaboration/Resources/Collection.php
+++ b/lib/private/Collaboration/Resources/Collection.php
@@ -37,7 +37,7 @@
 use OCP\IUser;
 
 class Collection implements ICollection {
-	/** @var IManager|Manager */
+	/** @var Manager */
 	protected $manager;
 
 	/** @var IDBConnection */
diff --git a/lib/private/NavigationManager.php b/lib/private/NavigationManager.php
index e3d5ac752d804..2050244d3846f 100644
--- a/lib/private/NavigationManager.php
+++ b/lib/private/NavigationManager.php
@@ -61,7 +61,7 @@ class NavigationManager implements INavigationManager {
 	private $l10nFac;
 	/** @var IUserSession */
 	private $userSession;
-	/** @var IGroupManager|Manager */
+	/** @var Manager */
 	private $groupManager;
 	/** @var IConfig */
 	private $config;
diff --git a/lib/private/Repair/NC16/ClearCollectionsAccessCache.php b/lib/private/Repair/NC16/ClearCollectionsAccessCache.php
index 8bc73c8f66baa..51a63406d2296 100644
--- a/lib/private/Repair/NC16/ClearCollectionsAccessCache.php
+++ b/lib/private/Repair/NC16/ClearCollectionsAccessCache.php
@@ -35,7 +35,7 @@ class ClearCollectionsAccessCache implements IRepairStep {
 	/** @var IConfig */
 	private $config;
 
-	/** @var IManager|Manager */
+	/** @var Manager */
 	private $manager;
 
 	public function __construct(IConfig $config, IManager $manager) {
diff --git a/lib/private/Updater.php b/lib/private/Updater.php
index 45a5b4c216013..45c22dc89bcb0 100644
--- a/lib/private/Updater.php
+++ b/lib/private/Updater.php
@@ -40,7 +40,6 @@
  */
 namespace OC;
 
-use OCP\App\IAppManager;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\HintException;
@@ -274,7 +273,7 @@ private function doUpgrade(string $currentVersion, string $installedVersion): vo
 		// Update the appfetchers version so it downloads the correct list from the appstore
 		\OC::$server->getAppFetcher()->setVersion($currentVersion);
 
-		/** @var IAppManager|AppManager $appManager */
+		/** @var AppManager $appManager */
 		$appManager = \OC::$server->getAppManager();
 
 		// upgrade appstore apps