diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml
index fed127847..2da8a3eea 100755
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -47,8 +47,8 @@
 
         <form name="thelia.cart.add" class="Thelia\Form\CartAdd"/>
 
-        <form name="thelia.admin.variable.creation" class="Thelia\Form\VariableCreationForm"/>
-        <form name="thelia.admin.variable.modification" class="Thelia\Form\VariableModificationForm"/>
+        <form name="thelia.admin.config.creation" class="Thelia\Form\ConfigCreationForm"/>
+        <form name="thelia.admin.config.modification" class="Thelia\Form\ConfigModificationForm"/>
     </forms>
 
 
diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml
index 8c790cd02..67bd55b30 100755
--- a/core/lib/Thelia/Config/Resources/routing/admin.xml
+++ b/core/lib/Thelia/Config/Resources/routing/admin.xml
@@ -38,27 +38,27 @@
     <!-- Routes to the Config (system variables) controller -->
 
     <route id="admin.configuration.variables.default" path="/admin/configuration/variables">
-        <default key="_controller">Thelia\Controller\Admin\VariablesController::defaultAction</default>
+        <default key="_controller">Thelia\Controller\Admin\ConfigController::defaultAction</default>
     </route>
 
     <route id="admin.configuration.variables.change-values" path="/admin/configuration/variables/change-values">
-        <default key="_controller">Thelia\Controller\Admin\VariablesController::changeValuesAction</default>
+        <default key="_controller">Thelia\Controller\Admin\ConfigController::changeValuesAction</default>
     </route>
 
     <route id="admin.configuration.variables.create" path="/admin/configuration/variables/create">
-        <default key="_controller">Thelia\Controller\Admin\VariablesController::createAction</default>
+        <default key="_controller">Thelia\Controller\Admin\ConfigController::createAction</default>
     </route>
 
     <route id="admin.configuration.variables.change" path="/admin/configuration/variables/change">
-        <default key="_controller">Thelia\Controller\Admin\VariablesController::changeAction</default>
+        <default key="_controller">Thelia\Controller\Admin\ConfigController::changeAction</default>
     </route>
 
     <route id="admin.configuration.variables.save-change" path="/admin/configuration/variables/save-change">
-        <default key="_controller">Thelia\Controller\Admin\VariablesController::saveChangeAction</default>
+        <default key="_controller">Thelia\Controller\Admin\ConfigController::saveChangeAction</default>
     </route>
 
     <route id="admin.configuration.variables.delete" path="/admin/configuration/variables/delete">
-        <default key="_controller">Thelia\Controller\Admin\VariablesController::deleteAction</default>
+        <default key="_controller">Thelia\Controller\Admin\ConfigController::deleteAction</default>
     </route>
 
 
diff --git a/core/lib/Thelia/Controller/Admin/VariablesController.php b/core/lib/Thelia/Controller/Admin/ConfigController.php
similarity index 96%
rename from core/lib/Thelia/Controller/Admin/VariablesController.php
rename to core/lib/Thelia/Controller/Admin/ConfigController.php
index 89e9fb326..ab6327e0e 100644
--- a/core/lib/Thelia/Controller/Admin/VariablesController.php
+++ b/core/lib/Thelia/Controller/Admin/ConfigController.php
@@ -27,20 +27,20 @@ use Thelia\Core\Event\ConfigDeleteEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Tools\URL;
 use Thelia\Core\Event\ConfigChangeEvent;
-use Thelia\Form\VariableCreationForm;
 use Thelia\Core\Event\ConfigCreateEvent;
 use Thelia\Log\Tlog;
 use Thelia\Form\Exception\FormValidationException;
 use Thelia\Core\Security\Exception\AuthorizationException;
-use Thelia\Form\VariableModificationForm;
 use Thelia\Model\ConfigQuery;
+use Thelia\Form\ConfigModificationForm;
+use Thelia\Form\ConfigCreationForm;
 
 /**
  * Manages Thelmia system variables, aka Config objects.
  *
  * @author Franck Allimant <franck@cqfdev.fr>
  */
