diff --git a/tests/Alchemy/Tests/Phrasea/Authentication/PersistentCookie/ManagerTest.php b/tests/Alchemy/Tests/Phrasea/Authentication/PersistentCookie/ManagerTest.php
index 703ec509ff..63f64ffafc 100644
--- a/tests/Alchemy/Tests/Phrasea/Authentication/PersistentCookie/ManagerTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Authentication/PersistentCookie/ManagerTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Alchemy\Phrasea\Authentication\PersistentCookie;
+namespace Alchemy\Tests\Phrasea\Authentication\PersistentCookie;
 
 use Alchemy\Phrasea\Model\Entities\Session;
+use Alchemy\Phrasea\Authentication\PersistentCookie\Manager;
 
 class ManagerTest extends \PhraseanetTestCase
 {
diff --git a/tests/Alchemy/Tests/Phrasea/Authentication/Phrasea/FailureHandledNativeAuthenticationTest.php b/tests/Alchemy/Tests/Phrasea/Authentication/Phrasea/FailureHandledNativeAuthenticationTest.php
index a82c8a5519..f833a076ea 100644
--- a/tests/Alchemy/Tests/Phrasea/Authentication/Phrasea/FailureHandledNativeAuthenticationTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Authentication/Phrasea/FailureHandledNativeAuthenticationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Alchemy\Tests\Phrasea;
+namespace Alchemy\Tests\Phrasea\Authentication\Phrasea;
 
 use Alchemy\Phrasea\Authentication\Phrasea\FailureHandledNativeAuthentication;
 
diff --git a/tests/Alchemy/Tests/Phrasea/Authentication/Token/TokenValidatorTest.php b/tests/Alchemy/Tests/Phrasea/Authentication/Token/TokenValidatorTest.php
index 11c7db62b1..68ff2e5c4f 100644
--- a/tests/Alchemy/Tests/Phrasea/Authentication/Token/TokenValidatorTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Authentication/Token/TokenValidatorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Alchemy\Tests\Phrasea\Authentication;
+namespace Alchemy\Tests\Phrasea\Authentication\Token;
 
 use Alchemy\Phrasea\Authentication\Token\TokenValidator;
 
diff --git a/tests/Alchemy/Tests/Phrasea/Command/Compile/ConfigurationTest.php b/tests/Alchemy/Tests/Phrasea/Command/Compile/ConfigurationTest.php
index c35f160360..c948b2acd1 100644
--- a/tests/Alchemy/Tests/Phrasea/Command/Compile/ConfigurationTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Command/Compile/ConfigurationTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Command\Compile;
+namespace Alchemy\Tests\Phrasea\Command\Compile;
+
+use Alchemy\Phrasea\Command\Compile\Configuration;
 
 class ConfigurationTest extends \PhraseanetTestCase
 {
diff --git a/tests/Alchemy/Tests/Phrasea/Command/Setup/CheckEnvironmentTest.php b/tests/Alchemy/Tests/Phrasea/Command/Setup/CheckEnvironmentTest.php
index 2ac045368c..db29ded877 100644
--- a/tests/Alchemy/Tests/Phrasea/Command/Setup/CheckEnvironmentTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Command/Setup/CheckEnvironmentTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Alchemy\Tests\Phrasea\Command;
+namespace Alchemy\Tests\Phrasea\Command\Setup;
 
 use Alchemy\Phrasea\Command\Setup\CheckEnvironment;
 
diff --git a/tests/Alchemy/Tests/Phrasea/Command/Setup/InstallTest.php b/tests/Alchemy/Tests/Phrasea/Command/Setup/InstallTest.php
index c9dfc6eef2..24dcd99032 100644
--- a/tests/Alchemy/Tests/Phrasea/Command/Setup/InstallTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Command/Setup/InstallTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Alchemy\Tests\Phrasea\Command;
+namespace Alchemy\Tests\Phrasea\Command\Setup;
 
 use Alchemy\Phrasea\Command\Setup\Install;
 
diff --git a/tests/Alchemy/Tests/Phrasea/Core/Configuration/DisplaySettingServiceTest.php b/tests/Alchemy/Tests/Phrasea/Core/Configuration/DisplaySettingServiceTest.php
index 22ff8ddc51..229f2d9015 100644
--- a/tests/Alchemy/Tests/Phrasea/Core/Configuration/DisplaySettingServiceTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Core/Configuration/DisplaySettingServiceTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Alchemy\Tests\Phrasea\Configuration;
+namespace Alchemy\Tests\Phrasea\Core\Configuration;
 
 use Alchemy\Phrasea\Model\Entities\User;
 use Doctrine\Common\Collections\ArrayCollection;
diff --git a/tests/Alchemy/Tests/Phrasea/Model/Converter/BasketConverterTest.php b/tests/Alchemy/Tests/Phrasea/Model/Converter/BasketConverterTest.php
index 47a22975b9..cf3824e53d 100644
--- a/tests/Alchemy/Tests/Phrasea/Model/Converter/BasketConverterTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Model/Converter/BasketConverterTest.php
@@ -1,6 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Model\Converter;
+namespace Alchemy\Tests\Phrasea\Model\Converter;
+
+use Alchemy\Phrasea\Model\Converter\BasketConverter;
 
 class BasketConverterTest extends \PhraseanetTestCase
 {
diff --git a/tests/Alchemy/Tests/Phrasea/Model/Converter/TaskConverterTest.php b/tests/Alchemy/Tests/Phrasea/Model/Converter/TaskConverterTest.php
index 2b9a62f02c..b848e87faa 100644
--- a/tests/Alchemy/Tests/Phrasea/Model/Converter/TaskConverterTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Model/Converter/TaskConverterTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Model\Converter;
+namespace Alchemy\Tests\Phrasea\Model\Converter;
 
-use Alchemy\Phrasea\Model\Entities\Task;
+use Alchemy\Phrasea\Model\Converter\TaskConverter;
 
 class TaskConverterTest extends \PhraseanetTestCase
 {
diff --git a/tests/Alchemy/Tests/Phrasea/Model/Manager/UserManagerTest.php b/tests/Alchemy/Tests/Phrasea/Model/Manager/UserManagerTest.php
index 3dfbfa7384..a28bba1266 100644
--- a/tests/Alchemy/Tests/Phrasea/Model/Manager/UserManagerTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Model/Manager/UserManagerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Alchemy\Tests\Phrasea\Model\Manipulator;
+namespace Alchemy\Tests\Phrasea\Model\Manager;
 
 class UserManagerTest extends \PhraseanetTestCase
 {
diff --git a/tests/Alchemy/Tests/Phrasea/Plugin/Management/ComposerInstallerTest.php b/tests/Alchemy/Tests/Phrasea/Plugin/Management/ComposerInstallerTest.php
index 340b44e6c0..d26628acbe 100644
--- a/tests/Alchemy/Tests/Phrasea/Plugin/Management/ComposerInstallerTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Plugin/Management/ComposerInstallerTest.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace Alchemy\Phrasea\Plugin\Management;
+namespace Alchemy\Tests\Phrasea\Plugin\Management;
 
+use Alchemy\Phrasea\Plugin\Management\ComposerInstaller;
 use Alchemy\Phrasea\Utilities\ComposerSetup;
 use Guzzle\Http\Client as Guzzle;
 use Symfony\Component\Process\ExecutableFinder;
diff --git a/tests/Alchemy/Tests/Phrasea/TaskManager/NotifierTest.php b/tests/Alchemy/Tests/Phrasea/TaskManager/NotifierTest.php
index 5fd80bd124..5cde4c6b2d 100644
--- a/tests/Alchemy/Tests/Phrasea/TaskManager/NotifierTest.php
+++ b/tests/Alchemy/Tests/Phrasea/TaskManager/NotifierTest.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace Alchemy\Phrasea\TaskManager;
+namespace Alchemy\Tests\Phrasea\TaskManager;
 
 use Alchemy\TaskManager\TaskManager;
+use Alchemy\Phrasea\TaskManager\Notifier;
 
 class NotifierTest extends \PhraseanetTestCase
 {
diff --git a/tests/Alchemy/Tests/Phrasea/Utilities/Less/BuilderTest.php b/tests/Alchemy/Tests/Phrasea/Utilities/Less/BuilderTest.php
index 767097a297..f452fd0b35 100644
--- a/tests/Alchemy/Tests/Phrasea/Utilities/Less/BuilderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Utilities/Less/BuilderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Alchemy\Tests\Phrasea\Utilities\Compiler;
+namespace Alchemy\Tests\Phrasea\Utilities\Less;
 
 use Alchemy\Phrasea\Utilities\Less\Builder;
 
diff --git a/tests/Alchemy/Tests/Phrasea/Utilities/Less/CompilerTest.php b/tests/Alchemy/Tests/Phrasea/Utilities/Less/CompilerTest.php
index 30345009eb..62dea82fc6 100644
--- a/tests/Alchemy/Tests/Phrasea/Utilities/Less/CompilerTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Utilities/Less/CompilerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Alchemy\Tests\Phrasea\Utilities\Compiler;
+namespace Alchemy\Tests\Phrasea\Utilities\Less;
 
 use Alchemy\Phrasea\Utilities\Less\Compiler;
 use Alchemy\BinaryDriver\Exception\ExecutionFailureException;
diff --git a/tests/Alchemy/Tests/Phrasea/Vocabulary/ControlProvider/UserProviderTest.php b/tests/Alchemy/Tests/Phrasea/Vocabulary/ControlProvider/UserProviderTest.php
index 6154395a86..c9c1ecdc92 100644
--- a/tests/Alchemy/Tests/Phrasea/Vocabulary/ControlProvider/UserProviderTest.php
+++ b/tests/Alchemy/Tests/Phrasea/Vocabulary/ControlProvider/UserProviderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Alchemy\Tests\Phrasea\Vocabulary\ControllerProvider;
+namespace Alchemy\Tests\Phrasea\Vocabulary\ControlProvider;
 
 use Alchemy\Phrasea\Vocabulary\ControlProvider\UserProvider;
 
diff --git a/tests/classes/Bridge/Bridge_AccountSettingsTest.php b/tests/classes/Bridge/AccountSettingsTest.php
similarity index 100%
rename from tests/classes/Bridge/Bridge_AccountSettingsTest.php
rename to tests/classes/Bridge/AccountSettingsTest.php
diff --git a/tests/classes/Bridge/Bridge_AccountTest.php b/tests/classes/Bridge/AccountTest.php
similarity index 100%
rename from tests/classes/Bridge/Bridge_AccountTest.php
rename to tests/classes/Bridge/AccountTest.php
diff --git a/tests/classes/Bridge/Api/Bridge_Api_AbstractCollectionTest.php b/tests/classes/Bridge/Api/AbstractCollectionTest.php
similarity index 100%
rename from tests/classes/Bridge/Api/Bridge_Api_AbstractCollectionTest.php
rename to tests/classes/Bridge/Api/AbstractCollectionTest.php
diff --git a/tests/classes/Bridge/Api/Bridge_Api_AbstractTest.php b/tests/classes/Bridge/Api/AbstractTest.php
similarity index 100%
rename from tests/classes/Bridge/Api/Bridge_Api_AbstractTest.php
rename to tests/classes/Bridge/Api/AbstractTest.php
diff --git a/tests/classes/Bridge/Api/Auth/Bridge_Api_Auth_AbstractTest.php b/tests/classes/Bridge/Api/Auth/AbstractTest.php
similarity index 100%
rename from tests/classes/Bridge/Api/Auth/Bridge_Api_Auth_AbstractTest.php
rename to tests/classes/Bridge/Api/Auth/AbstractTest.php
diff --git a/tests/classes/Bridge/Api/Auth/Bridge_Api_Auth_FlickrTest.php b/tests/classes/Bridge/Api/Auth/FlickrTest.php
similarity index 100%
rename from tests/classes/Bridge/Api/Auth/Bridge_Api_Auth_FlickrTest.php
rename to tests/classes/Bridge/Api/Auth/FlickrTest.php
diff --git a/tests/classes/Bridge/Api/Auth/Bridge_Api_Auth_OAuth2Test.php b/tests/classes/Bridge/Api/Auth/OAuth2Test.php
similarity index 100%
rename from tests/classes/Bridge/Api/Auth/Bridge_Api_Auth_OAuth2Test.php
rename to tests/classes/Bridge/Api/Auth/OAuth2Test.php
diff --git a/tests/classes/Bridge/Api/Bridge_Api_ContainerCollectionTest.php b/tests/classes/Bridge/Api/ContainerCollectionTest.php
similarity index 100%
rename from tests/classes/Bridge/Api/Bridge_Api_ContainerCollectionTest.php
rename to tests/classes/Bridge/Api/ContainerCollectionTest.php
diff --git a/tests/classes/Bridge/Api/Dailymotion/Bridge_Api_Dailymotion_ContainerTest.php b/tests/classes/Bridge/Api/Dailymotion/ContainerTest.php
similarity index 100%
rename from tests/classes/Bridge/Api/Dailymotion/Bridge_Api_Dailymotion_ContainerTest.php
rename to tests/classes/Bridge/Api/Dailymotion/ContainerTest.php
diff --git a/tests/classes/Bridge/Api/Dailymotion/Bridge_Api_Dailymotion_ElementTest.php b/tests/classes/Bridge/Api/Dailymotion/ElementTest.php
similarity index 100%
rename from tests/classes/Bridge/Api/Dailymotion/Bridge_Api_Dailymotion_ElementTest.php
rename to tests/classes/Bridge/Api/Dailymotion/ElementTest.php
diff --git a/tests/classes/Bridge/Api/Bridge_Api_ElementCollectionTest.php b/tests/classes/Bridge/Api/ElementCollectionTest.php
similarity index 100%
rename from tests/classes/Bridge/Api/Bridge_Api_ElementCollectionTest.php
rename to tests/classes/Bridge/Api/ElementCollectionTest.php
diff --git a/tests/classes/Bridge/Api/Flickr/Bridge_Api_Flickr_ContainerTest.php b/tests/classes/Bridge/Api/Flickr/ContainerTest.php
similarity index 100%
rename from tests/classes/Bridge/Api/Flickr/Bridge_Api_Flickr_ContainerTest.php
rename to tests/classes/Bridge/Api/Flickr/ContainerTest.php
diff --git a/tests/classes/Bridge/Api/Flickr/Bridge_Api_Flickr_ElementTest.php b/tests/classes/Bridge/Api/Flickr/ElementTest.php
similarity index 100%
rename from tests/classes/Bridge/Api/Flickr/Bridge_Api_Flickr_ElementTest.php
rename to tests/classes/Bridge/Api/Flickr/ElementTest.php
diff --git a/tests/classes/Bridge/Api/Youtube/Bridge_Api_Youtube_ContainerTest.php b/tests/classes/Bridge/Api/Youtube/ContainerTest.php
similarity index 100%
rename from tests/classes/Bridge/Api/Youtube/Bridge_Api_Youtube_ContainerTest.php
rename to tests/classes/Bridge/Api/Youtube/ContainerTest.php
diff --git a/tests/classes/Bridge/Api/Youtube/Bridge_Api_Youtube_ElementTest.php b/tests/classes/Bridge/Api/Youtube/ElementTest.php
similarity index 100%
rename from tests/classes/Bridge/Api/Youtube/Bridge_Api_Youtube_ElementTest.php
rename to tests/classes/Bridge/Api/Youtube/ElementTest.php
diff --git a/tests/classes/Bridge/Bridge_ApiTest.php b/tests/classes/Bridge/ApiTest.php
similarity index 100%
rename from tests/classes/Bridge/Bridge_ApiTest.php
rename to tests/classes/Bridge/ApiTest.php
diff --git a/tests/classes/Bridge/Bridge_ElementTest.php b/tests/classes/Bridge/ElementTest.php
similarity index 100%
rename from tests/classes/Bridge/Bridge_ElementTest.php
rename to tests/classes/Bridge/ElementTest.php
diff --git a/tests/classes/Session/Session_LoggerTest.php b/tests/classes/Session/LoggerTest.php
similarity index 100%
rename from tests/classes/Session/Session_LoggerTest.php
rename to tests/classes/Session/LoggerTest.php
diff --git a/tests/classes/Setup/Setup_UpgradeTest.php b/tests/classes/Setup/UpgradeTest.php
similarity index 100%
rename from tests/classes/Setup/Setup_UpgradeTest.php
rename to tests/classes/Setup/UpgradeTest.php
diff --git a/tests/classes/api/oauthv2/api_oauthv2_AccountTest.php b/tests/classes/api/oauthv2/AccountTest.php
similarity index 96%
rename from tests/classes/api/oauthv2/api_oauthv2_AccountTest.php
rename to tests/classes/api/oauthv2/AccountTest.php
index c6396a3d04..17a3ab3002 100644
--- a/tests/classes/api/oauthv2/api_oauthv2_AccountTest.php
+++ b/tests/classes/api/oauthv2/AccountTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class API_OAuth2_AccountTest extends \PhraseanetTestCase
+class api_oauthv2_AccountTest extends \PhraseanetTestCase
 {
     /**
      * @var API_OAuth2_Account
diff --git a/tests/classes/api/oauthv2/api_oauthv2_ApplicationTest.php b/tests/classes/api/oauthv2/ApplicationTest.php
similarity index 98%
rename from tests/classes/api/oauthv2/api_oauthv2_ApplicationTest.php
rename to tests/classes/api/oauthv2/ApplicationTest.php
index 64f8e53be6..3a6db61ec8 100644
--- a/tests/classes/api/oauthv2/api_oauthv2_ApplicationTest.php
+++ b/tests/classes/api/oauthv2/ApplicationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class API_OAuth2_ApplicationTest extends \PhraseanetTestCase
+class api_oauthv2_ApplicationTest extends \PhraseanetTestCase
 {
     public function testLoad_from_client_id()
     {
diff --git a/tests/classes/api/oauthv2/API_OAuth2_AuthCodeTest.php b/tests/classes/api/oauthv2/AuthCodeTest.php
similarity index 97%
rename from tests/classes/api/oauthv2/API_OAuth2_AuthCodeTest.php
rename to tests/classes/api/oauthv2/AuthCodeTest.php
index 2a400db8e8..cf2e924118 100644
--- a/tests/classes/api/oauthv2/API_OAuth2_AuthCodeTest.php
+++ b/tests/classes/api/oauthv2/AuthCodeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class API_OAuth2_AuthCodeTest extends \PhraseanetTestCase
+class api_oauthv2_AuthCodeTest extends \PhraseanetTestCase
 {
     /**
      * @var API_OAuth2_AuthCode
diff --git a/tests/classes/api/oauthv2/API_OAuth2_RefreshTokenTest.php b/tests/classes/api/oauthv2/RefreshTokenTest.php
similarity index 97%
rename from tests/classes/api/oauthv2/API_OAuth2_RefreshTokenTest.php
rename to tests/classes/api/oauthv2/RefreshTokenTest.php
index 3c88e301bd..ea45aeca9a 100644
--- a/tests/classes/api/oauthv2/API_OAuth2_RefreshTokenTest.php
+++ b/tests/classes/api/oauthv2/RefreshTokenTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class API_OAuth2_RefreshTokenTest extends \PhraseanetTestCase
+class api_oauthv2_RefreshTokenTest extends \PhraseanetTestCase
 {
     /**
      * @var API_OAuth2_RefreshToken
diff --git a/tests/classes/api/oauthv2/api_oauthv2_TokenTest.php b/tests/classes/api/oauthv2/TokenTest.php
similarity index 98%
rename from tests/classes/api/oauthv2/api_oauthv2_TokenTest.php
rename to tests/classes/api/oauthv2/TokenTest.php
index 07cbe89d72..44eb258fdf 100644
--- a/tests/classes/api/oauthv2/api_oauthv2_TokenTest.php
+++ b/tests/classes/api/oauthv2/TokenTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class API_OAuth2_TokenTest extends \PhraseanetTestCase
+class api_oauthv2_TokenTest extends \PhraseanetTestCase
 {
     /**
      * @var API_OAuth2_Token
diff --git a/tests/classes/api/v1/api_v1_TimerTest.php b/tests/classes/api/v1/TimerTest.php
similarity index 96%
rename from tests/classes/api/v1/api_v1_TimerTest.php
rename to tests/classes/api/v1/TimerTest.php
index ae391cef9b..567e22416a 100644
--- a/tests/classes/api/v1/api_v1_TimerTest.php
+++ b/tests/classes/api/v1/TimerTest.php
@@ -3,7 +3,7 @@
 use Alchemy\Phrasea\Core\PhraseaEvents;
 use Symfony\Component\EventDispatcher\Event;
 
-class API_V1_TimerTest extends \PhraseanetTestCase
+class api_v1_TimerTest extends \PhraseanetTestCase
 {
     public function testRegister()
     {
diff --git a/tests/classes/api/v1/api_v1_adapterTest.php b/tests/classes/api/v1/adapterTest.php
similarity index 99%
rename from tests/classes/api/v1/api_v1_adapterTest.php
rename to tests/classes/api/v1/adapterTest.php
index 576339dab0..0dec40cefa 100644
--- a/tests/classes/api/v1/api_v1_adapterTest.php
+++ b/tests/classes/api/v1/adapterTest.php
@@ -3,7 +3,7 @@
 use Alchemy\Phrasea\Border\File as BorderFile;
 use Symfony\Component\HttpFoundation\Request;
 
-class API_V1_adapterTest extends \PhraseanetAuthenticatedTestCase
+class api_v1_adapterTest extends \PhraseanetAuthenticatedTestCase
 {
     /**
      * @var API_V1_adapter
diff --git a/tests/classes/api/v1/api_v1_resultTest.php b/tests/classes/api/v1/resultTest.php
similarity index 99%
rename from tests/classes/api/v1/api_v1_resultTest.php
rename to tests/classes/api/v1/resultTest.php
index 42823c6522..168327f126 100644
--- a/tests/classes/api/v1/api_v1_resultTest.php
+++ b/tests/classes/api/v1/resultTest.php
@@ -4,7 +4,7 @@ require_once __DIR__ . '/../../../../vendor/alchemy/oauth2php/lib/OAuth2.php';
 
 use Symfony\Component\HttpFoundation\Request;
 
-class API_V1_resultTest extends \PhraseanetAuthenticatedTestCase
+class api_v1_resultTest extends \PhraseanetAuthenticatedTestCase
 {
     /**
      * @var API_V1_result
diff --git a/tests/classes/caption/caption_fieldTest.php b/tests/classes/caption/fieldTest.php
similarity index 100%
rename from tests/classes/caption/caption_fieldTest.php
rename to tests/classes/caption/fieldTest.php
diff --git a/tests/classes/caption/caption_recordTest.php b/tests/classes/caption/recordTest.php
similarity index 100%
rename from tests/classes/caption/caption_recordTest.php
rename to tests/classes/caption/recordTest.php
diff --git a/tests/classes/databox/Field/DCES/databox_Field_DCES_ContributorTest.php b/tests/classes/databox/Field/DCES/ContributorTest.php
similarity index 100%
rename from tests/classes/databox/Field/DCES/databox_Field_DCES_ContributorTest.php
rename to tests/classes/databox/Field/DCES/ContributorTest.php
diff --git a/tests/classes/databox/Field/DCES/databox_Field_DCES_CoverageTest.php b/tests/classes/databox/Field/DCES/CoverageTest.php
similarity index 100%
rename from tests/classes/databox/Field/DCES/databox_Field_DCES_CoverageTest.php
rename to tests/classes/databox/Field/DCES/CoverageTest.php
diff --git a/tests/classes/databox/Field/DCES/databox_Field_DCES_CreatorTest.php b/tests/classes/databox/Field/DCES/CreatorTest.php
similarity index 100%
rename from tests/classes/databox/Field/DCES/databox_Field_DCES_CreatorTest.php
rename to tests/classes/databox/Field/DCES/CreatorTest.php
diff --git a/tests/classes/databox/Field/DCES/databox_Field_DCES_DateTest.php b/tests/classes/databox/Field/DCES/DateTest.php
similarity index 100%
rename from tests/classes/databox/Field/DCES/databox_Field_DCES_DateTest.php
rename to tests/classes/databox/Field/DCES/DateTest.php
diff --git a/tests/classes/databox/Field/DCES/databox_Field_DCES_DescriptionTest.php b/tests/classes/databox/Field/DCES/DescriptionTest.php
similarity index 100%
rename from tests/classes/databox/Field/DCES/databox_Field_DCES_DescriptionTest.php
rename to tests/classes/databox/Field/DCES/DescriptionTest.php
diff --git a/tests/classes/databox/Field/DCES/databox_Field_DCES_FormatTest.php b/tests/classes/databox/Field/DCES/FormatTest.php
similarity index 100%
rename from tests/classes/databox/Field/DCES/databox_Field_DCES_FormatTest.php
rename to tests/classes/databox/Field/DCES/FormatTest.php
diff --git a/tests/classes/databox/Field/DCES/databox_Field_DCES_IdentifierTest.php b/tests/classes/databox/Field/DCES/IdentifierTest.php
similarity index 100%
rename from tests/classes/databox/Field/DCES/databox_Field_DCES_IdentifierTest.php
rename to tests/classes/databox/Field/DCES/IdentifierTest.php
diff --git a/tests/classes/databox/Field/DCES/databox_Field_DCES_LanguageTest.php b/tests/classes/databox/Field/DCES/LanguageTest.php
similarity index 100%
rename from tests/classes/databox/Field/DCES/databox_Field_DCES_LanguageTest.php
rename to tests/classes/databox/Field/DCES/LanguageTest.php
diff --git a/tests/classes/databox/Field/DCES/databox_Field_DCES_PublisherTest.php b/tests/classes/databox/Field/DCES/PublisherTest.php
similarity index 100%
rename from tests/classes/databox/Field/DCES/databox_Field_DCES_PublisherTest.php
rename to tests/classes/databox/Field/DCES/PublisherTest.php
diff --git a/tests/classes/databox/Field/DCES/databox_Field_DCES_RelationTest.php b/tests/classes/databox/Field/DCES/RelationTest.php
similarity index 100%
rename from tests/classes/databox/Field/DCES/databox_Field_DCES_RelationTest.php
rename to tests/classes/databox/Field/DCES/RelationTest.php
diff --git a/tests/classes/databox/Field/DCES/databox_Field_DCES_RightsTest.php b/tests/classes/databox/Field/DCES/RightsTest.php
similarity index 100%
rename from tests/classes/databox/Field/DCES/databox_Field_DCES_RightsTest.php
rename to tests/classes/databox/Field/DCES/RightsTest.php
diff --git a/tests/classes/databox/Field/DCES/databox_Field_DCES_SourceTest.php b/tests/classes/databox/Field/DCES/SourceTest.php
similarity index 100%
rename from tests/classes/databox/Field/DCES/databox_Field_DCES_SourceTest.php
rename to tests/classes/databox/Field/DCES/SourceTest.php
diff --git a/tests/classes/databox/Field/DCES/databox_Field_DCES_SubjectTest.php b/tests/classes/databox/Field/DCES/SubjectTest.php
similarity index 100%
rename from tests/classes/databox/Field/DCES/databox_Field_DCES_SubjectTest.php
rename to tests/classes/databox/Field/DCES/SubjectTest.php
diff --git a/tests/classes/databox/Field/DCES/databox_Field_DCES_TitleTest.php b/tests/classes/databox/Field/DCES/TitleTest.php
similarity index 100%
rename from tests/classes/databox/Field/DCES/databox_Field_DCES_TitleTest.php
rename to tests/classes/databox/Field/DCES/TitleTest.php
diff --git a/tests/classes/databox/Field/DCES/databox_Field_DCES_TypeTest.php b/tests/classes/databox/Field/DCES/TypeTest.php
similarity index 100%
rename from tests/classes/databox/Field/DCES/databox_Field_DCES_TypeTest.php
rename to tests/classes/databox/Field/DCES/TypeTest.php
diff --git a/tests/classes/databox/databox_descriptionStructureTest.php b/tests/classes/databox/descriptionStructureTest.php
similarity index 100%
rename from tests/classes/databox/databox_descriptionStructureTest.php
rename to tests/classes/databox/descriptionStructureTest.php
diff --git a/tests/classes/databox/databox_fieldTest.php b/tests/classes/databox/fieldTest.php
similarity index 100%
rename from tests/classes/databox/databox_fieldTest.php
rename to tests/classes/databox/fieldTest.php
diff --git a/tests/classes/databox/databox_statusTest.php b/tests/classes/databox/statusTest.php
similarity index 100%
rename from tests/classes/databox/databox_statusTest.php
rename to tests/classes/databox/statusTest.php
diff --git a/tests/classes/databox/databox_subdefTest.php b/tests/classes/databox/subdefTest.php
similarity index 100%
rename from tests/classes/databox/databox_subdefTest.php
rename to tests/classes/databox/subdefTest.php
diff --git a/tests/classes/media/Permalink/media_Permalink_AdapterTest.php b/tests/classes/media/Permalink/AdapterTest.php
similarity index 100%
rename from tests/classes/media/Permalink/media_Permalink_AdapterTest.php
rename to tests/classes/media/Permalink/AdapterTest.php
diff --git a/tests/classes/media/media_subdefTest.php b/tests/classes/media/subdefTest.php
similarity index 100%
rename from tests/classes/media/media_subdefTest.php
rename to tests/classes/media/subdefTest.php
diff --git a/tests/classes/module/console/module_console_aboutAuthorsTest.php b/tests/classes/module/console/aboutAuthorsTest.php
similarity index 100%
rename from tests/classes/module/console/module_console_aboutAuthorsTest.php
rename to tests/classes/module/console/aboutAuthorsTest.php
diff --git a/tests/classes/module/console/module_console_aboutLicenseTest.php b/tests/classes/module/console/aboutLicenseTest.php
similarity index 100%
rename from tests/classes/module/console/module_console_aboutLicenseTest.php
rename to tests/classes/module/console/aboutLicenseTest.php
diff --git a/tests/classes/module/console/module_console_systemTemplateGeneratorTest.php b/tests/classes/module/console/systemTemplateGeneratorTest.php
similarity index 100%
rename from tests/classes/module/console/module_console_systemTemplateGeneratorTest.php
rename to tests/classes/module/console/systemTemplateGeneratorTest.php
diff --git a/tests/classes/report/activityTest.php b/tests/classes/report/activityTest.php
index 2617060aed..3b99f9073b 100644
--- a/tests/classes/report/activityTest.php
+++ b/tests/classes/report/activityTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class activityTest extends \PhraseanetAuthenticatedTestCase
+class report_activityTest extends \PhraseanetAuthenticatedTestCase
 {
     protected $ret;
     protected $dmin;
diff --git a/tests/classes/report/addTest.php b/tests/classes/report/addTest.php
index 863676f8b6..c1baeecc4b 100644
--- a/tests/classes/report/addTest.php
+++ b/tests/classes/report/addTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class addReportTest extends \PhraseanetAuthenticatedTestCase
+class report_addTest extends \PhraseanetAuthenticatedTestCase
 {
     protected $ret;
     protected $dmin;
diff --git a/tests/classes/report/connexionReportTest.php b/tests/classes/report/connexionReportTest.php
index bd2f5b8b25..655299aaa1 100644
--- a/tests/classes/report/connexionReportTest.php
+++ b/tests/classes/report/connexionReportTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class connexionReportTest extends \PhraseanetAuthenticatedTestCase
+class report_connexionReportTest extends \PhraseanetAuthenticatedTestCase
 {
     protected $ret;
     protected $dmin;
diff --git a/tests/classes/report/dashboardTest.php b/tests/classes/report/dashboardTest.php
index 9a02ca1d42..7889e28069 100644
--- a/tests/classes/report/dashboardTest.php
+++ b/tests/classes/report/dashboardTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class dashboardTest extends \PhraseanetAuthenticatedTestCase
+class report_dashboardTest extends \PhraseanetAuthenticatedTestCase
 {
     protected $dashboard;
 
diff --git a/tests/classes/report/downloadReportTest.php b/tests/classes/report/downloadReportTest.php
index 7720519476..79ac1d485e 100644
--- a/tests/classes/report/downloadReportTest.php
+++ b/tests/classes/report/downloadReportTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class downloadReportTest extends \PhraseanetAuthenticatedTestCase
+class report_downloadReportTest extends \PhraseanetAuthenticatedTestCase
 {
     protected $ret;
     protected $dmin;
diff --git a/tests/classes/report/editTest.php b/tests/classes/report/editTest.php
index 48184fdf8d..2adb51b021 100644
--- a/tests/classes/report/editTest.php
+++ b/tests/classes/report/editTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class editTest extends \PhraseanetAuthenticatedTestCase
+class report_editTest extends \PhraseanetAuthenticatedTestCase
 {
     protected $ret;
     protected $dmin;
diff --git a/tests/classes/report/filterTest.php b/tests/classes/report/filterTest.php
index 194c8d0f5e..c208d8adf3 100644
--- a/tests/classes/report/filterTest.php
+++ b/tests/classes/report/filterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class filterTest extends \PhraseanetAuthenticatedTestCase
+class report_filterTest extends \PhraseanetAuthenticatedTestCase
 {
     protected $ret;
     protected $dmin;
diff --git a/tests/classes/report/pushTest.php b/tests/classes/report/pushTest.php
index 7604887c39..1f32b5caf4 100644
--- a/tests/classes/report/pushTest.php
+++ b/tests/classes/report/pushTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class pushReportTest extends \PhraseanetAuthenticatedTestCase
+class report_pushTest extends \PhraseanetAuthenticatedTestCase
 {
     protected $ret;
     protected $dmin;
diff --git a/tests/classes/report/questionReportTest.php b/tests/classes/report/questionReportTest.php
index 1ea48a0fd8..6f0bc3f160 100644
--- a/tests/classes/report/questionReportTest.php
+++ b/tests/classes/report/questionReportTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class questionReportTest extends \PhraseanetAuthenticatedTestCase
+class report_questionReportTest extends \PhraseanetAuthenticatedTestCase
 {
     protected $ret;
     protected $dmin;
diff --git a/tests/classes/report/reportTest.php b/tests/classes/report/reportTest.php
index df2d32f19f..2c333ba6c1 100644
--- a/tests/classes/report/reportTest.php
+++ b/tests/classes/report/reportTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class reportTest extends \PhraseanetAuthenticatedTestCase
+class report_reportTest extends \PhraseanetAuthenticatedTestCase
 {
     protected $ret;
     protected $dmin;
diff --git a/tests/classes/report/sentTest.php b/tests/classes/report/sentTest.php
index 23e8aff9fd..7d8d43e70a 100644
--- a/tests/classes/report/sentTest.php
+++ b/tests/classes/report/sentTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class sentReportTest extends \PhraseanetAuthenticatedTestCase
+class report_sentTest extends \PhraseanetAuthenticatedTestCase
 {
     protected $ret;
     protected $dmin;
diff --git a/tests/classes/report/sqlActionTest.php b/tests/classes/report/sqlActionTest.php
index 4664e5b45b..557dc20bcd 100644
--- a/tests/classes/report/sqlActionTest.php
+++ b/tests/classes/report/sqlActionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class sqlActionTest extends \PhraseanetAuthenticatedTestCase
+class report_sqlActionTest extends \PhraseanetAuthenticatedTestCase
 {
     protected $action;
     protected $mock;
diff --git a/tests/classes/report/sqlFilterTest.php b/tests/classes/report/sqlFilterTest.php
index d154ab4911..1f7bf775ed 100644
--- a/tests/classes/report/sqlFilterTest.php
+++ b/tests/classes/report/sqlFilterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class sqlFilterTest extends \PhraseanetAuthenticatedTestCase
+class report_sqlFilterTest extends \PhraseanetAuthenticatedTestCase
 {
     /**
      *
diff --git a/tests/classes/report/sqlTest.php b/tests/classes/report/sqlTest.php
index 6c27395b32..56bb099eaa 100644
--- a/tests/classes/report/sqlTest.php
+++ b/tests/classes/report/sqlTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class sqlTest extends \PhraseanetAuthenticatedTestCase
+class report_sqlTest extends \PhraseanetAuthenticatedTestCase
 {
 
     public function setUp()
diff --git a/tests/classes/system/system_serverTest.php b/tests/classes/system/serverTest.php
similarity index 100%
rename from tests/classes/system/system_serverTest.php
rename to tests/classes/system/serverTest.php