diff --git a/plugin/ims_lti/configure.php b/plugin/ims_lti/configure.php
index 2b060cd0bb..d623071548 100644
--- a/plugin/ims_lti/configure.php
+++ b/plugin/ims_lti/configure.php
@@ -35,7 +35,7 @@ $categories = Category::load(null, null, $course->getCode());
 
 switch ($action) {
     case 'add':
-        $form = new FrmAdd('ims_lti_add_tool', [], $baseTool);
+        $form = new \Chamilo\PluginBundle\ImsLti\Form\FrmAdd('ims_lti_add_tool', [], $baseTool);
         $form->build();
 
         if ($baseTool) {
@@ -173,7 +173,7 @@ switch ($action) {
             break;
         }
 
-        $form = new FrmEdit('ims_lti_edit_tool', [], $tool);
+        $form = new \Chamilo\PluginBundle\Form\FrmEdit('ims_lti_edit_tool', [], $tool);
         $form->build(false);
 
         if ($form->validate()) {
diff --git a/plugin/ims_lti/create.php b/plugin/ims_lti/create.php
index 93270d9c46..51d90bcd97 100644
--- a/plugin/ims_lti/create.php
+++ b/plugin/ims_lti/create.php
@@ -1,6 +1,7 @@
 <?php
 /* For license terms, see /license.txt */
 use Chamilo\PluginBundle\Entity\ImsLti\ImsLtiTool;
+use Chamilo\PluginBundle\ImsLti\Form\FrmAdd;
 
 $cidReset = true;
 
diff --git a/plugin/ims_lti/edit.php b/plugin/ims_lti/edit.php
index dc430de898..71f894dc36 100644
--- a/plugin/ims_lti/edit.php
+++ b/plugin/ims_lti/edit.php
@@ -1,6 +1,7 @@
 <?php
 /* For license terms, see /license.txt */
 use Chamilo\PluginBundle\Entity\ImsLti\ImsLtiTool;
+use Chamilo\PluginBundle\Form\FrmEdit;
 
 $cidReset = true;
 
diff --git a/plugin/ims_lti/src/Form/FrmAdd.php b/plugin/ims_lti/src/Form/FrmAdd.php
index 1e2384e3cc..6ee377f79d 100644
--- a/plugin/ims_lti/src/Form/FrmAdd.php
+++ b/plugin/ims_lti/src/Form/FrmAdd.php
@@ -1,7 +1,16 @@
 <?php
 /* For licensing terms, see /license.txt */
 
+namespace Chamilo\PluginBundle\ImsLti\Form;
+
+use Category;
 use Chamilo\PluginBundle\Entity\ImsLti\ImsLtiTool;
+use Display;
+use FormValidator;
+use ImsLti;
+use ImsLtiPlugin;
+use LtiAssignmentGradesService;
+use LtiNamesRoleProvisioningService;
 
 /**
  * Class FrmAdd.
@@ -15,7 +24,7 @@ class FrmAdd extends FormValidator
     /**
      * @var bool
      */
-    private $toolIsV1p3 = false;
+    private $toolIsV1p3;
 
     /**
      * FrmAdd constructor.
@@ -194,7 +203,7 @@ class FrmAdd extends FormValidator
         $this->setDefaults($defaults);
     }
 
-    public function returnForm()
+    public function returnForm(): string
     {
         $js = "<script>
                 \$(function () {
diff --git a/plugin/ims_lti/src/Form/FrmEdit.php b/plugin/ims_lti/src/Form/FrmEdit.php
index 11cabddc00..2d9e360ea5 100644
--- a/plugin/ims_lti/src/Form/FrmEdit.php
+++ b/plugin/ims_lti/src/Form/FrmEdit.php
@@ -1,7 +1,16 @@
 <?php
 /* For licensing terms, see /license.txt */
 
+namespace Chamilo\PluginBundle\Form;
+
+use Category;
 use Chamilo\PluginBundle\Entity\ImsLti\ImsLtiTool;
+use Display;
+use FormValidator;
+use ImsLti;
+use ImsLtiPlugin;
+use LtiAssignmentGradesService;
+use LtiNamesRoleProvisioningService;
 
 /**
  * Class FrmAdd.
@@ -34,8 +43,6 @@ class FrmEdit extends FormValidator
      * Build the form.
      *
      * @param bool $globalMode
-     *
-     * @throws Exception
      */
     public function build($globalMode = true)
     {
@@ -179,7 +186,7 @@ class FrmEdit extends FormValidator
     }
 
     /**
-     * @throws Exception
+     * @throws \Exception
      */
     public function setDefaultValues()
     {