diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14737f34756..b48fa84be1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
 - Fixed a bug where previewing an asset could wipe out all `h1` tags within Redactor fields. ([#12545](https://github.com/craftcms/cms/issues/12545))
 - Fixed a bug where `craft\image\Raster::getIsTransparent()` wasn’t working. ([#12565](https://github.com/craftcms/cms/issues/12565))
 - Fixed a bug where textual condition rules were still showing a text input when the “is empty” or “has a value” operators were selected. ([#12587](https://github.com/craftcms/cms/pull/12587))
+- Fixed a bug where the component name comments in project config YAML files would always lag behind the current project config a little. ([#12576](https://github.com/craftcms/cms/issues/12576), ([#12581](https://github.com/craftcms/cms/pull/12581)))
 - Added `craft\helpers\Db::escapeForLike()`.
 - `craft\services\Assets::getAllDescendantFolders()` now has a `$withParent` argument, which can be passed `false` to omit the parent folder from the results. ([#12536](https://github.com/craftcms/cms/issues/12536))
 - Deprecated `craft\helpers\DateTimeHelper::timeZoneAbbreviation()`.
diff --git a/src/services/ProjectConfig.php b/src/services/ProjectConfig.php
index a4143cfb79b..e28526b1eec 100644
--- a/src/services/ProjectConfig.php
+++ b/src/services/ProjectConfig.php
@@ -1568,7 +1568,8 @@ protected function updateYamlFiles(): void
                 'except' => ['.*', '.*/'],
             ]);
 
-            $projectConfigNames = $this->getInternalConfig()->get(self::PATH_META_NAMES);
+            // get fresh internal config so that all the name comments are properly updated
+            $projectConfigNames = $this->_loadInternalConfig()->get(self::PATH_META_NAMES);
 
             $uids = [];
             $replacements = [];