diff --git a/apps/files_external/lib/Command/Applicable.php b/apps/files_external/lib/Command/Applicable.php
index 902e76cb4cbde679185c563fc26a1518837d1308..4e178edbbaef58e3ca049a1148edf1bab132e895 100644
--- a/apps/files_external/lib/Command/Applicable.php
+++ b/apps/files_external/lib/Command/Applicable.php
@@ -22,8 +22,8 @@
 namespace OCA\Files_External\Command;
 
 use OC\Core\Command\Base;
-use OCA\Files_external\Lib\StorageConfig;
-use OCA\Files_external\NotFoundException;
+use OCA\Files_External\Lib\StorageConfig;
+use OCA\Files_External\NotFoundException;
 use OCA\Files_External\Service\GlobalStoragesService;
 use OCP\IGroupManager;
 use OCP\IUserManager;
diff --git a/apps/files_external/lib/Command/Config.php b/apps/files_external/lib/Command/Config.php
index 873fece86d76d612f52b6f1f5d93b8b1a700f75f..909b130f17b48104881a133ad1e6e413fb6f9fff 100644
--- a/apps/files_external/lib/Command/Config.php
+++ b/apps/files_external/lib/Command/Config.php
@@ -22,8 +22,8 @@
 namespace OCA\Files_External\Command;
 
 use OC\Core\Command\Base;
-use OCA\Files_external\Lib\StorageConfig;
-use OCA\Files_external\NotFoundException;
+use OCA\Files_External\Lib\StorageConfig;
+use OCA\Files_External\NotFoundException;
 use OCA\Files_External\Service\GlobalStoragesService;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\Table;
diff --git a/apps/files_external/lib/Command/Create.php b/apps/files_external/lib/Command/Create.php
index 17ad7ef1a16cd3943273e80e2893f228db22941b..e5fd095d6f2d532a61434f49a887f4c5d7e5427d 100644
--- a/apps/files_external/lib/Command/Create.php
+++ b/apps/files_external/lib/Command/Create.php
@@ -27,7 +27,7 @@ use OC\User\NoUserException;
 use OCA\Files_External\Lib\Auth\AuthMechanism;
 use OCA\Files_External\Lib\Backend\Backend;
 use OCA\Files_External\Lib\DefinitionParameter;
-use OCA\Files_external\Lib\StorageConfig;
+use OCA\Files_External\Lib\StorageConfig;
 use OCA\Files_External\Service\BackendService;
 use OCA\Files_External\Service\GlobalStoragesService;
 use OCA\Files_External\Service\UserStoragesService;
diff --git a/apps/files_external/lib/Command/Delete.php b/apps/files_external/lib/Command/Delete.php
index a3aef7f3303c93904899226d74cd4ef8d948ba8c..64228b2033b7c4a225202d1d71a95a98239202cf 100644
--- a/apps/files_external/lib/Command/Delete.php
+++ b/apps/files_external/lib/Command/Delete.php
@@ -22,7 +22,7 @@
 namespace OCA\Files_External\Command;
 
 use OC\Core\Command\Base;
-use OCA\Files_external\NotFoundException;
+use OCA\Files_External\NotFoundException;
 use OCA\Files_External\Service\GlobalStoragesService;
 use OCA\Files_External\Service\UserStoragesService;
 use OCP\IUserManager;
diff --git a/apps/files_external/lib/Command/Import.php b/apps/files_external/lib/Command/Import.php
index 55528b664720de780c3c338c52cbdcc2024d1b59..4f881acb500e10810313ba3eaf03a0fddc505067 100644
--- a/apps/files_external/lib/Command/Import.php
+++ b/apps/files_external/lib/Command/Import.php
@@ -23,7 +23,7 @@ namespace OCA\Files_External\Command;
 
 use OC\Core\Command\Base;
 use OC\User\NoUserException;
-use OCA\Files_external\Lib\StorageConfig;
+use OCA\Files_External\Lib\StorageConfig;
 use OCA\Files_External\Service\BackendService;
 use OCA\Files_External\Service\GlobalStoragesService;
 use OCA\Files_External\Service\ImportLegacyStoragesService;
