diff --git a/lib/internal/Magento/Framework/Module/DependencyChecker.php b/lib/internal/Magento/Framework/Module/DependencyChecker.php
index b4e5d043e4721eaa902661796c1a45a6bff35730..e84e2b99a119ddaba066853f748667bb1be2a1e3 100644
--- a/lib/internal/Magento/Framework/Module/DependencyChecker.php
+++ b/lib/internal/Magento/Framework/Module/DependencyChecker.php
@@ -33,8 +33,10 @@ class DependencyChecker
      */
     private $graph;
 
-    /** @var PackageInfo */
-    private $packageInfo;
+    /**
+     * @var PackageInfo
+     */
+    protected $packageInfo;
 
     /**
      * Constructor
diff --git a/lib/internal/Magento/Framework/Module/PackageInfo.php b/lib/internal/Magento/Framework/Module/PackageInfo.php
index 938d357b0a27f92ca2c1228df20433c0bb55c5d3..1e2ed5064c8e69bb067e82ae2173ef01b5e1f59a 100644
--- a/lib/internal/Magento/Framework/Module/PackageInfo.php
+++ b/lib/internal/Magento/Framework/Module/PackageInfo.php
@@ -53,7 +53,9 @@ class PackageInfo
      */
     private $componentRegistrar;
 
-    /** @var array */
+    /**
+     * @var array
+     */
     protected $nonExistingDependencies = [];
 
     /**
@@ -111,7 +113,7 @@ class PackageInfo
         $moduleName = null;
         if (isset($this->packageModuleMap[$packageName])) {
             $moduleName = $this->packageModuleMap[$packageName];
-        } else if ($this->isInternalPackage($packageName)) {
+        } elseif ($this->isMagentoPackage($packageName)) {
             $moduleName = $this->convertPackageNameToModuleName($packageName);
             $this->addNonExistingDependency($moduleName);
         }
@@ -122,7 +124,8 @@ class PackageInfo
     /**
      * Add non existing dependency
      *
-     * @param $dependency
+     * @param string $dependency
+     * @return void
      */
     protected function addNonExistingDependency($dependency)
     {
@@ -151,8 +154,7 @@ class PackageInfo
     {
         $moduleName = str_replace('magento/module-', '', $packageName);
         $moduleName = str_replace('-', ' ', $moduleName);
-        $moduleName = ucwords($moduleName);
-        $moduleName = str_replace(' ', '', $moduleName);
+        $moduleName = str_replace(' ', '', ucwords($moduleName));
 
         return 'Magento_' . $moduleName;
     }
@@ -163,7 +165,7 @@ class PackageInfo
      * @param string $packageName
      * @return bool
      */
-    protected function isInternalPackage($packageName)
+    protected function isMagentoPackage($packageName)
     {
         return strpos($packageName, 'magento/module-') === 0;
     }