diff --git a/apps/twofactor_backupcodes/appinfo/info.xml b/apps/twofactor_backupcodes/appinfo/info.xml
index 45e9b022bb..7b9ef2d90e 100644
--- a/apps/twofactor_backupcodes/appinfo/info.xml
+++ b/apps/twofactor_backupcodes/appinfo/info.xml
@@ -6,11 +6,11 @@
 	<licence>agpl</licence>
 	<author>Christoph Wurst</author>
 	<version>1.0.0</version>
-	<namespace>TwoFactor_BackupCodes</namespace>
+	<namespace>TwoFactorBackupCodes</namespace>
 	<category>other</category>
 
 	<two-factor-providers>
-		<provider>OCA\TwoFactor_BackupCodes\Provider\BackupCodesProvider</provider>
+		<provider>OCA\TwoFactorBackupCodes\Provider\BackupCodesProvider</provider>
 	</two-factor-providers>
 
 	<dependencies>
diff --git a/apps/twofactor_backupcodes/lib/Controller/SettingsController.php b/apps/twofactor_backupcodes/lib/Controller/SettingsController.php
index 5130357baa..fed7634643 100644
--- a/apps/twofactor_backupcodes/lib/Controller/SettingsController.php
+++ b/apps/twofactor_backupcodes/lib/Controller/SettingsController.php
@@ -20,9 +20,9 @@
  *
  */
 
-namespace OCA\TwoFactor_BackupCodes\Controller;
+namespace OCA\TwoFactorBackupCodes\Controller;
 
-use OCA\TwoFactor_BackupCodes\Service\BackupCodeStorage;
+use OCA\TwoFactorBackupCodes\Service\BackupCodeStorage;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\IRequest;
diff --git a/apps/twofactor_backupcodes/lib/Db/BackupCode.php b/apps/twofactor_backupcodes/lib/Db/BackupCode.php
index a59a414e18..cff515dd4a 100644
--- a/apps/twofactor_backupcodes/lib/Db/BackupCode.php
+++ b/apps/twofactor_backupcodes/lib/Db/BackupCode.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace OCA\TwoFactor_BackupCodes\Db;
+namespace OCA\TwoFactorBackupCodes\Db;
 
 
 use OCP\AppFramework\Db\Entity;
diff --git a/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php b/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php
index 8acdfa45aa..8b56724fce 100644
--- a/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php
+++ b/apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php
@@ -19,8 +19,7 @@
  *
  */
 
-namespace OCA\TwoFactor_BackupCodes\Db;
-
+namespace OCA\TwoFactorBackupCodes\Db;
 
 use OCP\AppFramework\Db\Mapper;
 use OCP\DB\QueryBuilder\IQueryBuilder;
diff --git a/apps/twofactor_backupcodes/lib/Provider/BackupCodesProvider.php b/apps/twofactor_backupcodes/lib/Provider/BackupCodesProvider.php
index 91975dfad8..902f7c783d 100644
--- a/apps/twofactor_backupcodes/lib/Provider/BackupCodesProvider.php
+++ b/apps/twofactor_backupcodes/lib/Provider/BackupCodesProvider.php
@@ -20,9 +20,9 @@
  *
  */
 
-namespace OCA\TwoFactor_BackupCodes\Provider;
+namespace OCA\TwoFactorBackupCodes\Provider;
 
-use OCA\TwoFactor_BackupCodes\Service\BackupCodeStorage;
+use OCA\TwoFactorBackupCodes\Service\BackupCodeStorage;
 use OCP\Authentication\TwoFactorAuth\IProvider;
 use OCP\IL10N;
 use OCP\IUser;
diff --git a/apps/twofactor_backupcodes/lib/Service/BackupCodeStorage.php b/apps/twofactor_backupcodes/lib/Service/BackupCodeStorage.php
index 9c78581255..bb10081bb5 100644
--- a/apps/twofactor_backupcodes/lib/Service/BackupCodeStorage.php
+++ b/apps/twofactor_backupcodes/lib/Service/BackupCodeStorage.php
@@ -20,10 +20,10 @@
  *
  */
 
