diff --git a/src/Options/OptionsFactory.php b/src/Options/OptionsManager.php
similarity index 98%
rename from src/Options/OptionsFactory.php
rename to src/Options/OptionsManager.php
index bab869ef..46ee6518 100644
--- a/src/Options/OptionsFactory.php
+++ b/src/Options/OptionsManager.php
@@ -4,7 +4,7 @@
 
 use BadMethodCallException;
 
-class OptionsFactory
+class OptionsManager
 {
     protected array $options = [];
 
diff --git a/src/Util/FormatterUtil.php b/src/Util/FormatterUtil.php
index f5662cc8..e9f6836b 100644
--- a/src/Util/FormatterUtil.php
+++ b/src/Util/FormatterUtil.php
@@ -14,7 +14,7 @@
 use Contao\StringUtil as Str;
 use Contao\System;
 use Contao\Validator;
-use HeimrichHannot\UtilsBundle\Options\OptionsFactory;
+use HeimrichHannot\UtilsBundle\Options\OptionsManager;
 use HeimrichHannot\UtilsBundle\Util\FormatterUtil\FormatDcaFieldValueOptions;
 
 class FormatterUtil
@@ -45,7 +45,7 @@ public function formatDcaFieldValue(
         DataContainer     $dc,
         string            $field,
         array|string|null $value,
-        OptionsFactory    $settings = null,
+        OptionsManager    $settings = null,
         array             $dcaOverride = null,
         string            $arrayJoiner = ', ',
         ?array            $cachedOptions = null
@@ -252,7 +252,7 @@ private function isMultiColumnsActive(): bool
      */
     private function formatArray(
         array          $values,
-        OptionsFactory $settings,
+        OptionsManager $settings,
         string         $arraySeparator,
         callable       $callback
     ): string
diff --git a/src/Util/FormatterUtil/FormatDcaFieldValueOptions.php b/src/Util/FormatterUtil/FormatDcaFieldValueOptions.php
index 8edc5fe9..5102fd38 100644
--- a/src/Util/FormatterUtil/FormatDcaFieldValueOptions.php
+++ b/src/Util/FormatterUtil/FormatDcaFieldValueOptions.php
@@ -2,7 +2,7 @@
 
 namespace HeimrichHannot\UtilsBundle\Util\FormatterUtil;
 
-use HeimrichHannot\UtilsBundle\Options\OptionsFactory;
+use HeimrichHannot\UtilsBundle\Options\OptionsManager;
 
 /**
  * @method $this setPreserveEmptyArrayValues(bool $value)
@@ -11,7 +11,7 @@
  * @method $this setCacheOptions(bool $value)
  * @method $this setReplaceInsertTags(bool $value)
  */
-class FormatDcaFieldValueOptions extends OptionsFactory
+class FormatDcaFieldValueOptions extends OptionsManager
 {
     public bool $preserveEmptyArrayValues = false;
     public bool $localize = true;
diff --git a/tests/Options/OptionsFactoryTest.php b/tests/Options/OptionsManagerTest.php
similarity index 91%
rename from tests/Options/OptionsFactoryTest.php
rename to tests/Options/OptionsManagerTest.php
index ba7f0473..e37b616b 100644
--- a/tests/Options/OptionsFactoryTest.php
+++ b/tests/Options/OptionsManagerTest.php
@@ -3,13 +3,13 @@
 namespace Options;
 
 use Contao\TestCase\ContaoTestCase;
-use HeimrichHannot\UtilsBundle\Options\OptionsFactory;
+use HeimrichHannot\UtilsBundle\Options\OptionsManager;
 
 class OptionsFactoryTest extends ContaoTestCase
 {
     public function testOptionsFactory()
     {
-        $options = new OptionsFactory();
+        $options = new OptionsManager();
         $options->set('foo', 'foo');
         $options->bar = 'bar';
 
@@ -34,7 +34,7 @@ public function testOptionsFactory()
 
     public function testOptionsFactoryInheritance()
     {
-        $options = new class extends OptionsFactory {
+        $options = new class extends OptionsManager {
             public string $foo = 'foo';
         };