diff --git a/core/lib/Drupal/Core/Form/ConfigTarget.php b/core/lib/Drupal/Core/Form/ConfigTarget.php
index 55b86dc6b4b55220d3323e139cd411d31303df55..4eab41288b6d706fd33f0fffb7368eface724f6c 100644
--- a/core/lib/Drupal/Core/Form/ConfigTarget.php
+++ b/core/lib/Drupal/Core/Form/ConfigTarget.php
@@ -74,8 +74,8 @@ final class ConfigTarget {
    *   return an array with the transformed values, also keyed by property path.
    *   The callback will receive the form state object as its second argument.
    *   The callback may return a special values:
-   *   - ToConfig::NoMapping, to indicate that the given form value does not
-   *     need to be mapped onto the Config object
+   *   - ToConfig::NoOp, to indicate that the given form value does not need to
+   *     be mapped onto the Config object
    *   - ToConfig::DeleteKey to indicate that the targeted property path should
    *     be deleted from config.
    *   Defaults to NULL.
@@ -237,7 +237,7 @@ public function setValue(Config $config, mixed $value, FormStateInterface $form_
     }
 
     // Set the returned value, or if a special value (one of the cases in the
-    // ConfigTargetValue enum): apply the appropriate action.
+    // ToConfig enum): apply the appropriate action.
     array_walk($value, fn (mixed $value, string $property) => match ($value) {
       // No-op.
       ToConfig::NoOp => NULL,
diff --git a/core/tests/Drupal/Tests/Core/Form/ConfigTargetTest.php b/core/tests/Drupal/Tests/Core/Form/ConfigTargetTest.php
index a2588857886d2622e2371959bea7fa36515060c9..5c7ad53788dd3b97b85e8dd7708789a028d76f9a 100644
--- a/core/tests/Drupal/Tests/Core/Form/ConfigTargetTest.php
+++ b/core/tests/Drupal/Tests/Core/Form/ConfigTargetTest.php
@@ -286,14 +286,14 @@ public function testSingleTarget(): void {
     $config->set('something', FALSE)->shouldBeCalledTimes(1);
     $config_target->setValue($config->reveal(), 'No', $this->prophesize(FormStateInterface::class)->reveal());
 
-    // Test `ConfigTargetValue::NoMapping`: nothing should happen to the Config.
+    // Test `ToConfig::NoOp`: nothing should happen to the Config.
     $config = $this->prophesize(Config::class);
     $config->getName()->willReturn('foo.settings');
     $config->set('something', Argument::any())->shouldBeCalledTimes(0);
     $config->clear('something', Argument::any())->shouldBeCalledTimes(0);
     $config_target->setValue($config->reveal(), '<test:noop>', $this->prophesize(FormStateInterface::class)->reveal());
 
-    // Test `ConfigTargetValue::DeleteKey`: Config::clear() should be called.
+    // Test `ToConfig::DeleteKey`: Config::clear() should be called.
     $config = $this->prophesize(Config::class);
     $config->getName()->willReturn('foo.settings');
     $config->clear('something')->shouldBeCalledTimes(1);