diff --git a/Controller/Backend/UserController.php b/Controller/Backend/UserController.php
index a6d9103..315c51d 100644
--- a/Controller/Backend/UserController.php
+++ b/Controller/Backend/UserController.php
@@ -25,7 +25,7 @@ class UserController extends Controller
     /**
      * @return EntityManager
      *
-     * @author fabricbe
+     * @author Fabrice Bernhard <fabriceb@theodo.fr>
      * @since 2011-07-08
      */
     public function getEntityManager()
@@ -38,7 +38,7 @@ public function getEntityManager()
     /**
      *
      * @return UserRepository
-     * @author fabricbe
+     * @author Fabrice Bernhard <fabriceb@theodo.fr>
      * @since 2011-07-08
      */
     public function getUserRepository()
diff --git a/Entity/Page.php b/Entity/Page.php
index d6d6bf6..b6bf6be 100644
--- a/Entity/Page.php
+++ b/Entity/Page.php
@@ -473,7 +473,7 @@ public function setLifetime($lifetime)
     /**
      * Get lifetime
      *
-     * @return integer 
+     * @return integer
      */
     public function getLifetime()
     {
@@ -499,7 +499,7 @@ public function setPublic($public)
     /**
      * Get public
      *
-     * @return boolean 
+     * @return boolean
      */
     public function getPublic()
     {
@@ -519,9 +519,9 @@ public function getContentSubtype()
 
         return $subtypes[$this->content_type];
     }
-    
+
     /**
-     * @author fabriceb
+     * @author Fabrice Bernhard <fabriceb@theodo.fr>
      * @since 2011-08-19
      */
     public function isHomepage()
@@ -553,7 +553,7 @@ public function setTitle($title)
     /**
      * Get title
      *
-     * @return string 
+     * @return string
      */
     public function getTitle()
     {
@@ -573,7 +573,7 @@ public function setKeywords($keywords)
     /**
      * Get keywords
      *
-     * @return text 
+     * @return text
      */
     public function getKeywords()
     {
diff --git a/Extensions/Twig/TwigCacheDatabase.php b/Extensions/Twig/TwigCacheDatabase.php
index d67bac4..95dc449 100644
--- a/Extensions/Twig/TwigCacheDatabase.php
+++ b/Extensions/Twig/TwigCacheDatabase.php
@@ -25,7 +25,7 @@ class TwigCacheDatabase
     /**
      *
      * @param Twig_Environment $twig_environment
-     * @author fabriceb
+     * @author Fabrice Bernhard <fabriceb@theodo.fr>
      * @since 2001-06-24
      */
     public function __construct(Twig_Environment $twig_environment)
@@ -36,7 +36,7 @@ public function __construct(Twig_Environment $twig_environment)
     /**
      *
      * @return Twig_Environment
-     * @author fabriceb
+     * @author Fabrice Bernhard <fabriceb@theodo.fr>
      * @since 2001-06-24
      */
     public function getTwigEnvironment()
@@ -47,7 +47,7 @@ public function getTwigEnvironment()
     /**
      *
      * @param Twig_Environment $twig_environment
-     * @author fabriceb
+     * @author Fabrice Bernhard <fabriceb@theodo.fr>
      * @since 2001-06-24
      */
     public function setTwigEnvironment(Twig_Environment $twig_environment)
@@ -58,7 +58,7 @@ public function setTwigEnvironment(Twig_Environment $twig_environment)
     /**
      *
      * @param string $name
-     * @author fabriceb
+     * @author Fabrice Bernhard <fabriceb@theodo.fr>
      * @since 2001-06-24
      */
     public function invalidate($name)
@@ -69,7 +69,7 @@ public function invalidate($name)
     /**
      *
      * @param string $name
-     * @author fabriceb
+     * @author Fabrice Bernhard <fabriceb@theodo.fr>
      * @since 2001-06-24
      */
     public function warmup($name/*, $ext*/)
diff --git a/Extensions/Twig/TwigLoaderRepository.php b/Extensions/Twig/TwigLoaderRepository.php
index 1a3b4db..1f60344 100644
--- a/Extensions/Twig/TwigLoaderRepository.php
+++ b/Extensions/Twig/TwigLoaderRepository.php
@@ -40,7 +40,7 @@ class TwigLoaderRepository implements Twig_LoaderInterface
      *
      * @param ContentRepositoryInterface $content_repository
      * @param Twig_LoaderInterface $fallback_loader
-     * @author fabriceb
+     * @author Fabrice Bernhard <fabriceb@theodo.fr>
      * @since 2001-06-22
      */
     public function __construct(ContentRepositoryInterface $content_repository, Twig_LoaderInterface $fallback_loader = null, $fallback_path = null)
@@ -63,7 +63,7 @@ public function __construct(ContentRepositoryInterface $content_repository, Twig
     /**
      *
      * @return EntityManager
-     * @author fabriceb
+     * @author Fabrice Bernhard <fabriceb@theodo.fr>
      * @since 2001-06-22
      */
     public function getContentRepository()
@@ -74,7 +74,7 @@ public function getContentRepository()
     /**
      *
      * @param ContentRepositoryInterface $content_repository
-     * @author fabriceb
+     * @author Fabrice Bernhard <fabriceb@theodo.fr>
      * @since 2001-06-22
      */
     public function setContentRepository(ContentRepositoryInterface $content_repository)
diff --git a/Repository/ContentEntityRepository.php b/Repository/ContentEntityRepository.php
index 61d5673..35fd1da 100644
--- a/Repository/ContentEntityRepository.php
+++ b/Repository/ContentEntityRepository.php
@@ -206,7 +206,7 @@ public function findAll($type = 'page')
      * @param string $type
      * @return EntityRepository
      *
-     * @author fabriceb
+     * @author Fabrice Bernhard <fabriceb@theodo.fr>
      * @since 2011-07-07
      */
     public function getRepository($type)
@@ -214,4 +214,4 @@ public function getRepository($type)
         return $this->getEntityManager()
                 ->getRepository('TheodoRogerCmsBundle:' . ucfirst($type));
     }
-}
\ No newline at end of file
+}
diff --git a/Tests/Extensions/Twig_Loader_RepositoryTest.php b/Tests/Extensions/TwigLoaderRepositoryTest.php
similarity index 97%
rename from Tests/Extensions/Twig_Loader_RepositoryTest.php
rename to Tests/Extensions/TwigLoaderRepositoryTest.php
index 7d9668d..807c603 100644
--- a/Tests/Extensions/Twig_Loader_RepositoryTest.php
+++ b/Tests/Extensions/TwigLoaderRepositoryTest.php
@@ -21,7 +21,7 @@
 use Theodo\RogerCmsBundle\Tests\Test as TestCase;
 use Theodo\RogerCmsBundle\Extensions\Twig\TwigLoaderRepository;
 
-class Twig_Loader_RepositoryTest extends TestCase
+class TwigLoaderRepositoryTest extends TestCase
 {
     /**
      * @var Theodo\RogerCmsBundle\Extensions\Twig\TwigLoaderRepository