diff --git a/src/Config/AppDatabaseConfig.php b/src/Config/AppDatabaseConfig.php
index 4eaae91..a418026 100644
--- a/src/Config/AppDatabaseConfig.php
+++ b/src/Config/AppDatabaseConfig.php
@@ -54,14 +54,14 @@
 /**
  * @class AppDatabaseConfig
  * @package Platine\Framework\Config
- * @template TEntity as Configuration
+ * @template TDbConfigurationEntity as \Platine\Framework\Config\Model\Configuration
  * @implements ArrayAccess<string, mixed>
  */
 class AppDatabaseConfig implements ArrayAccess
 {
     /**
      * The configuration loader to use
-     * @var DatabaseConfigLoaderInterface<TEntity>
+     * @var DatabaseConfigLoaderInterface<TDbConfigurationEntity>
      */
     protected DatabaseConfigLoaderInterface $loader;
 
@@ -79,7 +79,7 @@ class AppDatabaseConfig implements ArrayAccess
 
     /**
      * Create new configuration instance
-     * @param DatabaseConfigLoaderInterface<TEntity> $loader the loader to use
+     * @param DatabaseConfigLoaderInterface<TDbConfigurationEntity> $loader the loader to use
      * @param string          $env    the name of the environment
      */
     public function __construct(DatabaseConfigLoaderInterface $loader, string $env = '')
@@ -183,7 +183,7 @@ public function setEnvironment(string $env): self
 
     /**
      * Return the configuration current loader
-     * @return DatabaseConfigLoaderInterface<TEntity>
+     * @return DatabaseConfigLoaderInterface<TDbConfigurationEntity>
      */
     public function getLoader(): DatabaseConfigLoaderInterface
     {
@@ -193,7 +193,7 @@ public function getLoader(): DatabaseConfigLoaderInterface
     /**
      * Set the configuration loader
      *
-     * @param DatabaseConfigLoaderInterface<TEntity> $loader
+     * @param DatabaseConfigLoaderInterface<TDbConfigurationEntity> $loader
      * @return $this
      */
     public function setLoader(DatabaseConfigLoaderInterface $loader): self
@@ -205,7 +205,7 @@ public function setLoader(DatabaseConfigLoaderInterface $loader): self
 
     /**
      * Return all the configuration
-     * @return TEntity[]
+     * @return TDbConfigurationEntity[]
      */
     public function all(): array
     {
diff --git a/src/Config/ConfigurationRepositoryInterface.php b/src/Config/ConfigurationRepositoryInterface.php
index 9c435fd..c2fa3ed 100644
--- a/src/Config/ConfigurationRepositoryInterface.php
+++ b/src/Config/ConfigurationRepositoryInterface.php
@@ -52,8 +52,8 @@
 /**
  * @class ConfigurationRepositoryInterface
  * @package Platine\Framework\Config
- * @template TEntity as \Platine\Orm\Entity
- * @extends RepositoryInterface<TEntity>
+ * @template TDbConfigurationEntity as \Platine\Orm\Entity
+ * @extends RepositoryInterface<TDbConfigurationEntity>
  */
 interface ConfigurationRepositoryInterface extends RepositoryInterface
 {
diff --git a/src/Config/DatabaseConfigLoaderInterface.php b/src/Config/DatabaseConfigLoaderInterface.php
index a6e9b08..173c6a8 100644
--- a/src/Config/DatabaseConfigLoaderInterface.php
+++ b/src/Config/DatabaseConfigLoaderInterface.php
@@ -53,14 +53,14 @@
 /**
  * @class DatabaseConfigLoaderInterface
  * @package Platine\Framework\Config
- * @template TEntity as Entity
+ * @template TDbConfigurationEntity as Entity
  */
 interface DatabaseConfigLoaderInterface extends LoaderInterface
 {
     /**
      * Load the configuration from database
      * @param array<string, mixed> $where
-     * @return TEntity|null
+     * @return TDbConfigurationEntity|null
      */
     public function loadConfig(array $where = []): ?Entity;
 
@@ -73,14 +73,14 @@ public function insertConfig(array $data);
 
     /**
      * Update the configuration
-     * @param TEntity $entity
+     * @param TDbConfigurationEntity $entity
      * @return bool
      */
     public function updateConfig(Entity $entity): bool;
 
     /**
      * Return all the configuration
-     * @return TEntity[]
+     * @return TDbConfigurationEntity[]
      */
     public function all(): array;
 }