diff --git a/apps/files_external/lib/Command/ListCommand.php b/apps/files_external/lib/Command/ListCommand.php
index cbe1913ccfc3ccc701336c1323cdddb6cd1264cd..c1fb18b3bc250a2cc402a8903e2476766e9842d5 100644
--- a/apps/files_external/lib/Command/ListCommand.php
+++ b/apps/files_external/lib/Command/ListCommand.php
@@ -23,7 +23,7 @@ namespace OCA\Files_External\Command;
 
 use OC\Core\Command\Base;
 use OC\User\NoUserException;
-use OCA\Files_external\Lib\StorageConfig;
+use OCA\Files_External\Lib\StorageConfig;
 use OCA\Files_External\Service\GlobalStoragesService;
 use OCA\Files_External\Service\UserStoragesService;
 use OCP\IUserManager;
diff --git a/apps/files_external/lib/Command/Option.php b/apps/files_external/lib/Command/Option.php
index 109ca26c31f5bfbfc5c630aa40df8af04c837d7a..4f7733b25d80809aeed2b34967577593a21aa764 100644
--- a/apps/files_external/lib/Command/Option.php
+++ b/apps/files_external/lib/Command/Option.php
@@ -21,7 +21,7 @@
 
 namespace OCA\Files_External\Command;
 
-use OCA\Files_external\Lib\StorageConfig;
+use OCA\Files_External\Lib\StorageConfig;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Output\OutputInterface;
 
diff --git a/apps/files_external/lib/Command/Verify.php b/apps/files_external/lib/Command/Verify.php
index 6ff871a6094968d63a864240fb5b53ab6ee8dfb7..dfc536530bb9edc55fce2e023f3f1b5ebeb1badc 100644
--- a/apps/files_external/lib/Command/Verify.php
+++ b/apps/files_external/lib/Command/Verify.php
@@ -25,8 +25,8 @@ use OC\Core\Command\Base;
 use OCA\Files_External\Lib\Auth\AuthMechanism;
 use OCA\Files_External\Lib\Backend\Backend;
 use OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException;
-use OCA\Files_external\Lib\StorageConfig;
-use OCA\Files_external\NotFoundException;
+use OCA\Files_External\Lib\StorageConfig;
+use OCA\Files_External\NotFoundException;
 use OCA\Files_External\Service\GlobalStoragesService;
 use OCP\Files\StorageNotAvailableException;
 use Symfony\Component\Console\Input\InputArgument;
diff --git a/apps/files_external/lib/Controller/GlobalStoragesController.php b/apps/files_external/lib/Controller/GlobalStoragesController.php
index 2471ac861de9a62bc942979adf3956a77bb9d99c..0ae9e1fd5e0385f407d58c3d980f41cea6f19c5f 100644
--- a/apps/files_external/lib/Controller/GlobalStoragesController.php
+++ b/apps/files_external/lib/Controller/GlobalStoragesController.php
@@ -30,7 +30,7 @@ use \OCP\IL10N;
 use \OCP\AppFramework\Http\DataResponse;
 use \OCP\AppFramework\Http;
 use OCA\Files_External\Service\GlobalStoragesService;