-class VariablesController extends BaseAdminController
+class ConfigController extends BaseAdminController
 {
     /**
      * The default action is displaying the variables list.
@@ -67,7 +67,7 @@ class VariablesController extends BaseAdminController
         $message = false;
 
         // Create the Creation Form
-        $creationForm = new VariableCreationForm($this->getRequest());
+        $creationForm = new ConfigCreationForm($this->getRequest());
 
         try {
 
@@ -159,7 +159,7 @@ class VariablesController extends BaseAdminController
             );
 
             // Setup the object form
-            $changeForm = new VariableModificationForm($this->getRequest(), "form", $data);
+            $changeForm = new ConfigModificationForm($this->getRequest(), "form", $data);
 
             // Pass it to the parser
             $this->getParserContext()->addForm($changeForm);
@@ -182,7 +182,7 @@ class VariablesController extends BaseAdminController
         $message = false;
 
         // Create the form from the request
-        $changeForm = new VariableModificationForm($this->getRequest());
+        $changeForm = new ConfigModificationForm($this->getRequest());
 
         // Get the variable ID
         $variable_id = $this->getRequest()->get('variable_id');
diff --git a/core/lib/Thelia/Form/VariableCreationForm.php b/core/lib/Thelia/Form/ConfigCreationForm.php
similarity index 97%
rename from core/lib/Thelia/Form/VariableCreationForm.php
rename to core/lib/Thelia/Form/ConfigCreationForm.php
index 5ac0b47ea..5594830bc 100644
--- a/core/lib/Thelia/Form/VariableCreationForm.php
+++ b/core/lib/Thelia/Form/ConfigCreationForm.php
@@ -26,7 +26,7 @@ use Symfony\Component\Validator\Constraints;
 use Thelia\Model\ConfigQuery;
 use Symfony\Component\Validator\ExecutionContextInterface;
 
-class VariableCreationForm extends BaseForm
+class ConfigCreationForm extends BaseForm
 {
     protected function buildForm($change_mode = false)
     {
@@ -60,7 +60,7 @@ class VariableCreationForm extends BaseForm
 
     public function getName()
     {
-        return "thelia_variable_creation";
+        return "thelia_config_creation";
     }
 
     public function checkDuplicateName($value, ExecutionContextInterface $context)
diff --git a/core/lib/Thelia/Form/VariableModificationForm.php b/core/lib/Thelia/Form/ConfigModificationForm.php
similarity index 96%
rename from core/lib/Thelia/Form/VariableModificationForm.php
rename to core/lib/Thelia/Form/ConfigModificationForm.php
index 28589a9a4..dd0a0e42f 100644
--- a/core/lib/Thelia/Form/VariableModificationForm.php
+++ b/core/lib/Thelia/Form/ConfigModificationForm.php
@@ -27,7 +27,7 @@ use Thelia\Model\LangQuery;
 use Propel\Runtime\ActiveQuery\Criteria;
 use Symfony\Component\Validator\Constraints\GreaterThan;
 
-class VariableModificationForm extends BaseDescForm
+class ConfigModificationForm extends BaseDescForm
 {
     protected function buildForm()
     {
@@ -54,6 +54,6 @@ class VariableModificationForm extends BaseDescForm
 
     public function getName()
     {
-        return "thelia_variable_modification";
+        return "thelia_config_modification";
     }
 }
diff --git a/templates/admin/default/variable-edit.html b/templates/admin/default/variable-edit.html
index 257084711..410838df8 100644
--- a/templates/admin/default/variable-edit.html
+++ b/templates/admin/default/variable-edit.html
@@ -29,7 +29,7 @@
                          <div class="form-horizontal span12">
                              <fieldset>
 
-							    {form name="thelia.admin.variable.modification"}
+							    {form name="thelia.admin.config.modification"}
 							    <form method="POST" action="{url path='/admin/configuration/variables/save-change'}" {form_enctype form=$form}>
 
                                     {* Be sure to get the variable ID, even if the form could not be validated *}
diff --git a/templates/admin/default/variables.html b/templates/admin/default/variables.html
index e7819532c..2c290b625 100644
--- a/templates/admin/default/variables.html
+++ b/templates/admin/default/variables.html
@@ -95,7 +95,7 @@
         <h3>{intl l="Create a new variable"}</h3>
     </div>
 
-    {form name="thelia.admin.variable.creation"}
+    {form name="thelia.admin.config.creation"}
     <form method="POST" action="{url path='/admin/configuration/variables/create'}" {form_enctype form=$form}>
 
         {form_hidden_fields form=$form}
@@ -221,7 +221,7 @@
 
         {* display the form creation dialog if it contains errors *}
 
-        {form name="thelia.admin.variable.creation"}
+        {form name="thelia.admin.config.creation"}
             {if #form_error}
                 $('#add_variable_dialog').modal();
             {/if}