5.x Fix up class name issue on loading components (#17580)

Fixing up class name issue

ObjectRegistry.php

@@ -80,11 +80,16 @@ abstract class ObjectRegistry implements Countable, IteratorAggregate
      */
     public function load(string $name, array $config = []): object
     {
+        $plugin = null;
         if (isset($config['className'])) {
             $objName = $name;
             $name = $config['className'];
         } else {
-            [, $objName] = pluginSplit($name);
+            [$plugin, $objName] = pluginSplit($name);
+        }
+
+        if ($plugin) {
+            $config['className'] = $name;
         }
 
         $loaded = isset($this->_loaded[$objName]);