-use \OCA\Files_external\NotFoundException;
+use OCA\Files_External\NotFoundException;
 
 /**
  * Global storages controller
diff --git a/apps/files_external/lib/Controller/StoragesController.php b/apps/files_external/lib/Controller/StoragesController.php
index da26f24b6b8b34b9a1acb507fbc08b3e9ec13e52..a368169944e715be8c26c8be4c31ef05436ee4f8 100644
--- a/apps/files_external/lib/Controller/StoragesController.php
+++ b/apps/files_external/lib/Controller/StoragesController.php
@@ -32,8 +32,8 @@ use \OCP\AppFramework\Http\DataResponse;
 use \OCP\AppFramework\Controller;
 use \OCP\AppFramework\Http;
 use OCA\Files_External\Service\StoragesService;
-use \OCA\Files_external\NotFoundException;
-use \OCA\Files_external\Lib\StorageConfig;
+use OCA\Files_External\NotFoundException;
+use OCA\Files_External\Lib\StorageConfig;
 use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use \OCP\Files\StorageNotAvailableException;
diff --git a/apps/files_external/lib/Controller/UserGlobalStoragesController.php b/apps/files_external/lib/Controller/UserGlobalStoragesController.php
index c420d9ad59f6b07ce3946f6f95f2eec8944728a5..ee4cd640018e7658dcac62bd7a209d4e6da2db7a 100644
--- a/apps/files_external/lib/Controller/UserGlobalStoragesController.php
+++ b/apps/files_external/lib/Controller/UserGlobalStoragesController.php
@@ -31,8 +31,8 @@ use \OCP\IL10N;
 use \OCP\AppFramework\Http\DataResponse;
 use \OCP\AppFramework\Http;
 use OCA\Files_External\Service\UserGlobalStoragesService;
-use \OCA\Files_external\NotFoundException;
-use \OCA\Files_external\Lib\StorageConfig;
+use OCA\Files_External\NotFoundException;
+use OCA\Files_External\Lib\StorageConfig;
 use \OCA\Files_External\Lib\Backend\Backend;
 use OCP\IUserSession;
 
diff --git a/apps/files_external/lib/Controller/UserStoragesController.php b/apps/files_external/lib/Controller/UserStoragesController.php
index e20a41e0cc4e15804d28e364027ff39a3c34013f..1850d0087b32e973b0c58ac159a30aa48bdc7b52 100644
--- a/apps/files_external/lib/Controller/UserStoragesController.php
+++ b/apps/files_external/lib/Controller/UserStoragesController.php
@@ -32,8 +32,8 @@ use \OCP\IL10N;
 use \OCP\AppFramework\Http\DataResponse;
 use \OCP\AppFramework\Http;
 use OCA\Files_External\Service\UserStoragesService;
-use \OCA\Files_external\NotFoundException;
-use \OCA\Files_external\Lib\StorageConfig;
+use OCA\Files_External\NotFoundException;
+use OCA\Files_External\Lib\StorageConfig;
 use \OCA\Files_External\Lib\Backend\Backend;
 
 /**
diff --git a/apps/files_external/lib/api.php b/apps/files_external/lib/Lib/Api.php
similarity index 100%
rename from apps/files_external/lib/api.php
rename to apps/files_external/lib/Lib/Api.php
diff --git a/apps/files_external/lib/Lib/Auth/Builtin.php b/apps/files_external/lib/Lib/Auth/Builtin.php
index 8b43cb459cc3dc61ab21f41403760dc8253e7f2e..c5c3a19e54f5a45de6220d95f468ec60931c114d 100644
--- a/apps/files_external/lib/Lib/Auth/Builtin.php
+++ b/apps/files_external/lib/Lib/Auth/Builtin.php
@@ -22,8 +22,6 @@
 namespace OCA\Files_External\Lib\Auth;
 
 use \OCP\IL10N;
-use \OCA\Files_External\Lib\Auth\AuthMechanism;
-use \OCA\Files_external\Lib\StorageConfig;
 
 /**
  * Builtin authentication mechanism, for legacy backends
diff --git a/apps/files_external/lib/Lib/Auth/NullMechanism.php b/apps/files_external/lib/Lib/Auth/NullMechanism.php
index c0a8f4f119b3776efbb04d1d1cc266fc510a3469..671a5ff66c530e3ab6cbd8a7361e17c782cfcba9 100644
--- a/apps/files_external/lib/Lib/Auth/NullMechanism.php
+++ b/apps/files_external/lib/Lib/Auth/NullMechanism.php
@@ -22,7 +22,6 @@
 namespace OCA\Files_External\Lib\Auth;
 
 use \OCP\IL10N;
-use \OCA\Files_external\Lib\StorageConfig;
 
 /**
  * Null authentication mechanism
diff --git a/apps/files_external/lib/definitionparameter.php b/apps/files_external/lib/Lib/DefinitionParameter.php
similarity index 100%
rename from apps/files_external/lib/definitionparameter.php
rename to apps/files_external/lib/Lib/DefinitionParameter.php
diff --git a/apps/files_external/lib/dependencytrait.php b/apps/files_external/lib/Lib/DependencyTrait.php
similarity index 100%
rename from apps/files_external/lib/dependencytrait.php
rename to apps/files_external/lib/Lib/DependencyTrait.php
diff --git a/apps/files_external/lib/frontenddefinitiontrait.php b/apps/files_external/lib/Lib/FrontendDefinitionTrait.php
similarity index 100%
rename from apps/files_external/lib/frontenddefinitiontrait.php
rename to apps/files_external/lib/Lib/FrontendDefinitionTrait.php
diff --git a/apps/files_external/lib/identifiertrait.php b/apps/files_external/lib/Lib/IdentifierTrait.php
similarity index 100%
rename from apps/files_external/lib/identifiertrait.php
rename to apps/files_external/lib/Lib/IdentifierTrait.php
diff --git a/apps/files_external/lib/insufficientdataformeaningfulanswerexception.php b/apps/files_external/lib/Lib/InsufficientDataForMeaningfulAnswerException.php
similarity index 100%
rename from apps/files_external/lib/insufficientdataformeaningfulanswerexception.php
rename to apps/files_external/lib/Lib/InsufficientDataForMeaningfulAnswerException.php
diff --git a/apps/files_external/lib/legacydependencycheckpolyfill.php b/apps/files_external/lib/Lib/LegacyDependencyCheckPolyfill.php
similarity index 100%
rename from apps/files_external/lib/legacydependencycheckpolyfill.php
rename to apps/files_external/lib/Lib/LegacyDependencyCheckPolyfill.php
diff --git a/apps/files_external/lib/missingdependency.php b/apps/files_external/lib/Lib/MissingDependency.php
similarity index 100%
rename from apps/files_external/lib/missingdependency.php
rename to apps/files_external/lib/Lib/MissingDependency.php
diff --git a/apps/files_external/lib/personalmount.php b/apps/files_external/lib/Lib/PersonalMount.php
similarity index 100%
rename from apps/files_external/lib/personalmount.php
rename to apps/files_external/lib/Lib/PersonalMount.php
diff --git a/apps/files_external/lib/prioritytrait.php b/apps/files_external/lib/Lib/PriorityTrait.php
similarity index 100%
rename from apps/files_external/lib/prioritytrait.php
rename to apps/files_external/lib/Lib/PriorityTrait.php
diff --git a/apps/files_external/lib/sessionstoragewrapper.php b/apps/files_external/lib/Lib/SessionStorageWrapper.php
similarity index 100%
rename from apps/files_external/lib/sessionstoragewrapper.php
rename to apps/files_external/lib/Lib/SessionStorageWrapper.php
diff --git a/apps/files_external/lib/storageconfig.php b/apps/files_external/lib/Lib/StorageConfig.php
similarity index 99%
rename from apps/files_external/lib/storageconfig.php
rename to apps/files_external/lib/Lib/StorageConfig.php
index 590a5f53249377dbf47197dd0b66c5921480a257..2a22b324eadca0093e01c5f90864c6e715fd3375 100644
--- a/apps/files_external/lib/storageconfig.php
+++ b/apps/files_external/lib/Lib/StorageConfig.php
@@ -23,7 +23,7 @@
  *
  */
 