-namespace OCA\TwoFactor_BackupCodes\Service;
+namespace OCA\TwoFactorBackupCodes\Service;
 
-use OCA\TwoFactor_BackupCodes\Db\BackupCode;
-use OCA\TwoFactor_BackupCodes\Db\BackupCodeMapper;
+use OCA\TwoFactorBackupCodes\Db\BackupCode;
+use OCA\TwoFactorBackupCodes\Db\BackupCodeMapper;
 use OCP\IUser;
 use OCP\Security\IHasher;
 use OCP\Security\ISecureRandom;
diff --git a/apps/twofactor_backupcodes/tests/Integration/Db/BackupCodeMapperTest.php b/apps/twofactor_backupcodes/tests/Integration/Db/BackupCodeMapperTest.php
index bb97f929d7..c788262231 100644
--- a/apps/twofactor_backupcodes/tests/Integration/Db/BackupCodeMapperTest.php
+++ b/apps/twofactor_backupcodes/tests/Integration/Db/BackupCodeMapperTest.php
@@ -20,10 +20,10 @@
  *
  */
 
-namespace OCA\TwoFactor_BackupCodes\Tests\Integration\Db;
+namespace OCA\TwoFactorBackupCodes\Tests\Integration\Db;
 
-use OCA\TwoFactor_BackupCodes\Db\BackupCode;
-use OCA\TwoFactor_BackupCodes\Db\BackupCodeMapper;
+use OCA\TwoFactorBackupCodes\Db\BackupCode;
+use OCA\TwoFactorBackupCodes\Db\BackupCodeMapper;
 use OCP\IDBConnection;
 use OCP\IUser;
 use Test\TestCase;
diff --git a/apps/twofactor_backupcodes/tests/Integration/Service/BackupCodeStorageTest.php b/apps/twofactor_backupcodes/tests/Integration/Service/BackupCodeStorageTest.php
index 934c44fb0d..6d28b4fa75 100644
--- a/apps/twofactor_backupcodes/tests/Integration/Service/BackupCodeStorageTest.php
+++ b/apps/twofactor_backupcodes/tests/Integration/Service/BackupCodeStorageTest.php
@@ -20,9 +20,9 @@
  *
  */
 
-namespace OCA\TwoFactor_BackupCodes\Tests\Integration\Service;
+namespace OCA\TwoFactorBackupCodes\Tests\Integration\Service;
 
-use OCA\TwoFactor_BackupCodes\Service\BackupCodeStorage;
+use OCA\TwoFactorBackupCodes\Service\BackupCodeStorage;
 use Test\TestCase;
 
 /**
diff --git a/apps/twofactor_backupcodes/tests/Unit/Controller/SettingsControllerTest.php b/apps/twofactor_backupcodes/tests/Unit/Controller/SettingsControllerTest.php
index 918d1a8c64..c7ac33467b 100644
--- a/apps/twofactor_backupcodes/tests/Unit/Controller/SettingsControllerTest.php
+++ b/apps/twofactor_backupcodes/tests/Unit/Controller/SettingsControllerTest.php
@@ -20,10 +20,10 @@
  *
  */
 
-namespace OCA\TwoFactor_BackupCodes\Tests\Unit\Controller;
+namespace OCA\TwoFactorBackupCodes\Tests\Unit\Controller;
 
-use OCA\TwoFactor_BackupCodes\Controller\SettingsController;
-use OCA\TwoFactor_BackupCodes\Service\BackupCodeStorage;
+use OCA\TwoFactorBackupCodes\Controller\SettingsController;
+use OCA\TwoFactorBackupCodes\Service\BackupCodeStorage;
 use OCP\IRequest;
 use OCP\IUser;
 use OCP\IUserSession;
