diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php
index 7a43db95a..fd3a8a7b4 100644
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -481,7 +481,7 @@ return array(
     'Combodo\\iTop\\Forms\\Block\\AbstractTypeFormBlock' => $baseDir . '/sources/Forms/Block/AbstractTypeFormBlock.php',
     'Combodo\\iTop\\Forms\\Block\\Base\\CheckboxFormBlock' => $baseDir . '/sources/Forms/Block/Base/CheckboxFormBlock.php',
     'Combodo\\iTop\\Forms\\Block\\Base\\ChoiceFormBlock' => $baseDir . '/sources/Forms/Block/Base/ChoiceFormBlock.php',
-    'Combodo\\iTop\\Forms\\Block\\Base\\ChoiceFromInputs' => $baseDir . '/sources/Forms/Block/Base/ChoiceFromInputs.php',
+    'Combodo\\iTop\\Forms\\Block\\Base\\ChoiceFromInputsBlock' => $baseDir . '/sources/Forms/Block/Base/ChoiceFromInputsBlock.php',
     'Combodo\\iTop\\Forms\\Block\\Base\\CollectionBlock' => $baseDir . '/sources/Forms/Block/Base/CollectionBlock.php',
     'Combodo\\iTop\\Forms\\Block\\Base\\DateFormBlock' => $baseDir . '/sources/Forms/Block/Base/DateFormBlock.php',
     'Combodo\\iTop\\Forms\\Block\\Base\\DateTimeFormBlock' => $baseDir . '/sources/Forms/Block/Base/DateTimeFormBlock.php',
diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php
index 64f111092..a503b8c3a 100644
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -862,7 +862,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'Combodo\\iTop\\Forms\\Block\\AbstractTypeFormBlock' => __DIR__ . '/../..' . '/sources/Forms/Block/AbstractTypeFormBlock.php',
         'Combodo\\iTop\\Forms\\Block\\Base\\CheckboxFormBlock' => __DIR__ . '/../..' . '/sources/Forms/Block/Base/CheckboxFormBlock.php',
         'Combodo\\iTop\\Forms\\Block\\Base\\ChoiceFormBlock' => __DIR__ . '/../..' . '/sources/Forms/Block/Base/ChoiceFormBlock.php',
-        'Combodo\\iTop\\Forms\\Block\\Base\\ChoiceFromInputs' => __DIR__ . '/../..' . '/sources/Forms/Block/Base/ChoiceFromInputs.php',
+        'Combodo\\iTop\\Forms\\Block\\Base\\ChoiceFromInputsBlock' => __DIR__ . '/../..' . '/sources/Forms/Block/Base/ChoiceFromInputsBlock.php',
         'Combodo\\iTop\\Forms\\Block\\Base\\CollectionBlock' => __DIR__ . '/../..' . '/sources/Forms/Block/Base/CollectionBlock.php',
         'Combodo\\iTop\\Forms\\Block\\Base\\DateFormBlock' => __DIR__ . '/../..' . '/sources/Forms/Block/Base/DateFormBlock.php',
         'Combodo\\iTop\\Forms\\Block\\Base\\DateTimeFormBlock' => __DIR__ . '/../..' . '/sources/Forms/Block/Base/DateTimeFormBlock.php',
diff --git a/sources/Forms/Block/Base/ChoiceFromInputs.php b/sources/Forms/Block/Base/ChoiceFromInputsBlock.php
similarity index 93%
rename from sources/Forms/Block/Base/ChoiceFromInputs.php
rename to sources/Forms/Block/Base/ChoiceFromInputsBlock.php
index f93597bb3..763392ca8 100644
--- a/sources/Forms/Block/Base/ChoiceFromInputs.php
+++ b/sources/Forms/Block/Base/ChoiceFromInputsBlock.php
@@ -12,7 +12,7 @@ use Combodo\iTop\Forms\Register\OptionsRegister;
 /**
  *
  */
-class ChoiceFromInputs extends ChoiceFormBlock
+class ChoiceFromInputsBlock extends ChoiceFormBlock
 {
 	/** @inheritdoc  */
 	public function UpdateOptions(OptionsRegister $oOptionsRegister): void