-namespace OCA\Files_external\Lib;
+namespace OCA\Files_External\Lib;
 
 use OCA\Files_External\Lib\Auth\IUserProvided;
 use \OCA\Files_External\Lib\Backend\Backend;
diff --git a/apps/files_external/lib/storagemodifiertrait.php b/apps/files_external/lib/Lib/StorageModifierTrait.php
similarity index 100%
rename from apps/files_external/lib/storagemodifiertrait.php
rename to apps/files_external/lib/Lib/StorageModifierTrait.php
diff --git a/apps/files_external/lib/visibilitytrait.php b/apps/files_external/lib/Lib/VisibilityTrait.php
similarity index 100%
rename from apps/files_external/lib/visibilitytrait.php
rename to apps/files_external/lib/Lib/VisibilityTrait.php
diff --git a/apps/files_external/lib/notfoundexception.php b/apps/files_external/lib/NotFoundException.php
similarity index 96%
rename from apps/files_external/lib/notfoundexception.php
rename to apps/files_external/lib/NotFoundException.php
index dd3dd1907a555ab8237d474032b796e64ce31524..80333c103ca50c6ad71f92a5f80e8318316b3341 100644
--- a/apps/files_external/lib/notfoundexception.php
+++ b/apps/files_external/lib/NotFoundException.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace OCA\Files_external;
+namespace OCA\Files_External;
 
 /**
  * Storage is not found
diff --git a/apps/files_external/lib/Service/GlobalStoragesService.php b/apps/files_external/lib/Service/GlobalStoragesService.php
index 6032a8277357679c8e3f35ddcdd80a3cf1b492a3..592283444d1b8d5c77b438fb8cd7080f8d9bd4b3 100644
--- a/apps/files_external/lib/Service/GlobalStoragesService.php
+++ b/apps/files_external/lib/Service/GlobalStoragesService.php
@@ -24,11 +24,9 @@
 
 namespace OCA\Files_External\Service;
 
-use \OCP\IUserSession;
-use \OC\Files\Filesystem;
 
-use \OCA\Files_external\Lib\StorageConfig;
-use \OCA\Files_external\NotFoundException;
+use \OC\Files\Filesystem;
+use OCA\Files_External\Lib\StorageConfig;
 
 /**
  * Service class to manage global external storages
diff --git a/apps/files_external/lib/Service/LegacyStoragesService.php b/apps/files_external/lib/Service/LegacyStoragesService.php
index 40f57e4550621732ed7c68e00d02c57b8418cfff..365181d746c97e5f00d6154ffabc6981ee9dac53 100644
--- a/apps/files_external/lib/Service/LegacyStoragesService.php
+++ b/apps/files_external/lib/Service/LegacyStoragesService.php
@@ -21,7 +21,7 @@
 
 namespace OCA\Files_External\Service;
 
-use \OCA\Files_external\Lib\StorageConfig;
+use OCA\Files_External\Lib\StorageConfig;
 
 /**
  * Read mount config from legacy mount.json
diff --git a/apps/files_external/lib/Service/StoragesService.php b/apps/files_external/lib/Service/StoragesService.php
index 0999c0a7adf5cb2fcaf19c4a2ebc730ceb24f641..4fb0f65e7602fe5e29a1373e67b4625bd9acd68f 100644
--- a/apps/files_external/lib/Service/StoragesService.php
+++ b/apps/files_external/lib/Service/StoragesService.php
@@ -26,8 +26,8 @@
 namespace OCA\Files_External\Service;
 
 use \OC\Files\Filesystem;
-use \OCA\Files_external\Lib\StorageConfig;
-use \OCA\Files_external\NotFoundException;
+use OCA\Files_External\Lib\StorageConfig;
+use OCA\Files_External\NotFoundException;
 use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use OCP\Files\Config\IUserMountCache;
diff --git a/apps/files_external/lib/Service/UserStoragesService.php b/apps/files_external/lib/Service/UserStoragesService.php
index b64f289b3eeb89aab86689925ca54a323b7cd623..a527acbba3a2abfe7c4519fc8046a0ff934eafa4 100644
--- a/apps/files_external/lib/Service/UserStoragesService.php
+++ b/apps/files_external/lib/Service/UserStoragesService.php
@@ -27,8 +27,8 @@ use OCP\Files\Config\IUserMountCache;
 use \OCP\IUserSession;
 use \OC\Files\Filesystem;
 
-use \OCA\Files_external\Lib\StorageConfig;
-use \OCA\Files_external\NotFoundException;
+use OCA\Files_External\Lib\StorageConfig;
+use OCA\Files_External\NotFoundException;
 use \OCA\Files_External\Service\BackendService;
 use \OCA\Files_External\Service\UserTrait;
 
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 70f8550f39bcdb8c8ae49d9e58e73247785a0db9..d581deab19081e46db32f55c4fa069eb7bc2540d 100644
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -33,7 +33,7 @@
  */
 
 use phpseclib\Crypt\AES;