diff --git a/apps/twofactor_backupcodes/tests/Unit/Provider/BackupCodesProviderTest.php b/apps/twofactor_backupcodes/tests/Unit/Provider/BackupCodesProviderTest.php
index a744a44e60..5a99cfadd4 100644
--- a/apps/twofactor_backupcodes/tests/Unit/Provider/BackupCodesProviderTest.php
+++ b/apps/twofactor_backupcodes/tests/Unit/Provider/BackupCodesProviderTest.php
@@ -20,10 +20,10 @@
  *
  */
 
-namespace OCA\TwoFactor_BackupCodes\Tests\Unit\Provider;
+namespace OCA\TwoFactorBackupCodes\Tests\Unit\Provider;
 
-use OCA\TwoFactor_BackupCodes\Provider\BackupCodesProvider;
-use OCA\TwoFactor_BackupCodes\Service\BackupCodeStorage;
+use OCA\TwoFactorBackupCodes\Provider\BackupCodesProvider;
+use OCA\TwoFactorBackupCodes\Service\BackupCodeStorage;
 use OCP\IL10N;
 use OCP\IUser;
 use OCP\Template;
diff --git a/apps/twofactor_backupcodes/tests/Unit/Service/BackupCodeStorageTest.php b/apps/twofactor_backupcodes/tests/Unit/Service/BackupCodeStorageTest.php
index 1ebf445bb0..7a1132b064 100644
--- a/apps/twofactor_backupcodes/tests/Unit/Service/BackupCodeStorageTest.php
+++ b/apps/twofactor_backupcodes/tests/Unit/Service/BackupCodeStorageTest.php
@@ -20,11 +20,11 @@
  *
  */
 
-namespace OCA\TwoFactor_BackupCodes\Tests\Unit\Service;
+namespace OCA\TwoFactorBackupCodes\Tests\Unit\Service;
 
-use OCA\TwoFactor_BackupCodes\Db\BackupCode;
-use OCA\TwoFactor_BackupCodes\Db\BackupCodeMapper;
-use OCA\TwoFactor_BackupCodes\Service\BackupCodeStorage;
+use OCA\TwoFactorBackupCodes\Db\BackupCode;
+use OCA\TwoFactorBackupCodes\Db\BackupCodeMapper;
+use OCA\TwoFactorBackupCodes\Service\BackupCodeStorage;
 use OCP\IUser;
 use OCP\Security\IHasher;
 use OCP\Security\ISecureRandom;
diff --git a/tests/lib/Authentication/TwoFactorAuth/ManagerTest.php b/tests/lib/Authentication/TwoFactorAuth/ManagerTest.php
index b3fd28a30a..72b70d817d 100644
--- a/tests/lib/Authentication/TwoFactorAuth/ManagerTest.php
+++ b/tests/lib/Authentication/TwoFactorAuth/ManagerTest.php
@@ -26,7 +26,6 @@ use Exception;
 use OC;
 use OC\App\AppManager;
 use OC\Authentication\TwoFactorAuth\Manager;
-use OCA\TwoFactor_BackupCodes\Provider\BackupCodesProvider;
 use OCP\Authentication\TwoFactorAuth\IProvider;
 use OCP\IConfig;
 use OCP\ISession;
@@ -89,7 +88,7 @@ class ManagerTest extends TestCase {
 		$this->backupProvider->expects($this->any())
 			->method('isTwoFactorAuthEnabledForUser')
 			->will($this->returnValue(true));
-		OC::$server->registerService('\OCA\TwoFactor_BackupCodes\Provider\FakeBackupCodesProvider', function () {
+		OC::$server->registerService('\OCA\TwoFactorBackupCodes\Provider\FakeBackupCodesProvider', function () {
 			return $this->backupProvider;
 		});
 	}
@@ -149,7 +148,7 @@ class ManagerTest extends TestCase {
 					[
 						'twofactor_backupcodes',
 						['two-factor-providers' => [
-								'\OCA\TwoFactor_BackupCodes\Provider\FakeBackupCodesProvider',
+								'\OCA\TwoFactorBackupCodes\Provider\FakeBackupCodesProvider',
 							]
 						]
 					],