diff --git a/Config/module.xml b/Config/module.xml
index fb46698..4f9fc90 100644
--- a/Config/module.xml
+++ b/Config/module.xml
@@ -16,7 +16,7 @@
         <language>en_US</language>
         <language>fr_FR</language>
     </languages>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
     <authors>
         <author>
             <name>Franck Allimant</name>
diff --git a/Controller/OrderEditController.php b/Controller/OrderEditController.php
index 6042322..f186330 100644
--- a/Controller/OrderEditController.php
+++ b/Controller/OrderEditController.php
@@ -19,6 +19,8 @@
 namespace PayzenEmbedded\Controller;
 
 use PayzenEmbedded\Event\TransactionUpdateEvent;
+use PayzenEmbedded\Form\TransactionGetForm;
+use PayzenEmbedded\Form\TransactionUpdateForm;
 use PayzenEmbedded\LyraClient\LyraTransactionGetWrapper;
 use PayzenEmbedded\PayzenEmbedded;
 use Symfony\Component\EventDispatcher\EventDispatcher;
@@ -49,7 +51,7 @@ public function updateTransaction(EventDispatcher $dispatcher, Translator $trans
         $errorMsg = $ex = false;
 
         // Create the Form from the request
-        $updateForm = $this->createForm('payzen_embedded.order-edit.form');
+        $updateForm = $this->createForm(TransactionUpdateForm::getName());
 
         try {
             // Check the form against constraints violations
@@ -103,7 +105,7 @@ public function refreshTransaction(EventDispatcher $dispatcher, Translator $tran
         $errorMsg = $ex = false;
 
         // Create the Form from the request
-        $getForm = $this->createForm('payzen_embedded.get.form');
+        $getForm = $this->createForm(TransactionGetForm::getName());
 
         try {
             // Check the form against constraints violations
diff --git a/templates/backOffice/default/payzen-embedded/order-edit.html b/templates/backOffice/default/payzen-embedded/order-edit.html
index e91970d..b4b04fb 100644
--- a/templates/backOffice/default/payzen-embedded/order-edit.html
+++ b/templates/backOffice/default/payzen-embedded/order-edit.html
@@ -37,7 +37,7 @@
                 {/ifloop}
 
                 {elseloop rel="transaction-history"}
-                    {form name="payzen_embedded.get.form"}
+                    {form name="payzen_embedded_get_form"}
                         {if $form_error}
                             <div class="alert alert-danger">{$form_error_message}</div>
                         {/if}
@@ -69,7 +69,7 @@
                         {intl l='You can update here the PayZen transaction related to this order. You can change the transaction amount (it should be greater or eaqual to the current amount), define the capture date (the date at which the payment is done), and the validation mode, to change manual validation to automatic validation of the transaction' d=$_d}
                     </div>
                     {loop type="order" name="order" customer="*" id=$order_id}
-                        {form name="payzen_embedded.order-edit.form"}
+                        {form name="payzen_embedded_order_edit_form"}
                             <form method="post" action="{url path="/admin/module/payzen-embedded/update-transaction/%order_id" order_id=$ID}">
                                 {if $form_error}
                                     <div class="alert alert-danger">{$form_error_message}</div>