-use \OCA\Files_External\Appinfo\Application;
+use \OCA\Files_External\AppInfo\Application;
 use \OCA\Files_External\Lib\Backend\LegacyBackend;
 use \OCA\Files_External\Lib\StorageConfig;
 use \OCA\Files_External\Lib\Backend\Backend;
@@ -91,7 +91,7 @@ class OC_Mount_Config {
 		$userStoragesService->setUser($user);
 
 		foreach ($userGlobalStoragesService->getStorages() as $storage) {
-			/** @var \OCA\Files_external\Lib\StorageConfig $storage */
+			/** @var \OCA\Files_External\Lib\StorageConfig $storage */
 			$mountPoint = '/'.$uid.'/files'.$storage->getMountPoint();
 			$mountEntry = self::prepareMountPointEntry($storage, false);
 			foreach ($mountEntry['options'] as &$option) {
diff --git a/apps/files_external/tests/amazons3migration.php b/apps/files_external/tests/AmazonS3MigrationTest.php
similarity index 98%
rename from apps/files_external/tests/amazons3migration.php
rename to apps/files_external/tests/AmazonS3MigrationTest.php
index 614d6ca33dfa670dd8f490e6d318eaf144992e33..132d907ab14acd39c850d48bb89125927f1ff3f0 100644
--- a/apps/files_external/tests/amazons3migration.php
+++ b/apps/files_external/tests/AmazonS3MigrationTest.php
@@ -35,7 +35,7 @@ use OCA\Files_External\Lib\Storage\AmazonS3;
  *
  * @package OCA\Files_External\Tests
  */
-class AmazonS3Migration extends \Test\TestCase {
+class AmazonS3MigrationTest extends \Test\TestCase {
 
 	/**
 	 * @var \OC\Files\Storage\Storage instance
diff --git a/apps/files_external/tests/Command/CommandTest.php b/apps/files_external/tests/Command/CommandTest.php
index 73a1ea8315c87ef75e66b24130994ec6e4a23192..2283cf97ace233bc4ccca29276548aa34aeb254f 100644
--- a/apps/files_external/tests/Command/CommandTest.php
+++ b/apps/files_external/tests/Command/CommandTest.php
@@ -21,8 +21,8 @@
 
 namespace OCA\Files_External\Tests\Command;
 
-use OCA\Files_external\Lib\StorageConfig;
-use OCA\Files_external\NotFoundException;
+use OCA\Files_External\Lib\StorageConfig;
+use OCA\Files_External\NotFoundException;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\Input;
diff --git a/apps/files_external/tests/Command/ListCommandTest.php b/apps/files_external/tests/Command/ListCommandTest.php
index 1475249ae4327d507e395728e5e94907b5aab629..fee53c9f1438b5d0a8f050279bdee82d73d76fbc 100644
--- a/apps/files_external/tests/Command/ListCommandTest.php
+++ b/apps/files_external/tests/Command/ListCommandTest.php
@@ -26,7 +26,7 @@ use OCA\Files_External\Lib\Auth\NullMechanism;
 use OCA\Files_External\Lib\Auth\Password\Password;
 use OCA\Files_External\Lib\Auth\Password\SessionCredentials;
 use OCA\Files_External\Lib\Backend\Local;
-use OCA\Files_external\Lib\StorageConfig;
+use OCA\Files_External\Lib\StorageConfig;
 use Symfony\Component\Console\Output\BufferedOutput;
 
 class ListCommandTest extends CommandTest {
diff --git a/apps/files_external/tests/Controller/StoragesControllerTest.php b/apps/files_external/tests/Controller/StoragesControllerTest.php
index 81625fbbcb9fcd6f14ab83b1127ed08aae7a7745..4c3bd73fe4be678f6c9be0967e4b32c37fa7f302 100644
--- a/apps/files_external/tests/Controller/StoragesControllerTest.php
+++ b/apps/files_external/tests/Controller/StoragesControllerTest.php
@@ -25,8 +25,8 @@ use \OCP\AppFramework\Http;
 
 use \OCA\Files_External\Controller\GlobalStoragesController;
 use \OCA\Files_External\Service\GlobalStoragesService;
-use \OCA\Files_external\Lib\StorageConfig;
-use \OCA\Files_external\NotFoundException;
+use OCA\Files_External\Lib\StorageConfig;
+use OCA\Files_External\NotFoundException;
 
 abstract class StoragesControllerTest extends \Test\TestCase {
 
diff --git a/apps/files_external/tests/definitionparameterttest.php b/apps/files_external/tests/DefinitionParameterTest.php
similarity index 100%
rename from apps/files_external/tests/definitionparameterttest.php
rename to apps/files_external/tests/DefinitionParameterTest.php
diff --git a/apps/files_external/tests/frontenddefinitiontraittest.php b/apps/files_external/tests/FrontendDefinitionTraitTest.php
similarity index 100%
rename from apps/files_external/tests/frontenddefinitiontraittest.php
rename to apps/files_external/tests/FrontendDefinitionTraitTest.php
diff --git a/apps/files_external/tests/legacydependencycheckpolyfilltest.php b/apps/files_external/tests/LegacyDependencyCheckPolyfillTest.php
similarity index 100%
rename from apps/files_external/tests/legacydependencycheckpolyfilltest.php
rename to apps/files_external/tests/LegacyDependencyCheckPolyfillTest.php
diff --git a/apps/files_external/tests/owncloudfunctions.php b/apps/files_external/tests/OwnCloudFunctionsTest.php
similarity index 98%
rename from apps/files_external/tests/owncloudfunctions.php
rename to apps/files_external/tests/OwnCloudFunctionsTest.php
index 25aaa90d178b892063f646e739c71481a8734b47..41ae0421ebf686d42000fa61e81fcb40adec2d61 100644
--- a/apps/files_external/tests/owncloudfunctions.php
+++ b/apps/files_external/tests/OwnCloudFunctionsTest.php
@@ -32,7 +32,7 @@ namespace OCA\Files_External\Tests;
  *
  * @package OCA\Files_External\Tests
  */
-class OwnCloudFunctions extends \Test\TestCase {
+class OwnCloudFunctionsTest extends \Test\TestCase {
 
 	function configUrlProvider() {
 		return array(
diff --git a/apps/files_external/tests/personalmounttest.php b/apps/files_external/tests/PersonalMountTest.php
similarity index 97%
rename from apps/files_external/tests/personalmounttest.php
rename to apps/files_external/tests/PersonalMountTest.php
index d82773ad749b92d0aec6a7ede2c7c41e6c0dda08..8e8a299714f98f6b5c86d0b6412bb258a29ffd19 100644
--- a/apps/files_external/tests/personalmounttest.php
+++ b/apps/files_external/tests/PersonalMountTest.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace OCA\Files_external\Tests;
+namespace OCA\Files_External\Tests;
 
 use OC\Files\Mount\Manager;
 use OCA\Files_External\Lib\PersonalMount;
diff --git a/apps/files_external/tests/Service/StoragesServiceTest.php b/apps/files_external/tests/Service/StoragesServiceTest.php
index 7cc0d8fad93eee16ec87b03837f5458867ae307a..5d1094271e5a59ed510c1fde201f054535a85145 100644
--- a/apps/files_external/tests/Service/StoragesServiceTest.php
+++ b/apps/files_external/tests/Service/StoragesServiceTest.php
@@ -24,8 +24,8 @@ namespace OCA\Files_External\Tests\Service;
 
 use \OC\Files\Filesystem;
 
-use \OCA\Files_external\NotFoundException;
-use \OCA\Files_external\Lib\StorageConfig;
+use OCA\Files_External\NotFoundException;
+use OCA\Files_External\Lib\StorageConfig;
 use OCA\Files_External\Service\BackendService;
 use OCA\Files_External\Service\DBConfigService;
 use OCA\Files_External\Service\StoragesService;
@@ -241,7 +241,7 @@ abstract class StoragesServiceTest extends \Test\TestCase {
 
 
 	/**
-	 * @expectedException \OCA\Files_external\NotFoundException
+	 * @expectedException \OCA\Files_External\NotFoundException
 	 */
 	public function testNonExistingStorage() {
 		$backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB');
@@ -324,7 +324,7 @@ abstract class StoragesServiceTest extends \Test\TestCase {
 	}
 
 	/**
-	 * @expectedException \OCA\Files_external\NotFoundException
+	 * @expectedException \OCA\Files_External\NotFoundException
 	 */
 	public function testDeleteUnexistingStorage() {
 		$this->service->removeStorage(255);
diff --git a/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php b/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php
index 812c12392fc9ddc22b96ab001efdde4a5b71072c..4a03b6194e914c563154f0bca683efc530dbb277 100644
--- a/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php
+++ b/apps/files_external/tests/Service/UserGlobalStoragesServiceTest.php
@@ -22,7 +22,7 @@
  */
 namespace OCA\Files_External\Tests\Service;
 
-use OCA\Files_external\NotFoundException;
+use OCA\Files_External\NotFoundException;
 use OCA\Files_External\Service\StoragesService;
 use OCA\Files_External\Service\UserGlobalStoragesService;
 use OCP\IUser;
diff --git a/apps/files_external/tests/Service/UserStoragesServiceTest.php b/apps/files_external/tests/Service/UserStoragesServiceTest.php
index 21696878a01586b7d2f9f14624b7c8426c9fdcd8..6ae888d82742a9a3c11588bc7e8b2b501f995bde 100644
--- a/apps/files_external/tests/Service/UserStoragesServiceTest.php
+++ b/apps/files_external/tests/Service/UserStoragesServiceTest.php
@@ -27,7 +27,7 @@ use \OC\Files\Filesystem;
 use OCA\Files_External\Service\GlobalStoragesService;
 use OCA\Files_External\Service\StoragesService;
 use OCA\Files_External\Service\UserStoragesService;
-use \OCA\Files_external\Lib\StorageConfig;
+use OCA\Files_External\Lib\StorageConfig;
 use Test\Traits\UserTrait;
 
 /**
@@ -185,7 +185,7 @@ class UserStoragesServiceTest extends StoragesServiceTest {
 	}
 
 	/**
-	 * @expectedException \OCA\Files_external\NotFoundException
+	 * @expectedException \OCA\Files_External\NotFoundException
 	 */
 	public function testGetAdminStorage() {
 		$backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB');
@@ -200,7 +200,7 @@ class UserStoragesServiceTest extends StoragesServiceTest {
 
 		$newStorage = $this->globalStoragesService->addStorage($storage);
 
-		$this->assertInstanceOf('\OCA\Files_external\Lib\StorageConfig', $this->globalStoragesService->getStorage($newStorage->getId()));
+		$this->assertInstanceOf('\OCA\Files_External\Lib\StorageConfig', $this->globalStoragesService->getStorage($newStorage->getId()));
 
 		$this->service->getStorage($newStorage->getId());
 	}
diff --git a/apps/files_external/tests/storageconfigtest.php b/apps/files_external/tests/StorageConfigTest.php
similarity index 97%
rename from apps/files_external/tests/storageconfigtest.php
rename to apps/files_external/tests/StorageConfigTest.php
index 278c86d2cbe30468463c3011b4fc70d37630da29..a46ab14d84ba96763cf47e0560307d22fd0972cb 100644
--- a/apps/files_external/tests/storageconfigtest.php
+++ b/apps/files_external/tests/StorageConfigTest.php
@@ -21,9 +21,9 @@
  *
  */
 
-namespace OCA\Files_external\Tests;
+namespace OCA\Files_External\Tests;
 
-use \OCA\Files_external\Lib\StorageConfig;
+use OCA\Files_External\Lib\StorageConfig;
 
 class StorageConfigTest extends \Test\TestCase {