diff --git a/src/PHPDraft/Core/TestBase.php b/src/PHPDraft/Core/BaseTest.php
similarity index 95%
rename from src/PHPDraft/Core/TestBase.php
rename to src/PHPDraft/Core/BaseTest.php
index a680a66a..f27d05f6 100644
--- a/src/PHPDraft/Core/TestBase.php
+++ b/src/PHPDraft/Core/BaseTest.php
@@ -12,7 +12,7 @@
 use PHPUnit_Framework_TestCase;
 use ReflectionClass;
 
-class TestBase extends PHPUnit_Framework_TestCase
+class BaseTest extends PHPUnit_Framework_TestCase
 {
     const FUNCTION_ID = '_phpdraftbu';
     /**
diff --git a/src/PHPDraft/In/Tests/ApibFileParserTest.php b/src/PHPDraft/In/Tests/ApibFileParserTest.php
index e8e64a4f..9d68a779 100644
--- a/src/PHPDraft/In/Tests/ApibFileParserTest.php
+++ b/src/PHPDraft/In/Tests/ApibFileParserTest.php
@@ -9,11 +9,11 @@
 namespace PHPDraft\In\Tests;
 
 
-use PHPDraft\Core\TestBase;
+use PHPDraft\Core\BaseTest;
 use PHPDraft\In\ApibFileParser;
 use ReflectionClass;
 
-class ApibFileParserTest extends TestBase
+class ApibFileParserTest extends BaseTest
 {
     public function setUp()
     {
diff --git a/src/PHPDraft/Model/Elements/Tests/ArrayStructureTest.php b/src/PHPDraft/Model/Elements/Tests/ArrayStructureTest.php
index 5d011ce8..8bf32180 100644
--- a/src/PHPDraft/Model/Elements/Tests/ArrayStructureTest.php
+++ b/src/PHPDraft/Model/Elements/Tests/ArrayStructureTest.php
@@ -9,10 +9,10 @@
 namespace PHPDraft\Model\Elements\Tests;
 
 
-use PHPDraft\Core\TestBase;
+use PHPDraft\Core\BaseTest;
 use PHPDraft\Model\Elements\ArrayStructureElement;
 
-class ArrayStructureTest extends TestBase
+class ArrayStructureTest extends BaseTest
 {
     public function setUp()
     {
diff --git a/src/PHPDraft/Model/Elements/Tests/DataStructureElementTest.php b/src/PHPDraft/Model/Elements/Tests/DataStructureElementTest.php
index efc95b39..db7bdd48 100644
--- a/src/PHPDraft/Model/Elements/Tests/DataStructureElementTest.php
+++ b/src/PHPDraft/Model/Elements/Tests/DataStructureElementTest.php
@@ -9,11 +9,11 @@
 namespace PHPDraft\Model\Tests;
 
 
-use PHPDraft\Core\TestBase;
+use PHPDraft\Core\BaseTest;
 use PHPDraft\Model\DataStructureElement;
 use ReflectionClass;
 
-class DataStructureElementTest extends TestBase
+class DataStructureElementTest extends BaseTest
 {
 
     public function setUp()
diff --git a/src/PHPDraft/Model/Elements/Tests/RequestBodyElementTest.php b/src/PHPDraft/Model/Elements/Tests/RequestBodyElementTest.php
index 99052009..789a3925 100644
--- a/src/PHPDraft/Model/Elements/Tests/RequestBodyElementTest.php
+++ b/src/PHPDraft/Model/Elements/Tests/RequestBodyElementTest.php
@@ -9,10 +9,10 @@
 namespace PHPDraft\Model\Elements\Tests;
 
 
-use PHPDraft\Core\TestBase;
+use PHPDraft\Core\BaseTest;
 use PHPDraft\Model\Elements\RequestBodyElement;
 
-class RequestBodyElementTest extends TestBase
+class RequestBodyElementTest extends BaseTest
 {
     public function setUp()
     {
diff --git a/src/PHPDraft/Model/Tests/CategoryTest.php b/src/PHPDraft/Model/Tests/CategoryTest.php
index 6fadbb05..eb46cba7 100644
--- a/src/PHPDraft/Model/Tests/CategoryTest.php
+++ b/src/PHPDraft/Model/Tests/CategoryTest.php
@@ -9,11 +9,11 @@
 namespace PHPDraft\Model\Tests;
 
 
-use PHPDraft\Core\TestBase;
+use PHPDraft\Core\BaseTest;
 use PHPDraft\Model\Category;
 use ReflectionClass;
 
-class CategoryTest extends TestBase
+class CategoryTest extends BaseTest
 {
     /**
      * Set up
diff --git a/src/PHPDraft/Model/Tests/HTTPRequestTest.php b/src/PHPDraft/Model/Tests/HTTPRequestTest.php
index a7917bc4..5f579017 100644
--- a/src/PHPDraft/Model/Tests/HTTPRequestTest.php
+++ b/src/PHPDraft/Model/Tests/HTTPRequestTest.php
@@ -9,12 +9,12 @@
 namespace PHPDraft\Model\Tests;
 
 
-use PHPDraft\Core\TestBase;
+use PHPDraft\Core\BaseTest;
 use PHPDraft\Model\HTTPRequest;
 use PHPDraft\Model\Transition;
 use ReflectionClass;
 
-class HTTPRequestTest extends TestBase
+class HTTPRequestTest extends BaseTest
 {
     /**
      * Set up
diff --git a/src/PHPDraft/Model/Tests/HTTPResponseTest.php b/src/PHPDraft/Model/Tests/HTTPResponseTest.php
index b2003025..6b7be051 100644
--- a/src/PHPDraft/Model/Tests/HTTPResponseTest.php
+++ b/src/PHPDraft/Model/Tests/HTTPResponseTest.php
@@ -9,11 +9,11 @@
 namespace PHPDraft\Model\Tests;
 
 
-use PHPDraft\Core\TestBase;
+use PHPDraft\Core\BaseTest;
 use PHPDraft\Model\HTTPResponse;
 use ReflectionClass;
 
-class HTTPResponseTest extends TestBase
+class HTTPResponseTest extends BaseTest
 {
     /**
      * Set up
diff --git a/src/PHPDraft/Model/Tests/HierarchyElementTest.php b/src/PHPDraft/Model/Tests/HierarchyElementTest.php
index b0a7369b..20c877c8 100644
--- a/src/PHPDraft/Model/Tests/HierarchyElementTest.php
+++ b/src/PHPDraft/Model/Tests/HierarchyElementTest.php
@@ -9,10 +9,10 @@
 namespace PHPDraft\Model\Tests;
 
 
-use PHPDraft\Core\TestBase;
+use PHPDraft\Core\BaseTest;
 use ReflectionClass;
 
-class HierarchyElementTest extends TestBase
+class HierarchyElementTest extends BaseTest
 {
     /**
      * Set up
diff --git a/src/PHPDraft/Model/Tests/ResourceTest.php b/src/PHPDraft/Model/Tests/ResourceTest.php
index b960ce60..d81f6dce 100644
--- a/src/PHPDraft/Model/Tests/ResourceTest.php
+++ b/src/PHPDraft/Model/Tests/ResourceTest.php
@@ -9,11 +9,11 @@
 namespace PHPDraft\Model\Tests;
 
 
-use PHPDraft\Core\TestBase;
+use PHPDraft\Core\BaseTest;
 use PHPDraft\Model\Resource;
 use ReflectionClass;
 
-class ResourceTest extends TestBase
+class ResourceTest extends BaseTest
 {
     /**
      * Set up
diff --git a/src/PHPDraft/Model/Tests/TransitionTest.php b/src/PHPDraft/Model/Tests/TransitionTest.php
index 417f6d40..43e69e93 100644
--- a/src/PHPDraft/Model/Tests/TransitionTest.php
+++ b/src/PHPDraft/Model/Tests/TransitionTest.php
@@ -9,11 +9,11 @@
 namespace PHPDraft\Model\Tests;
 
 
-use PHPDraft\Core\TestBase;
+use PHPDraft\Core\BaseTest;
 use PHPDraft\Model\Transition;
 use ReflectionClass;
 
-class TransitionTest extends TestBase
+class TransitionTest extends BaseTest
 {
     /**
      * Set up
diff --git a/src/PHPDraft/Out/Tests/TemplateGeneratorTest.php b/src/PHPDraft/Out/Tests/TemplateGeneratorTest.php
index 30015dfb..9118cff8 100644
--- a/src/PHPDraft/Out/Tests/TemplateGeneratorTest.php
+++ b/src/PHPDraft/Out/Tests/TemplateGeneratorTest.php
@@ -9,10 +9,10 @@
 namespace PHPDraft\Out\Tests;
 
 
-use PHPDraft\Core\TestBase;
+use PHPDraft\Core\BaseTest;
 use PHPDraft\Out\TemplateGenerator;
 
-class TemplateGeneratorTest extends TestBase
+class TemplateGeneratorTest extends BaseTest
 {
     public function setUp()
     {
diff --git a/src/PHPDraft/Out/Tests/UITest.php b/src/PHPDraft/Out/Tests/UITest.php
index 75861763..ff3db867 100644
--- a/src/PHPDraft/Out/Tests/UITest.php
+++ b/src/PHPDraft/Out/Tests/UITest.php
@@ -9,11 +9,11 @@
 namespace PHPDraft\Out\Tests;
 
 
-use PHPDraft\Core\TestBase;
+use PHPDraft\Core\BaseTest;
 use PHPDraft\Out\UI;
 use ReflectionClass;
 
-class UITest extends TestBase
+class UITest extends BaseTest
 {
     public function setUp()
     {
diff --git a/src/PHPDraft/Parse/Tests/DrafterTest.php b/src/PHPDraft/Parse/Tests/DrafterTest.php
index 0a928224..1109d81d 100644
--- a/src/PHPDraft/Parse/Tests/DrafterTest.php
+++ b/src/PHPDraft/Parse/Tests/DrafterTest.php
@@ -8,7 +8,7 @@
 
 namespace PHPDraft\Parse\Tests;
 
-use PHPDraft\Core\TestBase;
+use PHPDraft\Core\BaseTest;
 use PHPDraft\Parse\Drafter;
 use ReflectionClass;
 
@@ -16,7 +16,7 @@
  * Class DrafterTest
  * @covers PHPDraft\Parse\Drafter
  */
-class DrafterTest extends TestBase
+class DrafterTest extends BaseTest
 {
 
     /**