diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php
index 7382bc258..3c056ebf2 100644
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -356,9 +356,9 @@ return array(
     'Combodo\\iTop\\Application\\UI\\Links\\Direct\\BlockDirectLinkSetViewTable' => $baseDir . '/sources/Application/UI/Links/Direct/BlockDirectLinkSetViewTable.php',
     'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockIndirectLinkSetEditTable' => $baseDir . '/sources/Application/UI/Links/Indirect/BlockIndirectLinkSetEditTable.php',
     'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockIndirectLinkSetViewTable' => $baseDir . '/sources/Application/UI/Links/Indirect/BlockIndirectLinkSetViewTable.php',
-    'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockLinksSetDisplayAsProperty' => $baseDir . '/sources/Application/UI/Links/Set/BlockLinksSetDisplayAsProperty.php',
     'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockObjectPickerDialog' => $baseDir . '/sources/Application/UI/Links/Indirect/BlockObjectPickerDialog.php',
-    'Combodo\\iTop\\Application\\UI\\Links\\Set\\LinksSetUIBlockFactory' => $baseDir . '/sources/Application/UI/Links/Set/LinksSetUIBlockFactory.php',
+    'Combodo\\iTop\\Application\\UI\\Links\\Set\\BlockLinkSetDisplayAsProperty' => $baseDir . '/sources/Application/UI/Links/Set/BlockLinksSetDisplayAsProperty.php',
+    'Combodo\\iTop\\Application\\UI\\Links\\Set\\LinkSetUIBlockFactory' => $baseDir . '/sources/Application/UI/Links/Set/LinksSetUIBlockFactory.php',
     'Combodo\\iTop\\Application\\UI\\Preferences\\BlockShortcuts\\BlockShortcuts' => $baseDir . '/sources/Application/UI/Preferences/BlockShortcuts/BlockShortcuts.php',
     'Combodo\\iTop\\Application\\UI\\Printable\\BlockPrintHeader\\BlockPrintHeader' => $baseDir . '/sources/Application/UI/Printable/BlockPrintHeader/BlockPrintHeader.php',
     'Combodo\\iTop\\Composer\\iTopComposer' => $baseDir . '/sources/Composer/iTopComposer.php',
diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php
index 625a5c1e0..7216cc3d3 100644
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -721,9 +721,9 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'Combodo\\iTop\\Application\\UI\\Links\\Direct\\BlockDirectLinkSetViewTable' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Direct/BlockDirectLinkSetViewTable.php',
         'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockIndirectLinkSetEditTable' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Indirect/BlockIndirectLinkSetEditTable.php',
         'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockIndirectLinkSetViewTable' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Indirect/BlockIndirectLinkSetViewTable.php',
-        'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockLinksSetDisplayAsProperty' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Set/BlockLinksSetDisplayAsProperty.php',
         'Combodo\\iTop\\Application\\UI\\Links\\Indirect\\BlockObjectPickerDialog' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Indirect/BlockObjectPickerDialog.php',
-        'Combodo\\iTop\\Application\\UI\\Links\\Set\\LinksSetUIBlockFactory' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Set/LinksSetUIBlockFactory.php',
+        'Combodo\\iTop\\Application\\UI\\Links\\Set\\BlockLinkSetDisplayAsProperty' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Set/BlockLinksSetDisplayAsProperty.php',
+        'Combodo\\iTop\\Application\\UI\\Links\\Set\\LinkSetUIBlockFactory' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Set/LinksSetUIBlockFactory.php',
         'Combodo\\iTop\\Application\\UI\\Preferences\\BlockShortcuts\\BlockShortcuts' => __DIR__ . '/../..' . '/sources/Application/UI/Preferences/BlockShortcuts/BlockShortcuts.php',
         'Combodo\\iTop\\Application\\UI\\Printable\\BlockPrintHeader\\BlockPrintHeader' => __DIR__ . '/../..' . '/sources/Application/UI/Printable/BlockPrintHeader/BlockPrintHeader.php',
         'Combodo\\iTop\\Composer\\iTopComposer' => __DIR__ . '/../..' . '/sources/Composer/iTopComposer.php',
diff --git a/sources/Application/UI/Links/Set/BlockLinksSetDisplayAsProperty.php b/sources/Application/UI/Links/Set/BlockLinksSetDisplayAsProperty.php
index 7c0296193..e8e188840 100644
--- a/sources/Application/UI/Links/Set/BlockLinksSetDisplayAsProperty.php
+++ b/sources/Application/UI/Links/Set/BlockLinksSetDisplayAsProperty.php
@@ -4,7 +4,7 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-namespace Combodo\iTop\Application\UI\Links\Indirect;
+namespace Combodo\iTop\Application\UI\Links\Set;
 
 use ApplicationContext;
 use AttributeLinkedSet;