diff --git a/sources/PhpParser/Evaluation/PhpExpressionEvaluator.php b/sources/PhpParser/Evaluation/PhpExpressionEvaluator.php
index 80eb6c4db..1fde0e5d3 100644
--- a/sources/PhpParser/Evaluation/PhpExpressionEvaluator.php
+++ b/sources/PhpParser/Evaluation/PhpExpressionEvaluator.php
@@ -2,12 +2,11 @@
 
 namespace Combodo\iTop\PhpParser\Evaluation;
 
-use ModuleFileParser;
-use ModuleFileReaderException;
+use \Combodo\iTop\Setup\ModuleDiscovery\ModuleFileParser;
+use \Combodo\iTop\Setup\ModuleDiscovery\ModuleFileReaderException;
 use PhpParser\ConstExprEvaluator;
 use PhpParser\Node\Expr;
 use PhpParser\ParserFactory;
-
 /**
  * Used at runtime/setup time
  */
@@ -31,7 +30,7 @@ class PhpExpressionEvaluator {
 	 * @param string $sBooleanExpr
 	 *
 	 * @return bool
-	 * @throws \ModuleFileReaderException
+	 * @throws ModuleFileReaderException
 	 */
 	public function ParseAndEvaluateBooleanExpression(string $sBooleanExpr) : bool
 	{
diff --git a/tests/php-unit-tests/unitary-tests/sources/PhpParser/Evaluation/PhpExpressionEvaluatorTest.php b/tests/php-unit-tests/unitary-tests/sources/PhpParser/Evaluation/PhpExpressionEvaluatorTest.php
index 214f58feb..46ebaf526 100644
--- a/tests/php-unit-tests/unitary-tests/sources/PhpParser/Evaluation/PhpExpressionEvaluatorTest.php
+++ b/tests/php-unit-tests/unitary-tests/sources/PhpParser/Evaluation/PhpExpressionEvaluatorTest.php
@@ -3,8 +3,9 @@
 namespace Combodo\iTop\Test\UnitTest\Sources\PhpParser\Evaluation;
 
 use Combodo\iTop\PhpParser\Evaluation\PhpExpressionEvaluator;
+use Combodo\iTop\Setup\ModuleDiscovery\ModuleFileReader;
+use Combodo\iTop\Setup\ModuleDiscovery\ModuleFileReaderException;
 use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
-use ModuleFileReader;
 
 class PhpExpressionEvaluatorTest extends ItopDataTestCase {
 	public static $STATIC_PROPERTY = 123;