diff --git a/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php b/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php
index 3d7240fd6ac4316d95e233afc0787949fff9a4f9..8acdfa45aaeea044f207b7d333d2f173b7422d72 100644
--- a/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php
+++ b/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php
@@ -38,7 +38,7 @@ class BackupCodeMapper extends Mapper {
 	 * @return BackupCode[]
 	 */
 	public function getBackupCodes(IUser $user) {
-		/* @var $qb IQueryBuilder */
+		/* @var IQueryBuilder $qb */
 		$qb = $this->db->getQueryBuilder();
 
 		$qb->select('id', 'user_id', 'code', 'used')
@@ -55,7 +55,7 @@ class BackupCodeMapper extends Mapper {
 	}
 
 	public function deleteCodes(IUser $user) {
-		/* @var $qb IQueryBuilder */
+		/* @var IQueryBuilder $qb */
 		$qb = $this->db->getQueryBuilder();
 
 		$qb->delete('twofactor_backup_codes')
diff --git a/apps/twofactor_backupcodes/tests/Integration/Db/BackupCodeMapperTest.php b/apps/twofactor_backupcodes/tests/Integration/Db/BackupCodeMapperTest.php
index 5d7d71dd17ac602618899b65c787e7a26e0410da..bb97f929d7a6c8db29677b8c2a67b0f5008bd373 100644
--- a/apps/twofactor_backupcodes/tests/Integration/Db/BackupCodeMapperTest.php
+++ b/apps/twofactor_backupcodes/tests/Integration/Db/BackupCodeMapperTest.php
@@ -22,7 +22,6 @@
 
 namespace OCA\TwoFactor_BackupCodes\Tests\Integration\Db;
 
-use OC;
 use OCA\TwoFactor_BackupCodes\Db\BackupCode;
 use OCA\TwoFactor_BackupCodes\Db\BackupCodeMapper;
 use OCP\IDBConnection;
@@ -53,8 +52,8 @@ class BackupCodeMapperTest extends TestCase {
 	protected function setUp() {
 		parent::setUp();
 
-		$this->db = OC::$server->getDatabaseConnection();
-		$this->mapper = OC::$server->query(BackupCodeMapper::class);
+		$this->db = \OC::$server->getDatabaseConnection();
+		$this->mapper = \OC::$server->query(BackupCodeMapper::class);
 
 		$this->resetDB();
 	}
diff --git a/apps/twofactor_backupcodes/tests/Integration/Service/BackupCodeStorageTest.php b/apps/twofactor_backupcodes/tests/Integration/Service/BackupCodeStorageTest.php
index 5517af5ce0d31a1406b41292e50b32954723d857..934c44fb0db2ac7a5c5327894b5ce99dcb95ffdc 100644
--- a/apps/twofactor_backupcodes/tests/Integration/Service/BackupCodeStorageTest.php
+++ b/apps/twofactor_backupcodes/tests/Integration/Service/BackupCodeStorageTest.php
@@ -22,7 +22,6 @@
 
 namespace OCA\TwoFactor_BackupCodes\Tests\Integration\Service;
 
-use OC;
 use OCA\TwoFactor_BackupCodes\Service\BackupCodeStorage;
 use Test\TestCase;
 
@@ -40,7 +39,7 @@ class BackupCodeStorageTest extends TestCase {
 	protected function setUp() {
 		parent::setUp();
 
-		$this->storage = OC::$server->query(BackupCodeStorage::class);
+		$this->storage = \OC::$server->query(BackupCodeStorage::class);
 	}
 
 	public function testSimpleWorkFlow() {