diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php b/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
index fa17138719fed..e9e00749a4fb2 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
@@ -21,7 +21,7 @@ class Baseurl implements \Magento\Framework\Notification\MessageInterface
     protected $_config;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -32,13 +32,13 @@ class Baseurl implements \Magento\Framework\Notification\MessageInterface
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\UrlInterface $urlBuilder
      * @param \Magento\Framework\App\Config\ValueFactory $configValueFactory
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\UrlInterface $urlBuilder,
         \Magento\Framework\App\Config\ValueFactory $configValueFactory
     ) {
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php b/app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php
index 26287c1db12fc..016508fef7d78 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php
@@ -69,7 +69,7 @@ public function getIdentity()
     public function isDisplayed()
     {
         return $this->_authorization->isAllowed(
-            'Magento_Adminhtml::cache'
+            'Magento_Backend::cache'
         ) && count(
             $this->_getCacheTypesForRefresh()
         ) > 0;
diff --git a/app/code/Magento/AdminNotification/etc/acl.xml b/app/code/Magento/AdminNotification/etc/acl.xml
index cd908639d98c9..01ae3b6da6fbb 100644
--- a/app/code/Magento/AdminNotification/etc/acl.xml
+++ b/app/code/Magento/AdminNotification/etc/acl.xml
@@ -8,9 +8,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::system">
-                    <resource id="Magento_Adminhtml::system_other_settings">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::system">
+                    <resource id="Magento_Backend::system_other_settings">
                         <resource id="Magento_AdminNotification::adminnotification" title="Notifications" sortOrder="10">
                             <resource id="Magento_AdminNotification::show_toolbar" title="Show Toolbar" sortOrder="10" />
                             <resource id="Magento_AdminNotification::show_list" title="Show List" sortOrder="20" />
diff --git a/app/code/Magento/AdminNotification/etc/adminhtml/routes.xml b/app/code/Magento/AdminNotification/etc/adminhtml/routes.xml
index 712232289da96..19c3fc2200c66 100644
--- a/app/code/Magento/AdminNotification/etc/adminhtml/routes.xml
+++ b/app/code/Magento/AdminNotification/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
     <router id="admin">
         <route id="adminhtml">
-            <module name="Magento_AdminNotification" before="Magento_Adminhtml" />
+            <module name="Magento_AdminNotification" before="Magento_Backend" />
         </route>
     </router>
 </config>
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml b/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml
index 42bdfd000bd5e..b407b09c38596 100644
--- a/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml
+++ b/app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml
@@ -7,7 +7,7 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
     <head>
-        <css src="Magento_Core::prototype/magento.css"/>
+        <css src="Magento_Theme::prototype/magento.css"/>
     </head>
     <body>
         <referenceContainer name="notifications">
diff --git a/app/code/Magento/Authorization/data/authorization_setup/data-install-2.0.0.php b/app/code/Magento/Authorization/data/authorization_setup/data-install-2.0.0.php
index 1e2f7b53f31a6..cfc55b8747621 100644
--- a/app/code/Magento/Authorization/data/authorization_setup/data-install-2.0.0.php
+++ b/app/code/Magento/Authorization/data/authorization_setup/data-install-2.0.0.php
@@ -47,7 +47,7 @@
     $this->createRules()->setData(
         [
             'role_id' => $admGroupRole->getId(),
-            'resource_id' => 'Magento_Adminhtml::all',
+            'resource_id' => 'Magento_Backend::all',
             'privileges' => null,
             'permission' => 'allow',
         ]
@@ -55,6 +55,6 @@
 } else {
     /** @var \Magento\Authorization\Model\Rules $rule */
     foreach ($rulesCollection as $rule) {
-        $rule->setData('resource_id', 'Magento_Adminhtml::all')->save();
+        $rule->setData('resource_id', 'Magento_Backend::all')->save();
     }
 }
diff --git a/app/code/Magento/Backend/App/Router.php b/app/code/Magento/Backend/App/Router.php
index 062d70ac4654f..3ae734acb76f9 100644
--- a/app/code/Magento/Backend/App/Router.php
+++ b/app/code/Magento/Backend/App/Router.php
@@ -53,7 +53,7 @@ class Router extends \Magento\Core\App\Router\Base
      * @param \Magento\Framework\App\ResponseFactory $responseFactory
      * @param \Magento\Framework\App\Route\ConfigInterface $routeConfig
      * @param \Magento\Framework\UrlInterface $url
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo
      * @param string $routerId
@@ -70,7 +70,7 @@ public function __construct(
         \Magento\Framework\App\ResponseFactory $responseFactory,
         \Magento\Framework\App\Route\ConfigInterface $routeConfig,
         \Magento\Framework\UrlInterface $url,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo,
         $routerId,
diff --git a/app/code/Magento/Backend/Block/Dashboard.php b/app/code/Magento/Backend/Block/Dashboard.php
index b6713c9e90ab3..6433c0a0514b7 100644
--- a/app/code/Magento/Backend/Block/Dashboard.php
+++ b/app/code/Magento/Backend/Block/Dashboard.php
@@ -31,7 +31,7 @@ protected function _prepareLayout()
 
         $this->addChild('sales', 'Magento\Backend\Block\Dashboard\Sales');
 
-        if ($this->_scopeConfig->getValue(self::XML_PATH_ENABLE_CHARTS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
+        if ($this->_scopeConfig->getValue(self::XML_PATH_ENABLE_CHARTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
             $block = $this->getLayout()->createBlock('Magento\Backend\Block\Dashboard\Diagrams');
         } else {
             $block = $this->getLayout()->createBlock(
diff --git a/app/code/Magento/Backend/Block/Dashboard/Graph.php b/app/code/Magento/Backend/Block/Dashboard/Graph.php
index ae9f2d4a868db..91c4d619072ba 100644
--- a/app/code/Magento/Backend/Block/Dashboard/Graph.php
+++ b/app/code/Magento/Backend/Block/Dashboard/Graph.php
@@ -210,7 +210,7 @@ public function getChartUrl($directUrl = true)
 
         $timezoneLocal = $this->_scopeConfig->getValue(
             $this->_localeDate->getDefaultTimezonePath(),
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
 
         list($dateStart, $dateEnd) = $this->_collectionFactory->create()->getDateRange(
diff --git a/app/code/Magento/Backend/Block/Page/Header.php b/app/code/Magento/Backend/Block/Page/Header.php
index 227db0beb9a1b..f4b8eb0b23ed3 100644
--- a/app/code/Magento/Backend/Block/Page/Header.php
+++ b/app/code/Magento/Backend/Block/Page/Header.php
@@ -80,6 +80,6 @@ public function getLogoutLink()
      */
     public function displayNoscriptNotice()
     {
-        return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 }
diff --git a/app/code/Magento/Backend/Block/Page/Notices.php b/app/code/Magento/Backend/Block/Page/Notices.php
index 3ae3ef4f719ef..231d51c9919dd 100644
--- a/app/code/Magento/Backend/Block/Page/Notices.php
+++ b/app/code/Magento/Backend/Block/Page/Notices.php
@@ -22,7 +22,7 @@ class Notices extends \Magento\Backend\Block\Template
      */
     public function displayNoscriptNotice()
     {
-        return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue('web/browser_capabilities/javascript', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
@@ -32,6 +32,6 @@ public function displayNoscriptNotice()
      */
     public function displayDemoNotice()
     {
-        return $this->_scopeConfig->getValue('design/head/demonotice', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue('design/head/demonotice', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 }
diff --git a/app/code/Magento/Backend/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php b/app/code/Magento/Backend/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php
index 5a345204f462a..54b2695b8624e 100644
--- a/app/code/Magento/Backend/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php
+++ b/app/code/Magento/Backend/Block/System/Config/Form/Fieldset/Modules/DisableOutput.php
@@ -69,7 +69,7 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
         sort($modules);
 
         foreach ($modules as $moduleName) {
-            if ($moduleName === 'Magento_Adminhtml' || $moduleName === 'Magento_Backend') {
+            if ($moduleName === 'Magento_Backend') {
                 continue;
             }
             $html .= $this->_getFieldHtml($element, $moduleName);
diff --git a/app/code/Magento/Backend/Block/System/Store/Store.php b/app/code/Magento/Backend/Block/System/Store/Store.php
index 21d35b35aad2c..5a984389aedc7 100644
--- a/app/code/Magento/Backend/Block/System/Store/Store.php
+++ b/app/code/Magento/Backend/Block/System/Store/Store.php
@@ -15,7 +15,7 @@ class Store extends \Magento\Backend\Block\Widget\Grid\Container
     /**
      * @var string
      */
-    protected $_blockGroup = 'Magento_Adminhtml';
+    protected $_blockGroup = 'Magento_Backend';
 
     /**
      * @return void
diff --git a/app/code/Magento/Backend/Block/Template.php b/app/code/Magento/Backend/Block/Template.php
index b9546009a53f3..ed21d0025e4ab 100644
--- a/app/code/Magento/Backend/Block/Template.php
+++ b/app/code/Magento/Backend/Block/Template.php
@@ -79,7 +79,7 @@ public function isOutputEnabled($moduleName = null)
 
         return !$this->_scopeConfig->isSetFlag(
             'advanced/modules_disable_output/' . $moduleName,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
diff --git a/app/code/Magento/Backend/Block/Template/Context.php b/app/code/Magento/Backend/Block/Template/Context.php
index 5be2763e3a500..da4142f87c2f1 100644
--- a/app/code/Magento/Backend/Block/Template/Context.php
+++ b/app/code/Magento/Backend/Block/Template/Context.php
@@ -66,7 +66,7 @@ class Context extends \Magento\Framework\View\Element\Template\Context
      * @param \Magento\Framework\View\FileSystem $viewFileSystem
      * @param \Magento\Framework\View\TemplateEnginePool $enginePool
      * @param \Magento\Framework\App\State $appState
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\View\Page\Config $pageConfig
      * @param \Magento\Framework\AuthorizationInterface $authorization
      * @param \Magento\Backend\Model\Session $backendSession
@@ -99,7 +99,7 @@ public function __construct(
         \Magento\Framework\View\FileSystem $viewFileSystem,
         \Magento\Framework\View\TemplateEnginePool $enginePool,
         \Magento\Framework\App\State $appState,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\View\Page\Config $pageConfig,
         \Magento\Framework\AuthorizationInterface $authorization,
         \Magento\Backend\Model\Session $backendSession,
@@ -143,7 +143,7 @@ public function __construct(
     /**
      * Get store manager
      *
-     * @return \Magento\Framework\Store\StoreManagerInterface
+     * @return \Magento\Store\Model\StoreManagerInterface
      */
     public function getStoreManager()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Context.php b/app/code/Magento/Backend/Block/Widget/Context.php
index e5ab71975d5ee..40bb65bc78fba 100644
--- a/app/code/Magento/Backend/Block/Widget/Context.php
+++ b/app/code/Magento/Backend/Block/Widget/Context.php
@@ -49,7 +49,7 @@ class Context extends \Magento\Backend\Block\Template\Context
      * @param \Magento\Framework\View\FileSystem $viewFileSystem
      * @param \Magento\Framework\View\TemplateEnginePool $enginePool
      * @param \Magento\Framework\App\State $appState
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\AuthorizationInterface $authorization
      * @param \Magento\Backend\Model\Session $backendSession
      * @param \Magento\Framework\Math\Random $mathRandom
@@ -84,7 +84,7 @@ public function __construct(
         \Magento\Framework\View\FileSystem $viewFileSystem,
         \Magento\Framework\View\TemplateEnginePool $enginePool,
         \Magento\Framework\App\State $appState,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\View\Page\Config $pageConfig,
         \Magento\Framework\AuthorizationInterface $authorization,
         \Magento\Backend\Model\Session $backendSession,
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
index 646aa02918598..fa7185cca11b7 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php
@@ -203,7 +203,7 @@ protected function _convertDate($date, $locale)
             $dateObj->setTimezone(
                 $this->_scopeConfig->getValue(
                     $this->_localeDate->getDefaultTimezonePath(),
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 )
             );
 
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
index 65a71d3944aea..3ea98889419dc 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php
@@ -44,7 +44,7 @@ public function getValue($index = null)
             $datetimeTo->setTimezone(
                 $this->_scopeConfig->getValue(
                     $this->_localeDate->getDefaultTimezonePath(),
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 )
             );
             $datetimeTo->addDay(1)->subSecond(1);
@@ -70,7 +70,7 @@ protected function _convertDate($date, $locale)
                 $dateObj->setTimezone(
                     $this->_scopeConfig->getValue(
                         $this->_localeDate->getDefaultTimezonePath(),
-                        \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                     )
                 );
 
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
index d8e73328b9167..f0454dd37a9ec 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php
@@ -30,7 +30,7 @@ class Currency extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
     /**
      * Application object
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -51,7 +51,7 @@ class Currency extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
 
     /**
      * @param \Magento\Backend\Block\Context $context
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Directory\Model\Currency\DefaultLocator $currencyLocator
      * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
      * @param \Magento\Framework\Locale\CurrencyInterface $localeCurrency
@@ -59,7 +59,7 @@ class Currency extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Directory\Model\Currency\DefaultLocator $currencyLocator,
         \Magento\Directory\Model\CurrencyFactory $currencyFactory,
         \Magento\Framework\Locale\CurrencyInterface $localeCurrency,
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Cache.php b/app/code/Magento/Backend/Controller/Adminhtml/Cache.php
index b3f9c969d7295..6d7cd7a7c9926 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Cache.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Cache.php
@@ -85,6 +85,6 @@ protected function _validateTypes(array $types)
      */
     protected function _isAllowed()
     {
-        return $this->_authorization->isAllowed('Magento_Adminhtml::cache');
+        return $this->_authorization->isAllowed('Magento_Backend::cache');
     }
 }
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard.php
index 9d8a1fcddd094..a4c41fde49a92 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard.php
@@ -18,6 +18,6 @@ class Dashboard extends \Magento\Backend\App\Action
      */
     protected function _isAllowed()
     {
-        return $this->_authorization->isAllowed('Magento_Adminhtml::dashboard');
+        return $this->_authorization->isAllowed('Magento_Backend::dashboard');
     }
 }
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php b/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php
index 1d003b0a130c4..c0017958a0bc8 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Index/GlobalSearch.php
@@ -44,7 +44,7 @@ public function execute()
     {
         $items = [];
 
-        if (!$this->_authorization->isAllowed('Magento_Adminhtml::global_search')) {
+        if (!$this->_authorization->isAllowed('Magento_Backend::global_search')) {
             $items[] = [
                 'id' => 'error',
                 'type' => __('Error'),
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System.php b/app/code/Magento/Backend/Controller/Adminhtml/System.php
index 7eaa017356909..5ce34283afccf 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System.php
@@ -19,6 +19,6 @@ class System extends AbstractAction
      */
     protected function _isAllowed()
     {
-        return $this->_authorization->isAllowed('Magento_Adminhtml::system');
+        return $this->_authorization->isAllowed('Magento_Backend::system');
     }
 }
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/AbstractConfig.php b/app/code/Magento/Backend/Controller/Adminhtml/System/AbstractConfig.php
index 9345cb672d8da..aeb025007f6b5 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/AbstractConfig.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/AbstractConfig.php
@@ -58,7 +58,7 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
     protected function _isAllowed()
     {
         $sectionId = $this->_request->getParam('section');
-        return $this->_authorization->isAllowed('Magento_Adminhtml::config')
+        return $this->_authorization->isAllowed('Magento_Backend::config')
             || $this->_configStructure->getElement($sectionId)->isAllowed();
     }
 
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Account.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Account.php
index 62bbfe91fee20..166951742d8f3 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Account.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Account.php
@@ -19,6 +19,6 @@ class Account extends Action
      */
     protected function _isAllowed()
     {
-        return $this->_authorization->isAllowed('Magento_Adminhtml::myaccount');
+        return $this->_authorization->isAllowed('Magento_Backend::myaccount');
     }
 }
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Design.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Design.php
index 8fae2b6ed7ef3..66e2b5739f615 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Design.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Design.php
@@ -73,6 +73,6 @@ public function __construct(
      */
     protected function _isAllowed()
     {
-        return $this->_authorization->isAllowed('Magento_Adminhtml::design');
+        return $this->_authorization->isAllowed('Magento_Backend::design');
     }
 }
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Index.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Index.php
index bf6a5d36a52d1..4af63776d2482 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Index.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Index.php
@@ -32,7 +32,7 @@ public function execute()
     {
         /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
         $resultPage = $this->resultPageFactory->create();
-        $resultPage->setActiveMenu('Magento_Adminhtml::system');
+        $resultPage->setActiveMenu('Magento_Backend::system');
         $resultPage->addBreadcrumb(__('System'), __('System'));
         return $resultPage;
     }
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
index 9a9d2a4a6d620..4ed6e97af4265 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store.php
@@ -90,7 +90,7 @@ protected function createPage()
      */
     protected function _isAllowed()
     {
-        return $this->_authorization->isAllowed('Magento_Adminhtml::store');
+        return $this->_authorization->isAllowed('Magento_Backend::store');
     }
 
     /**
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Variable.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Variable.php
index 8dd35c33673ff..f133ce599b39d 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Variable.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Variable.php
@@ -112,6 +112,6 @@ protected function _initVariable()
      */
     protected function _isAllowed()
     {
-        return $this->_authorization->isAllowed('Magento_Adminhtml::variable');
+        return $this->_authorization->isAllowed('Magento_Backend::variable');
     }
 }
diff --git a/app/code/Magento/Backend/Helper/Dashboard/Data.php b/app/code/Magento/Backend/Helper/Dashboard/Data.php
index 25b527c5013b0..17cffb3f53c45 100644
--- a/app/code/Magento/Backend/Helper/Dashboard/Data.php
+++ b/app/code/Magento/Backend/Helper/Dashboard/Data.php
@@ -30,7 +30,7 @@ class Data extends \Magento\Core\Helper\Data
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\State $appState
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param DeploymentConfig $deploymentConfig
@@ -39,7 +39,7 @@ class Data extends \Magento\Core\Helper\Data
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\State $appState,
         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
         DeploymentConfig $deploymentConfig,
diff --git a/app/code/Magento/Backend/Helper/Dashboard/Order.php b/app/code/Magento/Backend/Helper/Dashboard/Order.php
index a78e32e23d17d..899e2b2ee6e04 100644
--- a/app/code/Magento/Backend/Helper/Dashboard/Order.php
+++ b/app/code/Magento/Backend/Helper/Dashboard/Order.php
@@ -18,7 +18,7 @@ class Order extends \Magento\Backend\Helper\Dashboard\AbstractDashboard
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\State $appState
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param \Magento\Reports\Model\Resource\Order\Collection $orderCollection
@@ -27,7 +27,7 @@ class Order extends \Magento\Backend\Helper\Dashboard\AbstractDashboard
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\State $appState,
         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
         \Magento\Reports\Model\Resource\Order\Collection $orderCollection,
diff --git a/app/code/Magento/Backend/Model/Config.php b/app/code/Magento/Backend/Model/Config.php
index fac2a55a463c5..b5b099997e327 100644
--- a/app/code/Magento/Backend/Model/Config.php
+++ b/app/code/Magento/Backend/Model/Config.php
@@ -71,7 +71,7 @@ class Config extends \Magento\Framework\Object
     protected $_configValueFactory;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -82,7 +82,7 @@ class Config extends \Magento\Framework\Object
      * @param \Magento\Framework\DB\TransactionFactory $transactionFactory
      * @param \Magento\Backend\Model\Config\Loader $configLoader
      * @param \Magento\Framework\App\Config\ValueFactory $configValueFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param array $data
      */
     public function __construct(
@@ -92,7 +92,7 @@ public function __construct(
         \Magento\Framework\DB\TransactionFactory $transactionFactory,
         \Magento\Backend\Model\Config\Loader $configLoader,
         \Magento\Framework\App\Config\ValueFactory $configValueFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         array $data = []
     ) {
         parent::__construct($data);
diff --git a/app/code/Magento/Backend/Model/Config/Backend/Admin/Observer.php b/app/code/Magento/Backend/Model/Config/Backend/Admin/Observer.php
index be0e1bfd8ded4..a2ab813d88d44 100644
--- a/app/code/Magento/Backend/Model/Config/Backend/Admin/Observer.php
+++ b/app/code/Magento/Backend/Model/Config/Backend/Admin/Observer.php
@@ -32,7 +32,7 @@ class Observer
     protected $_response;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -48,7 +48,7 @@ public function __construct(
         \Magento\Framework\Registry $coreRegistry,
         \Magento\Backend\Model\Auth\Session $authSession,
         \Magento\Framework\App\ResponseInterface $response,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->_backendData = $backendData;
         $this->_coreRegistry = $coreRegistry;
diff --git a/app/code/Magento/Backend/Model/Config/Backend/Currency/AbstractCurrency.php b/app/code/Magento/Backend/Model/Config/Backend/Currency/AbstractCurrency.php
index b2eac31749d0a..677c9e83854db 100644
--- a/app/code/Magento/Backend/Model/Config/Backend/Currency/AbstractCurrency.php
+++ b/app/code/Magento/Backend/Model/Config/Backend/Currency/AbstractCurrency.php
@@ -77,7 +77,7 @@ protected function _getInstalledCurrencies()
             ',',
             $this->_scopeConfig->getValue(
                 'system/currency/installed',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
         );
     }
diff --git a/app/code/Magento/Backend/Model/Config/Backend/Locale.php b/app/code/Magento/Backend/Model/Config/Backend/Locale.php
index 37d3b759e0f19..8341277a0f883 100644
--- a/app/code/Magento/Backend/Model/Config/Backend/Locale.php
+++ b/app/code/Magento/Backend/Model/Config/Backend/Locale.php
@@ -95,14 +95,14 @@ public function afterSave()
                             $scopeName = __('Default scope');
                             break;
 
-                        case \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE:
+                        case \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE:
                             /** @var $website \Magento\Store\Model\Website */
                             $website = $this->_websiteFactory->create();
                             $websiteName = $website->load($data->getScopeId())->getName();
                             $scopeName = __('website(%1) scope', $websiteName);
                             break;
 
-                        case \Magento\Framework\Store\ScopeInterface::SCOPE_STORE:
+                        case \Magento\Store\Model\ScopeInterface::SCOPE_STORE:
                             /** @var $store \Magento\Store\Model\Store */
                             $store = $this->_storeFactory->create();
                             $storeName = $store->load($data->getScopeId())->getName();
diff --git a/app/code/Magento/Backend/Model/Config/Backend/Store.php b/app/code/Magento/Backend/Model/Config/Backend/Store.php
index 0926b1a7d46b4..8ada34865bf60 100644
--- a/app/code/Magento/Backend/Model/Config/Backend/Store.php
+++ b/app/code/Magento/Backend/Model/Config/Backend/Store.php
@@ -46,7 +46,7 @@ public function afterSave()
         $this->_mutableConfig->setValue(
             \Magento\Store\Model\Store::XML_PATH_STORE_IN_URL,
             $this->getValue(),
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         $this->_cacheManager->clean();
     }
diff --git a/app/code/Magento/Backend/Model/Config/Backend/Translate.php b/app/code/Magento/Backend/Model/Config/Backend/Translate.php
index 9fb7b137db93e..eddfffe2a06ba 100644
--- a/app/code/Magento/Backend/Model/Config/Backend/Translate.php
+++ b/app/code/Magento/Backend/Model/Config/Backend/Translate.php
@@ -67,7 +67,7 @@ public function afterSave()
         $types = array_keys(
             $this->_scopeConfig->getValue(
                 self::XML_PATH_INVALID_CACHES,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
         );
         if ($this->isValueChanged()) {
diff --git a/app/code/Magento/Backend/Model/Config/ScopeDefiner.php b/app/code/Magento/Backend/Model/Config/ScopeDefiner.php
index fc5f1ad32413e..734cdca03c1ac 100644
--- a/app/code/Magento/Backend/Model/Config/ScopeDefiner.php
+++ b/app/code/Magento/Backend/Model/Config/ScopeDefiner.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Backend\Model\Config;
 
-use Magento\Framework\Store\ScopeInterface as StoreScopeInterface;
+use Magento\Store\Model\ScopeInterface as StoreScopeInterface;
 
 /**
  * System configuration scope
diff --git a/app/code/Magento/Backend/Model/Config/Source/Website.php b/app/code/Magento/Backend/Model/Config/Source/Website.php
index 3998a2ba1534a..da9f210595c37 100644
--- a/app/code/Magento/Backend/Model/Config/Source/Website.php
+++ b/app/code/Magento/Backend/Model/Config/Source/Website.php
@@ -13,14 +13,14 @@ class Website implements \Magento\Framework\Option\ArrayInterface
     protected $_options;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
-    public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
+    public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
     {
         $this->_storeManager = $storeManager;
     }
diff --git a/app/code/Magento/Backend/Model/Config/Structure/AbstractElement.php b/app/code/Magento/Backend/Model/Config/Structure/AbstractElement.php
index 64518f6702983..4020737bac5a7 100644
--- a/app/code/Magento/Backend/Model/Config/Structure/AbstractElement.php
+++ b/app/code/Magento/Backend/Model/Config/Structure/AbstractElement.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Backend\Model\Config\Structure;
 
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 abstract class AbstractElement implements ElementInterface
 {
@@ -26,12 +26,12 @@ abstract class AbstractElement implements ElementInterface
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(StoreManagerInterface $storeManager)
     {
@@ -134,8 +134,8 @@ public function getAttribute($key)
     public function isVisible()
     {
         $showInScope = [
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE => $this->_hasVisibilityValue('showInStore'),
-            \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE => $this->_hasVisibilityValue('showInWebsite'),
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE => $this->_hasVisibilityValue('showInStore'),
+            \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE => $this->_hasVisibilityValue('showInWebsite'),
             \Magento\Framework\App\ScopeInterface::SCOPE_DEFAULT => $this->_hasVisibilityValue('showInDefault'),
         ];
 
diff --git a/app/code/Magento/Backend/Model/Config/Structure/Element/AbstractComposite.php b/app/code/Magento/Backend/Model/Config/Structure/Element/AbstractComposite.php
index 0083aebe7fb9a..0ee58ea850e99 100644
--- a/app/code/Magento/Backend/Model/Config/Structure/Element/AbstractComposite.php
+++ b/app/code/Magento/Backend/Model/Config/Structure/Element/AbstractComposite.php
@@ -15,11 +15,11 @@ abstract class AbstractComposite extends \Magento\Backend\Model\Config\Structure
     protected $_childrenIterator;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param Iterator $childrenIterator
      */
     public function __construct(
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         Iterator $childrenIterator
     ) {
         parent::__construct($storeManager);
diff --git a/app/code/Magento/Backend/Model/Config/Structure/Element/Dependency/Mapper.php b/app/code/Magento/Backend/Model/Config/Structure/Element/Dependency/Mapper.php
index 429afca222f75..e5458890fe645 100644
--- a/app/code/Magento/Backend/Model/Config/Structure/Element/Dependency/Mapper.php
+++ b/app/code/Magento/Backend/Model/Config/Structure/Element/Dependency/Mapper.php
@@ -66,7 +66,7 @@ public function getDependencies($dependencies, $storeCode, $fieldPrefix = '')
             if (false == $dependentField->isVisible()) {
                 $valueInStore = $this->_scopeConfig->getValue(
                     $dependentField->getPath($fieldPrefix),
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                     $storeCode
                 );
                 $shouldAddDependency = !$field->isValueSatisfy($valueInStore);
diff --git a/app/code/Magento/Backend/Model/Config/Structure/Element/Field.php b/app/code/Magento/Backend/Model/Config/Structure/Element/Field.php
index 6aab8e387cdb4..fd94275687ead 100644
--- a/app/code/Magento/Backend/Model/Config/Structure/Element/Field.php
+++ b/app/code/Magento/Backend/Model/Config/Structure/Element/Field.php
@@ -49,7 +49,7 @@ class Field extends \Magento\Backend\Model\Config\Structure\AbstractElement
     protected $_blockFactory;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Backend\Model\Config\BackendFactory $backendFactory
      * @param \Magento\Backend\Model\Config\SourceFactory $sourceFactory
      * @param \Magento\Backend\Model\Config\CommentFactory $commentFactory
@@ -57,7 +57,7 @@ class Field extends \Magento\Backend\Model\Config\Structure\AbstractElement
      * @param \Magento\Backend\Model\Config\Structure\Element\Dependency\Mapper $dependencyMapper
      */
     public function __construct(
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Backend\Model\Config\BackendFactory $backendFactory,
         \Magento\Backend\Model\Config\SourceFactory $sourceFactory,
         \Magento\Backend\Model\Config\CommentFactory $commentFactory,
diff --git a/app/code/Magento/Backend/Model/Config/Structure/Element/Group.php b/app/code/Magento/Backend/Model/Config/Structure/Element/Group.php
index 7213a534cc9da..251fa37a319d1 100644
--- a/app/code/Magento/Backend/Model/Config/Structure/Element/Group.php
+++ b/app/code/Magento/Backend/Model/Config/Structure/Element/Group.php
@@ -24,13 +24,13 @@ class Group extends AbstractComposite
     protected $_dependencyMapper;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Backend\Model\Config\Structure\Element\Iterator\Field $childrenIterator
      * @param \Magento\Backend\Model\Config\BackendClone\Factory $cloneModelFactory
      * @param \Magento\Backend\Model\Config\Structure\Element\Dependency\Mapper $dependencyMapper
      */
     public function __construct(
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Backend\Model\Config\Structure\Element\Iterator\Field $childrenIterator,
         \Magento\Backend\Model\Config\BackendClone\Factory $cloneModelFactory,
         \Magento\Backend\Model\Config\Structure\Element\Dependency\Mapper $dependencyMapper
diff --git a/app/code/Magento/Backend/Model/Config/Structure/Element/Section.php b/app/code/Magento/Backend/Model/Config/Structure/Element/Section.php
index e5f75aae53644..3965d01a4d26a 100644
--- a/app/code/Magento/Backend/Model/Config/Structure/Element/Section.php
+++ b/app/code/Magento/Backend/Model/Config/Structure/Element/Section.php
@@ -15,12 +15,12 @@ class Section extends AbstractComposite
     protected $_authorization;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param Iterator $childrenIterator
      * @param \Magento\Framework\AuthorizationInterface $authorization
      */
     public function __construct(
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         Iterator $childrenIterator,
         \Magento\Framework\AuthorizationInterface $authorization
     ) {
diff --git a/app/code/Magento/Backend/Model/Menu/Item.php b/app/code/Magento/Backend/Model/Menu/Item.php
index 6ed736567dfde..c52c96fe555ab 100644
--- a/app/code/Magento/Backend/Model/Menu/Item.php
+++ b/app/code/Magento/Backend/Model/Menu/Item.php
@@ -425,7 +425,7 @@ protected function _isModuleDependenciesAvailable()
     protected function _isConfigDependenciesAvailable()
     {
         if ($this->_dependsOnConfig) {
-            return $this->_scopeConfig->isSetFlag((string)$this->_dependsOnConfig, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+            return $this->_scopeConfig->isSetFlag((string)$this->_dependsOnConfig, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
         }
         return true;
     }
diff --git a/app/code/Magento/Backend/Model/Session/AdminConfig.php b/app/code/Magento/Backend/Model/Session/AdminConfig.php
index 0e66533f78691..564f9540a9703 100644
--- a/app/code/Magento/Backend/Model/Session/AdminConfig.php
+++ b/app/code/Magento/Backend/Model/Session/AdminConfig.php
@@ -30,7 +30,7 @@ class AdminConfig extends Config
     protected $_frontNameResolver;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -43,7 +43,7 @@ class AdminConfig extends Config
      * @param DeploymentConfig $deploymentConfig
      * @param string $scopeType
      * @param FrontNameResolver $frontNameResolver
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param string $lifetimePath
      * @param string $sessionName
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -57,7 +57,7 @@ public function __construct(
         DeploymentConfig $deploymentConfig,
         $scopeType,
         FrontNameResolver $frontNameResolver,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         $lifetimePath = self::XML_PATH_COOKIE_LIFETIME,
         $sessionName = self::SESSION_NAME_ADMIN
     ) {
diff --git a/app/code/Magento/Backend/Model/Session/Quote.php b/app/code/Magento/Backend/Model/Session/Quote.php
index 644ea27c6057f..96141a383c690 100644
--- a/app/code/Magento/Backend/Model/Session/Quote.php
+++ b/app/code/Magento/Backend/Model/Session/Quote.php
@@ -65,7 +65,7 @@ class Quote extends \Magento\Framework\Session\SessionManager
     protected $quoteRepository;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -86,7 +86,7 @@ class Quote extends \Magento\Framework\Session\SessionManager
      * @param CustomerRepositoryInterface $customerRepository
      * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
      * @param \Magento\Sales\Model\OrderFactory $orderFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param GroupManagementInterface $groupManagement
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -102,7 +102,7 @@ public function __construct(
         CustomerRepositoryInterface $customerRepository,
         \Magento\Quote\Model\QuoteRepository $quoteRepository,
         \Magento\Sales\Model\OrderFactory $orderFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         GroupManagementInterface $groupManagement
     ) {
         $this->customerRepository = $customerRepository;
diff --git a/app/code/Magento/Backend/etc/acl.xml b/app/code/Magento/Backend/etc/acl.xml
index 016251c8c070b..b488fc8dc3376 100644
--- a/app/code/Magento/Backend/etc/acl.xml
+++ b/app/code/Magento/Backend/etc/acl.xml
@@ -8,51 +8,51 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::all" title="Allow everything" sortOrder="10" />
-            <resource id="Magento_Adminhtml::admin" title="Magento Admin" sortOrder="20">
-                <resource id="Magento_Adminhtml::dashboard" title="Dashboard" sortOrder="0" />
-                <resource id="Magento_Adminhtml::global_search" title="Global Search" sortOrder="100" />
-                <resource id="Magento_Adminhtml::myaccount" title="My Account" sortOrder="50" />
-                <resource id="Magento_Adminhtml::marketing" title="Marketing" sortOrder="50">
-                    <resource id="Magento_Adminhtml::marketing_seo" title="SEO &amp; Search" sortOrder="40" />
-                    <resource id="Magento_Adminhtml::marketing_user_content" title="User Content" sortOrder="50" />
+            <resource id="Magento_Backend::all" title="Allow everything" sortOrder="10" />
+            <resource id="Magento_Backend::admin" title="Magento Admin" sortOrder="20">
+                <resource id="Magento_Backend::dashboard" title="Dashboard" sortOrder="0" />
+                <resource id="Magento_Backend::global_search" title="Global Search" sortOrder="100" />
+                <resource id="Magento_Backend::myaccount" title="My Account" sortOrder="50" />
+                <resource id="Magento_Backend::marketing" title="Marketing" sortOrder="50">
+                    <resource id="Magento_Backend::marketing_seo" title="SEO &amp; Search" sortOrder="40" />
+                    <resource id="Magento_Backend::marketing_user_content" title="User Content" sortOrder="50" />
                 </resource>
-                <resource id="Magento_Adminhtml::content" title="Content" sortOrder="60">
-                    <resource id="Magento_Adminhtml::content_elements" title="Elements" sortOrder="10" />
-                    <resource id="Magento_Adminhtml::design"  title="Design" sortOrder="20">
-                        <resource id="Magento_Adminhtml::schedule" title="Schedule" sortOrder="30" />
+                <resource id="Magento_Backend::content" title="Content" sortOrder="60">
+                    <resource id="Magento_Backend::content_elements" title="Elements" sortOrder="10" />
+                    <resource id="Magento_Backend::design"  title="Design" sortOrder="20">
+                        <resource id="Magento_Backend::schedule" title="Schedule" sortOrder="30" />
                     </resource>
                 </resource>
-                <resource id="Magento_Adminhtml::stores" title="Stores" sortOrder="80">
-                    <resource id="Magento_Adminhtml::stores_settings" title="Settings" sortOrder="10">
-                        <resource id="Magento_Adminhtml::store" title="All Stores" sortOrder="10"/>
-                        <resource id="Magento_Adminhtml::config" title="Configuration" sortOrder="20">
-                            <resource id="Magento_Adminhtml::advanced" title="Advanced Section" sortOrder="90" />
-                            <resource id="Magento_Adminhtml::config_admin" title="Advanced Admin Section" sortOrder="100" />
-                            <resource id="Magento_Adminhtml::config_design" title="Design Section" sortOrder="40" />
-                            <resource id="Magento_Adminhtml::config_general" title="General Section" sortOrder="20" />
-                            <resource id="Magento_Adminhtml::config_system" title="System Section" sortOrder="80" />
-                            <resource id="Magento_Adminhtml::currency" title="Currency Setup Section" sortOrder="120" />
-                            <resource id="Magento_Adminhtml::dev" title="Developer Section" sortOrder="110" />
-                            <resource id="Magento_Adminhtml::web" title="Web Section" sortOrder="30" />
-                            <resource id="Magento_Adminhtml::trans_email" title="Store Email Addresses Section" sortOrder="100" />
-                            <resource id="Magento_Adminhtml::sendfriend" title="Email to a Friend" sortOrder="140" />
+                <resource id="Magento_Backend::stores" title="Stores" sortOrder="80">
+                    <resource id="Magento_Backend::stores_settings" title="Settings" sortOrder="10">
+                        <resource id="Magento_Backend::store" title="All Stores" sortOrder="10"/>
+                        <resource id="Magento_Backend::config" title="Configuration" sortOrder="20">
+                            <resource id="Magento_Backend::advanced" title="Advanced Section" sortOrder="90" />
+                            <resource id="Magento_Backend::config_admin" title="Advanced Admin Section" sortOrder="100" />
+                            <resource id="Magento_Backend::config_design" title="Design Section" sortOrder="40" />
+                            <resource id="Magento_Backend::config_general" title="General Section" sortOrder="20" />
+                            <resource id="Magento_Backend::config_system" title="System Section" sortOrder="80" />
+                            <resource id="Magento_Backend::currency" title="Currency Setup Section" sortOrder="120" />
+                            <resource id="Magento_Backend::dev" title="Developer Section" sortOrder="110" />
+                            <resource id="Magento_Backend::web" title="Web Section" sortOrder="30" />
+                            <resource id="Magento_Backend::trans_email" title="Store Email Addresses Section" sortOrder="100" />
+                            <resource id="Magento_Backend::sendfriend" title="Email to a Friend" sortOrder="140" />
                         </resource>
                     </resource>
-                    <resource id="Magento_Adminhtml::stores_attributes" title="Attributes" sortOrder="40" />
-                    <resource id="Magento_Adminhtml::stores_other_settings" title="Other Settings" sortOrder="50" />
+                    <resource id="Magento_Backend::stores_attributes" title="Attributes" sortOrder="40" />
+                    <resource id="Magento_Backend::stores_other_settings" title="Other Settings" sortOrder="50" />
                 </resource>
-                <resource id="Magento_Adminhtml::system" title="System" sortOrder="90">
-                    <resource id="Magento_Adminhtml::convert" title="Data Transfer" sortOrder="10" />
-                    <resource id="Magento_Adminhtml::extensions" title="Magento Connect" sortOrder="20">
-                        <resource id="Magento_Adminhtml::local" title="Connect Manager" sortOrder="10" />
-                        <resource id="Magento_Adminhtml::custom" title="Package Extensions" sortOrder="20" />
+                <resource id="Magento_Backend::system" title="System" sortOrder="90">
+                    <resource id="Magento_Backend::convert" title="Data Transfer" sortOrder="10" />
+                    <resource id="Magento_Backend::extensions" title="Magento Connect" sortOrder="20">
+                        <resource id="Magento_Backend::local" title="Connect Manager" sortOrder="10" />
+                        <resource id="Magento_Backend::custom" title="Package Extensions" sortOrder="20" />
                     </resource>
-                    <resource id="Magento_Adminhtml::tools" title="Tools" sortOrder="50">
-                        <resource id="Magento_Adminhtml::cache" title="Cache Management"  sortOrder="10" />
+                    <resource id="Magento_Backend::tools" title="Tools" sortOrder="50">
+                        <resource id="Magento_Backend::cache" title="Cache Management"  sortOrder="10" />
                     </resource>
-                    <resource id="Magento_Adminhtml::system_other_settings" title="Other Settings"  sortOrder="80">
-                        <resource id="Magento_Adminhtml::variable" title="Custom Variables"  sortOrder="20" />
+                    <resource id="Magento_Backend::system_other_settings" title="Other Settings"  sortOrder="80">
+                        <resource id="Magento_Backend::variable" title="Custom Variables"  sortOrder="20" />
                     </resource>
                 </resource>
             </resource>
diff --git a/app/code/Magento/Backend/etc/adminhtml/menu.xml b/app/code/Magento/Backend/etc/adminhtml/menu.xml
index 4a17367d3cb81..8d9fa29167bbc 100644
--- a/app/code/Magento/Backend/etc/adminhtml/menu.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/menu.xml
@@ -7,27 +7,27 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../Backend/etc/menu.xsd">
     <menu>
-        <add id="Magento_Backend::system_design_schedule" title="Schedule" module="Magento_Backend" sortOrder="30" parent="Magento_Backend::system_design" action="adminhtml/system_design" resource="Magento_Adminhtml::schedule"/>
+        <add id="Magento_Backend::system_design_schedule" title="Schedule" module="Magento_Backend" sortOrder="30" parent="Magento_Backend::system_design" action="adminhtml/system_design" resource="Magento_Backend::schedule"/>
         <add id="Magento_Backend::system_currency" title="Currency" module="Magento_Backend" sortOrder="30" parent="Magento_Backend::stores" action="adminhtml/system_currency" resource="Magento_CurrencySymbol::system_currency"/>
-        <add id="Magento_Backend::system_variable" title="Custom Variables" module="Magento_Backend" sortOrder="20" parent="Magento_Backend::system_other_settings" action="adminhtml/system_variable" resource="Magento_Adminhtml::variable"/>
-        <add id="Magento_Backend::system_store" title="All Stores" module="Magento_Core" sortOrder="10" parent="Magento_Backend::stores_settings" action="adminhtml/system_store/" resource="Magento_Adminhtml::store"/>
-        <add id="Magento_Backend::system_config" title="Configuration" module="Magento_Backend" sortOrder="20" parent="Magento_Backend::stores_settings" action="adminhtml/system_config" resource="Magento_Adminhtml::config"/>
-        <add id="Magento_Backend::dashboard" title="Dashboard" module="Magento_Backend" sortOrder="10" action="adminhtml/dashboard" resource="Magento_Adminhtml::dashboard"/>
-        <add id="Magento_Backend::system" title="System" module="Magento_Backend" sortOrder="80" resource="Magento_Adminhtml::system"/>
-        <add id="Magento_Backend::system_tools" title="Tools" module="Magento_Backend" sortOrder="50" parent="Magento_Backend::system" resource="Magento_Adminhtml::tools"/>
-        <add id="Magento_Backend::system_design" title="Design" module="Magento_Backend" sortOrder="20" parent="Magento_Backend::content" resource="Magento_Adminhtml::design"/>
-        <add id="Magento_Backend::system_convert" title="Data Transfer" module="Magento_Backend" sortOrder="10" parent="Magento_Backend::system" resource="Magento_Adminhtml::convert"/>
-        <add id="Magento_Backend::system_cache" title="Cache Management" module="Magento_Backend" sortOrder="10" parent="Magento_Backend::system_tools" action="adminhtml/cache" resource="Magento_Adminhtml::cache"/>
-        <add id="Magento_Backend::marketing" title="Marketing" module="Magento_Backend" sortOrder="40" resource="Magento_Adminhtml::marketing"/>
-        <add id="Magento_Backend::marketing_communications" title="Communications" module="Magento_Backend" sortOrder="30" parent="Magento_Backend::marketing"  resource="Magento_Adminhtml::marketing_communications"/>
-        <add id="Magento_Backend::marketing_seo" title="SEO &amp; Search" module="Magento_Backend" sortOrder="40" parent="Magento_Backend::marketing"  resource="Magento_Adminhtml::marketing_seo"/>
-        <add id="Magento_Backend::marketing_user_content" title="User Content" module="Magento_Backend" sortOrder="50" parent="Magento_Backend::marketing"  resource="Magento_Adminhtml::marketing_user_content"/>
-        <add id="Magento_Backend::content" title="Content" module="Magento_Backend" sortOrder="50" resource="Magento_Adminhtml::content"/>
-        <add id="Magento_Backend::content_elements" title="Elements" module="Magento_Backend" sortOrder="10" parent="Magento_Backend::content" resource="Magento_Adminhtml::content_elements"/>
-        <add id="Magento_Backend::stores" title="Stores" module="Magento_Backend" sortOrder="70" resource="Magento_Adminhtml::stores"/>
-        <add id="Magento_Backend::stores_settings" title="Settings" module="Magento_Backend" sortOrder="10" parent="Magento_Backend::stores" resource="Magento_Adminhtml::stores_settings"/>
-        <add id="Magento_Backend::stores_attributes" title="Attributes" module="Magento_Backend" sortOrder="40" parent="Magento_Backend::stores" resource="Magento_Adminhtml::stores_attributes"/>
-        <add id="Magento_Backend::other_settings" title="Other Settings" module="Magento_Backend" sortOrder="50" parent="Magento_Backend::stores" resource="Magento_Adminhtml::stores_other_settings"/>
-        <add id="Magento_Backend::system_other_settings" title="Other Settings" module="Magento_Backend" sortOrder="80" parent="Magento_Backend::system" resource="Magento_Adminhtml::system_other_settings"/>
+        <add id="Magento_Backend::system_variable" title="Custom Variables" module="Magento_Backend" sortOrder="20" parent="Magento_Backend::system_other_settings" action="adminhtml/system_variable" resource="Magento_Backend::variable"/>
+        <add id="Magento_Backend::system_store" title="All Stores" module="Magento_Core" sortOrder="10" parent="Magento_Backend::stores_settings" action="adminhtml/system_store/" resource="Magento_Backend::store"/>
+        <add id="Magento_Backend::system_config" title="Configuration" module="Magento_Backend" sortOrder="20" parent="Magento_Backend::stores_settings" action="adminhtml/system_config" resource="Magento_Backend::config"/>
+        <add id="Magento_Backend::dashboard" title="Dashboard" module="Magento_Backend" sortOrder="10" action="adminhtml/dashboard" resource="Magento_Backend::dashboard"/>
+        <add id="Magento_Backend::system" title="System" module="Magento_Backend" sortOrder="80" resource="Magento_Backend::system"/>
+        <add id="Magento_Backend::system_tools" title="Tools" module="Magento_Backend" sortOrder="50" parent="Magento_Backend::system" resource="Magento_Backend::tools"/>
+        <add id="Magento_Backend::system_design" title="Design" module="Magento_Backend" sortOrder="20" parent="Magento_Backend::content" resource="Magento_Backend::design"/>
+        <add id="Magento_Backend::system_convert" title="Data Transfer" module="Magento_Backend" sortOrder="10" parent="Magento_Backend::system" resource="Magento_Backend::convert"/>
+        <add id="Magento_Backend::system_cache" title="Cache Management" module="Magento_Backend" sortOrder="10" parent="Magento_Backend::system_tools" action="adminhtml/cache" resource="Magento_Backend::cache"/>
+        <add id="Magento_Backend::marketing" title="Marketing" module="Magento_Backend" sortOrder="40" resource="Magento_Backend::marketing"/>
+        <add id="Magento_Backend::marketing_communications" title="Communications" module="Magento_Backend" sortOrder="30" parent="Magento_Backend::marketing"  resource="Magento_Backend::marketing_communications"/>
+        <add id="Magento_Backend::marketing_seo" title="SEO &amp; Search" module="Magento_Backend" sortOrder="40" parent="Magento_Backend::marketing"  resource="Magento_Backend::marketing_seo"/>
+        <add id="Magento_Backend::marketing_user_content" title="User Content" module="Magento_Backend" sortOrder="50" parent="Magento_Backend::marketing"  resource="Magento_Backend::marketing_user_content"/>
+        <add id="Magento_Backend::content" title="Content" module="Magento_Backend" sortOrder="50" resource="Magento_Backend::content"/>
+        <add id="Magento_Backend::content_elements" title="Elements" module="Magento_Backend" sortOrder="10" parent="Magento_Backend::content" resource="Magento_Backend::content_elements"/>
+        <add id="Magento_Backend::stores" title="Stores" module="Magento_Backend" sortOrder="70" resource="Magento_Backend::stores"/>
+        <add id="Magento_Backend::stores_settings" title="Settings" module="Magento_Backend" sortOrder="10" parent="Magento_Backend::stores" resource="Magento_Backend::stores_settings"/>
+        <add id="Magento_Backend::stores_attributes" title="Attributes" module="Magento_Backend" sortOrder="40" parent="Magento_Backend::stores" resource="Magento_Backend::stores_attributes"/>
+        <add id="Magento_Backend::other_settings" title="Other Settings" module="Magento_Backend" sortOrder="50" parent="Magento_Backend::stores" resource="Magento_Backend::stores_other_settings"/>
+        <add id="Magento_Backend::system_other_settings" title="Other Settings" module="Magento_Backend" sortOrder="80" parent="Magento_Backend::system" resource="Magento_Backend::system_other_settings"/>
     </menu>
 </config>
diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml
index b4aeadf75a9e3..57dd62a88bfcd 100644
--- a/app/code/Magento/Backend/etc/adminhtml/system.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/system.xml
@@ -19,7 +19,7 @@
         <section id="advanced" translate="label" type="text" sortOrder="910" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Advanced</label>
             <tab>advanced</tab>
-            <resource>Magento_Adminhtml::advanced</resource>
+            <resource>Magento_Backend::advanced</resource>
             <group id="modules_disable_output" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Disable Modules Output</label>
                 <frontend_model>Magento\Backend\Block\System\Config\Form\Fieldset\Modules\DisableOutput</frontend_model>
@@ -29,7 +29,7 @@
             <class>separator-top</class>
             <label>Store Email Addresses</label>
             <tab>general</tab>
-            <resource>Magento_Adminhtml::trans_email</resource>
+            <resource>Magento_Backend::trans_email</resource>
             <group id="ident_custom1" translate="label" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Custom Email 1</label>
                 <field id="email" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -99,7 +99,7 @@
         <section id="design" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Design</label>
             <tab>general</tab>
-            <resource>Magento_Adminhtml::config_design</resource>
+            <resource>Magento_Backend::config_design</resource>
             <group id="theme" translate="label" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Design Theme</label>
                 <field id="theme_id" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -153,7 +153,7 @@
         <section id="dev" translate="label" type="text" sortOrder="920" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Developer</label>
             <tab>advanced</tab>
-            <resource>Magento_Adminhtml::dev</resource>
+            <resource>Magento_Backend::dev</resource>
             <group id="restrict" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Developer Client Restrictions</label>
                 <field id="allow_ips" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -236,7 +236,7 @@
         <section id="general" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>General</label>
             <tab>general</tab>
-            <resource>Magento_Adminhtml::config_general</resource>
+            <resource>Magento_Backend::config_general</resource>
             <group id="country" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Country Options</label>
                 <field id="allow" translate="label" type="multiselect" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -321,7 +321,7 @@
             <class>separator-top</class>
             <label>System</label>
             <tab>advanced</tab>
-            <resource>Magento_Adminhtml::config_system</resource>
+            <resource>Magento_Backend::config_system</resource>
             <group id="smtp" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Mail Sending Settings</label>
                 <field id="disable" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -375,7 +375,7 @@
         <section id="admin" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
             <label>Admin</label>
             <tab>advanced</tab>
-            <resource>Magento_Adminhtml::config_admin</resource>
+            <resource>Magento_Backend::config_admin</resource>
             <group id="emails" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>Admin User Emails</label>
                 <field id="forgot_email_template" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
@@ -458,7 +458,7 @@
         <section id="web" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Web</label>
             <tab>general</tab>
-            <resource>Magento_Adminhtml::web</resource>
+            <resource>Magento_Backend::web</resource>
             <group id="url" translate="label" type="text" sortOrder="3" showInDefault="1" showInWebsite="0" showInStore="0">
                 <label>Url Options</label>
                 <field id="use_store" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="0" showInStore="0">
diff --git a/app/code/Magento/Backend/etc/di.xml b/app/code/Magento/Backend/etc/di.xml
index 4d5f28658fb33..de433e3b8e18e 100644
--- a/app/code/Magento/Backend/etc/di.xml
+++ b/app/code/Magento/Backend/etc/di.xml
@@ -79,7 +79,7 @@
             <argument name="scopeResolver" xsi:type="object">Magento\Backend\Model\Url\ScopeResolver</argument>
             <argument name="authSession" xsi:type="object">Magento\Backend\Model\Auth\Session\Proxy</argument>
             <argument name="formKey" xsi:type="object">Magento\Framework\Data\Form\FormKey\Proxy</argument>
-            <argument name="scopeType" xsi:type="const">Magento\Framework\Store\ScopeInterface::SCOPE_STORE</argument>
+            <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
             <argument name="backendHelper" xsi:type="object">Magento\Backend\Helper\Data\Proxy</argument>
         </arguments>
     </type>
@@ -108,7 +108,7 @@
     </type>
     <type name="Magento\Framework\Acl\RootResource">
         <arguments>
-            <argument name="identifier" xsi:type="string">Magento_Adminhtml::all</argument>
+            <argument name="identifier" xsi:type="string">Magento_Backend::all</argument>
         </arguments>
     </type>
     <type name="Magento\Backend\Controller\Adminhtml\Index\GlobalSearch">
diff --git a/app/code/Magento/Backend/etc/webapi.xml b/app/code/Magento/Backend/etc/webapi.xml
index 1188507e93082..8d6b69d864e59 100644
--- a/app/code/Magento/Backend/etc/webapi.xml
+++ b/app/code/Magento/Backend/etc/webapi.xml
@@ -10,7 +10,7 @@
     <route url="/V1/modules" method="GET">
         <service class="Magento\Backend\Service\V1\ModuleServiceInterface" method="getModules"/>
         <resources>
-            <resource ref="Magento_Adminhtml::admin"/>
+            <resource ref="Magento_Backend::admin"/>
         </resources>
     </route>
 </routes>
diff --git a/app/code/Magento/Backend/view/adminhtml/layout/default.xml b/app/code/Magento/Backend/view/adminhtml/layout/default.xml
index 977282aa8d3a8..67fa7c2c76c76 100644
--- a/app/code/Magento/Backend/view/adminhtml/layout/default.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/default.xml
@@ -28,7 +28,7 @@
                     <argument name="edition" translate="true" xsi:type="string">Community Edition</argument>
                 </arguments>
             </block>
-            <block class="Magento\Backend\Block\GlobalSearch" as="search" after="logo" acl="Magento_Adminhtml::global_search"/>
+            <block class="Magento\Backend\Block\GlobalSearch" as="search" after="logo" acl="Magento_Backend::global_search"/>
             <block class="Magento\Backend\Block\Page\Header" name="user" after="-">
                 <arguments>
                     <argument name="show_part" xsi:type="string">user</argument>
diff --git a/app/code/Magento/Backend/view/adminhtml/layout/editor.xml b/app/code/Magento/Backend/view/adminhtml/layout/editor.xml
index 6701d66516030..887e846d529ee 100644
--- a/app/code/Magento/Backend/view/adminhtml/layout/editor.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/editor.xml
@@ -9,7 +9,7 @@
     <head>
         <link src="Magento_Backend::js/bootstrap/editor.js"/>
         <css src="prototype/windows/themes/default.css"/>
-        <css src="Magento_Core::prototype/magento.css"/>
+        <css src="Magento_Theme::prototype/magento.css"/>
     </head>
     <body/>
 </page>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
index 285a25ad27d31..f7635da3c5804 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml
@@ -19,7 +19,7 @@
                 <?php echo $block->escapeHtml($block->getUser()->getUsername()); ?>
             </a>
             <ul class="dropdown-menu admin-user-menu">
-                <?php if ($block->getAuthorization()->isAllowed('Magento_Adminhtml::myaccount')): ?>
+                <?php if ($block->getAuthorization()->isAllowed('Magento_Backend::myaccount')): ?>
                 <li>
                     <a href="<?php echo $block->getUrl('adminhtml/system_account/index') ?>" <?php echo $block->getUiId('user', 'account', 'settings')?> title="<?php echo __('Account Setting') ?>"><?php echo __('Account Setting') ?> <span><?php echo $block->escapeHtml($block->getUser()->getUsername()); ?></span></a>
                 </li>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
index edc512b99c823..09ef80cdfa899 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml
@@ -113,7 +113,7 @@
                     <?php endforeach; ?>
                 <?php endforeach; ?>
             <?php endforeach; ?>
-            <?php if ($block->getShowManageStoresLink() && $block->getAuthorization()->isAllowed('Magento_Adminhtml::store')): ?>
+            <?php if ($block->getShowManageStoresLink() && $block->getAuthorization()->isAllowed('Magento_Backend::store')): ?>
                 <li class="dropdown-toolbar">
                     <a href="<?php echo $block->getUrl('*/system_store') ?>"><?php echo __('Stores Configuration') ?></a>
                 </li>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/config/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/system/config/switcher.phtml
index dc25a1e7945f6..4cec327329db0 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/system/config/switcher.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/system/config/switcher.phtml
@@ -28,7 +28,7 @@
         </select>
     </div>
     <?php echo $block->getHintHtml() ?>
-    <?php if ($block->getAuthorization()->isAllowed('Magento_Adminhtml::store')): ?>
+    <?php if ($block->getAuthorization()->isAllowed('Magento_Backend::store')): ?>
         <div class="actions">
             <a href="<?php echo $block->getUrl('*/system_store') ?>"><?php echo __('Stores') ?></a>
         </div>
diff --git a/app/code/Magento/Backup/Model/Observer.php b/app/code/Magento/Backup/Model/Observer.php
index 56e4bc515c5a9..6518b64e61ee0 100644
--- a/app/code/Magento/Backup/Model/Observer.php
+++ b/app/code/Magento/Backup/Model/Observer.php
@@ -12,7 +12,7 @@
 namespace Magento\Backup\Model;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 class Observer
 {
diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json
index cb30156bdd8be..e62db7e73e9d2 100644
--- a/app/code/Magento/Backup/composer.json
+++ b/app/code/Magento/Backup/composer.json
@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
+        "magento/module-store": "0.42.0-beta7",
         "magento/module-backend": "0.42.0-beta7",
         "magento/module-cron": "0.42.0-beta7",
         "magento/framework": "0.42.0-beta7",
diff --git a/app/code/Magento/Backup/etc/acl.xml b/app/code/Magento/Backup/etc/acl.xml
index 03b48f04cd91c..6b9dda6244e7d 100644
--- a/app/code/Magento/Backup/etc/acl.xml
+++ b/app/code/Magento/Backup/etc/acl.xml
@@ -8,9 +8,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::system">
-                    <resource id="Magento_Adminhtml::tools">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::system">
+                    <resource id="Magento_Backend::tools">
                         <resource id="Magento_Backup::backup" title="Backups" sortOrder="30">
                             <resource id="Magento_Backup::rollback" title="Rollback" />
                         </resource>
diff --git a/app/code/Magento/Backup/etc/adminhtml/routes.xml b/app/code/Magento/Backup/etc/adminhtml/routes.xml
index d59acc42ae494..8993bc033dc68 100644
--- a/app/code/Magento/Backup/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Backup/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
     <router id="admin">
         <route id="backup" frontName="backup">
-            <module name="Magento_Backup" before="Magento_Adminhtml" />
+            <module name="Magento_Backup" before="Magento_Backend" />
         </route>
     </router>
 </config>
diff --git a/app/code/Magento/Backup/etc/module.xml b/app/code/Magento/Backup/etc/module.xml
index 315546d99b5af..d4c108c014b67 100644
--- a/app/code/Magento/Backup/etc/module.xml
+++ b/app/code/Magento/Backup/etc/module.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
     <module name="Magento_Backup" schema_version="1.6.0.0">
         <sequence>
+            <module name="Magento_Store"/>
         </sequence>
     </module>
 </config>
diff --git a/app/code/Magento/Bundle/Model/LinkManagement.php b/app/code/Magento/Bundle/Model/LinkManagement.php
index 77d839b7cb9bc..35bda8aafe5bb 100644
--- a/app/code/Magento/Bundle/Model/LinkManagement.php
+++ b/app/code/Magento/Bundle/Model/LinkManagement.php
@@ -46,7 +46,7 @@ class LinkManagement implements \Magento\Bundle\Api\ProductLinkManagementInterfa
      * @param \Magento\Bundle\Model\Resource\BundleFactory $bundleFactory
      * @param \Magento\Bundle\Model\SelectionFactory $bundleSelection
      * @param \Magento\Bundle\Model\Resource\Option\CollectionFactory $optionCollection
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         ProductRepositoryInterface $productRepository,
@@ -54,7 +54,7 @@ public function __construct(
         \Magento\Bundle\Model\SelectionFactory $bundleSelection,
         \Magento\Bundle\Model\Resource\BundleFactory $bundleFactory,
         \Magento\Bundle\Model\Resource\Option\CollectionFactory $optionCollection,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->productRepository = $productRepository;
         $this->linkBuilder = $linkBuilder;
diff --git a/app/code/Magento/Bundle/Model/OptionRepository.php b/app/code/Magento/Bundle/Model/OptionRepository.php
index d02ce9ebb95d7..438a229021721 100644
--- a/app/code/Magento/Bundle/Model/OptionRepository.php
+++ b/app/code/Magento/Bundle/Model/OptionRepository.php
@@ -60,7 +60,7 @@ class OptionRepository implements \Magento\Bundle\Api\ProductOptionRepositoryInt
      * @param Product\Type $type
      * @param \Magento\Bundle\Api\Data\OptionDataBuilder $optionBuilder
      * @param Resource\Option $optionResource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Bundle\Api\ProductLinkManagementInterface $linkManagement
      * @param Product\OptionList $productOptionList
      * @param Product\LinksList $linkList
@@ -70,7 +70,7 @@ public function __construct(
         \Magento\Bundle\Model\Product\Type $type,
         \Magento\Bundle\Api\Data\OptionDataBuilder $optionBuilder,
         \Magento\Bundle\Model\Resource\Option $optionResource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Bundle\Api\ProductLinkManagementInterface $linkManagement,
         \Magento\Bundle\Model\Product\OptionList $productOptionList,
         \Magento\Bundle\Model\Product\LinksList $linkList
diff --git a/app/code/Magento/Bundle/Model/Product/CatalogPrice.php b/app/code/Magento/Bundle/Model/Product/CatalogPrice.php
index 977a927516459..78e473883547c 100644
--- a/app/code/Magento/Bundle/Model/Product/CatalogPrice.php
+++ b/app/code/Magento/Bundle/Model/Product/CatalogPrice.php
@@ -11,7 +11,7 @@
 class CatalogPrice implements \Magento\Catalog\Model\Product\CatalogPriceInterface
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -26,12 +26,12 @@ class CatalogPrice implements \Magento\Catalog\Model\Product\CatalogPriceInterfa
     protected $coreRegistry;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Product\CatalogPrice $commonPriceModel
      * @param \Magento\Framework\Registry $coreRegistry
      */
     public function __construct(
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Product\CatalogPrice $commonPriceModel,
         \Magento\Framework\Registry $coreRegistry
     ) {
diff --git a/app/code/Magento/Bundle/Model/Product/Price.php b/app/code/Magento/Bundle/Model/Product/Price.php
index 4fc817f7006e7..af198bf0b1b72 100644
--- a/app/code/Magento/Bundle/Model/Product/Price.php
+++ b/app/code/Magento/Bundle/Model/Product/Price.php
@@ -41,7 +41,7 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
 
     /**
      * @param \Magento\CatalogRule\Model\Resource\RuleFactory $ruleFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -51,7 +51,7 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
      */
     public function __construct(
         \Magento\CatalogRule\Model\Resource\RuleFactory $ruleFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index a086ccd852ab5..b14a7d9292e62 100644
--- a/app/code/Magento/Bundle/Model/Product/Type.php
+++ b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -90,7 +90,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
     protected $_catalogProduct = null;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -158,7 +158,7 @@ class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
      * @param \Magento\Catalog\Model\Config $config
      * @param \Magento\Bundle\Model\Resource\Selection $bundleSelection
      * @param \Magento\Bundle\Model\OptionFactory $bundleOption
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param PriceCurrencyInterface $priceCurrency
      * @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
      * @param \Magento\CatalogInventory\Api\StockStateInterface $stockState
@@ -184,7 +184,7 @@ public function __construct(
         \Magento\Catalog\Model\Config $config,
         \Magento\Bundle\Model\Resource\Selection $bundleSelection,
         \Magento\Bundle\Model\OptionFactory $bundleOption,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         PriceCurrencyInterface $priceCurrency,
         \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry,
         \Magento\CatalogInventory\Api\StockStateInterface $stockState
diff --git a/app/code/Magento/Bundle/etc/adminhtml/routes.xml b/app/code/Magento/Bundle/etc/adminhtml/routes.xml
index be8fd1bfecb7f..ee8835be1a680 100644
--- a/app/code/Magento/Bundle/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Bundle/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
     <router id="admin">
         <route id="adminhtml">
-            <module name="Magento_Bundle" before="Magento_Adminhtml" />
+            <module name="Magento_Bundle" before="Magento_Backend" />
         </route>
     </router>
 </config>
diff --git a/app/code/Magento/Captcha/Helper/Data.php b/app/code/Magento/Captcha/Helper/Data.php
index af41ad286188a..47c0ad3a56bb0 100644
--- a/app/code/Magento/Captcha/Helper/Data.php
+++ b/app/code/Magento/Captcha/Helper/Data.php
@@ -55,7 +55,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     protected $_filesystem;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -66,14 +66,14 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      * @param Filesystem $filesystem
      * @param \Magento\Captcha\Model\CaptchaFactory $factory
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
         Filesystem $filesystem,
         \Magento\Captcha\Model\CaptchaFactory $factory
@@ -117,7 +117,7 @@ public function getConfig($key, $store = null)
     {
         return $this->_config->getValue(
             'customer/captcha/' . $key,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php
index 9e99b739b3528..023b9f78f2c0a 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Helper/Image.php
@@ -14,7 +14,7 @@
 class Image extends \Magento\Framework\Data\Form\Element\Image
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -23,7 +23,7 @@ class Image extends \Magento\Framework\Data\Form\Element\Image
      * @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
      * @param \Magento\Framework\Escaper $escaper
      * @param \Magento\Framework\UrlInterface $urlBuilder
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param array $data
      */
     public function __construct(
@@ -31,7 +31,7 @@ public function __construct(
         \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection,
         \Magento\Framework\Escaper $escaper,
         \Magento\Framework\UrlInterface $urlBuilder,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         $data = []
     ) {
         $this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php
index 3085a2ebba94c..e45d7cbb1aebd 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tab/Product.php
@@ -164,7 +164,7 @@ protected function _prepareColumns()
                 'type' => 'currency',
                 'currency_code' => (string)$this->_scopeConfig->getValue(
                     \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 ),
                 'index' => 'price'
             ]
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
index f9d6a0e2c2955..f757d4f3e99c1 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
@@ -28,8 +28,8 @@ protected function _prepareLayout()
         $accordion = $this->getLayout()->createBlock('Magento\Backend\Block\Widget\Accordion')->setId('productAlerts');
         /* @var $accordion \Magento\Backend\Block\Widget\Accordion */
 
-        $alertPriceAllow = $this->_scopeConfig->getValue('catalog/productalert/allow_price', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
-        $alertStockAllow = $this->_scopeConfig->getValue('catalog/productalert/allow_stock', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        $alertPriceAllow = $this->_scopeConfig->getValue('catalog/productalert/allow_price', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        $alertStockAllow = $this->_scopeConfig->getValue('catalog/productalert/allow_stock', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
 
         if ($alertPriceAllow) {
             $accordion->addItem(
@@ -76,8 +76,8 @@ public function getAccordionHtml()
      */
     public function canShowTab()
     {
-        $alertPriceAllow = $this->_scopeConfig->getValue('catalog/productalert/allow_price', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
-        $alertStockAllow = $this->_scopeConfig->getValue('catalog/productalert/allow_stock', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        $alertPriceAllow = $this->_scopeConfig->getValue('catalog/productalert/allow_price', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+        $alertStockAllow = $this->_scopeConfig->getValue('catalog/productalert/allow_stock', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
         return ($alertPriceAllow || $alertStockAllow) && parent::canShowTab();
     }
 }
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php
index f1906209cf6a7..3a3b7c04f5ff5 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts/Price.php
@@ -99,7 +99,7 @@ protected function _prepareColumns()
                 'type' => 'currency',
                 'currency_code' => $this->_scopeConfig->getValue(
                     \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 )
             ]
         );
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
index d0fca12a103bb..9f6229afbb32b 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Crosssell.php
@@ -299,7 +299,7 @@ protected function _prepareColumns()
                 'type' => 'currency',
                 'currency_code' => (string)$this->_scopeConfig->getValue(
                     \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 ),
                 'index' => 'price',
                 'header_css_class' => 'col-price',
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
index 45b9a559cb502..3a86850d5f87c 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
@@ -284,7 +284,7 @@ public function getOptionValues()
             $values = [];
             $scope = (int)$this->_scopeConfig->getValue(
                 \Magento\Store\Model\Store::XML_PATH_PRICE_SCOPE,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
             foreach ($optionsArr as $option) {
                 /* @var $option \Magento\Catalog\Model\Product\Option */
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
index 23a5257f146a2..685aa481fe9fa 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Related.php
@@ -293,7 +293,7 @@ protected function _prepareColumns()
                 'type' => 'currency',
                 'currency_code' => (string)$this->_scopeConfig->getValue(
                     \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 ),
                 'index' => 'price',
                 'header_css_class' => 'col-price',
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
index 0a55182e300a4..ca442c0b98b3e 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Upsell.php
@@ -289,7 +289,7 @@ protected function _prepareColumns()
                 'type' => 'currency',
                 'currency_code' => (string)$this->_scopeConfig->getValue(
                     \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 ),
                 'index' => 'price',
                 'header_css_class' => 'col-price',
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
index b7d4052a455e0..d8ad928169948 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery.php
@@ -20,7 +20,7 @@
 class Gallery extends AbstractElement
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -34,7 +34,7 @@ class Gallery extends AbstractElement
      * @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
      * @param \Magento\Framework\Escaper $escaper
      * @param \Magento\Framework\View\LayoutInterface $layout
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param array $data
      */
     public function __construct(
@@ -42,7 +42,7 @@ public function __construct(
         \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection,
         \Magento\Framework\Escaper $escaper,
         \Magento\Framework\View\LayoutInterface $layout,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         $data = []
     ) {
         $this->_layout = $layout;
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Price.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Price.php
index fb9cf9a0b43e1..2e5688bbca617 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Price.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Price.php
@@ -19,7 +19,7 @@ class Price extends \Magento\Framework\Data\Form\Element\Text
     protected $_taxData;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -32,7 +32,7 @@ class Price extends \Magento\Framework\Data\Form\Element\Text
      * @param \Magento\Framework\Data\Form\Element\Factory $factoryElement
      * @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
      * @param \Magento\Framework\Escaper $escaper
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Locale\CurrencyInterface $localeCurrency
      * @param \Magento\Tax\Helper\Data $taxData
      * @param array $data
@@ -41,7 +41,7 @@ public function __construct(
         \Magento\Framework\Data\Form\Element\Factory $factoryElement,
         \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection,
         \Magento\Framework\Escaper $escaper,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Locale\CurrencyInterface $localeCurrency,
         \Magento\Tax\Helper\Data $taxData,
         array $data = []
diff --git a/app/code/Magento/Catalog/Block/Breadcrumbs.php b/app/code/Magento/Catalog/Block/Breadcrumbs.php
index 248bc8e5a7c22..5b6769b296d1a 100644
--- a/app/code/Magento/Catalog/Block/Breadcrumbs.php
+++ b/app/code/Magento/Catalog/Block/Breadcrumbs.php
@@ -43,7 +43,7 @@ public function __construct(Context $context, Data $catalogData, array $data = [
      */
     public function getTitleSeparator($store = null)
     {
-        $separator = (string)$this->_scopeConfig->getValue('catalog/seo/title_separator', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+        $separator = (string)$this->_scopeConfig->getValue('catalog/seo/title_separator', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
         return ' ' . $separator . ' ';
     }
 
diff --git a/app/code/Magento/Catalog/Block/Category/Rss/Link.php b/app/code/Magento/Catalog/Block/Category/Rss/Link.php
index 094b0556e1208..2f3905087570a 100644
--- a/app/code/Magento/Catalog/Block/Category/Rss/Link.php
+++ b/app/code/Magento/Catalog/Block/Category/Rss/Link.php
@@ -47,7 +47,7 @@ public function isRssAllowed()
     {
         return $this->_scopeConfig->getValue(
             'rss/catalog/category',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
diff --git a/app/code/Magento/Catalog/Block/Product/Context.php b/app/code/Magento/Catalog/Block/Product/Context.php
index 10f1d2ab54814..7244352e26286 100644
--- a/app/code/Magento/Catalog/Block/Product/Context.php
+++ b/app/code/Magento/Catalog/Block/Product/Context.php
@@ -94,7 +94,7 @@ class Context extends \Magento\Framework\View\Element\Template\Context
      * @param \Magento\Framework\View\FileSystem $viewFileSystem
      * @param \Magento\Framework\View\TemplateEnginePool $enginePool
      * @param \Magento\Framework\App\State $appState
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Config $catalogConfig
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Tax\Helper\Data $taxHelper
@@ -133,7 +133,7 @@ public function __construct(
         \Magento\Framework\View\FileSystem $viewFileSystem,
         \Magento\Framework\View\TemplateEnginePool $enginePool,
         \Magento\Framework\App\State $appState,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\View\Page\Config $pageConfig,
         \Magento\Catalog\Model\Config $catalogConfig,
         \Magento\Framework\Registry $registry,
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
index 7177c8a45c7da..b2f02218b1d7e 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
@@ -650,12 +650,12 @@ public function getPagerHtml()
             )->setFrameLength(
                 $this->_scopeConfig->getValue(
                     'design/pagination/pagination_frame',
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 )
             )->setJump(
                 $this->_scopeConfig->getValue(
                     'design/pagination/pagination_frame_skip',
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 )
             )->setLimit(
                 $this->getLimit()
diff --git a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php
index 302c92ff1de23..4cdd4984ff31a 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Options/Type/Date.php
@@ -91,7 +91,7 @@ public function getCalendarDateHtml()
         )->setClass(
             'product-custom-option datetime-picker input-text'
         )->setImage(
-            $this->getViewFileUrl('Magento_Core::calendar.png')
+            $this->getViewFileUrl('Magento_Theme::calendar.png')
         )->setDateFormat(
             $this->_localeDate->getDateFormat(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::FORMAT_TYPE_SHORT)
         )->setValue(
diff --git a/app/code/Magento/Catalog/Block/Rss/Category.php b/app/code/Magento/Catalog/Block/Rss/Category.php
index 2453f3c5e4795..0386230d77972 100644
--- a/app/code/Magento/Catalog/Block/Rss/Category.php
+++ b/app/code/Magento/Catalog/Block/Rss/Category.php
@@ -37,7 +37,7 @@ class Category extends \Magento\Framework\View\Element\AbstractBlock implements
     protected $rssModel;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -217,7 +217,7 @@ public function isAllowed()
     {
         return $this->_scopeConfig->isSetFlag(
             'rss/catalog/category',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
diff --git a/app/code/Magento/Catalog/Block/Rss/Product/NewProducts.php b/app/code/Magento/Catalog/Block/Rss/Product/NewProducts.php
index 69634b68d58d6..85c4cca4dcee2 100644
--- a/app/code/Magento/Catalog/Block/Rss/Product/NewProducts.php
+++ b/app/code/Magento/Catalog/Block/Rss/Product/NewProducts.php
@@ -29,7 +29,7 @@ class NewProducts extends \Magento\Framework\View\Element\AbstractBlock implemen
     protected $rssUrlBuilder;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -68,7 +68,7 @@ protected function _construct()
      */
     public function isAllowed()
     {
-        return $this->_scopeConfig->isSetFlag('rss/catalog/new', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->isSetFlag('rss/catalog/new', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
@@ -81,7 +81,7 @@ public function getRssData()
         $title = __('New Products from %1', $storeModel->getFrontendName());
         $lang = $this->_scopeConfig->getValue(
             'general/locale/code',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeModel
         );
         $data = [
diff --git a/app/code/Magento/Catalog/Block/Rss/Product/Special.php b/app/code/Magento/Catalog/Block/Rss/Product/Special.php
index 499e8e652e47e..60be17cb4881e 100644
--- a/app/code/Magento/Catalog/Block/Rss/Product/Special.php
+++ b/app/code/Magento/Catalog/Block/Rss/Product/Special.php
@@ -41,7 +41,7 @@ class Special extends \Magento\Framework\View\Element\AbstractBlock implements D
     protected $httpContext;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -123,7 +123,7 @@ public function getRssData()
         $title = __('%1 - Special Products', $this->storeManager->getStore()->getFrontendName());
         $lang = $this->_scopeConfig->getValue(
             'general/locale/code',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
 
         $data = [
@@ -258,7 +258,7 @@ public function isAllowed()
     {
         return $this->_scopeConfig->isSetFlag(
             'rss/catalog/special',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category.php
index 9e7071dd11744..048739d49b1dd 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category.php
@@ -45,7 +45,7 @@ protected function _initCategory($getRootInstead = false)
             $category->load($categoryId);
             if ($storeId) {
                 $rootId = $this->_objectManager->get(
-                    'Magento\Framework\Store\StoreManagerInterface'
+                    'Magento\Store\Model\StoreManagerInterface'
                 )->getStore(
                     $storeId
                 )->getRootCategoryId();
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php
index d1c6b3a1c1419..f6b54278aa3ea 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php
@@ -49,7 +49,7 @@ public function execute()
         $categoryId = (int)$this->getRequest()->getParam('id');
 
         if ($storeId && !$categoryId && !$parentId) {
-            $store = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore($storeId);
+            $store = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore($storeId);
             $this->getRequest()->setParam('id', (int)$store->getRootCategoryId());
         }
 
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
index 669584b1a84ab..4599a379adbc9 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php
@@ -93,7 +93,7 @@ public function execute()
                 if (!$parentId) {
                     if ($storeId) {
                         $parentId = $this->_objectManager->get(
-                            'Magento\Framework\Store\StoreManagerInterface'
+                            'Magento\Store\Model\StoreManagerInterface'
                         )->getStore(
                             $storeId
                         )->getRootCategoryId();
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Tree.php
index 790959ea64e7f..b7410f3ada3ee 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Category/Tree.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Category/Tree.php
@@ -49,7 +49,7 @@ public function execute()
         if ($storeId) {
             if (!$categoryId) {
                 $store = $this->_objectManager
-                    ->get('Magento\Framework\Store\StoreManagerInterface')
+                    ->get('Magento\Store\Model\StoreManagerInterface')
                     ->getStore($storeId);
                 $rootId = $store->getRootCategoryId();
                 $this->getRequest()->setParam('id', $rootId);
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php
index 31a448a81d1d8..34d74da1fa0c0 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php
@@ -68,7 +68,7 @@ public function execute()
         $resultPage->getConfig()->getTitle()->prepend(__('Products'));
         $resultPage->getConfig()->getTitle()->prepend($product->getName());
 
-        if (!$this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->isSingleStoreMode()
+        if (!$this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->isSingleStoreMode()
             &&
             ($switchBlock = $resultPage->getLayout()->getBlock('store_switcher'))
         ) {
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
index fc23b7d3f5a83..9dbbddcee68f8 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php
@@ -13,7 +13,7 @@ class Helper
     protected $request;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -34,14 +34,14 @@ class Helper
 
     /**
      * @param \Magento\Framework\App\RequestInterface $request
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param StockDataFilter $stockFilter
      * @param \Magento\Catalog\Model\Product\Initialization\Helper\ProductLinks $productLinks
      * @param \Magento\Backend\Helper\Js $jsHelper
      */
     public function __construct(
         \Magento\Framework\App\RequestInterface $request,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         StockDataFilter $stockFilter,
         \Magento\Catalog\Model\Product\Initialization\Helper\ProductLinks $productLinks,
         \Magento\Backend\Helper\Js $jsHelper
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Wysiwyg.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Wysiwyg.php
index f12d2aa2f1ec4..f0f0b5274a667 100644
--- a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Wysiwyg.php
+++ b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Wysiwyg.php
@@ -44,7 +44,7 @@ public function execute()
     {
         $elementId = $this->getRequest()->getParam('element_id', md5(microtime()));
         $storeId = $this->getRequest()->getParam('store_id', 0);
-        $storeMediaUrl = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')
+        $storeMediaUrl = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')
             ->getStore($storeId)
             ->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA);
 
diff --git a/app/code/Magento/Catalog/Controller/Category/View.php b/app/code/Magento/Catalog/Controller/Category/View.php
index bc4eaa1e538b6..0a6ee361fd07d 100644
--- a/app/code/Magento/Catalog/Controller/Category/View.php
+++ b/app/code/Magento/Catalog/Controller/Category/View.php
@@ -38,7 +38,7 @@ class View extends \Magento\Framework\App\Action\Action
     protected $_catalogDesign;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -81,7 +81,7 @@ class View extends \Magento\Framework\App\Action\Action
      * @param \Magento\Catalog\Model\Design $catalogDesign
      * @param \Magento\Catalog\Model\Session $catalogSession
      * @param \Magento\Framework\Registry $coreRegistry
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator $categoryUrlPathGenerator
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
@@ -94,7 +94,7 @@ public function __construct(
         \Magento\Catalog\Model\Design $catalogDesign,
         \Magento\Catalog\Model\Session $catalogSession,
         \Magento\Framework\Registry $coreRegistry,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator $categoryUrlPathGenerator,
         PageFactory $resultPageFactory,
         \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory,
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare.php b/app/code/Magento/Catalog/Controller/Product/Compare.php
index 2fce69244f5a0..4e934b0685e69 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare.php
@@ -68,7 +68,7 @@ class Compare extends \Magento\Framework\App\Action\Action
     protected $_compareItemFactory;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -102,7 +102,7 @@ class Compare extends \Magento\Framework\App\Action\Action
      * @param \Magento\Customer\Model\Visitor $customerVisitor
      * @param \Magento\Catalog\Model\Product\Compare\ListCompare $catalogProductCompareList
      * @param \Magento\Catalog\Model\Session $catalogSession
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param FormKeyValidator $formKeyValidator
      * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
@@ -117,7 +117,7 @@ public function __construct(
         \Magento\Customer\Model\Visitor $customerVisitor,
         \Magento\Catalog\Model\Product\Compare\ListCompare $catalogProductCompareList,
         \Magento\Catalog\Model\Session $catalogSession,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         FormKeyValidator $formKeyValidator,
         Result\RedirectFactory $resultRedirectFactory,
         PageFactory $resultPageFactory,
diff --git a/app/code/Magento/Catalog/Controller/Product/Compare/Index.php b/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
index 5090c890f13d2..aa311afa1c330 100644
--- a/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
+++ b/app/code/Magento/Catalog/Controller/Product/Compare/Index.php
@@ -29,7 +29,7 @@ class Index extends \Magento\Catalog\Controller\Product\Compare
      * @param \Magento\Customer\Model\Visitor $customerVisitor
      * @param \Magento\Catalog\Model\Product\Compare\ListCompare $catalogProductCompareList
      * @param \Magento\Catalog\Model\Session $catalogSession
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param FormKeyValidator $formKeyValidator
      * @param Result\RedirectFactory $resultRedirectFactory
      * @param PageFactory $resultPageFactory
@@ -46,7 +46,7 @@ public function __construct(
         \Magento\Customer\Model\Visitor $customerVisitor,
         \Magento\Catalog\Model\Product\Compare\ListCompare $catalogProductCompareList,
         \Magento\Catalog\Model\Session $catalogSession,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         FormKeyValidator $formKeyValidator,
         Result\RedirectFactory $resultRedirectFactory,
         PageFactory $resultPageFactory,
diff --git a/app/code/Magento/Catalog/Helper/Category.php b/app/code/Magento/Catalog/Helper/Category.php
index 22ef6b0ca9861..04492509b595c 100644
--- a/app/code/Magento/Catalog/Helper/Category.php
+++ b/app/code/Magento/Catalog/Helper/Category.php
@@ -39,7 +39,7 @@ class Category extends AbstractHelper
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -65,7 +65,7 @@ class Category extends AbstractHelper
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\Data\CollectionFactory $dataCollectionFactory
      * @param CategoryRepositoryInterface $categoryRepository
@@ -73,7 +73,7 @@ class Category extends AbstractHelper
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Catalog\Model\CategoryFactory $categoryFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\Data\CollectionFactory $dataCollectionFactory,
         CategoryRepositoryInterface $categoryRepository
@@ -118,7 +118,7 @@ public function getStoreCategories($sorted = false, $asCollection = false, $toLo
             0,
             (int)$this->_scopeConfig->getValue(
                 'catalog/navigation/max_depth',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
         );
         $storeCategories = $category->getCategories($parent, $recursionLevel, $sorted, $asCollection, $toLoad);
@@ -181,7 +181,7 @@ public function canUseCanonicalTag($store = null)
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_USE_CATEGORY_CANONICAL_TAG,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
diff --git a/app/code/Magento/Catalog/Helper/Data.php b/app/code/Magento/Catalog/Helper/Data.php
index e48b8a74427b1..7e4d6732ae26f 100644
--- a/app/code/Magento/Catalog/Helper/Data.php
+++ b/app/code/Magento/Catalog/Helper/Data.php
@@ -98,7 +98,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -168,7 +168,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Session $catalogSession
      * @param \Magento\Framework\Stdlib\String $string
      * @param Category $catalogCategory
@@ -190,7 +190,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Session $catalogSession,
         \Magento\Framework\Stdlib\String $string,
         Category $catalogCategory,
@@ -388,7 +388,7 @@ public function getPriceScope()
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_PRICE_SCOPE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
@@ -411,7 +411,7 @@ public function isUsingStaticUrlsAllowed()
     {
         return $this->_scopeConfig->isSetFlag(
             self::CONFIG_USE_STATIC_URLS,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->_storeId
         );
     }
@@ -425,7 +425,7 @@ public function isUrlDirectivesParsingAllowed()
     {
         return $this->_scopeConfig->isSetFlag(
             self::CONFIG_PARSE_URL_DIRECTIVES,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->_storeId
         );
     }
@@ -449,7 +449,7 @@ public function shouldDisplayProductCountOnLayer($storeId = null)
     {
         return $this->_scopeConfig->isSetFlag(
             self::XML_PATH_DISPLAY_PRODUCT_COUNT,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeId
         );
     }
diff --git a/app/code/Magento/Catalog/Helper/Image.php b/app/code/Magento/Catalog/Helper/Image.php
index c4937397eeb9c..4f1afb10f4ba2 100644
--- a/app/code/Magento/Catalog/Helper/Image.php
+++ b/app/code/Magento/Catalog/Helper/Image.php
@@ -164,25 +164,25 @@ public function init(\Magento\Catalog\Model\Product $product, $attributeName, $i
         $this->setWatermark(
             $this->_scopeConfig->getValue(
                 "design/watermark/{$this->_getModel()->getDestinationSubdir()}_image",
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
         );
         $this->setWatermarkImageOpacity(
             $this->_scopeConfig->getValue(
                 "design/watermark/{$this->_getModel()->getDestinationSubdir()}_imageOpacity",
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
         );
         $this->setWatermarkPosition(
             $this->_scopeConfig->getValue(
                 "design/watermark/{$this->_getModel()->getDestinationSubdir()}_position",
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
         );
         $this->setWatermarkSize(
             $this->_scopeConfig->getValue(
                 "design/watermark/{$this->_getModel()->getDestinationSubdir()}_size",
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
         );
 
diff --git a/app/code/Magento/Catalog/Helper/Product.php b/app/code/Magento/Catalog/Helper/Product.php
index 156f475513517..b18e4b6b2f0d1 100644
--- a/app/code/Magento/Catalog/Helper/Product.php
+++ b/app/code/Magento/Catalog/Helper/Product.php
@@ -107,7 +107,7 @@ class Product extends \Magento\Core\Helper\Url
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Session $catalogSession
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      * @param \Magento\Framework\Registry $coreRegistry
@@ -123,7 +123,7 @@ class Product extends \Magento\Core\Helper\Url
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Session $catalogSession,
         \Magento\Framework\View\Asset\Repository $assetRepo,
         \Magento\Framework\Registry $coreRegistry,
@@ -341,7 +341,7 @@ public function canUseCanonicalTag($store = null)
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_USE_PRODUCT_CANONICAL_TAG,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
diff --git a/app/code/Magento/Catalog/Helper/Product/Compare.php b/app/code/Magento/Catalog/Helper/Product/Compare.php
index de95592316a2b..469c47e77d539 100644
--- a/app/code/Magento/Catalog/Helper/Product/Compare.php
+++ b/app/code/Magento/Catalog/Helper/Product/Compare.php
@@ -96,7 +96,7 @@ class Compare extends \Magento\Core\Helper\Url
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Resource\Product\Compare\Item\CollectionFactory $itemCollectionFactory
      * @param \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility
      * @param \Magento\Customer\Model\Visitor $customerVisitor
@@ -109,7 +109,7 @@ class Compare extends \Magento\Core\Helper\Url
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Resource\Product\Compare\Item\CollectionFactory $itemCollectionFactory,
         \Magento\Catalog\Model\Product\Visibility $catalogProductVisibility,
         \Magento\Customer\Model\Visitor $customerVisitor,
diff --git a/app/code/Magento/Catalog/Helper/Product/Composite.php b/app/code/Magento/Catalog/Helper/Product/Composite.php
index a74b848da95df..eca50adc3e225 100644
--- a/app/code/Magento/Catalog/Helper/Product/Composite.php
+++ b/app/code/Magento/Catalog/Helper/Product/Composite.php
@@ -10,7 +10,7 @@
 use Magento\Framework\View\Result\LayoutFactory;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Catalog\Helper\Product;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Customer\Controller\RegistryConstants;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Framework\Registry;
@@ -38,7 +38,7 @@ class Composite extends \Magento\Framework\App\Helper\AbstractHelper
     protected $_catalogProduct = null;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -59,7 +59,7 @@ class Composite extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param Product $catalogProduct
      * @param Registry $coreRegistry
      * @param LayoutFactory $resultLayoutFactory
diff --git a/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php b/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
index 8cca46b6a9da1..add782fd4d41e 100644
--- a/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
+++ b/app/code/Magento/Catalog/Helper/Product/Edit/Action/Attribute.php
@@ -52,7 +52,7 @@ class Attribute extends \Magento\Backend\Helper\Data
     protected $_eavConfig;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -67,7 +67,7 @@ class Attribute extends \Magento\Backend\Helper\Data
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Backend\Model\Session $session
      * @param \Magento\Catalog\Model\Resource\Product\CollectionFactory $productsFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -81,7 +81,7 @@ public function __construct(
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Backend\Model\Session $session,
         \Magento\Catalog\Model\Resource\Product\CollectionFactory $productsFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->_eavConfig = $eavConfig;
         $this->_session = $session;
diff --git a/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php b/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php
index 1d0d2ef7ac8d5..27d3d25fa89dc 100644
--- a/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php
+++ b/app/code/Magento/Catalog/Helper/Product/Flat/Indexer.php
@@ -101,7 +101,7 @@ class Indexer extends \Magento\Framework\App\Helper\AbstractHelper
     protected $_attributeFactory;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -127,7 +127,7 @@ class Indexer extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Catalog\Model\Attribute\Config $attributeConfig
      * @param \Magento\Catalog\Model\Resource\ConfigFactory $configFactory
      * @param \Magento\Eav\Model\Entity\AttributeFactory $attributeFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Mview\View\Changelog $changelog
      * @param bool $addFilterableAttrs
      * @param bool $addChildData
@@ -141,7 +141,7 @@ public function __construct(
         \Magento\Catalog\Model\Attribute\Config $attributeConfig,
         \Magento\Catalog\Model\Resource\ConfigFactory $configFactory,
         \Magento\Eav\Model\Entity\AttributeFactory $attributeFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Mview\View\Changelog $changelog,
         $addFilterableAttrs = false,
         $addChildData = false,
diff --git a/app/code/Magento/Catalog/Helper/Product/ProductList.php b/app/code/Magento/Catalog/Helper/Product/ProductList.php
index 63940f6072228..f298f7b940f79 100644
--- a/app/code/Magento/Catalog/Helper/Product/ProductList.php
+++ b/app/code/Magento/Catalog/Helper/Product/ProductList.php
@@ -50,7 +50,7 @@ public function __construct(
      */
     public function getAvailableViewMode()
     {
-        switch ($this->scopeConfig->getValue(self::XML_PATH_LIST_MODE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
+        switch ($this->scopeConfig->getValue(self::XML_PATH_LIST_MODE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
             case 'grid':
                 $availableMode = ['grid' => __('Grid')];
                 break;
@@ -96,7 +96,7 @@ public function getDefaultSortField()
     {
         return $this->scopeConfig->getValue(
             \Magento\Catalog\Model\Config::XML_PATH_LIST_DEFAULT_SORT_BY,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
@@ -114,13 +114,13 @@ public function getAvailableLimit($mode)
         $perPageConfigKey = 'catalog/frontend/' . $mode . '_per_page_values';
         $perPageValues = (string)$this->scopeConfig->getValue(
             $perPageConfigKey,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         $perPageValues = explode(',', $perPageValues);
         $perPageValues = array_combine($perPageValues, $perPageValues);
         if ($this->scopeConfig->isSetFlag(
             'catalog/frontend/list_allow_all',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )) {
             return ($perPageValues + ['all' => __('All')]);
         } else {
@@ -139,12 +139,12 @@ public function getDefaultLimitPerPageValue($viewMode)
         if ($viewMode == self::VIEW_MODE_LIST) {
             return $this->scopeConfig->getValue(
                 'catalog/frontend/list_per_page',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         } elseif ($viewMode == self::VIEW_MODE_GRID) {
             return $this->scopeConfig->getValue(
                 'catalog/frontend/grid_per_page',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
         return 0;
diff --git a/app/code/Magento/Catalog/Model/AbstractModel.php b/app/code/Magento/Catalog/Model/AbstractModel.php
index 91574d561c1b6..19c70245700c4 100644
--- a/app/code/Magento/Catalog/Model/AbstractModel.php
+++ b/app/code/Magento/Catalog/Model/AbstractModel.php
@@ -55,7 +55,7 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensible
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -64,7 +64,7 @@ abstract class AbstractModel extends \Magento\Framework\Model\AbstractExtensible
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\Api\MetadataServiceInterface $metadataService
      * @param AttributeValueFactory $customAttributeFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\Db $resourceCollection
      * @param array $data
@@ -74,7 +74,7 @@ public function __construct(
         \Magento\Framework\Registry $registry,
         \Magento\Framework\Api\MetadataServiceInterface $metadataService,
         AttributeValueFactory $customAttributeFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\Db $resourceCollection = null,
         array $data = []
diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php b/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
index 64ce3d94e347c..cc6329800747b 100644
--- a/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
+++ b/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Catalog\Model\Attribute\Backend;
 
-use Magento\Core\Model\Layout\Update\ValidatorFactory;
+use Magento\Framework\View\Model\Layout\Update\ValidatorFactory;
 use Magento\Eav\Model\Entity\Attribute\Exception;
 
 /**
@@ -48,7 +48,7 @@ public function validate($object)
             return true;
         }
 
-        /** @var $validator \Magento\Core\Model\Layout\Update\Validator */
+        /** @var $validator \Magento\Framework\View\Model\Layout\Update\Validator */
         $validator = $this->_layoutUpdateValidatorFactory->create();
         if (!$validator->isValid($xml)) {
             $messages = $validator->getMessages();
diff --git a/app/code/Magento/Catalog/Model/Category.php b/app/code/Magento/Catalog/Model/Category.php
index 4bdd5cc819d2a..abb1c4d530b01 100644
--- a/app/code/Magento/Catalog/Model/Category.php
+++ b/app/code/Magento/Catalog/Model/Category.php
@@ -178,7 +178,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Catalog\Api\CategoryAttributeRepositoryInterface $metadataService
      * @param AttributeValueFactory $customAttributeFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param Resource\Category\Tree $categoryTreeResource
      * @param Resource\Category\TreeFactory $categoryTreeFactory
      * @param \Magento\Store\Model\Resource\Store\CollectionFactory $storeCollectionFactory
@@ -201,7 +201,7 @@ public function __construct(
         \Magento\Framework\Registry $registry,
         \Magento\Catalog\Api\CategoryAttributeRepositoryInterface $metadataService,
         AttributeValueFactory $customAttributeFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Resource\Category\Tree $categoryTreeResource,
         \Magento\Catalog\Model\Resource\Category\TreeFactory $categoryTreeFactory,
         \Magento\Store\Model\Resource\Store\CollectionFactory $storeCollectionFactory,
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
index 7aebe4cc11837..c1d07fc693ab2 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
@@ -68,7 +68,7 @@ public function validate($object)
                 $attributeCode
             ) : $this->_scopeConfig->getValue(
                 "catalog/frontend/default_sort_by",
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
             if (!in_array($data, $available) && !in_array('available_sort_by', $postDataConfig)) {
                 throw new \Magento\Framework\Model\Exception(
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php
index 59e05f1fc589e..95ec54333023e 100644
--- a/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php
+++ b/app/code/Magento/Catalog/Model/Category/Attribute/Source/Layout.php
@@ -13,14 +13,14 @@
 class Layout extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
 {
     /**
-     * @var \Magento\Core\Model\PageLayout\Config\Builder
+     * @var \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface
      */
     protected $pageLayoutBuilder;
 
     /**
-     * @param \Magento\Core\Model\PageLayout\Config\Builder $pageLayoutBuilder
+     * @param \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder
      */
-    public function __construct(\Magento\Core\Model\PageLayout\Config\Builder $pageLayoutBuilder)
+    public function __construct(\Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder)
     {
         $this->pageLayoutBuilder = $pageLayoutBuilder;
     }
diff --git a/app/code/Magento/Catalog/Model/Category/Tree.php b/app/code/Magento/Catalog/Model/Category/Tree.php
index 538605dd82d16..8b131a66d64a1 100644
--- a/app/code/Magento/Catalog/Model/Category/Tree.php
+++ b/app/code/Magento/Catalog/Model/Category/Tree.php
@@ -18,7 +18,7 @@ class Tree
     protected $categoryTree;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -34,13 +34,13 @@ class Tree
 
     /**
      * @param \Magento\Catalog\Model\Resource\Category\Tree $categoryTree
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Resource\Category\Collection $categoryCollection
      * @param \Magento\Catalog\Api\Data\CategoryTreeDataBuilder $treeBuilder
      */
     public function __construct(
         \Magento\Catalog\Model\Resource\Category\Tree $categoryTree,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Resource\Category\Collection $categoryCollection,
         \Magento\Catalog\Api\Data\CategoryTreeDataBuilder $treeBuilder
     ) {
diff --git a/app/code/Magento/Catalog/Model/CategoryRepository.php b/app/code/Magento/Catalog/Model/CategoryRepository.php
index b4929f290f59c..161c990a845e6 100644
--- a/app/code/Magento/Catalog/Model/CategoryRepository.php
+++ b/app/code/Magento/Catalog/Model/CategoryRepository.php
@@ -19,7 +19,7 @@ class CategoryRepository implements \Magento\Catalog\Api\CategoryRepositoryInter
     protected $instances = [];
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -48,13 +48,13 @@ class CategoryRepository implements \Magento\Catalog\Api\CategoryRepositoryInter
     /**
      * @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
      * @param \Magento\Catalog\Model\Resource\Category $categoryResource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Api\Data\CategoryDataBuilder $dataBuilder
      */
     public function __construct(
         \Magento\Catalog\Model\CategoryFactory $categoryFactory,
         \Magento\Catalog\Model\Resource\Category $categoryResource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Api\Data\CategoryDataBuilder $dataBuilder
     ) {
         $this->categoryFactory = $categoryFactory;
diff --git a/app/code/Magento/Catalog/Model/Config.php b/app/code/Magento/Catalog/Model/Config.php
index eb7e12ddc7c83..8cbdb43ad337b 100644
--- a/app/code/Magento/Catalog/Model/Config.php
+++ b/app/code/Magento/Catalog/Model/Config.php
@@ -85,7 +85,7 @@ class Config extends \Magento\Eav\Model\Config
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -130,7 +130,7 @@ class Config extends \Magento\Eav\Model\Config
      * @param \Magento\Catalog\Model\Product\TypeFactory $productTypeFactory
      * @param \Magento\Eav\Model\Resource\Entity\Attribute\Group\CollectionFactory $groupCollectionFactory
      * @param \Magento\Eav\Model\Resource\Entity\Attribute\Set\CollectionFactory $setCollectionFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Eav\Model\Config $eavConfig
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -146,7 +146,7 @@ public function __construct(
         \Magento\Catalog\Model\Product\TypeFactory $productTypeFactory,
         \Magento\Eav\Model\Resource\Entity\Attribute\Group\CollectionFactory $groupCollectionFactory,
         \Magento\Eav\Model\Resource\Entity\Attribute\Set\CollectionFactory $setCollectionFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Eav\Model\Config $eavConfig
     ) {
         $this->_scopeConfig = $scopeConfig;
@@ -481,6 +481,6 @@ public function getAttributeUsedForSortByArray()
      */
     public function getProductListDefaultSortBy($store = null)
     {
-        return $this->_scopeConfig->getValue(self::XML_PATH_LIST_DEFAULT_SORT_BY, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+        return $this->_scopeConfig->getValue(self::XML_PATH_LIST_DEFAULT_SORT_BY, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
     }
 }
diff --git a/app/code/Magento/Catalog/Model/Entity/Attribute.php b/app/code/Magento/Catalog/Model/Entity/Attribute.php
index a03e272b84191..50e0a28c5d5fd 100644
--- a/app/code/Magento/Catalog/Model/Entity/Attribute.php
+++ b/app/code/Magento/Catalog/Model/Entity/Attribute.php
@@ -76,7 +76,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute
      * @param \Magento\Core\Helper\Data $coreData
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Eav\Model\Entity\TypeFactory $eavTypeFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Eav\Model\Resource\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
      * @param \Magento\Eav\Api\Data\AttributeOptionDataBuilder $optionDataBuilder
@@ -97,7 +97,7 @@ public function __construct(
         \Magento\Core\Helper\Data $coreData,
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Eav\Model\Entity\TypeFactory $eavTypeFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Eav\Model\Resource\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
         \Magento\Eav\Api\Data\AttributeOptionDataBuilder $optionDataBuilder,
diff --git a/app/code/Magento/Catalog/Model/Indexer/AbstractFlatState.php b/app/code/Magento/Catalog/Model/Indexer/AbstractFlatState.php
index 25580a392be25..ee3f56b70d965 100644
--- a/app/code/Magento/Catalog/Model/Indexer/AbstractFlatState.php
+++ b/app/code/Magento/Catalog/Model/Indexer/AbstractFlatState.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Catalog\Model\Indexer;
 
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 abstract class AbstractFlatState
 {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
index 96f73c1fab612..9fba6a8ae9670 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/AbstractAction.php
@@ -28,7 +28,7 @@ class AbstractAction
     protected $resource;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -48,12 +48,12 @@ class AbstractAction
 
     /**
      * @param \Magento\Framework\App\Resource $resource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Resource\Helper $resourceHelper
     ) {
         $this->resource = $resource;
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php
index 2015ea5681c0e..34c02fd4e7e02 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Rows.php
@@ -17,13 +17,13 @@ class Rows extends \Magento\Catalog\Model\Indexer\Category\Flat\AbstractAction
 
     /**
      * @param \Magento\Framework\App\Resource $resource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
      * @param CategoryRepositoryInterface $categoryRepository
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Resource\Helper $resourceHelper,
         CategoryRepositoryInterface $categoryRepository
     ) {
diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
index c8869611bf2ce..fc76af0a7552b 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
@@ -64,7 +64,7 @@ abstract class AbstractAction
     protected $resource;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -82,12 +82,12 @@ abstract class AbstractAction
 
     /**
      * @param \Magento\Framework\App\Resource $resource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Config $config
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Config $config
     ) {
         $this->resource = $resource;
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
index e0481f9859d6a..c160e95db9b1f 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php
@@ -26,7 +26,7 @@ abstract class AbstractAction
     protected $_tableDropSuffix = '_drop_indexer';
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -71,7 +71,7 @@ abstract class AbstractAction
 
     /**
      * @param \Magento\Framework\App\Resource $resource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Helper\Product\Flat\Indexer $productHelper
      * @param \Magento\Catalog\Model\Product\Type $productType
      * @param TableBuilder $tableBuilder
@@ -79,7 +79,7 @@ abstract class AbstractAction
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Helper\Product\Flat\Indexer $productHelper,
         \Magento\Catalog\Model\Product\Type $productType,
         TableBuilder $tableBuilder,
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
index c6050d69cedb9..f3f78f4e1edae 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Eraser.php
@@ -20,19 +20,19 @@ class Eraser
     protected $connection;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
     /**
      * @param \Magento\Framework\App\Resource $resource
      * @param \Magento\Catalog\Helper\Product\Flat\Indexer $productHelper
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
         \Magento\Catalog\Helper\Product\Flat\Indexer $productHelper,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->productIndexerHelper = $productHelper;
         $this->connection = $resource->getConnection('default');
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
index 5b04085972308..d7f2bda96a5fc 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Row.php
@@ -25,7 +25,7 @@ class Row extends \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
 
     /**
      * @param \Magento\Framework\App\Resource $resource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Helper\Product\Flat\Indexer $productHelper
      * @param \Magento\Catalog\Model\Product\Type $productType
      * @param TableBuilder $tableBuilder
@@ -35,7 +35,7 @@ class Row extends \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Helper\Product\Flat\Indexer $productHelper,
         \Magento\Catalog\Model\Product\Type $productType,
         TableBuilder $tableBuilder,
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows.php
index 079ff838e3614..1014882f1ef82 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Rows.php
@@ -21,7 +21,7 @@ class Rows extends \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
 
     /**
      * @param \Magento\Framework\App\Resource $resource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Helper\Product\Flat\Indexer $productHelper
      * @param \Magento\Catalog\Model\Product\Type $productType
      * @param TableBuilder $tableBuilder
@@ -30,7 +30,7 @@ class Rows extends \Magento\Catalog\Model\Indexer\Product\Flat\AbstractAction
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Helper\Product\Flat\Indexer $productHelper,
         \Magento\Catalog\Model\Product\Type $productType,
         TableBuilder $tableBuilder,
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
index bab6bd58d3d13..3c5fd37274111 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Flat/FlatTableBuilder.php
@@ -31,7 +31,7 @@ class FlatTableBuilder
     protected $_config;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -44,14 +44,14 @@ class FlatTableBuilder
      * @param \Magento\Catalog\Helper\Product\Flat\Indexer $productIndexerHelper
      * @param \Magento\Framework\App\Resource $resource
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param TableDataInterface $tableData
      */
     public function __construct(
         \Magento\Catalog\Helper\Product\Flat\Indexer $productIndexerHelper,
         \Magento\Framework\App\Resource $resource,
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Indexer\Product\Flat\TableDataInterface $tableData
     ) {
         $this->_productIndexerHelper = $productIndexerHelper;
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
index c922137b49815..52861a1d42ada 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/AbstractAction.php
@@ -39,7 +39,7 @@ abstract class AbstractAction
     protected $_config;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -87,7 +87,7 @@ abstract class AbstractAction
     /**
      * @param \Magento\Framework\App\Resource $resource
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
@@ -98,7 +98,7 @@ abstract class AbstractAction
     public function __construct(
         \Magento\Framework\App\Resource $resource,
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Directory\Model\CurrencyFactory $currencyFactory,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Framework\Stdlib\DateTime $dateTime,
diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Observer.php b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Observer.php
index 3d7782328365e..0d8b328c8873a 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Product/Price/Observer.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Product/Price/Observer.php
@@ -8,7 +8,7 @@
 class Observer
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -43,7 +43,7 @@ class Observer
     protected $_connection;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Resource $resource
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
@@ -51,7 +51,7 @@ class Observer
      * @param \Magento\Catalog\Model\Indexer\Product\Price\Processor $processor
      */
     public function __construct(
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\Resource $resource,
         \Magento\Framework\Stdlib\DateTime $dateTime,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
diff --git a/app/code/Magento/Catalog/Model/Layer.php b/app/code/Magento/Catalog/Model/Layer.php
index 812edf9327932..74bcbfdf7cc84 100644
--- a/app/code/Magento/Catalog/Model/Layer.php
+++ b/app/code/Magento/Catalog/Model/Layer.php
@@ -40,7 +40,7 @@ class Layer extends \Magento\Framework\Object
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -90,7 +90,7 @@ class Layer extends \Magento\Framework\Object
      * @param Layer\StateFactory $layerStateFactory
      * @param Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory
      * @param Resource\Product $catalogProduct
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Registry $registry
      * @param CategoryRepositoryInterface $categoryRepository
      * @param array $data
@@ -100,7 +100,7 @@ public function __construct(
         \Magento\Catalog\Model\Layer\StateFactory $layerStateFactory,
         \Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory,
         \Magento\Catalog\Model\Resource\Product $catalogProduct,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Registry $registry,
         CategoryRepositoryInterface $categoryRepository,
         array $data = []
diff --git a/app/code/Magento/Catalog/Model/Layer/Category.php b/app/code/Magento/Catalog/Model/Layer/Category.php
index 22fb2dba6197c..c27f563e8b5f2 100644
--- a/app/code/Magento/Catalog/Model/Layer/Category.php
+++ b/app/code/Magento/Catalog/Model/Layer/Category.php
@@ -16,7 +16,7 @@ class Category extends \Magento\Catalog\Model\Layer
      * @param StateFactory $layerStateFactory
      * @param Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory
      * @param Resource\Product $catalogProduct
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Registry $registry
      * @param CategoryRepositoryInterface $categoryRepository
      * @param array $data
@@ -26,7 +26,7 @@ public function __construct(
         StateFactory $layerStateFactory,
         Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory,
         Resource\Product $catalogProduct,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Registry $registry,
         CategoryRepositoryInterface $categoryRepository,
         array $data = []
diff --git a/app/code/Magento/Catalog/Model/Layer/Category/FilterableAttributeList.php b/app/code/Magento/Catalog/Model/Layer/Category/FilterableAttributeList.php
index 4ba8fb004975e..7d37ce6bf92c2 100644
--- a/app/code/Magento/Catalog/Model/Layer/Category/FilterableAttributeList.php
+++ b/app/code/Magento/Catalog/Model/Layer/Category/FilterableAttributeList.php
@@ -17,7 +17,7 @@ class FilterableAttributeList implements FilterableAttributeListInterface
     protected $collectionFactory;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -30,12 +30,12 @@ class FilterableAttributeList implements FilterableAttributeListInterface
      * FilterableAttributeList constructor
      *
      * @param \Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $collectionFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
      */
     public function __construct(
         \Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $collectionFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Layer\Resolver $layerResolver
     ) {
         $this->collectionFactory = $collectionFactory;
diff --git a/app/code/Magento/Catalog/Model/Layer/Category/StateKey.php b/app/code/Magento/Catalog/Model/Layer/Category/StateKey.php
index d935d6db2f07c..35fa74eebaa1f 100644
--- a/app/code/Magento/Catalog/Model/Layer/Category/StateKey.php
+++ b/app/code/Magento/Catalog/Model/Layer/Category/StateKey.php
@@ -12,7 +12,7 @@
 class StateKey implements StateKeyInterface
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -22,11 +22,11 @@ class StateKey implements StateKeyInterface
     protected $customerSession;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Customer\Model\Session $customerSession
      */
     public function __construct(
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Customer\Model\Session $customerSession
     ) {
         $this->storeManager = $storeManager;
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php b/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php
index b3ccf6aac75bb..91e8aaadbef39 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php
@@ -36,7 +36,7 @@ abstract class AbstractFilter extends \Magento\Framework\Object implements Filte
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -58,7 +58,7 @@ abstract class AbstractFilter extends \Magento\Framework\Object implements Filte
      * Constructor
      *
      * @param \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Layer $layer
      * @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
      * @param array $data
@@ -66,7 +66,7 @@ abstract class AbstractFilter extends \Magento\Framework\Object implements Filte
      */
     public function __construct(
         \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Layer $layer,
         \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder,
         array $data = []
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Attribute.php b/app/code/Magento/Catalog/Model/Layer/Filter/Attribute.php
index 8d1cde939fb2e..b46e0d63c8831 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Attribute.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Attribute.php
@@ -33,7 +33,7 @@ class Attribute extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
 
     /**
      * @param ItemFactory $filterItemFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Layer $layer
      * @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
      * @param \Magento\Catalog\Model\Resource\Layer\Filter\AttributeFactory $filterAttributeFactory
@@ -43,7 +43,7 @@ class Attribute extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
      */
     public function __construct(
         \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Layer $layer,
         \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder,
         \Magento\Catalog\Model\Resource\Layer\Filter\AttributeFactory $filterAttributeFactory,
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Category.php b/app/code/Magento/Catalog/Model/Layer/Filter/Category.php
index 38ca98bf7920c..b582dd8fdfd82 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Category.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Category.php
@@ -53,7 +53,7 @@ class Category extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
      * Construct
      *
      * @param \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Layer $layer
      * @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
      * @param \Magento\Framework\Escaper $escaper
@@ -62,7 +62,7 @@ class Category extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
      */
     public function __construct(
         \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Layer $layer,
         \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder,
         \Magento\Framework\Escaper $escaper,
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Price.php b/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Price.php
index 783ab5ac822e4..cc9e06a5a80a1 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Price.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Price.php
@@ -8,7 +8,7 @@
 use Magento\Catalog\Model\Layer;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Registry;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 class Price
 {
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php b/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php
index 8deac3cca7afd..2aff097b02334 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php
@@ -32,7 +32,7 @@ class Decimal extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
 
     /**
      * @param ItemFactory $filterItemFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Layer $layer
      * @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
      * @param \Magento\Catalog\Model\Resource\Layer\Filter\DecimalFactory $filterDecimalFactory
@@ -41,7 +41,7 @@ class Decimal extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
      */
     public function __construct(
         \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Layer $layer,
         \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder,
         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmFactory.php b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmFactory.php
index b8c4183760e10..d86b8220296bf 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmFactory.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/AlgorithmFactory.php
@@ -11,7 +11,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Model\Exception;
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 class AlgorithmFactory
 {
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Improved.php b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Improved.php
index d53ed9bbda47b..ab08c7eb49de9 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Improved.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Improved.php
@@ -10,7 +10,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Search\Dynamic\Algorithm;
 use Magento\Framework\Search\Dynamic\IntervalFactory;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 class Improved implements AlgorithmInterface
 {
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Manual.php b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Manual.php
index 6d8a98eaa43bc..b81568ae537e0 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Manual.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Dynamic/Manual.php
@@ -12,7 +12,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Registry;
 use Magento\Framework\Search\Dynamic\Algorithm;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 class Manual implements AlgorithmInterface
 {
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Price.php b/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
index a18190e0a2f9a..5f2e21f3f22d9 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
@@ -64,7 +64,7 @@ class Price extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
 
     /**
      * @param ItemFactory $filterItemFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Layer $layer
      * @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
      * @param \Magento\Catalog\Model\Resource\Layer\Filter\Price $resource
@@ -78,7 +78,7 @@ class Price extends \Magento\Catalog\Model\Layer\Filter\AbstractFilter
      */
     public function __construct(
         \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Layer $layer,
         \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder,
         \Magento\Catalog\Model\Resource\Layer\Filter\Price $resource,
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Price/Range.php b/app/code/Magento/Catalog/Model/Layer/Filter/Price/Range.php
index 5c80ebacb6db1..c1ff0681b3e7f 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Price/Range.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Price/Range.php
@@ -8,7 +8,7 @@
 use Magento\Catalog\Model\Layer\Resolver;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Registry;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 class Range
 {
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php b/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php
index 35e15b20a9a1e..baece7b17624a 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php
@@ -8,7 +8,7 @@
 use Magento\Catalog\Model\Layer\Filter\Item\DataBuilder;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 class Render
 {
diff --git a/app/code/Magento/Catalog/Model/Layer/Search.php b/app/code/Magento/Catalog/Model/Layer/Search.php
index 150dfab4b28a6..467fe6462d900 100644
--- a/app/code/Magento/Catalog/Model/Layer/Search.php
+++ b/app/code/Magento/Catalog/Model/Layer/Search.php
@@ -17,7 +17,7 @@ class Search extends \Magento\Catalog\Model\Layer
      * @param StateFactory $layerStateFactory
      * @param Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory
      * @param Resource\Product $catalogProduct
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Registry $registry
      * @param CategoryRepositoryInterface $categoryRepository
      * @param array $data
@@ -27,7 +27,7 @@ public function __construct(
         StateFactory $layerStateFactory,
         Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory,
         Resource\Product $catalogProduct,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Registry $registry,
         CategoryRepositoryInterface $categoryRepository,
         array $data = []
diff --git a/app/code/Magento/Catalog/Model/Layer/Search/CollectionFilter.php b/app/code/Magento/Catalog/Model/Layer/Search/CollectionFilter.php
index 630b4179b45ac..986d4bf3ae8e8 100644
--- a/app/code/Magento/Catalog/Model/Layer/Search/CollectionFilter.php
+++ b/app/code/Magento/Catalog/Model/Layer/Search/CollectionFilter.php
@@ -9,7 +9,7 @@
 use Magento\Catalog\Model\Layer\CollectionFilterInterface;
 use Magento\Catalog\Model\Product\Visibility;
 use Magento\Framework\DB\Select;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 class CollectionFilter implements CollectionFilterInterface
 {
@@ -19,7 +19,7 @@ class CollectionFilter implements CollectionFilterInterface
     protected $catalogConfig;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $storeManager;
 
@@ -30,7 +30,7 @@ class CollectionFilter implements CollectionFilterInterface
 
     /**
      * @param Config $catalogConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param StoreManagerInterface $storeManager
      * @param Visibility $productVisibility
      */
     public function __construct(
diff --git a/app/code/Magento/Catalog/Model/Layer/Search/FilterableAttributeList.php b/app/code/Magento/Catalog/Model/Layer/Search/FilterableAttributeList.php
index 1918ab29b016f..45093a58a2818 100644
--- a/app/code/Magento/Catalog/Model/Layer/Search/FilterableAttributeList.php
+++ b/app/code/Magento/Catalog/Model/Layer/Search/FilterableAttributeList.php
@@ -10,12 +10,12 @@ class FilterableAttributeList extends \Magento\Catalog\Model\Layer\Category\Filt
 {
     /**
      * @param \Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $collectionFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
      */
     public function __construct(
         \Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $collectionFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Layer\Resolver $layerResolver
     ) {
         parent::__construct($collectionFactory, $storeManager, $layerResolver);
diff --git a/app/code/Magento/Catalog/Model/Observer.php b/app/code/Magento/Catalog/Model/Observer.php
index ea38137a24a35..dac92e427e266 100644
--- a/app/code/Magento/Catalog/Model/Observer.php
+++ b/app/code/Magento/Catalog/Model/Observer.php
@@ -36,7 +36,7 @@ class Observer
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -64,7 +64,7 @@ class Observer
     /**
      * @param \Magento\Catalog\Model\Resource\Category $categoryResource
      * @param \Magento\Catalog\Model\Resource\Product $catalogProduct
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
      * @param \Magento\Catalog\Helper\Category $catalogCategory
      * @param \Magento\Catalog\Helper\Data $catalogData
@@ -74,7 +74,7 @@ class Observer
     public function __construct(
         \Magento\Catalog\Model\Resource\Category $categoryResource,
         \Magento\Catalog\Model\Resource\Product $catalogProduct,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Layer\Resolver $layerResolver,
         \Magento\Catalog\Helper\Category $catalogCategory,
         \Magento\Catalog\Helper\Data $catalogData,
diff --git a/app/code/Magento/Catalog/Model/Product.php b/app/code/Magento/Catalog/Model/Product.php
index 5dd893011abe4..0cfa67a717a5e 100644
--- a/app/code/Magento/Catalog/Model/Product.php
+++ b/app/code/Magento/Catalog/Model/Product.php
@@ -243,7 +243,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Catalog\Api\ProductAttributeRepositoryInterface $metadataService
      * @param AttributeValueFactory $customAttributeFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param Product\Url $url
      * @param Product\Link $productLink
      * @param Product\Configuration\Item\OptionFactory $itemOptionFactory
@@ -274,7 +274,7 @@ public function __construct(
         \Magento\Framework\Registry $registry,
         \Magento\Catalog\Api\ProductAttributeRepositoryInterface $metadataService,
         AttributeValueFactory $customAttributeFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         Product\Url $url,
         Product\Link $productLink,
         \Magento\Catalog\Model\Product\Configuration\Item\OptionFactory $itemOptionFactory,
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice.php
index a3b1e442c1aef..82377067645a4 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice.php
@@ -21,7 +21,7 @@ class GroupPrice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupP
 
     /**
      * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Helper\Data $catalogData
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      * @param \Magento\Catalog\Model\Product\Type $catalogProductType
@@ -30,7 +30,7 @@ class GroupPrice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupP
      */
     public function __construct(
         \Magento\Directory\Model\CurrencyFactory $currencyFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Helper\Data $catalogData,
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
         \Magento\Catalog\Model\Product\Type $catalogProductType,
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
index a3fdf8eff8cc0..c743b671c4bdb 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
@@ -45,7 +45,7 @@ abstract protected function _getDuplicateErrorMessage();
 
     /**
      * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Helper\Data $catalogData
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      * @param \Magento\Catalog\Model\Product\Type $catalogProductType
@@ -53,7 +53,7 @@ abstract protected function _getDuplicateErrorMessage();
      */
     public function __construct(
         \Magento\Directory\Model\CurrencyFactory $currencyFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Helper\Data $catalogData,
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
         \Magento\Catalog\Model\Product\Type $catalogProductType,
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php
index 5fdb39d5408fa..79b2b1b752ad9 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Price.php
@@ -22,7 +22,7 @@ class Price extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -44,13 +44,13 @@ class Price extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
      * Construct
      *
      * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Helper\Data $catalogData
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      */
     public function __construct(
         \Magento\Directory\Model\CurrencyFactory $currencyFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Helper\Data $catalogData,
         \Magento\Framework\App\Config\ScopeConfigInterface $config
     ) {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
index a3745f3e3a052..7142957657abc 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
@@ -22,7 +22,7 @@ class Tierprice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupPr
 
     /**
      * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Helper\Data $catalogData
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      * @param \Magento\Catalog\Model\Product\Type $catalogProductType
@@ -31,7 +31,7 @@ class Tierprice extends \Magento\Catalog\Model\Product\Attribute\Backend\GroupPr
      */
     public function __construct(
         \Magento\Directory\Model\CurrencyFactory $currencyFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Helper\Data $catalogData,
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
         \Magento\Catalog\Model\Product\Type $catalogProductType,
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php b/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php
index 01cf095460868..389500c6108a2 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Frontend/Image.php
@@ -16,16 +16,16 @@ class Image extends \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFronten
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
      * Construct
      *
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
-    public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
+    public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
     {
         $this->_storeManager = $storeManager;
     }
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php
index 2a5f2607b0170..11d9864f39bb0 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Countryofmanufacture.php
@@ -21,7 +21,7 @@ class Countryofmanufacture extends \Magento\Eav\Model\Entity\Attribute\Source\Ab
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -36,12 +36,12 @@ class Countryofmanufacture extends \Magento\Eav\Model\Entity\Attribute\Source\Ab
      * Construct
      *
      * @param \Magento\Directory\Model\CountryFactory $countryFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Cache\Type\Config $configCacheType
      */
     public function __construct(
         \Magento\Directory\Model\CountryFactory $countryFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\Cache\Type\Config $configCacheType
     ) {
         $this->_countryFactory = $countryFactory;
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php
index 26c76db08df0c..ed84205fd5168 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Source/Layout.php
@@ -13,14 +13,14 @@
 class Layout extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
 {
     /**
-     * @var \Magento\Core\Model\PageLayout\Config\Builder
+     * @var \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface
      */
     protected $pageLayoutBuilder;
 
     /**
-     * @param \Magento\Core\Model\PageLayout\Config\Builder $pageLayoutBuilder
+     * @param \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder
      */
-    public function __construct(\Magento\Core\Model\PageLayout\Config\Builder $pageLayoutBuilder)
+    public function __construct(\Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder)
     {
         $this->pageLayoutBuilder = $pageLayoutBuilder;
     }
diff --git a/app/code/Magento/Catalog/Model/Product/Compare/Item.php b/app/code/Magento/Catalog/Model/Product/Compare/Item.php
index 21565cb006149..b488f1d02e0bd 100644
--- a/app/code/Magento/Catalog/Model/Product/Compare/Item.php
+++ b/app/code/Magento/Catalog/Model/Product/Compare/Item.php
@@ -65,14 +65,14 @@ class Item extends \Magento\Framework\Model\AbstractModel implements \Magento\Fr
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Customer\Model\Visitor $customerVisitor
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Catalog\Helper\Product\Compare $catalogProductCompare
@@ -83,7 +83,7 @@ class Item extends \Magento\Framework\Model\AbstractModel implements \Magento\Fr
     public function __construct(
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\Registry $registry,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Customer\Model\Visitor $customerVisitor,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Catalog\Helper\Product\Compare $catalogProductCompare,
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php b/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
index 7e38fc5705e38..bedbdec0d8860 100644
--- a/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php
@@ -33,7 +33,7 @@ class GalleryManagement implements \Magento\Catalog\Api\ProductAttributeMediaGal
     ];
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -73,7 +73,7 @@ class GalleryManagement implements \Magento\Catalog\Api\ProductAttributeMediaGal
     protected $attributeRepository;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
      * @param \Magento\Catalog\Api\ProductAttributeRepositoryInterface $attributeRepository
      * @param MediaConfig $mediaConfig
@@ -84,7 +84,7 @@ class GalleryManagement implements \Magento\Catalog\Api\ProductAttributeMediaGal
      * @param \Magento\Catalog\Model\Resource\Product\Attribute\Backend\Media $mediaGallery
      */
     public function __construct(
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
         \Magento\Catalog\Api\ProductAttributeRepositoryInterface $attributeRepository,
         MediaConfig $mediaConfig,
diff --git a/app/code/Magento/Catalog/Model/Product/GroupPriceManagement.php b/app/code/Magento/Catalog/Model/Product/GroupPriceManagement.php
index 7c270cfc54dc6..3c562be9fa177 100644
--- a/app/code/Magento/Catalog/Model/Product/GroupPriceManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/GroupPriceManagement.php
@@ -39,13 +39,13 @@ class GroupPriceManagement implements \Magento\Catalog\Api\ProductGroupPriceMana
     protected $config;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
     /**
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Api\Data\ProductGroupPriceDataBuilder $groupPriceBuilder
      * @param GroupRepositoryInterface $groupRepository
      * @param PriceModifier $priceModifier
@@ -57,7 +57,7 @@ public function __construct(
         GroupRepositoryInterface $groupRepository,
         \Magento\Catalog\Model\Product\PriceModifier $priceModifier,
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->productRepository = $productRepository;
         $this->groupPriceBuilder = $groupPriceBuilder;
@@ -81,7 +81,7 @@ public function add($productSku, $customerGroupId, $price)
         $product = $this->productRepository->get($productSku, true);
         $groupPrices = $product->getData('group_price');
         $websiteIdentifier = 0;
-        $value = $this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE);
+        $value = $this->config->getValue('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE);
         if ($value != 0) {
             $websiteIdentifier = $this->storeManager->getWebsite()->getId();
         }
@@ -126,7 +126,7 @@ public function remove($productSku, $customerGroupId)
     {
         $product = $this->productRepository->get($productSku, true);
         $websiteIdentifier = 0;
-        $value = $this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE);
+        $value = $this->config->getValue('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE);
         if ($value != 0) {
             $websiteIdentifier = $this->storeManager->getWebsite()->getId();
         }
@@ -141,7 +141,7 @@ public function getList($productSku, $websiteId = null)
     {
         $product = $this->productRepository->get($productSku, true);
         $priceKey = 'website_price';
-        $value = $this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE);
+        $value = $this->config->getValue('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE);
         if ($value == 0) {
             $priceKey = 'price';
         }
diff --git a/app/code/Magento/Catalog/Model/Product/Image.php b/app/code/Magento/Catalog/Model/Product/Image.php
index fd4a81f6218f2..eede4fe531f74 100644
--- a/app/code/Magento/Catalog/Model/Product/Image.php
+++ b/app/code/Magento/Catalog/Model/Product/Image.php
@@ -163,14 +163,14 @@ class Image extends \Magento\Framework\Model\AbstractModel
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Product\Media\Config $catalogProductMediaConfig
      * @param \Magento\Core\Helper\File\Storage\Database $coreFileStorageDatabase
      * @param \Magento\Framework\Filesystem $filesystem
@@ -187,7 +187,7 @@ class Image extends \Magento\Framework\Model\AbstractModel
     public function __construct(
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\Registry $registry,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Product\Media\Config $catalogProductMediaConfig,
         \Magento\Core\Helper\File\Storage\Database $coreFileStorageDatabase,
         \Magento\Framework\Filesystem $filesystem,
@@ -471,7 +471,7 @@ public function setBaseFile($file)
             // check if placeholder defined in config
             $isConfigPlaceholder = $this->_scopeConfig->getValue(
                 "catalog/placeholder/{$this->getDestinationSubdir()}_placeholder",
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
             $configPlaceholder = '/placeholder/' . $isConfigPlaceholder;
             if (!empty($isConfigPlaceholder) && $this->_fileExists($baseDir . $configPlaceholder)) {
diff --git a/app/code/Magento/Catalog/Model/Product/Media/AttributeManagement.php b/app/code/Magento/Catalog/Model/Product/Media/AttributeManagement.php
index 35d07d3cf0d36..3babcdc846db6 100644
--- a/app/code/Magento/Catalog/Model/Product/Media/AttributeManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/Media/AttributeManagement.php
@@ -6,7 +6,7 @@
 namespace Magento\Catalog\Model\Product\Media;
 
 use Magento\Catalog\Api\ProductMediaAttributeManagementInterface;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Catalog\Model\Product;
 
 class AttributeManagement implements ProductMediaAttributeManagementInterface
@@ -17,7 +17,7 @@ class AttributeManagement implements ProductMediaAttributeManagementInterface
     private $collectionFactory;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     private $storeManager;
 
diff --git a/app/code/Magento/Catalog/Model/Product/Media/Config.php b/app/code/Magento/Catalog/Model/Product/Media/Config.php
index b1ebf440a003d..55b22c509a945 100644
--- a/app/code/Magento/Catalog/Model/Product/Media/Config.php
+++ b/app/code/Magento/Catalog/Model/Product/Media/Config.php
@@ -18,14 +18,14 @@ class Config implements ConfigInterface
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
-    public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
+    public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
     {
         $this->storeManager = $storeManager;
     }
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
index 6271c735c6b66..b573c37ee059e 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/DefaultType.php
@@ -190,7 +190,7 @@ public function getRequest()
      */
     public function getConfigData($key)
     {
-        return $this->_scopeConfig->getValue('catalog/custom_options/' . $key, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue('catalog/custom_options/' . $key, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/File/Validator.php b/app/code/Magento/Catalog/Model/Product/Option/Type/File/Validator.php
index 55710d57ac5de..d4cf7b3463d96 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/File/Validator.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/File/Validator.php
@@ -52,7 +52,7 @@ protected function getConfigData($key)
     {
         return $this->scopeConfig->getValue(
             'catalog/custom_options/' . $key,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
diff --git a/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php b/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php
index f40ae21baed3e..4d40710150da3 100644
--- a/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php
+++ b/app/code/Magento/Catalog/Model/Product/TierPriceManagement.php
@@ -29,7 +29,7 @@ class TierPriceManagement implements \Magento\Catalog\Api\ProductTierPriceManage
     protected $priceBuilder;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -56,7 +56,7 @@ class TierPriceManagement implements \Magento\Catalog\Api\ProductTierPriceManage
     /**
      * @param ProductRepositoryInterface $productRepository
      * @param \Magento\Catalog\Api\Data\ProductTierPriceDataBuilder $priceBuilder
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param PriceModifier $priceModifier
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      * @param GroupManagementInterface $groupManagement
@@ -65,7 +65,7 @@ class TierPriceManagement implements \Magento\Catalog\Api\ProductTierPriceManage
     public function __construct(
         ProductRepositoryInterface $productRepository,
         \Magento\Catalog\Api\Data\ProductTierPriceDataBuilder $priceBuilder,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Product\PriceModifier $priceModifier,
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
         GroupManagementInterface $groupManagement,
@@ -93,7 +93,7 @@ public function add($productSku, $customerGroupId, $price, $qty)
         $product = $this->productRepository->get($productSku, ['edit_mode' => true]);
         $tierPrices = $product->getData('tier_price');
         $websiteIdentifier = 0;
-        $value = $this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE);
+        $value = $this->config->getValue('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE);
         if ($value != 0) {
             $websiteIdentifier = $this->storeManager->getWebsite()->getId();
         }
@@ -149,7 +149,7 @@ public function remove($productSku, $customerGroupId, $qty)
     {
         $product = $this->productRepository->get($productSku, ['edit_mode' => true]);
         $websiteIdentifier = 0;
-        $value = $this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE);
+        $value = $this->config->getValue('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE);
         if ($value != 0) {
             $websiteIdentifier = $this->storeManager->getWebsite()->getId();
         }
@@ -165,7 +165,7 @@ public function getList($productSku, $customerGroupId)
         $product = $this->productRepository->get($productSku, ['edit_mode' => true]);
 
         $priceKey = 'website_price';
-        $value = $this->config->getValue('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE);
+        $value = $this->config->getValue('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE);
         if ($value == 0) {
             $priceKey = 'price';
         }
diff --git a/app/code/Magento/Catalog/Model/Product/Type/Price.php b/app/code/Magento/Catalog/Model/Product/Type/Price.php
index 0050da069e01b..da34894119078 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/Price.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/Price.php
@@ -48,7 +48,7 @@ class Price
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -71,7 +71,7 @@ class Price
 
     /**
      * @param \Magento\CatalogRule\Model\Resource\RuleFactory $ruleFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -80,7 +80,7 @@ class Price
      */
     public function __construct(
         \Magento\CatalogRule\Model\Resource\RuleFactory $ruleFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/Catalog/Model/Product/Url.php b/app/code/Magento/Catalog/Model/Product/Url.php
index e4fb8ac7baa07..819232c072597 100644
--- a/app/code/Magento/Catalog/Model/Product/Url.php
+++ b/app/code/Magento/Catalog/Model/Product/Url.php
@@ -38,7 +38,7 @@ class Url extends \Magento\Framework\Object
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -55,7 +55,7 @@ class Url extends \Magento\Framework\Object
 
     /**
      * @param \Magento\Framework\UrlInterface $url
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Helper\Category $catalogCategory
      * @param \Magento\Framework\Filter\FilterManager $filter
      * @param \Magento\Framework\Session\SidResolverInterface $sidResolver
@@ -65,7 +65,7 @@ class Url extends \Magento\Framework\Object
      */
     public function __construct(
         \Magento\Framework\UrlInterface $url,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Helper\Category $catalogCategory,
         \Magento\Framework\Filter\FilterManager $filter,
         \Magento\Framework\Session\SidResolverInterface $sidResolver,
diff --git a/app/code/Magento/Catalog/Model/Resource/AbstractResource.php b/app/code/Magento/Catalog/Model/Resource/AbstractResource.php
index adfda93a7c98e..a27766bd86276 100644
--- a/app/code/Magento/Catalog/Model/Resource/AbstractResource.php
+++ b/app/code/Magento/Catalog/Model/Resource/AbstractResource.php
@@ -26,7 +26,7 @@ abstract class AbstractResource extends \Magento\Eav\Model\Entity\AbstractEntity
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -46,7 +46,7 @@ abstract class AbstractResource extends \Magento\Eav\Model\Entity\AbstractEntity
      * @param \Magento\Framework\Locale\FormatInterface $localeFormat
      * @param \Magento\Eav\Model\Resource\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Factory $modelFactory
      * @param array $data
      */
@@ -57,7 +57,7 @@ public function __construct(
         \Magento\Framework\Locale\FormatInterface $localeFormat,
         \Magento\Eav\Model\Resource\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Factory $modelFactory,
         $data = []
     ) {
diff --git a/app/code/Magento/Catalog/Model/Resource/Attribute.php b/app/code/Magento/Catalog/Model/Resource/Attribute.php
index 21813424a1193..26ca2463c968d 100644
--- a/app/code/Magento/Catalog/Model/Resource/Attribute.php
+++ b/app/code/Magento/Catalog/Model/Resource/Attribute.php
@@ -28,14 +28,14 @@ class Attribute extends \Magento\Eav\Model\Resource\Entity\Attribute
 
     /**
      * @param \Magento\Framework\App\Resource $resource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Eav\Model\Resource\Entity\Type $eavEntityType
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param LockValidatorInterface $lockValidator
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Eav\Model\Resource\Entity\Type $eavEntityType,
         \Magento\Eav\Model\Config $eavConfig,
         LockValidatorInterface $lockValidator
diff --git a/app/code/Magento/Catalog/Model/Resource/Category.php b/app/code/Magento/Catalog/Model/Resource/Category.php
index 19eb4ee65f49c..02a2c6d82a4d6 100644
--- a/app/code/Magento/Catalog/Model/Resource/Category.php
+++ b/app/code/Magento/Catalog/Model/Resource/Category.php
@@ -74,7 +74,7 @@ class Category extends AbstractResource
      * @param \Magento\Framework\Locale\FormatInterface $localeFormat
      * @param \Magento\Eav\Model\Resource\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Factory $modelFactory
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Catalog\Model\Resource\Category\TreeFactory $categoryTreeFactory
@@ -90,7 +90,7 @@ public function __construct(
         \Magento\Framework\Locale\FormatInterface $localeFormat,
         \Magento\Eav\Model\Resource\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Factory $modelFactory,
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Catalog\Model\Resource\Category\TreeFactory $categoryTreeFactory,
diff --git a/app/code/Magento/Catalog/Model/Resource/Category/Attribute/Frontend/Image.php b/app/code/Magento/Catalog/Model/Resource/Category/Attribute/Frontend/Image.php
index c4d1e5e602c4b..61b59b70d9d56 100644
--- a/app/code/Magento/Catalog/Model/Resource/Category/Attribute/Frontend/Image.php
+++ b/app/code/Magento/Catalog/Model/Resource/Category/Attribute/Frontend/Image.php
@@ -17,16 +17,16 @@ class Image extends \Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFronten
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
      * Construct
      *
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
-    public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
+    public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
     {
         $this->_storeManager = $storeManager;
     }
diff --git a/app/code/Magento/Catalog/Model/Resource/Category/Flat.php b/app/code/Magento/Catalog/Model/Resource/Category/Flat.php
index 95227879e5cbb..e18f88ff4d18a 100644
--- a/app/code/Magento/Catalog/Model/Resource/Category/Flat.php
+++ b/app/code/Magento/Catalog/Model/Resource/Category/Flat.php
@@ -59,7 +59,7 @@ class Flat extends \Magento\Indexer\Model\Resource\AbstractResource
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -81,7 +81,7 @@ class Flat extends \Magento\Indexer\Model\Resource\AbstractResource
      * @param \Magento\Framework\App\Resource $resource
      * @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
      * @param \Magento\Catalog\Model\Resource\Category\CollectionFactory $categoryCollectionFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Config $catalogConfig
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      */
@@ -89,7 +89,7 @@ public function __construct(
         \Magento\Framework\App\Resource $resource,
         \Magento\Catalog\Model\CategoryFactory $categoryFactory,
         \Magento\Catalog\Model\Resource\Category\CollectionFactory $categoryCollectionFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Config $catalogConfig,
         \Magento\Framework\Event\ManagerInterface $eventManager
     ) {
diff --git a/app/code/Magento/Catalog/Model/Resource/Category/Flat/Collection.php b/app/code/Magento/Catalog/Model/Resource/Category/Flat/Collection.php
index adb32fd357681..b40b88289c251 100644
--- a/app/code/Magento/Catalog/Model/Resource/Category/Flat/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Category/Flat/Collection.php
@@ -11,7 +11,7 @@
 use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
 use Magento\Framework\Model\Resource\Db\AbstractDb;
 use Psr\Log\LoggerInterface as Logger;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Catalog category flat collection
@@ -37,7 +37,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -53,7 +53,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
      * @param Logger $logger
      * @param FetchStrategyInterface $fetchStrategy
      * @param ManagerInterface $eventManager
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Zend_Db_Adapter_Abstract $connection
      * @param AbstractDb $resource
      */
diff --git a/app/code/Magento/Catalog/Model/Resource/Category/Tree.php b/app/code/Magento/Catalog/Model/Resource/Category/Tree.php
index bf196c00952a8..bbd46711f99c3 100644
--- a/app/code/Magento/Catalog/Model/Resource/Category/Tree.php
+++ b/app/code/Magento/Catalog/Model/Resource/Category/Tree.php
@@ -69,7 +69,7 @@ class Tree extends \Magento\Framework\Data\Tree\Dbp
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -92,7 +92,7 @@ class Tree extends \Magento\Framework\Data\Tree\Dbp
      *
      * @param \Magento\Catalog\Model\Resource\Category $catalogCategory
      * @param \Magento\Framework\App\CacheInterface $cache
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Resource $resource
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Catalog\Model\Attribute\Config $attributeConfig
@@ -101,7 +101,7 @@ class Tree extends \Magento\Framework\Data\Tree\Dbp
     public function __construct(
         \Magento\Catalog\Model\Resource\Category $catalogCategory,
         \Magento\Framework\App\CacheInterface $cache,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\Resource $resource,
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Catalog\Model\Attribute\Config $attributeConfig,
diff --git a/app/code/Magento/Catalog/Model/Resource/Collection/AbstractCollection.php b/app/code/Magento/Catalog/Model/Resource/Collection/AbstractCollection.php
index de2727ae8b93f..80e088ff3af0f 100644
--- a/app/code/Magento/Catalog/Model/Resource/Collection/AbstractCollection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Collection/AbstractCollection.php
@@ -23,7 +23,7 @@ class AbstractCollection extends \Magento\Eav\Model\Entity\Collection\AbstractCo
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -37,7 +37,7 @@ class AbstractCollection extends \Magento\Eav\Model\Entity\Collection\AbstractCo
      * @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
      * @param \Magento\Eav\Model\Resource\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Zend_Db_Adapter_Abstract $connection
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -52,7 +52,7 @@ public function __construct(
         \Magento\Eav\Model\EntityFactory $eavEntityFactory,
         \Magento\Eav\Model\Resource\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         $connection = null
     ) {
         $this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Catalog/Model/Resource/Config.php b/app/code/Magento/Catalog/Model/Resource/Config.php
index 1a650c5c7f09b..d4abad7a0ed0c 100644
--- a/app/code/Magento/Catalog/Model/Resource/Config.php
+++ b/app/code/Magento/Catalog/Model/Resource/Config.php
@@ -36,18 +36,18 @@ class Config extends \Magento\Framework\Model\Resource\Db\AbstractDb
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Framework\App\Resource $resource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Eav\Model\Config $eavConfig
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Eav\Model\Config $eavConfig
     ) {
         $this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Catalog/Model/Resource/Eav/Attribute.php b/app/code/Magento/Catalog/Model/Resource/Eav/Attribute.php
index 286750824f7ca..bbe11009e88cc 100644
--- a/app/code/Magento/Catalog/Model/Resource/Eav/Attribute.php
+++ b/app/code/Magento/Catalog/Model/Resource/Eav/Attribute.php
@@ -103,7 +103,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute implements
      * @param \Magento\Core\Helper\Data $coreData
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Eav\Model\Entity\TypeFactory $eavTypeFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Eav\Model\Resource\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
      * @param \Magento\Eav\Api\Data\AttributeOptionDataBuilder $optionDataBuilder
@@ -127,7 +127,7 @@ public function __construct(
         \Magento\Core\Helper\Data $coreData,
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Eav\Model\Entity\TypeFactory $eavTypeFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Eav\Model\Resource\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
         \Magento\Eav\Api\Data\AttributeOptionDataBuilder $optionDataBuilder,
diff --git a/app/code/Magento/Catalog/Model/Resource/Layer/Filter/Price.php b/app/code/Magento/Catalog/Model/Resource/Layer/Filter/Price.php
index fdcc55de263dd..7dfcf7810f121 100644
--- a/app/code/Magento/Catalog/Model/Resource/Layer/Filter/Price.php
+++ b/app/code/Magento/Catalog/Model/Resource/Layer/Filter/Price.php
@@ -33,7 +33,7 @@ class Price extends \Magento\Framework\Model\Resource\Db\AbstractDb
     private $session;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     private $storeManager;
 
@@ -42,14 +42,14 @@ class Price extends \Magento\Framework\Model\Resource\Db\AbstractDb
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
      * @param \Magento\Customer\Model\Session $session
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Catalog\Model\Layer\Resolver $layerResolver,
         \Magento\Customer\Model\Session $session,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->layer = $layerResolver->get();
         $this->session = $session;
diff --git a/app/code/Magento/Catalog/Model/Resource/Product.php b/app/code/Magento/Catalog/Model/Resource/Product.php
index abfa6e7998c71..814f9e6ec81e9 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product.php
@@ -63,7 +63,7 @@ class Product extends AbstractResource
      * @param \Magento\Framework\Locale\FormatInterface $localeFormat
      * @param \Magento\Eav\Model\Resource\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Factory $modelFactory
      * @param Category\CollectionFactory $categoryCollectionFactory
      * @param Category $catalogCategory
@@ -81,7 +81,7 @@ public function __construct(
         \Magento\Framework\Locale\FormatInterface $localeFormat,
         \Magento\Eav\Model\Resource\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Factory $modelFactory,
         \Magento\Catalog\Model\Resource\Category\CollectionFactory $categoryCollectionFactory,
         Category $catalogCategory,
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Collection.php b/app/code/Magento/Catalog/Model/Resource/Product/Collection.php
index a5ef49306bc7d..1d4a1ee8a13ab 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Collection.php
@@ -265,7 +265,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Collection\AbstractColl
      * @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
      * @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -289,7 +289,7 @@ public function __construct(
         \Magento\Eav\Model\EntityFactory $eavEntityFactory,
         \Magento\Catalog\Model\Resource\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -1244,7 +1244,7 @@ public function addUrlRewrite($categoryId = '')
         $this->_addUrlRewrite = true;
         $useCategoryUrl = $this->_scopeConfig->getValue(
             \Magento\Catalog\Helper\Product::XML_PATH_PRODUCT_URL_USE_CATEGORY,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->getStoreId()
         );
         if ($useCategoryUrl) {
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Compare/Item/Collection.php b/app/code/Magento/Catalog/Model/Resource/Product/Compare/Item/Collection.php
index d64d6cc2d5bb5..e4e28b738b52e 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Compare/Item/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Compare/Item/Collection.php
@@ -59,7 +59,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
      * @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
      * @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -85,7 +85,7 @@ public function __construct(
         \Magento\Eav\Model\EntityFactory $eavEntityFactory,
         \Magento\Catalog\Model\Resource\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Flat.php b/app/code/Magento/Catalog/Model/Resource/Product/Flat.php
index ecdac4c6c4ee8..711a988b91a94 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Flat.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Flat.php
@@ -31,18 +31,18 @@ class Flat extends \Magento\Framework\Model\Resource\Db\AbstractDb
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Framework\App\Resource $resource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Config $catalogConfig
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Config $catalogConfig
     ) {
         $this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Option.php b/app/code/Magento/Catalog/Model/Resource/Product/Option.php
index 1e3882df9ae61..0150acf9b0e76 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Option.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Option.php
@@ -15,7 +15,7 @@ class Option extends \Magento\Framework\Model\Resource\Db\AbstractDb
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -38,13 +38,13 @@ class Option extends \Magento\Framework\Model\Resource\Db\AbstractDb
      *
      * @param \Magento\Framework\App\Resource $resource
      * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
         \Magento\Directory\Model\CurrencyFactory $currencyFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\Config\ScopeConfigInterface $config
     ) {
         $this->_currencyFactory = $currencyFactory;
@@ -153,7 +153,7 @@ protected function _saveValuePrices(\Magento\Framework\Model\AbstractModel $obje
 
             $scope = (int)$this->_config->getValue(
                 \Magento\Store\Model\Store::XML_PATH_PRICE_SCOPE,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
 
             if ($object->getStoreId() != '0' && $scope == \Magento\Store\Model\Store::PRICE_SCOPE_WEBSITE) {
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Option/Collection.php b/app/code/Magento/Catalog/Model/Resource/Product/Option/Collection.php
index 851bfa2bd096e..d819d3a0da8c4 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Option/Collection.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Option/Collection.php
@@ -15,7 +15,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -32,7 +32,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Catalog\Model\Resource\Product\Option\Value\CollectionFactory $optionValueCollectionFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Zend_Db_Adapter_Abstract $connection
      * @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
      */
@@ -42,7 +42,7 @@ public function __construct(
         \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Catalog\Model\Resource\Product\Option\Value\CollectionFactory $optionValueCollectionFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         $connection = null,
         \Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
     ) {
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Option/Value.php b/app/code/Magento/Catalog/Model/Resource/Product/Option/Value.php
index 89a1dba13bc49..89ecd99e7b368 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Option/Value.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Option/Value.php
@@ -15,7 +15,7 @@ class Value extends \Magento\Framework\Model\Resource\Db\AbstractDb
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -38,13 +38,13 @@ class Value extends \Magento\Framework\Model\Resource\Db\AbstractDb
      *
      * @param \Magento\Framework\App\Resource $resource
      * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
         \Magento\Directory\Model\CurrencyFactory $currencyFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\Config\ScopeConfigInterface $config
     ) {
         $this->_currencyFactory = $currencyFactory;
@@ -130,7 +130,7 @@ protected function _saveValuePrices(\Magento\Framework\Model\AbstractModel $obje
 
         $scope = (int)$this->_config->getValue(
             \Magento\Store\Model\Store::XML_PATH_PRICE_SCOPE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
 
         if ($scope == \Magento\Store\Model\Store::PRICE_SCOPE_WEBSITE
diff --git a/app/code/Magento/Catalog/Model/Resource/Product/Website.php b/app/code/Magento/Catalog/Model/Resource/Product/Website.php
index f73573e2e5074..25c5a807fe892 100644
--- a/app/code/Magento/Catalog/Model/Resource/Product/Website.php
+++ b/app/code/Magento/Catalog/Model/Resource/Product/Website.php
@@ -13,17 +13,17 @@ class Website extends \Magento\Framework\Model\Resource\Db\AbstractDb
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Framework\App\Resource $resource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->_storeManager = $storeManager;
         parent::__construct($resource);
diff --git a/app/code/Magento/Catalog/Model/Resource/Url.php b/app/code/Magento/Catalog/Model/Resource/Url.php
index 8bbcdb9f5adb2..b41e752056677 100644
--- a/app/code/Magento/Catalog/Model/Resource/Url.php
+++ b/app/code/Magento/Catalog/Model/Resource/Url.php
@@ -78,7 +78,7 @@ class Url extends \Magento\Framework\Model\Resource\Db\AbstractDb
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -89,7 +89,7 @@ class Url extends \Magento\Framework\Model\Resource\Db\AbstractDb
 
     /**
      * @param \Magento\Framework\App\Resource $resource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param Product $productResource
      * @param \Magento\Catalog\Model\Category $catalogCategory
@@ -97,7 +97,7 @@ class Url extends \Magento\Framework\Model\Resource\Db\AbstractDb
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Eav\Model\Config $eavConfig,
         Product $productResource,
         \Magento\Catalog\Model\Category $catalogCategory,
diff --git a/app/code/Magento/Catalog/Model/Rss/Product/Special.php b/app/code/Magento/Catalog/Model/Rss/Product/Special.php
index 488c04a652f18..9bcf78cea24bf 100644
--- a/app/code/Magento/Catalog/Model/Rss/Product/Special.php
+++ b/app/code/Magento/Catalog/Model/Rss/Product/Special.php
@@ -17,17 +17,17 @@ class Special
     protected $productFactory;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
     /**
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Catalog\Model\ProductFactory $productFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->productFactory = $productFactory;
         $this->storeManager = $storeManager;
diff --git a/app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php b/app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php
index 5872ea852a0e7..c9054ef4160d0 100644
--- a/app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php
+++ b/app/code/Magento/Catalog/Model/System/Config/Backend/Catalog/Url/Rewrite/Suffix.php
@@ -14,7 +14,7 @@
 use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\Framework\App\Resource;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 use Magento\UrlRewrite\Model\Storage\DbStorage;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 
@@ -26,7 +26,7 @@ class Suffix extends \Magento\Framework\App\Config\Value
     /** @var \Magento\UrlRewrite\Helper\UrlRewrite */
     protected $urlRewriteHelper;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface */
+    /** @var \Magento\Store\Model\StoreManagerInterface */
     protected $storeManager;
 
     /** @var \Magento\UrlRewrite\Model\UrlFinderInterface */
@@ -42,7 +42,7 @@ class Suffix extends \Magento\Framework\App\Config\Value
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\Db $resourceCollection
      * @param \Magento\UrlRewrite\Helper\UrlRewrite $urlRewriteHelper
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Resource $appResource
      * @param \Magento\UrlRewrite\Model\UrlFinderInterface $urlFinder
      * @param array $data
@@ -53,7 +53,7 @@ public function __construct(
         \Magento\Framework\Registry $registry,
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
         \Magento\UrlRewrite\Helper\UrlRewrite $urlRewriteHelper,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\Resource $appResource,
         \Magento\UrlRewrite\Model\UrlFinderInterface $urlFinder,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
diff --git a/app/code/Magento/Catalog/Model/Template/Filter.php b/app/code/Magento/Catalog/Model/Template/Filter.php
index f8912a3edfe9d..93376946e09d1 100644
--- a/app/code/Magento/Catalog/Model/Template/Filter.php
+++ b/app/code/Magento/Catalog/Model/Template/Filter.php
@@ -38,19 +38,19 @@ class Filter extends \Magento\Framework\Filter\Template
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Framework\Stdlib\String $string
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      * @param array $variables
      */
     public function __construct(
         \Magento\Framework\Stdlib\String $string,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\View\Asset\Repository $assetRepo,
         $variables = []
     ) {
diff --git a/app/code/Magento/Catalog/etc/acl.xml b/app/code/Magento/Catalog/etc/acl.xml
index 0b2c33c4242a0..f43fc32b97bb6 100644
--- a/app/code/Magento/Catalog/etc/acl.xml
+++ b/app/code/Magento/Catalog/etc/acl.xml
@@ -8,20 +8,20 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
+            <resource id="Magento_Backend::admin">
                 <resource id="Magento_Catalog::catalog" title="Products" sortOrder="30">
                     <resource id="Magento_Catalog::catalog_inventory" title="Inventory" sortOrder="10">
                         <resource id="Magento_Catalog::products" title="Catalog" sortOrder="10" />
                         <resource id="Magento_Catalog::categories" title="Categories" sortOrder="20" />
                     </resource>
                 </resource>
-                <resource id="Magento_Adminhtml::stores">
-                    <resource id="Magento_Adminhtml::stores_settings">
-                        <resource id="Magento_Adminhtml::config">
+                <resource id="Magento_Backend::stores">
+                    <resource id="Magento_Backend::stores_settings">
+                        <resource id="Magento_Backend::config">
                             <resource id="Magento_Catalog::config_catalog" title="Catalog Section" />
                         </resource>
                     </resource>
-                    <resource id="Magento_Adminhtml::stores_attributes">
+                    <resource id="Magento_Backend::stores_attributes">
                         <resource id="Magento_Catalog::attributes_attributes" title="Product" sortOrder="30" />
                         <resource id="Magento_Catalog::update_attributes" title="Update Attributes" sortOrder="35" />
                         <resource id="Magento_Catalog::sets" title="Product Template" sortOrder="40"/>
diff --git a/app/code/Magento/Catalog/etc/adminhtml/routes.xml b/app/code/Magento/Catalog/etc/adminhtml/routes.xml
index 39679652290e4..0c690d80e4ce1 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
     <router id="admin">
         <route id="catalog" frontName="catalog">
-            <module name="Magento_Catalog" before="Magento_Adminhtml" />
+            <module name="Magento_Catalog" before="Magento_Backend" />
         </route>
     </router>
 </config>
diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product.php b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
index e97ee609b72ba..58aa1666678f9 100644
--- a/app/code/Magento/CatalogImportExport/Model/Export/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
@@ -210,7 +210,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Eav\Model\Config $config
      * @param \Magento\Framework\App\Resource $resource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Catalog\Model\Resource\Product\Collection $collection
      * @param \Magento\ImportExport\Model\Export\ConfigInterface $exportConfig
@@ -229,7 +229,7 @@ public function __construct(
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Eav\Model\Config $config,
         \Magento\Framework\App\Resource $resource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Psr\Log\LoggerInterface $logger,
         \Magento\Catalog\Model\Resource\Product\Collection $collection,
         \Magento\ImportExport\Model\Export\ConfigInterface $exportConfig,
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
index c4bbe716a9450..979a5ede17cf5 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Option.php
@@ -276,7 +276,7 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
     protected $_resource;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -304,7 +304,7 @@ class Option extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      * @param \Magento\ImportExport\Model\Resource\Import\Data $importData
      * @param \Magento\Framework\App\Resource $resource
      * @param \Magento\ImportExport\Model\Resource\Helper $resourceHelper
-     * @param \Magento\Framework\Store\StoreManagerInterface $_storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $_storeManager
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
      * @param \Magento\Catalog\Model\Resource\Product\Option\CollectionFactory $optionColFactory
      * @param \Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $colIteratorFactory
@@ -319,7 +319,7 @@ public function __construct(
         \Magento\ImportExport\Model\Resource\Import\Data $importData,
         \Magento\Framework\App\Resource $resource,
         \Magento\ImportExport\Model\Resource\Helper $resourceHelper,
-        \Magento\Framework\Store\StoreManagerInterface $_storeManager,
+        \Magento\Store\Model\StoreManagerInterface $_storeManager,
         \Magento\Catalog\Model\ProductFactory $productFactory,
         \Magento\Catalog\Model\Resource\Product\Option\CollectionFactory $optionColFactory,
         \Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $colIteratorFactory,
@@ -484,7 +484,7 @@ protected function _initSourceEntities(array $data)
         } else {
             $this->_pageSize = self::XML_PATH_PAGE_SIZE ? (int)$this->_scopeConfig->getValue(
                 self::XML_PATH_PAGE_SIZE,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             ) : 0;
         }
         return $this;
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php
index e720730c386bc..af478e82e4c3f 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/StoreResolver.php
@@ -8,7 +8,7 @@
 class StoreResolver
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -40,9 +40,9 @@ class StoreResolver
     protected $storeIdToWebsiteStoreIds = [];
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
-    public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
+    public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
     {
         $this->storeManager = $storeManager;
     }
diff --git a/app/code/Magento/CatalogInventory/Block/Stockqty/AbstractStockqty.php b/app/code/Magento/CatalogInventory/Block/Stockqty/AbstractStockqty.php
index 699139cb7e9d2..93224e80fe3ef 100644
--- a/app/code/Magento/CatalogInventory/Block/Stockqty/AbstractStockqty.php
+++ b/app/code/Magento/CatalogInventory/Block/Stockqty/AbstractStockqty.php
@@ -105,7 +105,7 @@ public function getThresholdQty()
         if (!$this->hasData('threshold_qty')) {
             $qty = (float)$this->_scopeConfig->getValue(
                 self::XML_PATH_STOCK_THRESHOLD_QTY,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
             $this->setData('threshold_qty', $qty);
         }
diff --git a/app/code/Magento/CatalogInventory/Helper/Minsaleqty.php b/app/code/Magento/CatalogInventory/Helper/Minsaleqty.php
index dba9ec3ae9a91..a68ab1576e1bd 100644
--- a/app/code/Magento/CatalogInventory/Helper/Minsaleqty.php
+++ b/app/code/Magento/CatalogInventory/Helper/Minsaleqty.php
@@ -175,7 +175,7 @@ public function getConfigValue($customerGroupId, $store = null)
     {
         $value = $this->scopeConfig->getValue(
             \Magento\CatalogInventory\Model\Configuration::XML_PATH_MIN_SALE_QTY,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
         $value = $this->unserializeValue($value);
diff --git a/app/code/Magento/CatalogInventory/Helper/Stock.php b/app/code/Magento/CatalogInventory/Helper/Stock.php
index 2d8efe41d2b75..e8d111dfa1f35 100644
--- a/app/code/Magento/CatalogInventory/Helper/Stock.php
+++ b/app/code/Magento/CatalogInventory/Helper/Stock.php
@@ -6,7 +6,7 @@
 namespace Magento\CatalogInventory\Helper;
 
 use Magento\CatalogInventory\Api\StockRegistryInterface;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\ObjectManagerInterface;
 
@@ -46,7 +46,7 @@ class Stock
 
     /**
      * @param StockRegistryInterface $stockRegistry
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param StoreManagerInterface $storeManager
      * @param ScopeConfigInterface $scopeConfig
      * @param ObjectManagerInterface $objectManager
      */
@@ -109,7 +109,7 @@ public function addInStockFilterToCollection($collection)
     {
         $manageStock = $this->scopeConfig->getValue(
             \Magento\CatalogInventory\Model\Configuration::XML_PATH_MANAGE_STOCK,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         $cond = [
             '{{table}}.use_config_manage_stock = 0 AND {{table}}.manage_stock=1 AND {{table}}.is_in_stock=1',
diff --git a/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
index 14f613549db80..fe76faa8934a5 100644
--- a/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
+++ b/app/code/Magento/CatalogInventory/Model/Adminhtml/Stock/Item.php
@@ -29,7 +29,7 @@ class Item extends \Magento\CatalogInventory\Model\Stock\Item
      * @param MetadataServiceInterface $metadataService
      * @param AttributeValueFactory $customAttributeFactory
      * @param \Magento\Customer\Model\Session $customerSession
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param StockConfigurationInterface $stockConfiguration
      * @param StockRegistryInterface $stockRegistry
      * @param StockItemRepositoryInterface $stockItemRepository
@@ -45,7 +45,7 @@ public function __construct(
         MetadataServiceInterface $metadataService,
         AttributeValueFactory $customAttributeFactory,
         \Magento\Customer\Model\Session $customerSession,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         StockConfigurationInterface $stockConfiguration,
         StockRegistryInterface $stockRegistry,
         StockItemRepositoryInterface $stockItemRepository,
diff --git a/app/code/Magento/CatalogInventory/Model/Configuration.php b/app/code/Magento/CatalogInventory/Model/Configuration.php
index 3f587e9fbcd0c..2d4d0189a63c5 100644
--- a/app/code/Magento/CatalogInventory/Model/Configuration.php
+++ b/app/code/Magento/CatalogInventory/Model/Configuration.php
@@ -9,7 +9,7 @@
 use Magento\CatalogInventory\Helper\Minsaleqty as MinsaleqtyHelper;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Catalog\Model\ProductTypes\ConfigInterface;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class Configuration
@@ -129,13 +129,13 @@ class Configuration implements StockConfigurationInterface
      * @param ConfigInterface $config
      * @param ScopeConfigInterface $scopeConfig
      * @param MinsaleqtyHelper $minsaleqtyHelper
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         ConfigInterface $config,
         ScopeConfigInterface $scopeConfig,
         MinsaleqtyHelper $minsaleqtyHelper,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        StoreManagerInterface $storeManager
     ) {
         $this->config = $config;
         $this->scopeConfig = $scopeConfig;
@@ -196,7 +196,7 @@ public function canSubtractQty($store = null)
     {
         return $this->scopeConfig->isSetFlag(
             self::XML_PATH_CAN_SUBTRACT,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -209,7 +209,7 @@ public function getMinQty($store = null)
     {
         return (float)$this->scopeConfig->getValue(
             self::XML_PATH_MIN_QTY,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -232,7 +232,7 @@ public function getMaxSaleQty($store = null)
     {
         return (float)$this->scopeConfig->getValue(
             self::XML_PATH_MAX_SALE_QTY,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -245,7 +245,7 @@ public function getNotifyStockQty($store = null)
     {
         return (float) $this->scopeConfig->getValue(
             self::XML_PATH_NOTIFY_STOCK_QTY,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -261,7 +261,7 @@ public function getEnableQtyIncrements($store = null)
     {
         return (bool) $this->scopeConfig->getValue(
             self::XML_PATH_ENABLE_QTY_INCREMENTS,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -274,7 +274,7 @@ public function getQtyIncrements($store = null)
     {
         return (float)$this->scopeConfig->getValue(
             self::XML_PATH_QTY_INCREMENTS,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -289,7 +289,7 @@ public function getBackorders($store = null)
     {
         return (int) $this->scopeConfig->getValue(
             self::XML_PATH_BACKORDERS,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -304,7 +304,7 @@ public function getManageStock($store = null)
     {
         return (int) $this->scopeConfig->isSetFlag(
             self::XML_PATH_MANAGE_STOCK,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -320,7 +320,7 @@ public function getCanBackInStock($store = null)
     {
         return $this->scopeConfig->isSetFlag(
             self::XML_PATH_CAN_BACK_IN_STOCK,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -335,7 +335,7 @@ public function isShowOutOfStock($store = null)
     {
         return $this->scopeConfig->isSetFlag(
             self::XML_PATH_SHOW_OUT_OF_STOCK,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -350,7 +350,7 @@ public function isAutoReturnEnabled($store = null)
     {
         return $this->scopeConfig->isSetFlag(
             self::XML_PATH_ITEM_AUTO_RETURN,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -366,7 +366,7 @@ public function isDisplayProductStockStatus($store = null)
     {
         return $this->scopeConfig->isSetFlag(
             self::XML_PATH_DISPLAY_PRODUCT_STOCK_STATUS,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -380,7 +380,7 @@ public function getDefaultConfigValue($field, $store = null)
     {
         return $this->scopeConfig->getValue(
             self::XML_PATH_ITEM . $field,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
diff --git a/app/code/Magento/CatalogInventory/Model/Plugin/Layer.php b/app/code/Magento/CatalogInventory/Model/Plugin/Layer.php
index 18a88e83fb758..3b16b43106e80 100644
--- a/app/code/Magento/CatalogInventory/Model/Plugin/Layer.php
+++ b/app/code/Magento/CatalogInventory/Model/Plugin/Layer.php
@@ -61,7 +61,7 @@ protected function _isEnabledShowOutOfStock()
     {
         return $this->scopeConfig->isSetFlag(
             'cataloginventory/options/show_out_of_stock',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 }
diff --git a/app/code/Magento/CatalogInventory/Model/Resource/Indexer/Stock/DefaultStock.php b/app/code/Magento/CatalogInventory/Model/Resource/Indexer/Stock/DefaultStock.php
index 9699aa3e98b36..6be23ba43302a 100644
--- a/app/code/Magento/CatalogInventory/Model/Resource/Indexer/Stock/DefaultStock.php
+++ b/app/code/Magento/CatalogInventory/Model/Resource/Indexer/Stock/DefaultStock.php
@@ -148,7 +148,7 @@ protected function _isManageStock()
     {
         return $this->_scopeConfig->isSetFlag(
             \Magento\CatalogInventory\Model\Configuration::XML_PATH_MANAGE_STOCK,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
diff --git a/app/code/Magento/CatalogInventory/Model/Resource/Stock.php b/app/code/Magento/CatalogInventory/Model/Resource/Stock.php
index 25d8f752f5a42..42c162eb4f8ed 100644
--- a/app/code/Magento/CatalogInventory/Model/Resource/Stock.php
+++ b/app/code/Magento/CatalogInventory/Model/Resource/Stock.php
@@ -7,7 +7,7 @@
 namespace Magento\CatalogInventory\Model\Resource;
 
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Stock resource model
@@ -74,7 +74,7 @@ class Stock extends \Magento\Framework\Model\Resource\Db\AbstractDb
     protected $dateTime;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $storeManager;
 
@@ -181,7 +181,7 @@ protected function _initConfig()
             foreach ($configMap as $field => $const) {
                 $this->{$field} = (int) $this->_scopeConfig->getValue(
                     $const,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 );
             }
 
diff --git a/app/code/Magento/CatalogInventory/Model/Resource/Stock/Item/StockItemCriteriaMapper.php b/app/code/Magento/CatalogInventory/Model/Resource/Stock/Item/StockItemCriteriaMapper.php
index 7754966be9461..a78cd2b52317e 100644
--- a/app/code/Magento/CatalogInventory/Model/Resource/Stock/Item/StockItemCriteriaMapper.php
+++ b/app/code/Magento/CatalogInventory/Model/Resource/Stock/Item/StockItemCriteriaMapper.php
@@ -10,7 +10,7 @@
 use Magento\Framework\DB\MapperFactory;
 use Magento\Framework\DB\Select;
 use Magento\Framework\Data\ObjectFactory;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Psr\Log\LoggerInterface as Logger;
 use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
 
@@ -24,7 +24,7 @@ class StockItemCriteriaMapper extends GenericMapper
      * @param Logger $logger
      * @param FetchStrategyInterface $fetchStrategy
      * @param ObjectFactory $objectFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param StoreManagerInterface $storeManager
      * @param MapperFactory $mapperFactory
      * @param Select $select
      */
diff --git a/app/code/Magento/CatalogInventory/Model/Resource/Stock/Status.php b/app/code/Magento/CatalogInventory/Model/Resource/Stock/Status.php
index ff68cf46fb9dc..4b971fecf3131 100644
--- a/app/code/Magento/CatalogInventory/Model/Resource/Stock/Status.php
+++ b/app/code/Magento/CatalogInventory/Model/Resource/Stock/Status.php
@@ -15,7 +15,7 @@ class Status extends \Magento\Framework\Model\Resource\Db\AbstractDb
     /**
      * Store model manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -33,13 +33,13 @@ class Status extends \Magento\Framework\Model\Resource\Db\AbstractDb
 
     /**
      * @param \Magento\Framework\App\Resource $resource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Store\Model\WebsiteFactory $websiteFactory
      * @param \Magento\Eav\Model\Config $eavConfig
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Store\Model\WebsiteFactory $websiteFactory,
         \Magento\Eav\Model\Config $eavConfig
     ) {
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/Stock/Item.php
index e614cb51ba487..2e28d5fbd60fe 100644
--- a/app/code/Magento/CatalogInventory/Model/Stock/Item.php
+++ b/app/code/Magento/CatalogInventory/Model/Stock/Item.php
@@ -68,7 +68,7 @@ class Item extends AbstractExtensibleModel implements StockItemInterface
     /**
      * Store model manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -117,7 +117,7 @@ class Item extends AbstractExtensibleModel implements StockItemInterface
      * @param MetadataServiceInterface $metadataService
      * @param AttributeValueFactory $customAttributeFactory
      * @param \Magento\Customer\Model\Session $customerSession
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param StockConfigurationInterface $stockConfiguration
      * @param StockRegistryInterface $stockRegistry
      * @param StockItemRepositoryInterface $stockItemRepository
@@ -132,7 +132,7 @@ public function __construct(
         MetadataServiceInterface $metadataService,
         AttributeValueFactory $customAttributeFactory,
         \Magento\Customer\Model\Session $customerSession,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         StockConfigurationInterface $stockConfiguration,
         StockRegistryInterface $stockRegistry,
         StockItemRepositoryInterface $stockItemRepository,
diff --git a/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php b/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php
index 2051eaa9ce0b8..0a9f1f04d0132 100644
--- a/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php
+++ b/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php
@@ -15,7 +15,7 @@
 use Magento\CatalogInventory\Api\StockCriteriaInterfaceFactory;
 use Magento\CatalogInventory\Api\StockItemCriteriaInterfaceFactory;
 use Magento\CatalogInventory\Api\StockStatusCriteriaInterfaceFactory;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class StockRegistryProvider
diff --git a/app/code/Magento/CatalogInventory/etc/acl.xml b/app/code/Magento/CatalogInventory/etc/acl.xml
index dd120ed5a0ac2..278e6b650b55b 100644
--- a/app/code/Magento/CatalogInventory/etc/acl.xml
+++ b/app/code/Magento/CatalogInventory/etc/acl.xml
@@ -8,10 +8,10 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::stores">
-                    <resource id="Magento_Adminhtml::stores_settings">
-                        <resource id="Magento_Adminhtml::config">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::stores">
+                    <resource id="Magento_Backend::stores_settings">
+                        <resource id="Magento_Backend::config">
                             <resource id="Magento_CatalogInventory::cataloginventory" title="Inventory Section" />
                         </resource>
                     </resource>
diff --git a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
index 02afbcf4eb9d9..5812b16b0832d 100644
--- a/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
+++ b/app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php
@@ -25,7 +25,7 @@ class IndexBuilder
     protected $resource;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -78,7 +78,7 @@ class IndexBuilder
      * @param RuleCollectionFactory $ruleCollectionFactory
      * @param PriceCurrencyInterface $priceCurrency
      * @param \Magento\Framework\App\Resource $resource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Framework\Stdlib\DateTime $dateFormat
@@ -91,7 +91,7 @@ public function __construct(
         RuleCollectionFactory $ruleCollectionFactory,
         PriceCurrencyInterface $priceCurrency,
         \Magento\Framework\App\Resource $resource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Psr\Log\LoggerInterface $logger,
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Framework\Stdlib\DateTime $dateFormat,
diff --git a/app/code/Magento/CatalogRule/Model/Observer.php b/app/code/Magento/CatalogRule/Model/Observer.php
index b0c6ff50c45aa..887b60b9c8a2e 100644
--- a/app/code/Magento/CatalogRule/Model/Observer.php
+++ b/app/code/Magento/CatalogRule/Model/Observer.php
@@ -15,7 +15,7 @@
 use Magento\CatalogRule\Model\Rule;
 use Magento\CatalogRule\Model\Rule\Product\Price;
 use Magento\Framework\Registry;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Customer\Api\GroupManagementInterface;
 use Magento\Customer\Model\Session as CustomerModelSession;
diff --git a/app/code/Magento/CatalogRule/Model/Resource/Rule.php b/app/code/Magento/CatalogRule/Model/Resource/Rule.php
index f9e6ee80903b4..330c01f9680b2 100644
--- a/app/code/Magento/CatalogRule/Model/Resource/Rule.php
+++ b/app/code/Magento/CatalogRule/Model/Resource/Rule.php
@@ -78,7 +78,7 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
     protected $_conditionFactory;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -94,7 +94,7 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
 
     /**
      * @param \Magento\Framework\App\Resource $resource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param Product\ConditionFactory $conditionFactory
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $coreDate
      * @param \Magento\Eav\Model\Config $eavConfig
@@ -107,7 +107,7 @@ class Rule extends \Magento\Rule\Model\Resource\AbstractResource
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Product\ConditionFactory $conditionFactory,
         \Magento\Framework\Stdlib\DateTime\DateTime $coreDate,
         \Magento\Eav\Model\Config $eavConfig,
diff --git a/app/code/Magento/CatalogRule/Model/Rule.php b/app/code/Magento/CatalogRule/Model/Rule.php
index 44ba49e140294..1228ac74d24cb 100644
--- a/app/code/Magento/CatalogRule/Model/Rule.php
+++ b/app/code/Magento/CatalogRule/Model/Rule.php
@@ -129,7 +129,7 @@ class Rule extends \Magento\Rule\Model\AbstractModel
     protected $_productFactory;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -149,7 +149,7 @@ class Rule extends \Magento\Rule\Model\AbstractModel
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Catalog\Model\Resource\Product\CollectionFactory $productCollectionFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\CatalogRule\Model\Rule\Condition\CombineFactory $combineFactory
      * @param \Magento\CatalogRule\Model\Rule\Action\CollectionFactory $actionCollectionFactory
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
@@ -170,7 +170,7 @@ public function __construct(
         \Magento\Framework\Data\FormFactory $formFactory,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Catalog\Model\Resource\Product\CollectionFactory $productCollectionFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\CatalogRule\Model\Rule\Condition\CombineFactory $combineFactory,
         \Magento\CatalogRule\Model\Rule\Action\CollectionFactory $actionCollectionFactory,
         \Magento\Catalog\Model\ProductFactory $productFactory,
diff --git a/app/code/Magento/CatalogRule/etc/acl.xml b/app/code/Magento/CatalogRule/etc/acl.xml
index b8de10ca8bc21..c5216b6f58560 100644
--- a/app/code/Magento/CatalogRule/etc/acl.xml
+++ b/app/code/Magento/CatalogRule/etc/acl.xml
@@ -8,8 +8,8 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::marketing">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::marketing">
                     <resource id="Magento_CatalogRule::promo" title="Promotions" sortOrder="10">
                         <resource id="Magento_CatalogRule::promo_catalog" title="Catalog Price Rules" sortOrder="10" />
                     </resource>
diff --git a/app/code/Magento/CatalogRule/etc/adminhtml/routes.xml b/app/code/Magento/CatalogRule/etc/adminhtml/routes.xml
index 550edbd358b9a..b085941c0c111 100644
--- a/app/code/Magento/CatalogRule/etc/adminhtml/routes.xml
+++ b/app/code/Magento/CatalogRule/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
     <router id="admin">
         <route id="catalog_rule" frontName="catalog_rule">
-            <module name="Magento_CatalogRule" before="Magento_Adminhtml" />
+            <module name="Magento_CatalogRule" before="Magento_Backend" />
         </route>
     </router>
 </config>
diff --git a/app/code/Magento/CatalogSearch/Block/Advanced/Form.php b/app/code/Magento/CatalogSearch/Block/Advanced/Form.php
index f9c63ee9f2744..948f2db6e5e13 100644
--- a/app/code/Magento/CatalogSearch/Block/Advanced/Form.php
+++ b/app/code/Magento/CatalogSearch/Block/Advanced/Form.php
@@ -346,7 +346,7 @@ public function getDateInput($attribute, $part = 'from')
         )->setValue(
             $value
         )->setImage(
-            $this->getViewFileUrl('Magento_Core::calendar.png')
+            $this->getViewFileUrl('Magento_Theme::calendar.png')
         )->setDateFormat(
             $this->_localeDate->getDateFormat(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::FORMAT_TYPE_SHORT)
         )->setClass(
diff --git a/app/code/Magento/CatalogSearch/Controller/Result/Index.php b/app/code/Magento/CatalogSearch/Controller/Result/Index.php
index 6c98094d8f55f..4392814b229bd 100644
--- a/app/code/Magento/CatalogSearch/Controller/Result/Index.php
+++ b/app/code/Magento/CatalogSearch/Controller/Result/Index.php
@@ -9,7 +9,7 @@
 use Magento\Catalog\Model\Layer\Resolver;
 use Magento\Catalog\Model\Session;
 use Magento\Framework\App\Action\Context;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Search\Model\QueryFactory;
 
 class Index extends \Magento\Framework\App\Action\Action
@@ -41,7 +41,7 @@ class Index extends \Magento\Framework\App\Action\Action
     /**
      * @param Context $context
      * @param Session $catalogSession
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param StoreManagerInterface $storeManager
      * @param QueryFactory $queryFactory
      * @param Resolver $layerResolver
      */
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php
index 30b8477a0bdae..341783fa0dcd6 100644
--- a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php
@@ -15,7 +15,7 @@
 use Magento\Framework\Search\Dynamic\DataProviderInterface;
 use Magento\Framework\Search\Dynamic\IntervalFactory;
 use Magento\Framework\Search\Request\BucketInterface;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/CatalogSearch/Model/Advanced.php b/app/code/Magento/CatalogSearch/Model/Advanced.php
index a943dd06abab5..5558d89322e00 100644
--- a/app/code/Magento/CatalogSearch/Model/Advanced.php
+++ b/app/code/Magento/CatalogSearch/Model/Advanced.php
@@ -18,7 +18,7 @@
 use Magento\Framework\Model\Context;
 use Magento\Framework\Model\Exception;
 use Magento\Framework\Registry;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Catalog advanced search model
@@ -83,7 +83,7 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -118,7 +118,7 @@ class Advanced extends \Magento\Framework\Model\AbstractModel
      * @param Config $catalogConfig
      * @param CurrencyFactory $currencyFactory
      * @param ProductFactory $productFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param ResourceProvider $resourceProvider
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
diff --git a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
index fab9da1af37c8..e4f6fea57b08b 100644
--- a/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
+++ b/app/code/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/Full.php
@@ -98,7 +98,7 @@ class Full
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -153,7 +153,7 @@ class Full
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\CatalogSearch\Helper\Data $catalogSearchData
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
@@ -172,7 +172,7 @@ public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\CatalogSearch\Helper\Data $catalogSearchData,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Stdlib\DateTime $dateTime,
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
@@ -765,12 +765,12 @@ protected function getStoreDate($storeId, $date = null)
         if (!isset($this->dates[$storeId])) {
             $timezone = $this->scopeConfig->getValue(
                 $this->localeDate->getDefaultTimezonePath(),
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $storeId
             );
             $locale = $this->scopeConfig->getValue(
                 $this->localeResolver->getDefaultLocalePath(),
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $storeId
             );
             $locale = new \Zend_Locale($locale);
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Advanced.php b/app/code/Magento/CatalogSearch/Model/Layer/Advanced.php
index 3cd2c5a514c59..1603844981af7 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Advanced.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Advanced.php
@@ -18,7 +18,7 @@ class Advanced extends \Magento\Catalog\Model\Layer
      * @param \Magento\Catalog\Model\Layer\StateFactory $layerStateFactory
      * @param Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory
      * @param Resource\Product $catalogProduct
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Registry $registry
      * @param CategoryRepositoryInterface $categoryRepository
      * @param array $data
@@ -28,7 +28,7 @@ public function __construct(
         \Magento\Catalog\Model\Layer\StateFactory $layerStateFactory,
         Resource\Product\Attribute\CollectionFactory $attributeCollectionFactory,
         Resource\Product $catalogProduct,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Registry $registry,
         CategoryRepositoryInterface $categoryRepository,
         array $data = []
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Advanced/CollectionFilter.php b/app/code/Magento/CatalogSearch/Model/Layer/Advanced/CollectionFilter.php
index 7f2b7be73cfcf..7acc2cd6a3b20 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Advanced/CollectionFilter.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Advanced/CollectionFilter.php
@@ -21,7 +21,7 @@ class CollectionFilter implements CollectionFilterInterface
     protected $helper;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -33,14 +33,14 @@ class CollectionFilter implements CollectionFilterInterface
     /**
      * @param \Magento\Catalog\Model\Config $catalogConfig
      * @param \Magento\CatalogSearch\Helper\Data $helper
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Product\Visibility $productVisibility
      * @param \Magento\Framework\Registry $registry
      */
     public function __construct(
         \Magento\Catalog\Model\Config $catalogConfig,
         \Magento\CatalogSearch\Helper\Data $helper,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Product\Visibility $productVisibility,
         \Magento\Framework\Registry $registry
     ) {
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Advanced/FilterableAttributeList.php b/app/code/Magento/CatalogSearch/Model/Layer/Advanced/FilterableAttributeList.php
index c5277044a26f3..645f8a5901f00 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Advanced/FilterableAttributeList.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Advanced/FilterableAttributeList.php
@@ -10,12 +10,12 @@ class FilterableAttributeList extends \Magento\Catalog\Model\Layer\Category\Filt
 {
     /**
      * @param \Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $collectionFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Layer\Resolver $layerResolver
      */
     public function __construct(
         \Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory $collectionFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Layer\Resolver $layerResolver
     ) {
         parent::__construct($collectionFactory, $storeManager, $layerResolver);
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
index 33eb26bbafba6..ec2782eb07c4f 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Attribute.php
@@ -19,7 +19,7 @@ class Attribute extends AbstractFilter
 
     /**
      * @param \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Layer $layer
      * @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
      * @param \Magento\Framework\Filter\StripTags $tagFilter
@@ -27,7 +27,7 @@ class Attribute extends AbstractFilter
      */
     public function __construct(
         \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Layer $layer,
         \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder,
         \Magento\Framework\Filter\StripTags $tagFilter,
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php
index c737e32d8c839..3c29805598700 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php
@@ -25,7 +25,7 @@ class Category extends AbstractFilter
 
     /**
      * @param \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Layer $layer
      * @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
      * @param \Magento\Catalog\Model\CategoryFactory $categoryFactory
@@ -35,7 +35,7 @@ class Category extends AbstractFilter
      */
     public function __construct(
         \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Layer $layer,
         \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder,
         \Magento\Framework\Escaper $escaper,
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
index 143224e173eeb..e00a0a138e704 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
@@ -24,7 +24,7 @@ class Decimal extends AbstractFilter
 
     /**
      * @param \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Layer $layer
      * @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
      * @param \Magento\Catalog\Model\Resource\Layer\Filter\DecimalFactory $filterDecimalFactory
@@ -33,7 +33,7 @@ class Decimal extends AbstractFilter
      */
     public function __construct(
         \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Layer $layer,
         \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder,
         \Magento\Catalog\Model\Resource\Layer\Filter\DecimalFactory $filterDecimalFactory,
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
index 80974819bad6d..f026a8fc4f4c8 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
@@ -44,7 +44,7 @@ class Price extends AbstractFilter
 
     /**
      * @param \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Layer $layer
      * @param \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder
      * @param \Magento\Catalog\Model\Resource\Layer\Filter\Price $resource
@@ -59,7 +59,7 @@ class Price extends AbstractFilter
      */
     public function __construct(
         \Magento\Catalog\Model\Layer\Filter\ItemFactory $filterItemFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Layer $layer,
         \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder $itemDataBuilder,
         \Magento\Catalog\Model\Resource\Layer\Filter\Price $resource,
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Search/StateKey.php b/app/code/Magento/CatalogSearch/Model/Layer/Search/StateKey.php
index 20633d528d21a..5f38437c05978 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Search/StateKey.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Search/StateKey.php
@@ -17,12 +17,12 @@ class StateKey extends \Magento\Catalog\Model\Layer\Category\StateKey implements
     protected $queryFactory;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Search\Model\QueryFactory $queryFactory
      */
     public function __construct(
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Search\Model\QueryFactory $queryFactory
     ) {
diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Advanced.php b/app/code/Magento/CatalogSearch/Model/Resource/Advanced.php
index 2227c8bfa7cf2..2cbb9e51f972c 100644
--- a/app/code/Magento/CatalogSearch/Model/Resource/Advanced.php
+++ b/app/code/Magento/CatalogSearch/Model/Resource/Advanced.php
@@ -22,7 +22,7 @@ class Advanced extends \Magento\Framework\Model\Resource\Db\AbstractDb
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -30,12 +30,12 @@ class Advanced extends \Magento\Framework\Model\Resource\Db\AbstractDb
      * Construct
      *
      * @param \Magento\Framework\App\Resource $resource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Event\ManagerInterface $eventManager
     ) {
         $this->_storeManager = $storeManager;
diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Advanced/Collection.php b/app/code/Magento/CatalogSearch/Model/Resource/Advanced/Collection.php
index 8f004d5d809ee..e1948554d6cf7 100644
--- a/app/code/Magento/CatalogSearch/Model/Resource/Advanced/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/Resource/Advanced/Collection.php
@@ -41,7 +41,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
      * @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
      * @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Module\Manager $moduleManager ,
      * @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -66,7 +66,7 @@ public function __construct(
         \Magento\Eav\Model\EntityFactory $eavEntityFactory,
         \Magento\Catalog\Model\Resource\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/CatalogSearch/Model/Resource/EngineProvider.php b/app/code/Magento/CatalogSearch/Model/Resource/EngineProvider.php
index cb6636b0520e7..1d021b322f757 100644
--- a/app/code/Magento/CatalogSearch/Model/Resource/EngineProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Resource/EngineProvider.php
@@ -9,7 +9,7 @@
  */
 namespace Magento\CatalogSearch\Model\Resource;
 
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 class EngineProvider
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Collection.php b/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Collection.php
index 02aa586bcb5da..aab04055483cf 100644
--- a/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/Resource/Fulltext/Collection.php
@@ -58,7 +58,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
      * @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
      * @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -85,7 +85,7 @@ public function __construct(
         \Magento\Eav\Model\EntityFactory $eavEntityFactory,
         \Magento\Catalog\Model\Resource\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -178,7 +178,7 @@ protected function _renderFiltersBefore()
 
         $priceRangeCalculation = $this->_scopeConfig->getValue(
             \Magento\Catalog\Model\Layer\Filter\Dynamic\AlgorithmFactory::XML_PATH_RANGE_CALCULATION,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         if ($priceRangeCalculation) {
             $this->requestBuilder->bind('price_dynamic_algorithm', $priceRangeCalculation);
diff --git a/app/code/Magento/CatalogSearch/Model/Resource/ResourceProvider.php b/app/code/Magento/CatalogSearch/Model/Resource/ResourceProvider.php
index 9389b9f22b0a1..c18aa10f02c43 100644
--- a/app/code/Magento/CatalogSearch/Model/Resource/ResourceProvider.php
+++ b/app/code/Magento/CatalogSearch/Model/Resource/ResourceProvider.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\CatalogSearch\Model\Resource;
 
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 class ResourceProvider
 {
diff --git a/app/code/Magento/CatalogSearch/Model/Resource/Search/Collection.php b/app/code/Magento/CatalogSearch/Model/Resource/Search/Collection.php
index caa53627c4210..e592285ee1278 100644
--- a/app/code/Magento/CatalogSearch/Model/Resource/Search/Collection.php
+++ b/app/code/Magento/CatalogSearch/Model/Resource/Search/Collection.php
@@ -47,7 +47,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection impl
      * @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
      * @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -72,7 +72,7 @@ public function __construct(
         \Magento\Eav\Model\EntityFactory $eavEntityFactory,
         \Magento\Catalog\Model\Resource\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php b/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php
index 74c68b4fdae12..e47ba631ebfca 100644
--- a/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php
+++ b/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php
@@ -11,8 +11,8 @@
 use Magento\Framework\DB\Select;
 use Magento\Framework\Search\Adapter\Mysql\IndexBuilderInterface;
 use Magento\Framework\Search\RequestInterface;
-use Magento\Framework\Store\ScopeInterface;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Build base Query for Index
@@ -30,14 +30,14 @@ class IndexBuilder implements IndexBuilderInterface
     private $config;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     private $storeManager;
 
     /**
      * @param \Magento\Framework\App\Resource $resource
      * @param ScopeConfigInterface $config
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param StoreManagerInterface $storeManager
      */
     public function __construct(Resource $resource, ScopeConfigInterface $config, StoreManagerInterface $storeManager)
     {
diff --git a/app/code/Magento/CatalogSearch/composer.json b/app/code/Magento/CatalogSearch/composer.json
index b1a03b83d87a2..8a6837646b782 100644
--- a/app/code/Magento/CatalogSearch/composer.json
+++ b/app/code/Magento/CatalogSearch/composer.json
@@ -7,7 +7,6 @@
         "magento/module-catalog": "0.42.0-beta7",
         "magento/module-search": "0.42.0-beta7",
         "magento/module-customer": "0.42.0-beta7",
-        "magento/module-core": "0.42.0-beta7",
         "magento/module-directory": "0.42.0-beta7",
         "magento/module-indexer": "0.42.0-beta7",
         "magento/module-eav": "0.42.0-beta7",
diff --git a/app/code/Magento/CatalogSearch/etc/di.xml b/app/code/Magento/CatalogSearch/etc/di.xml
index 566fe53bf30fe..e4c718050c3ff 100644
--- a/app/code/Magento/CatalogSearch/etc/di.xml
+++ b/app/code/Magento/CatalogSearch/etc/di.xml
@@ -74,7 +74,7 @@
             <argument name="intervals" xsi:type="array">
                 <item name="Magento\CatalogSearch\Model\Resource\Engine" xsi:type="string">Magento\CatalogSearch\Model\Price\Interval</item>
             </argument>
-            <argument name="scope" xsi:type="const">\Magento\Framework\Store\ScopeInterface::SCOPE_STORE</argument>
+            <argument name="scope" xsi:type="const">\Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
         </arguments>
     </type>
     <type name="Magento\Backend\Controller\Adminhtml\Index\GlobalSearch">
diff --git a/app/code/Magento/CatalogUrlRewrite/Block/UrlKeyRenderer.php b/app/code/Magento/CatalogUrlRewrite/Block/UrlKeyRenderer.php
index 070fcc526da05..5e6cd86f1757f 100644
--- a/app/code/Magento/CatalogUrlRewrite/Block/UrlKeyRenderer.php
+++ b/app/code/Magento/CatalogUrlRewrite/Block/UrlKeyRenderer.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\CatalogUrlRewrite\Block;
 
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Renderer for URL key input
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/Observer.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/Observer.php
index 1a6fc23b6d0a1..cc6941491117b 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Category/Observer.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/Observer.php
@@ -11,7 +11,7 @@
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Event\Observer as EventObserver;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 use Magento\UrlRewrite\Model\UrlPersistInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php
index aea86ff792c0d..9bebcf6b59ea8 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php
@@ -9,7 +9,7 @@
 use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
 use Magento\Catalog\Model\CategoryFactory;
 use Magento\Catalog\Model\ProductFactory;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\Store\Model\Store;
@@ -35,7 +35,7 @@ class Group
     /** @var ProductUrlRewriteGenerator */
     protected $productUrlRewriteGenerator;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface  */
+    /** @var StoreManagerInterface  */
     protected $storeManager;
 
     /**
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php
index 6eda18ccc1870..6e7547e9ce886 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGenerator.php
@@ -30,7 +30,7 @@ class CategoryUrlPathGenerator
     /** @var \Magento\Framework\App\Config\ScopeConfigInterface */
     protected $scopeConfig;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface */
+    /** @var \Magento\Store\Model\StoreManagerInterface */
     protected $storeManager;
 
     /**
@@ -39,12 +39,12 @@ class CategoryUrlPathGenerator
     protected $categoryRepository;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param CategoryRepositoryInterface $categoryRepository
      */
     public function __construct(
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         CategoryRepositoryInterface $categoryRepository
     ) {
@@ -117,7 +117,7 @@ protected function getCategoryUrlSuffix($storeId = null)
         if (!isset($this->categoryUrlSuffix[$storeId])) {
             $this->categoryUrlSuffix[$storeId] = $this->scopeConfig->getValue(
                 self::XML_PATH_CATEGORY_URL_SUFFIX,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $storeId
             );
         }
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/Product/CurrentUrlRewritesRegenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/Product/CurrentUrlRewritesRegenerator.php
index 1c64c8a1a3449..1e6fac93ed6fd 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/Product/CurrentUrlRewritesRegenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/Product/CurrentUrlRewritesRegenerator.php
@@ -14,7 +14,7 @@
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewriteBuilder;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php
index 6a7a4a6b4bfa9..bdf70eeb288bd 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php
@@ -16,7 +16,7 @@ class ProductUrlPathGenerator
      */
     protected $productUrlSuffix = [];
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface */
+    /** @var \Magento\Store\Model\StoreManagerInterface */
     protected $storeManager;
 
     /** @var \Magento\Framework\App\Config\ScopeConfigInterface */
@@ -26,12 +26,12 @@ class ProductUrlPathGenerator
     protected $categoryUrlPathGenerator;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param CategoryUrlPathGenerator $categoryUrlPathGenerator
      */
     public function __construct(
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator $categoryUrlPathGenerator
     ) {
@@ -111,7 +111,7 @@ protected function getProductUrlSuffix($storeId = null)
         if (!isset($this->productUrlSuffix[$storeId])) {
             $this->productUrlSuffix[$storeId] = $this->scopeConfig->getValue(
                 self::XML_PATH_PRODUCT_URL_SUFFIX,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $storeId
             );
         }
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGenerator.php
index 507febcf075c2..a8661bfdc9eaa 100644
--- a/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGenerator.php
+++ b/app/code/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGenerator.php
@@ -40,7 +40,7 @@ class ProductUrlRewriteGenerator
     /** @var \Magento\CatalogUrlRewrite\Model\ObjectRegistry */
     protected $productCategories;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface */
+    /** @var \Magento\Store\Model\StoreManagerInterface */
     protected $storeManager;
 
     /**
@@ -49,7 +49,7 @@ class ProductUrlRewriteGenerator
      * @param \Magento\CatalogUrlRewrite\Model\Product\CategoriesUrlRewriteGenerator $categoriesUrlRewriteGenerator
      * @param \Magento\CatalogUrlRewrite\Model\ObjectRegistryFactory $objectRegistryFactory
      * @param \Magento\CatalogUrlRewrite\Service\V1\StoreViewService $storeViewService
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         CanonicalUrlRewriteGenerator $canonicalUrlRewriteGenerator,
@@ -57,7 +57,7 @@ public function __construct(
         CategoriesUrlRewriteGenerator $categoriesUrlRewriteGenerator,
         ObjectRegistryFactory $objectRegistryFactory,
         StoreViewService $storeViewService,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->canonicalUrlRewriteGenerator = $canonicalUrlRewriteGenerator;
         $this->currentUrlRewritesRegenerator = $currentUrlRewritesRegenerator;
diff --git a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
index 588cc9809bc84..19da2e1702c3f 100644
--- a/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
+++ b/app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php
@@ -28,7 +28,7 @@ class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -41,7 +41,7 @@ class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
      * @param \Magento\Catalog\Model\Resource\Product $productResource
      * @param \Magento\Eav\Model\Resource\Entity\Attribute\Set\Collection $attrSetCollection
      * @param \Magento\Framework\Locale\FormatInterface $localeFormat
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -54,7 +54,7 @@ public function __construct(
         \Magento\Catalog\Model\Resource\Product $productResource,
         \Magento\Eav\Model\Resource\Entity\Attribute\Set\Collection $attrSetCollection,
         \Magento\Framework\Locale\FormatInterface $localeFormat,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         array $data = []
     ) {
         $this->storeManager = $storeManager;
diff --git a/app/code/Magento/CatalogWidget/etc/adminhtml/routes.xml b/app/code/Magento/CatalogWidget/etc/adminhtml/routes.xml
index 708f09d1f0d72..870b1cabec0be 100644
--- a/app/code/Magento/CatalogWidget/etc/adminhtml/routes.xml
+++ b/app/code/Magento/CatalogWidget/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
     <router id="admin">
         <route id="catalog_widget" frontName="catalog_widget">
-            <module name="Magento_CatalogWidget" before="Magento_Adminhtml" />
+            <module name="Magento_CatalogWidget" before="Magento_Backend" />
         </route>
     </router>
 </config>
diff --git a/app/code/Magento/Centinel/Model/Config.php b/app/code/Magento/Centinel/Model/Config.php
index 5bc8147524de4..81d187f3ed2ed 100644
--- a/app/code/Magento/Centinel/Model/Config.php
+++ b/app/code/Magento/Centinel/Model/Config.php
@@ -134,7 +134,7 @@ public function getIsTestMode()
      */
     private function _getServiceConfigValue($key)
     {
-        return $this->_scopeConfig->getValue($this->_serviceConfigPath . '/' . $key, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $this->getStore());
+        return $this->_scopeConfig->getValue($this->_serviceConfigPath . '/' . $key, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $this->getStore());
     }
 
     /**
diff --git a/app/code/Magento/Centinel/composer.json b/app/code/Magento/Centinel/composer.json
index 28fa184401f98..8ce38d81b1383 100644
--- a/app/code/Magento/Centinel/composer.json
+++ b/app/code/Magento/Centinel/composer.json
@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
+        "magento/module-store": "0.42.0-beta7",
         "magento/module-checkout": "0.42.0-beta7",
         "magento/module-core": "0.42.0-beta7",
         "magento/module-backend": "0.42.0-beta7",
diff --git a/app/code/Magento/Centinel/etc/adminhtml/routes.xml b/app/code/Magento/Centinel/etc/adminhtml/routes.xml
index dd23e109265de..2ff9c2bc4715a 100644
--- a/app/code/Magento/Centinel/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Centinel/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
     <router id="admin">
         <route id="adminhtml">
-            <module name="Magento_Centinel" before="Magento_Adminhtml" />
+            <module name="Magento_Centinel" before="Magento_Backend" />
         </route>
     </router>
 </config>
diff --git a/app/code/Magento/Checkout/Block/Cart.php b/app/code/Magento/Checkout/Block/Cart.php
index 6c3e87661066d..6e406dae410fc 100644
--- a/app/code/Magento/Checkout/Block/Cart.php
+++ b/app/code/Magento/Checkout/Block/Cart.php
@@ -130,7 +130,7 @@ public function isWishlistActive()
         if ($isActive === null) {
             $isActive = $this->_scopeConfig->getValue(
                 'wishlist/general/active',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             ) && $this->httpContext->getValue(
                 Context::CONTEXT_AUTH
             );
diff --git a/app/code/Magento/Checkout/Block/Cart/Shipping.php b/app/code/Magento/Checkout/Block/Cart/Shipping.php
index 9b314544b8893..27f72fb347f39 100644
--- a/app/code/Magento/Checkout/Block/Cart/Shipping.php
+++ b/app/code/Magento/Checkout/Block/Cart/Shipping.php
@@ -76,7 +76,7 @@ public function __construct(
      */
     public function getConfig($path)
     {
-        return $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
@@ -124,7 +124,7 @@ public function getCarrierName($carrierCode)
     {
         if ($name = $this->_scopeConfig->getValue(
             'carriers/' . $carrierCode . '/title',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )
         ) {
             return $name;
diff --git a/app/code/Magento/Checkout/Block/Cart/Sidebar.php b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
index 6170e65cef60c..a811d6069b6ff 100644
--- a/app/code/Magento/Checkout/Block/Cart/Sidebar.php
+++ b/app/code/Magento/Checkout/Block/Cart/Sidebar.php
@@ -73,7 +73,7 @@ public function getItemCount()
         if (is_null($count)) {
             $count = $this->_scopeConfig->getValue(
                 self::XML_PATH_CHECKOUT_SIDEBAR_COUNT,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
             $this->setData('item_count', $count);
         }
@@ -179,7 +179,7 @@ public function getIsNeedToDisplaySideBar()
     {
         return (bool)$this->_scopeConfig->getValue(
             'checkout/sidebar/display',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
diff --git a/app/code/Magento/Checkout/Block/Onepage/AbstractOnepage.php b/app/code/Magento/Checkout/Block/Onepage/AbstractOnepage.php
index 6189b5f5e0a13..941b0425c66f4 100644
--- a/app/code/Magento/Checkout/Block/Onepage/AbstractOnepage.php
+++ b/app/code/Magento/Checkout/Block/Onepage/AbstractOnepage.php
@@ -139,7 +139,7 @@ public function __construct(
      */
     public function getConfig($path)
     {
-        return $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
diff --git a/app/code/Magento/Checkout/Block/Onepage/Shipping/Method/Available.php b/app/code/Magento/Checkout/Block/Onepage/Shipping/Method/Available.php
index 2e56f635a2d7d..679f00970c0e2 100644
--- a/app/code/Magento/Checkout/Block/Onepage/Shipping/Method/Available.php
+++ b/app/code/Magento/Checkout/Block/Onepage/Shipping/Method/Available.php
@@ -103,7 +103,7 @@ public function getCarrierName($carrierCode)
     {
         if ($name = $this->_scopeConfig->getValue(
             'carriers/' . $carrierCode . '/title',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )
         ) {
             return $name;
diff --git a/app/code/Magento/Checkout/Controller/Cart.php b/app/code/Magento/Checkout/Controller/Cart.php
index 01dc93000f74d..e2db457c9ee14 100644
--- a/app/code/Magento/Checkout/Controller/Cart.php
+++ b/app/code/Magento/Checkout/Controller/Cart.php
@@ -7,7 +7,7 @@
 
 use Magento\Catalog\Controller\Product\View\ViewInterface;
 use Magento\Checkout\Model\Cart as CustomerCart;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Shopping cart controller
@@ -25,7 +25,7 @@ class Cart extends \Magento\Framework\App\Action\Action implements ViewInterface
     protected $_checkoutSession;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -48,7 +48,7 @@ class Cart extends \Magento\Framework\App\Action\Action implements ViewInterface
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Checkout\Model\Session $checkoutSession
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
      * @param CustomerCart $cart
      * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
@@ -57,7 +57,7 @@ public function __construct(
         \Magento\Framework\App\Action\Context $context,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Checkout\Model\Session $checkoutSession,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
         CustomerCart $cart,
         \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
diff --git a/app/code/Magento/Checkout/Controller/Cart/Add.php b/app/code/Magento/Checkout/Controller/Cart/Add.php
index 0e0393085cece..d3b8958c7656f 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Add.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Add.php
@@ -27,7 +27,7 @@ class Add extends \Magento\Checkout\Controller\Cart
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Checkout\Model\Session $checkoutSession
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
      * @param CustomerCart $cart
      * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
@@ -37,7 +37,7 @@ public function __construct(
         \Magento\Framework\App\Action\Context $context,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Checkout\Model\Session $checkoutSession,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
         CustomerCart $cart,
         \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
@@ -64,7 +64,7 @@ protected function _initProduct()
     {
         $productId = (int)$this->getRequest()->getParam('product');
         if ($productId) {
-            $storeId = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getId();
+            $storeId = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getId();
             try {
                 return $this->productRepository->getById($productId, false, $storeId);
             } catch (NoSuchEntityException $e) {
diff --git a/app/code/Magento/Checkout/Controller/Cart/Configure.php b/app/code/Magento/Checkout/Controller/Cart/Configure.php
index 7aa783af5930a..48230baf5e14d 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Configure.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Configure.php
@@ -19,7 +19,7 @@ class Configure extends \Magento\Checkout\Controller\Cart
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Checkout\Model\Session $checkoutSession
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
      * @param \Magento\Checkout\Model\Cart $cart
      * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
@@ -29,7 +29,7 @@ public function __construct(
         Framework\App\Action\Context $context,
         Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Checkout\Model\Session $checkoutSession,
-        Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
         \Magento\Checkout\Model\Cart $cart,
         Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
diff --git a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
index d0cc5b471fcd9..bd615f30205e2 100644
--- a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
@@ -18,7 +18,7 @@ class CouponPost extends \Magento\Checkout\Controller\Cart
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Checkout\Model\Session $checkoutSession
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
      * @param \Magento\Checkout\Model\Cart $cart
      * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
@@ -28,7 +28,7 @@ public function __construct(
         \Magento\Framework\App\Action\Context $context,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Checkout\Model\Session $checkoutSession,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
         \Magento\Checkout\Model\Cart $cart,
         \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
diff --git a/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php b/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
index 4ef98861c9488..bfdb46f935339 100644
--- a/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
@@ -19,7 +19,7 @@ class EstimatePost extends \Magento\Checkout\Controller\Cart
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Checkout\Model\Session $checkoutSession
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
      * @param CustomerCart $cart
      * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
@@ -29,7 +29,7 @@ public function __construct(
         Framework\App\Action\Context $context,
         Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Checkout\Model\Session $checkoutSession,
-        Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
         CustomerCart $cart,
         Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
diff --git a/app/code/Magento/Checkout/Controller/Cart/Index.php b/app/code/Magento/Checkout/Controller/Cart/Index.php
index 1b2e1b221eef7..15b238c9a409f 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Index.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Index.php
@@ -20,7 +20,7 @@ class Index extends \Magento\Checkout\Controller\Cart
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Checkout\Model\Session $checkoutSession
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
      * @param \Magento\Checkout\Model\Cart $cart
      * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
@@ -30,7 +30,7 @@ public function __construct(
         \Magento\Framework\App\Action\Context $context,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Checkout\Model\Session $checkoutSession,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
         \Magento\Checkout\Model\Cart $cart,
         \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
@@ -61,7 +61,7 @@ public function execute()
             $this->cart->save();
 
             if (!$this->cart->getQuote()->validateMinimumAmount()) {
-                $currencyCode = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')
+                $currencyCode = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')
                     ->getStore()
                     ->getCurrentCurrencyCode();
                 $minimumAmount = $this->_objectManager->get('Magento\Framework\Locale\CurrencyInterface')
@@ -69,16 +69,16 @@ public function execute()
                     ->toCurrency(
                         $this->_scopeConfig->getValue(
                             'sales/minimum_order/amount',
-                            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                         )
                 );
 
                 $warning = $this->_scopeConfig->getValue(
                     'sales/minimum_order/description',
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 ) ? $this->_scopeConfig->getValue(
                     'sales/minimum_order/description',
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 ) : __(
                     'Minimum order amount is %1',
                     $minimumAmount
diff --git a/app/code/Magento/Checkout/Controller/Onepage/SaveBilling.php b/app/code/Magento/Checkout/Controller/Onepage/SaveBilling.php
index 5426e9722a771..c9f0fc3478af5 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/SaveBilling.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/SaveBilling.php
@@ -40,7 +40,7 @@ public function execute()
                         'error' => -1,
                         'message' => $this->scopeConfig->getValue(
                             'sales/minimum_order/error_message',
-                            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                             $quote->getStoreId()
                         ),
                     ];
diff --git a/app/code/Magento/Checkout/Controller/Onepage/SaveShipping.php b/app/code/Magento/Checkout/Controller/Onepage/SaveShipping.php
index fd9d3750a533d..491a0411bccdd 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/SaveShipping.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/SaveShipping.php
@@ -29,7 +29,7 @@ public function execute()
                     'error' => -1,
                     'message' => $this->scopeConfig->getValue(
                         'sales/minimum_order/error_message',
-                        \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                         $quote->getStoreId()
                     ),
                 ];
diff --git a/app/code/Magento/Checkout/Helper/Cart.php b/app/code/Magento/Checkout/Helper/Cart.php
index ad7b2ed172168..54705d9d4d1da 100644
--- a/app/code/Magento/Checkout/Helper/Cart.php
+++ b/app/code/Magento/Checkout/Helper/Cart.php
@@ -49,14 +49,14 @@ class Cart extends \Magento\Core\Helper\Url
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Checkout\Model\Cart $checkoutCart
      * @param \Magento\Checkout\Model\Session $checkoutSession
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Checkout\Model\Cart $checkoutCart,
         \Magento\Checkout\Model\Session $checkoutSession
@@ -210,6 +210,6 @@ public function getIsVirtualQuote()
      */
     public function getShouldRedirectToCart($store = null)
     {
-        return $this->_scopeConfig->isSetFlag(self::XML_PATH_REDIRECT_TO_CART, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+        return $this->_scopeConfig->isSetFlag(self::XML_PATH_REDIRECT_TO_CART, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
     }
 }
diff --git a/app/code/Magento/Checkout/Helper/Data.php b/app/code/Magento/Checkout/Helper/Data.php
index b7e6a243b0fc3..8d7fc660b514a 100644
--- a/app/code/Magento/Checkout/Helper/Data.php
+++ b/app/code/Magento/Checkout/Helper/Data.php
@@ -29,7 +29,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     protected $_scopeConfig;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -61,7 +61,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
@@ -71,7 +71,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Checkout\Model\Session $checkoutSession,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
@@ -143,7 +143,7 @@ public function canOnepageCheckout()
     {
         return (bool)$this->_scopeConfig->getValue(
             'checkout/options/onepage_checkout_enabled',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
@@ -217,14 +217,14 @@ public function sendPaymentFailedEmail($checkout, $message, $checkoutType = 'one
 
         $template = $this->_scopeConfig->getValue(
             'checkout/payment_failed/template',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $checkout->getStoreId()
         );
 
         $copyTo = $this->_getEmails('checkout/payment_failed/copy_to', $checkout->getStoreId());
         $copyMethod = $this->_scopeConfig->getValue(
             'checkout/payment_failed/copy_method',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $checkout->getStoreId()
         );
         $bcc = [];
@@ -234,19 +234,19 @@ public function sendPaymentFailedEmail($checkout, $message, $checkoutType = 'one
 
         $_receiver = $this->_scopeConfig->getValue(
             'checkout/payment_failed/receiver',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $checkout->getStoreId()
         );
         $sendTo = [
             [
                 'email' => $this->_scopeConfig->getValue(
                     'trans_email/ident_' . $_receiver . '/email',
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                     $checkout->getStoreId()
                 ),
                 'name' => $this->_scopeConfig->getValue(
                     'trans_email/ident_' . $_receiver . '/name',
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                     $checkout->getStoreId()
                 ),
             ],
@@ -295,11 +295,11 @@ public function sendPaymentFailedEmail($checkout, $message, $checkoutType = 'one
                     'shippingAddress' => $checkout->getShippingAddress(),
                     'shippingMethod' => $this->_scopeConfig->getValue(
                         'carriers/' . $shippingMethod . '/title',
-                        \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                     ),
                     'paymentMethod' => $this->_scopeConfig->getValue(
                         'payment/' . $paymentMethod . '/title',
-                        \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                     ),
                     'items' => nl2br($items),
                     'total' => $total,
@@ -307,7 +307,7 @@ public function sendPaymentFailedEmail($checkout, $message, $checkoutType = 'one
             )->setFrom(
                 $this->_scopeConfig->getValue(
                     'checkout/payment_failed/identity',
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                     $checkout->getStoreId()
                 )
             )->addTo(
@@ -334,7 +334,7 @@ protected function _getEmails($configPath, $storeId)
     {
         $data = $this->_scopeConfig->getValue(
             $configPath,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeId
         );
         if (!empty($data)) {
@@ -358,7 +358,7 @@ public function isAllowedGuestCheckout(\Magento\Quote\Model\Quote $quote, $store
         }
         $guestCheckout = $this->_scopeConfig->isSetFlag(
             self::XML_PATH_GUEST_CHECKOUT,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
 
@@ -395,7 +395,7 @@ public function isCustomerMustBeLogged()
     {
         return $this->_scopeConfig->isSetFlag(
             self::XML_PATH_CUSTOMER_MUST_BE_LOGGED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 }
diff --git a/app/code/Magento/Checkout/Model/Cart.php b/app/code/Magento/Checkout/Model/Cart.php
index b44a2140bc6d1..bc7bbb9af1298 100644
--- a/app/code/Magento/Checkout/Model/Cart.php
+++ b/app/code/Magento/Checkout/Model/Cart.php
@@ -46,7 +46,7 @@ class Cart extends Object implements CartInterface
     protected $_scopeConfig;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -93,7 +93,7 @@ class Cart extends Object implements CartInterface
     /**
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param Resource\Cart $resourceCart
      * @param Session $checkoutSession
      * @param \Magento\Customer\Model\Session $customerSession
@@ -108,7 +108,7 @@ class Cart extends Object implements CartInterface
     public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Checkout\Model\Resource\Cart $resourceCart,
         Session $checkoutSession,
         \Magento\Customer\Model\Session $customerSession,
@@ -623,7 +623,7 @@ public function getSummaryQty()
         if ($quoteId && $this->_summaryQty === null) {
             $useQty = $this->_scopeConfig->getValue(
                 'checkout/cart_link/use_qty',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
             $this->_summaryQty = $useQty ? $this->getItemsQty() : $this->getItemsCount();
         }
diff --git a/app/code/Magento/Checkout/Model/Session.php b/app/code/Magento/Checkout/Model/Session.php
index 2e40a7bd3f55b..d647592240822 100644
--- a/app/code/Magento/Checkout/Model/Session.php
+++ b/app/code/Magento/Checkout/Model/Session.php
@@ -72,7 +72,7 @@ class Session extends \Magento\Framework\Session\SessionManager
     protected $_eventManager;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -95,7 +95,7 @@ class Session extends \Magento\Framework\Session\SessionManager
      * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
      * @param \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress $remoteAddress
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -113,7 +113,7 @@ public function __construct(
         \Magento\Quote\Model\QuoteRepository $quoteRepository,
         \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress $remoteAddress,
         \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
     ) {
         $this->_orderFactory = $orderFactory;
diff --git a/app/code/Magento/Checkout/Model/Type/Onepage.php b/app/code/Magento/Checkout/Model/Type/Onepage.php
index 1562275b9ce06..35e81bbe013eb 100644
--- a/app/code/Magento/Checkout/Model/Type/Onepage.php
+++ b/app/code/Magento/Checkout/Model/Type/Onepage.php
@@ -77,7 +77,7 @@ class Onepage
     protected $_eventManager = null;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -178,7 +178,7 @@ class Onepage
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Customer\Model\Session $customerSession
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\RequestInterface $request
      * @param \Magento\Customer\Model\AddressFactory $customrAddrFactory
      * @param \Magento\Customer\Model\FormFactory $customerFormFactory
@@ -208,7 +208,7 @@ public function __construct(
         \Psr\Log\LoggerInterface $logger,
         \Magento\Checkout\Model\Session $checkoutSession,
         \Magento\Customer\Model\Session $customerSession,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\RequestInterface $request,
         \Magento\Customer\Model\AddressFactory $customrAddrFactory,
         \Magento\Customer\Model\FormFactory $customerFormFactory,
diff --git a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_review.xml b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_review.xml
index f9bb6f56b796f..8965d3d498b05 100644
--- a/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_review.xml
+++ b/app/code/Magento/Checkout/view/frontend/layout/checkout_onepage_review.xml
@@ -14,7 +14,7 @@
             <container name="checkout.onepage.review.info.items.before" as="items_before" label="Items Before"/>
             <container name="checkout.onepage.review.info.items.after" as="items_after" label="Items After"/>
             <block class="Magento\Checkout\Block\Onepage\Review\Button" name="checkout.onepage.review.button" as="button" template="Magento_Checkout::onepage/review/button.phtml"/>
-            <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+            <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
         </block>
     </container>
 </layout>
diff --git a/app/code/Magento/CheckoutAgreements/Block/Agreements.php b/app/code/Magento/CheckoutAgreements/Block/Agreements.php
index 1df7e59a0a358..f43827a6b5820 100644
--- a/app/code/Magento/CheckoutAgreements/Block/Agreements.php
+++ b/app/code/Magento/CheckoutAgreements/Block/Agreements.php
@@ -35,7 +35,7 @@ public function __construct(
     public function getAgreements()
     {
         if (!$this->hasAgreements()) {
-            if (!$this->_scopeConfig->isSetFlag('checkout/options/enable_agreements', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
+            if (!$this->_scopeConfig->isSetFlag('checkout/options/enable_agreements', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
                 $agreements = [];
             } else {
                 /** @var \Magento\CheckoutAgreements\Model\Resource\Agreement\Collection $agreements */
diff --git a/app/code/Magento/CheckoutAgreements/Model/AgreementsProvider.php b/app/code/Magento/CheckoutAgreements/Model/AgreementsProvider.php
index 2dff3c5c82fd2..a8e88e80ff2fc 100644
--- a/app/code/Magento/CheckoutAgreements/Model/AgreementsProvider.php
+++ b/app/code/Magento/CheckoutAgreements/Model/AgreementsProvider.php
@@ -6,7 +6,7 @@
 namespace Magento\CheckoutAgreements\Model;
 
 use Magento\Checkout\Model\Agreements\AgreementsProviderInterface;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Provide Agreements stored in db
@@ -22,17 +22,17 @@ class AgreementsProvider implements AgreementsProviderInterface
     /** @var \Magento\Framework\App\Config\ScopeConfigInterface */
     protected $scopeConfig;
 
-    /** @var  \Magento\Framework\Store\StoreManagerInterface */
+    /** @var  \Magento\Store\Model\StoreManagerInterface */
     protected $storeManager;
 
     /**
      * @param Resource\Agreement\CollectionFactory $agreementCollectionFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      */
     public function __construct(
         \Magento\CheckoutAgreements\Model\Resource\Agreement\CollectionFactory $agreementCollectionFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
     ) {
         $this->agreementCollectionFactory = $agreementCollectionFactory;
diff --git a/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepository.php b/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepository.php
index 4df65dee190cd..892e1599241f3 100644
--- a/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepository.php
+++ b/app/code/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepository.php
@@ -11,8 +11,8 @@
 use Magento\CheckoutAgreements\Model\Resource\Agreement\CollectionFactory as AgreementCollectionFactory;
 use Magento\CheckoutAgreements\Model\Resource\Agreement\Collection as AgreementCollection;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\Store\StoreManagerInterface;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\ScopeInterface;
 use Magento\CheckoutAgreements\Api\CheckoutAgreementsRepositoryInterface;
 
 /**
@@ -30,7 +30,7 @@ class CheckoutAgreementsRepository implements CheckoutAgreementsRepositoryInterf
     /**
      * Store manager.
      *
-     * @var  \Magento\Framework\Store\StoreManagerInterface
+     * @var  \Magento\Store\Model\StoreManagerInterface
      */
     private $storeManager;
 
@@ -45,7 +45,7 @@ class CheckoutAgreementsRepository implements CheckoutAgreementsRepositoryInterf
      * Constructs a checkout agreement data object.
      *
      * @param AgreementCollectionFactory $collectionFactory Collection factory.
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager Store manager.
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager Store manager.
      * @param ScopeConfigInterface $scopeConfig Scope config.
      */
     public function __construct(
diff --git a/app/code/Magento/CheckoutAgreements/etc/acl.xml b/app/code/Magento/CheckoutAgreements/etc/acl.xml
index 585c65a89cfc7..d3ae7b6338cbd 100644
--- a/app/code/Magento/CheckoutAgreements/etc/acl.xml
+++ b/app/code/Magento/CheckoutAgreements/etc/acl.xml
@@ -8,9 +8,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::stores">
-                    <resource id="Magento_Adminhtml::stores_settings">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::stores">
+                    <resource id="Magento_Backend::stores_settings">
                         <resource id="Magento_CheckoutAgreements::checkoutagreement" title="Terms &amp; Conditions" sortOrder="30" />
                     </resource>
                 </resource>
diff --git a/app/code/Magento/CheckoutAgreements/etc/adminhtml/routes.xml b/app/code/Magento/CheckoutAgreements/etc/adminhtml/routes.xml
index 6bde15b5e437a..5d1ee9a70e415 100644
--- a/app/code/Magento/CheckoutAgreements/etc/adminhtml/routes.xml
+++ b/app/code/Magento/CheckoutAgreements/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
     <router id="admin">
         <route id="checkout" frontName="checkout">
-            <module name="Magento_CheckoutAgreements" before="Magento_Adminhtml" />
+            <module name="Magento_CheckoutAgreements" before="Magento_Backend" />
         </route>
     </router>
 </config>
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Design.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Design.php
index c862e0e15e461..0d639ce848375 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Design.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Design.php
@@ -22,7 +22,7 @@ class Design extends \Magento\Backend\Block\Widget\Form\Generic implements
     protected $_pageLayout;
 
     /**
-     * @var \Magento\Core\Model\PageLayout\Config\Builder
+     * @var \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface
      */
     protected $pageLayoutBuilder;
 
@@ -32,7 +32,7 @@ class Design extends \Magento\Backend\Block\Widget\Form\Generic implements
      * @param \Magento\Framework\Data\FormFactory $formFactory
      * @param \Magento\Theme\Model\Layout\Source\Layout $pageLayout
      * @param \Magento\Framework\View\Design\Theme\LabelFactory $labelFactory
-     * @param \Magento\Core\Model\PageLayout\Config\Builder $pageLayoutBuilder
+     * @param \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder
      * @param array $data
      */
     public function __construct(
@@ -41,7 +41,7 @@ public function __construct(
         \Magento\Framework\Data\FormFactory $formFactory,
         \Magento\Theme\Model\Layout\Source\Layout $pageLayout,
         \Magento\Framework\View\Design\Theme\LabelFactory $labelFactory,
-        \Magento\Core\Model\PageLayout\Config\Builder $pageLayoutBuilder,
+        \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder,
         array $data = []
     ) {
         $this->pageLayoutBuilder = $pageLayoutBuilder;
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Grid.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Grid.php
index ce330ce17a0b4..0580ceeaeb0d1 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Grid.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Grid.php
@@ -21,7 +21,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
     protected $_cmsPage;
 
     /**
-     * @var \Magento\Core\Model\PageLayout\Config\Builder
+     * @var \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface
      */
     protected $pageLayoutBuilder;
 
@@ -30,7 +30,7 @@ class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Backend\Helper\Data $backendHelper
      * @param \Magento\Cms\Model\Page $cmsPage
      * @param \Magento\Cms\Model\Resource\Page\Grid\CollectionFactory $collectionFactory
-     * @param \Magento\Core\Model\PageLayout\Config\Builder $pageLayoutBuilder
+     * @param \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder
      * @param array $data
      */
     public function __construct(
@@ -38,7 +38,7 @@ public function __construct(
         \Magento\Backend\Helper\Data $backendHelper,
         \Magento\Cms\Model\Page $cmsPage,
         \Magento\Cms\Model\Resource\Page\Grid\CollectionFactory $collectionFactory,
-        \Magento\Core\Model\PageLayout\Config\Builder $pageLayoutBuilder,
+        \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder,
         array $data = []
     ) {
         $this->_collectionFactory = $collectionFactory;
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Widget/Chooser.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Widget/Chooser.php
index 900055473762d..f6efab805aa28 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Widget/Chooser.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Widget/Chooser.php
@@ -28,7 +28,7 @@ class Chooser extends \Magento\Backend\Block\Widget\Grid\Extended
     protected $_collectionFactory;
 
     /**
-     * @var \Magento\Core\Model\PageLayout\Config\Builder
+     * @var \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface
      */
     protected $pageLayoutBuilder;
 
@@ -38,7 +38,7 @@ class Chooser extends \Magento\Backend\Block\Widget\Grid\Extended
      * @param \Magento\Cms\Model\Page $cmsPage
      * @param \Magento\Cms\Model\PageFactory $pageFactory
      * @param \Magento\Cms\Model\Resource\Page\Grid\CollectionFactory $collectionFactory
-     * @param \Magento\Core\Model\PageLayout\Config\Builder $pageLayoutBuilder
+     * @param \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder
      * @param array $data
      */
     public function __construct(
@@ -47,7 +47,7 @@ public function __construct(
         \Magento\Cms\Model\Page $cmsPage,
         \Magento\Cms\Model\PageFactory $pageFactory,
         \Magento\Cms\Model\Resource\Page\Grid\CollectionFactory $collectionFactory,
-        \Magento\Core\Model\PageLayout\Config\Builder $pageLayoutBuilder,
+        \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface $pageLayoutBuilder,
         array $data = []
     ) {
         $this->pageLayoutBuilder = $pageLayoutBuilder;
diff --git a/app/code/Magento/Cms/Block/Block.php b/app/code/Magento/Cms/Block/Block.php
index d512a2aa053a4..2f8f28e4334fc 100644
--- a/app/code/Magento/Cms/Block/Block.php
+++ b/app/code/Magento/Cms/Block/Block.php
@@ -21,7 +21,7 @@ class Block extends \Magento\Framework\View\Element\AbstractBlock implements \Ma
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -37,14 +37,14 @@ class Block extends \Magento\Framework\View\Element\AbstractBlock implements \Ma
      *
      * @param \Magento\Framework\View\Element\Context $context
      * @param \Magento\Cms\Model\Template\FilterProvider $filterProvider
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Cms\Model\BlockFactory $blockFactory
      * @param array $data
      */
     public function __construct(
         \Magento\Framework\View\Element\Context $context,
         \Magento\Cms\Model\Template\FilterProvider $filterProvider,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Cms\Model\BlockFactory $blockFactory,
         array $data = []
     ) {
diff --git a/app/code/Magento/Cms/Block/Page.php b/app/code/Magento/Cms/Block/Page.php
index 0d23f9f88a382..6788811a85054 100644
--- a/app/code/Magento/Cms/Block/Page.php
+++ b/app/code/Magento/Cms/Block/Page.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Cms\Block;
 
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Cms page content block
@@ -26,7 +26,7 @@ class Page extends \Magento\Framework\View\Element\AbstractBlock implements
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -48,7 +48,7 @@ class Page extends \Magento\Framework\View\Element\AbstractBlock implements
      * @param \Magento\Framework\View\Element\Context $context
      * @param \Magento\Cms\Model\Page $page
      * @param \Magento\Cms\Model\Template\FilterProvider $filterProvider
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Cms\Model\PageFactory $pageFactory
      * @param \Magento\Framework\View\Page\Config $pageConfig
      * @param array $data
@@ -57,7 +57,7 @@ public function __construct(
         \Magento\Framework\View\Element\Context $context,
         \Magento\Cms\Model\Page $page,
         \Magento\Cms\Model\Template\FilterProvider $filterProvider,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Cms\Model\PageFactory $pageFactory,
         \Magento\Framework\View\Page\Config $pageConfig,
         array $data = []
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php
index 6ff20ec06ff46..fc04c496ac135 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/PostDataProcessor.php
@@ -14,7 +14,7 @@ class PostDataProcessor
     protected $dateFilter;
 
     /**
-     * @var \Magento\Core\Model\Layout\Update\ValidatorFactory
+     * @var \Magento\Framework\View\Model\Layout\Update\ValidatorFactory
      */
     protected $validatorFactory;
 
@@ -26,12 +26,12 @@ class PostDataProcessor
     /**
      * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
-     * @param \Magento\Core\Model\Layout\Update\ValidatorFactory $validatorFactory
+     * @param \Magento\Framework\View\Model\Layout\Update\ValidatorFactory $validatorFactory
      */
     public function __construct(
         \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter,
         \Magento\Framework\Message\ManagerInterface $messageManager,
-        \Magento\Core\Model\Layout\Update\ValidatorFactory $validatorFactory
+        \Magento\Framework\View\Model\Layout\Update\ValidatorFactory $validatorFactory
     ) {
         $this->dateFilter = $dateFilter;
         $this->messageManager = $messageManager;
@@ -65,7 +65,7 @@ public function validate($data)
     {
         $errorNo = true;
         if (!empty($data['layout_update_xml']) || !empty($data['custom_layout_update_xml'])) {
-            /** @var $validatorCustomLayout \Magento\Core\Model\Layout\Update\Validator */
+            /** @var $validatorCustomLayout \Magento\Framework\View\Model\Layout\Update\Validator */
             $validatorCustomLayout = $this->validatorFactory->create();
             if (!empty($data['layout_update_xml']) && !$validatorCustomLayout->isValid($data['layout_update_xml'])) {
                 $errorNo = false;
diff --git a/app/code/Magento/Cms/Controller/Index/Index.php b/app/code/Magento/Cms/Controller/Index/Index.php
index 99d871198fc44..fe007e0d5173d 100755
--- a/app/code/Magento/Cms/Controller/Index/Index.php
+++ b/app/code/Magento/Cms/Controller/Index/Index.php
@@ -38,7 +38,7 @@ public function execute($coreRoute = null)
             'Magento\Framework\App\Config\ScopeConfigInterface'
         )->getValue(
             \Magento\Cms\Helper\Page::XML_PATH_HOME_PAGE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         $resultPage = $this->_objectManager->get('Magento\Cms\Helper\Page')->prepareResultPage($this, $pageId);
         if (!$resultPage) {
diff --git a/app/code/Magento/Cms/Controller/Noroute/Index.php b/app/code/Magento/Cms/Controller/Noroute/Index.php
index ebd61e73ac136..ec1bdfcf89cf1 100755
--- a/app/code/Magento/Cms/Controller/Noroute/Index.php
+++ b/app/code/Magento/Cms/Controller/Noroute/Index.php
@@ -34,10 +34,10 @@ public function execute()
     {
         $pageId = $this->_objectManager->get(
             'Magento\Framework\App\Config\ScopeConfigInterface',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )->getValue(
             \Magento\Cms\Helper\Page::XML_PATH_NO_ROUTE_PAGE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         /** @var \Magento\Cms\Helper\Page $pageHelper */
         $pageHelper = $this->_objectManager->get('Magento\Cms\Helper\Page');
diff --git a/app/code/Magento/Cms/Controller/Router.php b/app/code/Magento/Cms/Controller/Router.php
index 56684456944f1..669434a634247 100644
--- a/app/code/Magento/Cms/Controller/Router.php
+++ b/app/code/Magento/Cms/Controller/Router.php
@@ -27,7 +27,7 @@ class Router implements \Magento\Framework\App\RouterInterface
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -64,7 +64,7 @@ class Router implements \Magento\Framework\App\RouterInterface
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Framework\UrlInterface $url
      * @param \Magento\Cms\Model\PageFactory $pageFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\ResponseInterface $response
      */
     public function __construct(
@@ -72,7 +72,7 @@ public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Framework\UrlInterface $url,
         \Magento\Cms\Model\PageFactory $pageFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\ResponseInterface $response
     ) {
         $this->actionFactory = $actionFactory;
diff --git a/app/code/Magento/Cms/Helper/Page.php b/app/code/Magento/Cms/Helper/Page.php
index c6c6dd649399e..38cdcaae130bf 100755
--- a/app/code/Magento/Cms/Helper/Page.php
+++ b/app/code/Magento/Cms/Helper/Page.php
@@ -55,7 +55,7 @@ class Page extends \Magento\Framework\App\Helper\AbstractHelper
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -84,7 +84,7 @@ class Page extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Cms\Model\Page $page
      * @param \Magento\Framework\View\DesignInterface $design
      * @param \Magento\Cms\Model\PageFactory $pageFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Framework\Escaper $escaper
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
@@ -96,7 +96,7 @@ public function __construct(
         \Magento\Cms\Model\Page $page,
         \Magento\Framework\View\DesignInterface $design,
         \Magento\Cms\Model\PageFactory $pageFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Framework\Escaper $escaper,
         \Magento\Framework\View\Result\PageFactory $resultPageFactory
diff --git a/app/code/Magento/Cms/Helper/Wysiwyg/Images.php b/app/code/Magento/Cms/Helper/Wysiwyg/Images.php
index af9308c14f5a6..6a175852ee4f2 100644
--- a/app/code/Magento/Cms/Helper/Wysiwyg/Images.php
+++ b/app/code/Magento/Cms/Helper/Wysiwyg/Images.php
@@ -46,7 +46,7 @@ class Images extends \Magento\Framework\App\Helper\AbstractHelper
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -56,13 +56,13 @@ class Images extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Backend\Helper\Data $backendData
      * @param \Magento\Framework\Filesystem $filesystem
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Backend\Helper\Data $backendData,
         \Magento\Framework\Filesystem $filesystem,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         parent::__construct($context);
         $this->_backendData = $backendData;
diff --git a/app/code/Magento/Cms/Model/Observer.php b/app/code/Magento/Cms/Model/Observer.php
index c514d0165107a..7082759a7c42e 100644
--- a/app/code/Magento/Cms/Model/Observer.php
+++ b/app/code/Magento/Cms/Model/Observer.php
@@ -68,7 +68,7 @@ public function noCookies(\Magento\Framework\Event\Observer $observer)
 
         $pageId = $this->_scopeConfig->getValue(
             \Magento\Cms\Helper\Page::XML_PATH_NO_COOKIES_PAGE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         $pageUrl = $this->_cmsPage->getPageUrl($pageId);
 
diff --git a/app/code/Magento/Cms/Model/Resource/AbstractCollection.php b/app/code/Magento/Cms/Model/Resource/AbstractCollection.php
index 698cd57845824..f251a32c3dd1e 100644
--- a/app/code/Magento/Cms/Model/Resource/AbstractCollection.php
+++ b/app/code/Magento/Cms/Model/Resource/AbstractCollection.php
@@ -6,7 +6,7 @@
 namespace Magento\Cms\Model\Resource;
 
 use Magento\Framework\Data\AbstractSearchResult;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\Data\SearchResultProcessorFactory;
 use Magento\Framework\Data\SearchResultProcessor;
 use Magento\Framework\DB\QueryInterface;
@@ -20,7 +20,7 @@
 class AbstractCollection extends AbstractSearchResult
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $storeManager;
 
@@ -46,7 +46,7 @@ class AbstractCollection extends AbstractSearchResult
      * @param EntityFactoryInterface $entityFactory
      * @param ManagerInterface $eventManager
      * @param SearchResultIteratorFactory $resultIteratorFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param StoreManagerInterface $storeManager
      * @param SearchResultProcessorFactory $searchResultProcessorFactory
      */
     public function __construct(
diff --git a/app/code/Magento/Cms/Model/Resource/Block.php b/app/code/Magento/Cms/Model/Resource/Block.php
index 2b15dcaa243f4..894aa6d629576 100644
--- a/app/code/Magento/Cms/Model/Resource/Block.php
+++ b/app/code/Magento/Cms/Model/Resource/Block.php
@@ -18,7 +18,7 @@ class Block extends \Magento\Framework\Model\Resource\Db\AbstractDb
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -27,12 +27,12 @@ class Block extends \Magento\Framework\Model\Resource\Db\AbstractDb
      *
      * @param \Magento\Framework\App\Resource $resource
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
         \Magento\Framework\Stdlib\DateTime\DateTime $date,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         parent::__construct($resource);
         $this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Cms/Model/Resource/Page.php b/app/code/Magento/Cms/Model/Resource/Page.php
index b5af42c81c334..4efe1734c056c 100644
--- a/app/code/Magento/Cms/Model/Resource/Page.php
+++ b/app/code/Magento/Cms/Model/Resource/Page.php
@@ -28,7 +28,7 @@ class Page extends \Magento\Framework\Model\Resource\Db\AbstractDb
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -42,13 +42,13 @@ class Page extends \Magento\Framework\Model\Resource\Db\AbstractDb
      *
      * @param \Magento\Framework\App\Resource $resource
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
         \Magento\Framework\Stdlib\DateTime\DateTime $date,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Stdlib\DateTime $dateTime
     ) {
         parent::__construct($resource);
diff --git a/app/code/Magento/Cms/Model/Resource/Page/Collection.php b/app/code/Magento/Cms/Model/Resource/Page/Collection.php
index 491e95954d13c..0a37cf81d4757 100644
--- a/app/code/Magento/Cms/Model/Resource/Page/Collection.php
+++ b/app/code/Magento/Cms/Model/Resource/Page/Collection.php
@@ -10,7 +10,7 @@
 use Magento\Framework\Data\SearchResultIteratorFactory;
 use Magento\Framework\DB\QueryInterface;
 use Magento\Framework\Event\ManagerInterface;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\Data\SearchResultProcessorFactory;
 use Magento\Framework\Data\SearchResultProcessor;
 
@@ -34,7 +34,7 @@ class Collection extends AbstractSearchResult
      * @param EntityFactoryInterface $entityFactory
      * @param ManagerInterface $eventManager
      * @param SearchResultIteratorFactory $resultIteratorFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param StoreManagerInterface $storeManager
      * @param SearchResultProcessorFactory $searchResultProcessorFactory
      */
     public function __construct(
diff --git a/app/code/Magento/Cms/Model/Resource/Page/Grid/Collection.php b/app/code/Magento/Cms/Model/Resource/Page/Grid/Collection.php
index 3ccfe7ee83272..41402e0ed343f 100644
--- a/app/code/Magento/Cms/Model/Resource/Page/Grid/Collection.php
+++ b/app/code/Magento/Cms/Model/Resource/Page/Grid/Collection.php
@@ -22,7 +22,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -31,7 +31,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param mixed $connection
      * @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
      */
@@ -40,7 +40,7 @@ public function __construct(
         \Psr\Log\LoggerInterface $logger,
         \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
         \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         $connection = null,
         \Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
     ) {
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Config.php b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
index ae1e7ae9e3d21..7fd5b26290dfc 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Config.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
@@ -85,7 +85,7 @@ class Config extends \Magento\Framework\Object
     protected $_backendUrl;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -97,7 +97,7 @@ class Config extends \Magento\Framework\Object
      * @param \Magento\Core\Model\Variable\Config $variableConfig
      * @param \Magento\Widget\Model\Widget\Config $widgetConfig
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param array $windowSize
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -110,7 +110,7 @@ public function __construct(
         \Magento\Core\Model\Variable\Config $variableConfig,
         \Magento\Widget\Model\Widget\Config $widgetConfig,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         array $windowSize = [],
         array $data = []
     ) {
@@ -218,7 +218,7 @@ public function isEnabled()
     {
         $wysiwygState = $this->_scopeConfig->getValue(
             self::WYSIWYG_STATUS_CONFIG_PATH,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->getStoreId()
         );
         return in_array($wysiwygState, [self::WYSIWYG_ENABLED, self::WYSIWYG_HIDDEN]);
@@ -233,7 +233,7 @@ public function isHidden()
     {
         $status = $this->_scopeConfig->getValue(
             self::WYSIWYG_STATUS_CONFIG_PATH,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         return $status == self::WYSIWYG_HIDDEN;
     }
diff --git a/app/code/Magento/Cms/Ui/DataProvider/Page/Options/PageLayout.php b/app/code/Magento/Cms/Ui/DataProvider/Page/Options/PageLayout.php
index 33df16b539084..7a053e0fd3948 100644
--- a/app/code/Magento/Cms/Ui/DataProvider/Page/Options/PageLayout.php
+++ b/app/code/Magento/Cms/Ui/DataProvider/Page/Options/PageLayout.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Cms\Ui\DataProvider\Page\Options;
 
-use Magento\Core\Model\PageLayout\Config\Builder;
+use Magento\Framework\View\Model\PageLayout\Config\BuilderInterface;
 use Magento\Ui\Component\Listing\OptionsInterface;
 
 /**
@@ -14,16 +14,16 @@
 class PageLayout implements OptionsInterface
 {
     /**
-     * @var \Magento\Core\Model\PageLayout\Config\Builder
+     * @var \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface
      */
     protected $pageLayoutBuilder;
 
     /**
      * Constructor
      *
-     * @param Builder $pageLayoutBuilder
+     * @param BuilderInterface $pageLayoutBuilder
      */
-    public function __construct(Builder $pageLayoutBuilder)
+    public function __construct(BuilderInterface $pageLayoutBuilder)
     {
         $this->pageLayoutBuilder = $pageLayoutBuilder;
     }
diff --git a/app/code/Magento/Cms/etc/acl.xml b/app/code/Magento/Cms/etc/acl.xml
index 84509ce0f46f8..2e6b7a2c5e208 100644
--- a/app/code/Magento/Cms/etc/acl.xml
+++ b/app/code/Magento/Cms/etc/acl.xml
@@ -8,9 +8,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::content">
-                    <resource id="Magento_Adminhtml::content_elements">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::content">
+                    <resource id="Magento_Backend::content_elements">
                         <resource id="Magento_Cms::page" title="Pages" sortOrder="10">
                             <resource id="Magento_Cms::save" title="Save Page" sortOrder="10" />
                             <resource id="Magento_Cms::page_delete" title="Delete Page" sortOrder="20" />
@@ -19,9 +19,9 @@
                         <resource id="Magento_Cms::media_gallery" title="Media Gallery" sortOrder="70" />
                     </resource>
                 </resource>
-                <resource id="Magento_Adminhtml::stores">
-                    <resource id="Magento_Adminhtml::stores_settings">
-                        <resource id="Magento_Adminhtml::config">
+                <resource id="Magento_Backend::stores">
+                    <resource id="Magento_Backend::stores_settings">
+                        <resource id="Magento_Backend::config">
                             <resource id="Magento_Cms::config_cms" title="Content Management" />
                         </resource>
                     </resource>
diff --git a/app/code/Magento/Cms/etc/adminhtml/routes.xml b/app/code/Magento/Cms/etc/adminhtml/routes.xml
index fbfc4ca010ef6..b0ddbbf93e31c 100644
--- a/app/code/Magento/Cms/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Cms/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
     <router id="admin">
         <route id="cms" frontName="cms">
-            <module name="Magento_Cms" before="Magento_Adminhtml" />
+            <module name="Magento_Cms" before="Magento_Backend" />
         </route>
     </router>
 </config>
diff --git a/app/code/Magento/CmsUrlRewrite/Model/CmsPageUrlRewriteGenerator.php b/app/code/Magento/CmsUrlRewrite/Model/CmsPageUrlRewriteGenerator.php
index 119f4dfdaef47..41fd268b4dd68 100644
--- a/app/code/Magento/CmsUrlRewrite/Model/CmsPageUrlRewriteGenerator.php
+++ b/app/code/Magento/CmsUrlRewrite/Model/CmsPageUrlRewriteGenerator.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\CmsUrlRewrite\Model;
 
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\UrlRewrite\Service\V1\Data\UrlRewriteBuilder;
 
 class CmsPageUrlRewriteGenerator
diff --git a/app/code/Magento/CmsUrlRewrite/composer.json b/app/code/Magento/CmsUrlRewrite/composer.json
index 621f6121f673a..2800905d79e5b 100644
--- a/app/code/Magento/CmsUrlRewrite/composer.json
+++ b/app/code/Magento/CmsUrlRewrite/composer.json
@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
+        "magento/module-store": "0.42.0-beta7",
         "magento/module-cms": "0.42.0-beta7",
         "magento/module-url-rewrite": "0.42.0-beta7",
         "magento/framework": "0.42.0-beta7",
diff --git a/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
index 86070ac04922e..84fbb287ce22e 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Cart/Item/Renderer/Configurable.php
@@ -63,7 +63,7 @@ public function getProductForThumbnail()
          */
         if ($this->_scopeConfig->getValue(
             self::CONFIG_THUMBNAIL_SOURCE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         ) == ThumbnailSource::OPTION_USE_PARENT_IMAGE ||
             !($this->getChildProduct()->getThumbnail() && $this->getChildProduct()->getThumbnail() != 'no_selection')
         ) {
diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/SuggestConfigurableAttributes.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/SuggestConfigurableAttributes.php
index 4975ebfba871d..cc5151fce4135 100644
--- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/SuggestConfigurableAttributes.php
+++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/SuggestConfigurableAttributes.php
@@ -24,7 +24,7 @@ class SuggestConfigurableAttributes extends Action
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -32,13 +32,13 @@ class SuggestConfigurableAttributes extends Action
      * @param Action\Context $context
      * @param SuggestedAttributeList $attributeList
      * @param \Magento\Core\Helper\Data $coreHelper
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         Action\Context $context,
         SuggestedAttributeList $attributeList,
         \Magento\Core\Helper\Data $coreHelper,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->attributeList = $attributeList;
         $this->coreHelper = $coreHelper;
diff --git a/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php b/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php
index cef1c44b363d0..adb3c2b9bd413 100644
--- a/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php
+++ b/app/code/Magento/ConfigurableProduct/Model/OptionRepository.php
@@ -41,7 +41,7 @@ class OptionRepository implements \Magento\ConfigurableProduct\Api\OptionReposit
     protected $optionResource;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -60,7 +60,7 @@ class OptionRepository implements \Magento\ConfigurableProduct\Api\OptionReposit
      * @param \Magento\ConfigurableProduct\Api\Data\OptionValueDataBuilder $optionValueBuilder
      * @param ConfigurableType $configurableType
      * @param Resource\Product\Type\Configurable\Attribute $optionResource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Api\ProductAttributeRepositoryInterface $productAttributeRepository
      * @param ConfigurableType\AttributeFactory $configurableAttributeFactory
      */
@@ -69,7 +69,7 @@ public function __construct(
         \Magento\ConfigurableProduct\Api\Data\OptionValueDataBuilder $optionValueBuilder,
         \Magento\ConfigurableProduct\Model\Product\Type\Configurable $configurableType,
         \Magento\ConfigurableProduct\Model\Resource\Product\Type\Configurable\Attribute $optionResource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Api\ProductAttributeRepositoryInterface $productAttributeRepository,
         \Magento\ConfigurableProduct\Model\Product\Type\Configurable\AttributeFactory $configurableAttributeFactory
     ) {
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php
index 43d717193d13b..55e4f4e0c3925 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php
@@ -19,7 +19,7 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
 
     /**
      * @param \Magento\CatalogRule\Model\Resource\RuleFactory $ruleFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -29,7 +29,7 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
      */
     public function __construct(
         \Magento\CatalogRule\Model\Resource\RuleFactory $ruleFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Framework\Event\ManagerInterface $eventManager,
diff --git a/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Collection/AssociatedProduct.php b/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Collection/AssociatedProduct.php
index ead1105b04a45..6a26d7235085f 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Collection/AssociatedProduct.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Collection/AssociatedProduct.php
@@ -49,7 +49,7 @@ class AssociatedProduct extends \Magento\Catalog\Model\Resource\Product\Collecti
      * @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
      * @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -76,7 +76,7 @@ public function __construct(
         \Magento\Eav\Model\EntityFactory $eavEntityFactory,
         \Magento\Catalog\Model\Resource\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/Attribute.php b/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/Attribute.php
index d03d2dd89ae02..7361db789933d 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/Attribute.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/Attribute.php
@@ -35,18 +35,18 @@ class Attribute extends \Magento\Framework\Model\Resource\Db\AbstractDb
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Framework\App\Resource $resource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Helper\Data $catalogData
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Helper\Data $catalogData
     ) {
         $this->_storeManager = $storeManager;
diff --git a/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/Attribute/Collection.php b/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/Attribute/Collection.php
index 0a955a372793e..9d2ca8b5414c7 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/Attribute/Collection.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/Attribute/Collection.php
@@ -54,7 +54,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -70,7 +70,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\ConfigurableProduct\Model\Product\Type\Configurable $catalogProductTypeConfigurable
      * @param \Magento\Catalog\Helper\Data $catalogData
      * @param \Magento\ConfigurableProduct\Model\Resource\Product\Type\Configurable\Attribute $resource
@@ -83,7 +83,7 @@ public function __construct(
         \Psr\Log\LoggerInterface $logger,
         \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
         \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\ConfigurableProduct\Model\Product\Type\Configurable $catalogProductTypeConfigurable,
         \Magento\Catalog\Helper\Data $catalogData,
         \Magento\ConfigurableProduct\Model\Resource\Product\Type\Configurable\Attribute $resource,
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/AttributePrice.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/AttributePrice.php
index 8ee7d54d4518a..706d41d867bad 100644
--- a/app/code/Magento/ConfigurableProduct/Pricing/Price/AttributePrice.php
+++ b/app/code/Magento/ConfigurableProduct/Pricing/Price/AttributePrice.php
@@ -29,7 +29,7 @@ class AttributePrice extends AbstractPrice implements AttributePriceInterface
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -44,7 +44,7 @@ class AttributePrice extends AbstractPrice implements AttributePriceInterface
      * @param CalculatorInterface $calculator
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param PriceModifierInterface $modifier
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         Product $saleableItem,
@@ -52,7 +52,7 @@ public function __construct(
         CalculatorInterface $calculator,
         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
         PriceModifierInterface $modifier,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->priceCurrency = $priceCurrency;
         $this->priceModifier = $modifier;
diff --git a/app/code/Magento/Contact/Controller/Index.php b/app/code/Magento/Contact/Controller/Index.php
index 6335cf80724f9..d144b198916e8 100644
--- a/app/code/Magento/Contact/Controller/Index.php
+++ b/app/code/Magento/Contact/Controller/Index.php
@@ -7,7 +7,7 @@
 
 use Magento\Framework\App\Action\NotFoundException;
 use Magento\Framework\App\RequestInterface;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Contact index controller
@@ -50,7 +50,7 @@ class Index extends \Magento\Framework\App\Action\Action
     protected $scopeConfig;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -59,14 +59,14 @@ class Index extends \Magento\Framework\App\Action\Action
      * @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
      * @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
         \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
         \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         parent::__construct($context);
         $this->_transportBuilder = $transportBuilder;
diff --git a/app/code/Magento/Contact/Controller/Index/Post.php b/app/code/Magento/Contact/Controller/Index/Post.php
index 812e7818a6627..8c4e719065080 100644
--- a/app/code/Magento/Contact/Controller/Index/Post.php
+++ b/app/code/Magento/Contact/Controller/Index/Post.php
@@ -45,7 +45,7 @@ public function execute()
                 throw new \Exception();
             }
 
-            $storeScope = \Magento\Framework\Store\ScopeInterface::SCOPE_STORE;
+            $storeScope = \Magento\Store\Model\ScopeInterface::SCOPE_STORE;
             $transport = $this->_transportBuilder
                 ->setTemplateIdentifier($this->scopeConfig->getValue(self::XML_PATH_EMAIL_TEMPLATE, $storeScope))
                 ->setTemplateOptions(
diff --git a/app/code/Magento/Contact/Helper/Data.php b/app/code/Magento/Contact/Helper/Data.php
index c18494f3dcb68..86a94346806e1 100644
--- a/app/code/Magento/Contact/Helper/Data.php
+++ b/app/code/Magento/Contact/Helper/Data.php
@@ -62,7 +62,7 @@ public function isEnabled()
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
diff --git a/app/code/Magento/Contact/etc/acl.xml b/app/code/Magento/Contact/etc/acl.xml
index adcb100513a93..363ab6f81ad82 100644
--- a/app/code/Magento/Contact/etc/acl.xml
+++ b/app/code/Magento/Contact/etc/acl.xml
@@ -8,10 +8,10 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::stores">
-                    <resource id="Magento_Adminhtml::stores_settings">
-                        <resource id="Magento_Adminhtml::config">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::stores">
+                    <resource id="Magento_Backend::stores_settings">
+                        <resource id="Magento_Backend::config">
                             <resource id="Magento_Contact::contact" title="Contacts Section" />
                         </resource>
                     </resource>
diff --git a/app/code/Magento/Cookie/Helper/Cookie.php b/app/code/Magento/Cookie/Helper/Cookie.php
index 86f011311c247..a1d291261f636 100644
--- a/app/code/Magento/Cookie/Helper/Cookie.php
+++ b/app/code/Magento/Cookie/Helper/Cookie.php
@@ -42,7 +42,7 @@ class Cookie extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param array $data
      *
@@ -50,7 +50,7 @@ class Cookie extends \Magento\Framework\App\Helper\AbstractHelper
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         array $data = []
     ) {
@@ -79,7 +79,7 @@ public function isUserNotAllowSaveCookie()
         $acceptedSaveCookiesWebsites = $this->_getAcceptedSaveCookiesWebsites();
         return $this->_scopeConfig->getValue(
             self::XML_PATH_COOKIE_RESTRICTION,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->_currentStore
         ) && empty($acceptedSaveCookiesWebsites[$this->_website->getId()]);
     }
@@ -117,7 +117,7 @@ public function getCookieRestrictionLifetime()
     {
         return (int)$this->_scopeConfig->getValue(
             self::XML_PATH_COOKIE_RESTRICTION_LIFETIME,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->_currentStore
         );
     }
diff --git a/app/code/Magento/Core/App/Router/Base.php b/app/code/Magento/Core/App/Router/Base.php
index 9b84da13d6272..58175d62b1726 100644
--- a/app/code/Magento/Core/App/Router/Base.php
+++ b/app/code/Magento/Core/App/Router/Base.php
@@ -67,7 +67,7 @@ class Base implements \Magento\Framework\App\RouterInterface
     protected $_url;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -115,7 +115,7 @@ class Base implements \Magento\Framework\App\RouterInterface
      * @param \Magento\Framework\App\ResponseFactory $responseFactory
      * @param \Magento\Framework\App\Route\ConfigInterface $routeConfig
      * @param \Magento\Framework\UrlInterface $url
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo
      * @param string $routerId
@@ -131,7 +131,7 @@ public function __construct(
         \Magento\Framework\App\ResponseFactory $responseFactory,
         \Magento\Framework\App\Route\ConfigInterface $routeConfig,
         \Magento\Framework\UrlInterface $url,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo,
         $routerId,
@@ -330,7 +330,7 @@ protected function matchAction(\Magento\Framework\App\RequestInterface $request,
      */
     protected function _getDefaultPath()
     {
-        return $this->_scopeConfig->getValue('web/default/front', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue('web/default/front', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
@@ -406,14 +406,14 @@ protected function _shouldBeSecure($path)
         return parse_url(
             $this->_scopeConfig->getValue(
                 'web/unsecure/base_url',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             ),
             PHP_URL_SCHEME
         ) === 'https' || $this->_scopeConfig->isSetFlag(
             \Magento\Store\Model\Store::XML_PATH_SECURE_IN_FRONTEND,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         ) && parse_url(
-            $this->_scopeConfig->getValue('web/secure/base_url', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+            $this->_scopeConfig->getValue('web/secure/base_url', \Magento\Store\Model\ScopeInterface::SCOPE_STORE),
             PHP_URL_SCHEME
         ) == 'https' && $this->_urlSecurityInfo->isSecure(
             $path
diff --git a/app/code/Magento/Core/Helper/Data.php b/app/code/Magento/Core/Helper/Data.php
index b1763205c9c89..21809fba96716 100644
--- a/app/code/Magento/Core/Helper/Data.php
+++ b/app/code/Magento/Core/Helper/Data.php
@@ -55,7 +55,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     protected $_scopeConfig;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -77,7 +77,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\State $appState
      * @param PriceCurrencyInterface $priceCurrency
      * @param bool $dbCompatibleMode
@@ -85,7 +85,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\State $appState,
         PriceCurrencyInterface $priceCurrency,
         $dbCompatibleMode = true
@@ -172,7 +172,7 @@ public function isDevAllowed($storeId = null)
 
         $allowedIps = $this->_scopeConfig->getValue(
             self::XML_PATH_DEV_ALLOW_IPS,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeId
         );
         $remoteAddr = $this->_remoteAddress->getRemoteAddress();
@@ -242,7 +242,7 @@ public function getDefaultCountry($store = null)
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_DEFAULT_COUNTRY,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
diff --git a/app/code/Magento/Core/Helper/Url.php b/app/code/Magento/Core/Helper/Url.php
index e3096f6839474..270a8194bccd9 100644
--- a/app/code/Magento/Core/Helper/Url.php
+++ b/app/code/Magento/Core/Helper/Url.php
@@ -14,17 +14,17 @@
 class Url extends \Magento\Framework\App\Helper\AbstractHelper
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         parent::__construct($context);
         $this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Core/Model/File/Storage.php b/app/code/Magento/Core/Model/File/Storage.php
index 0d9d138c3ad96..540c0b8fb19a0 100644
--- a/app/code/Magento/Core/Model/File/Storage.php
+++ b/app/code/Magento/Core/Model/File/Storage.php
@@ -292,7 +292,7 @@ public function getScriptConfig()
             $config['allowed_resources'][] = $allowedResource;
         }
 
-        $config['update_time'] = $this->_scopeConfig->getValue(self::XML_PATH_MEDIA_UPDATE_TIME, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        $config['update_time'] = $this->_scopeConfig->getValue(self::XML_PATH_MEDIA_UPDATE_TIME, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
 
         return $config;
     }
diff --git a/app/code/Magento/Core/Model/File/Validator/NotProtectedExtension.php b/app/code/Magento/Core/Model/File/Validator/NotProtectedExtension.php
index 1f555aef0dfc2..a4e57209398de 100644
--- a/app/code/Magento/Core/Model/File/Validator/NotProtectedExtension.php
+++ b/app/code/Magento/Core/Model/File/Validator/NotProtectedExtension.php
@@ -99,7 +99,7 @@ protected function _initProtectedFileExtensions()
      */
     public function getProtectedFileExtensions($store = null)
     {
-        return $this->_scopeConfig->getValue(self::XML_PATH_PROTECTED_FILE_EXTENSIONS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+        return $this->_scopeConfig->getValue(self::XML_PATH_PROTECTED_FILE_EXTENSIONS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
     }
 
     /**
diff --git a/app/code/Magento/Core/composer.json b/app/code/Magento/Core/composer.json
index ae27a5d6214c4..9ad63e9c43eb8 100644
--- a/app/code/Magento/Core/composer.json
+++ b/app/code/Magento/Core/composer.json
@@ -5,8 +5,6 @@
         "php": "~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta7",
         "magento/module-backend": "0.42.0-beta7",
-        "magento/module-theme": "0.42.0-beta7",
-        "magento/module-page-cache": "0.42.0-beta7",
         "magento/framework": "0.42.0-beta7",
         "lib-libxml": "*",
         "magento/magento-composer-installer": "*"
diff --git a/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php b/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php
index f63086dd9f7af..a1f195ab31c28 100644
--- a/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php
+++ b/app/code/Magento/Core/data/core_setup/data-install-2.0.0.php
@@ -15,13 +15,6 @@
     \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_PLAIN,
     ['config_id']
 );
-$installer->appendClassAliasReplace(
-    'core_layout_update',
-    'xml',
-    \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_BLOCK,
-    \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_XML,
-    ['layout_update_id']
-);
 $installer->doUpdateClassAliases();
 
 /**
diff --git a/app/code/Magento/Core/etc/di.xml b/app/code/Magento/Core/etc/di.xml
index 751643e14c78d..660ff5429aea4 100644
--- a/app/code/Magento/Core/etc/di.xml
+++ b/app/code/Magento/Core/etc/di.xml
@@ -6,375 +6,12 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
-    <preference for="Magento\Framework\Acl\CacheInterface" type="Magento\Framework\Acl\Cache" />
-    <preference for="Magento\Framework\App\AreaInterface" type="Magento\Framework\App\Area" />
-    <preference for="Magento\Framework\Module\Updater\SetupInterface" type="Magento\Framework\Module\DataSetup" />
-    <preference for="Magento\Framework\Module\ResourceResolverInterface" type="Magento\Framework\Module\ResourceResolver" />
-    <preference for="Magento\Framework\AuthorizationInterface" type="Magento\Framework\Authorization" />
-    <preference for="Magento\Framework\Authorization\PolicyInterface" type="Magento\Framework\Authorization\Policy\DefaultPolicy" />
-    <preference for="Magento\Framework\Authorization\RoleLocatorInterface" type="Magento\Framework\Authorization\RoleLocator\DefaultRoleLocator" />
-    <preference for="Magento\Framework\Session\SessionManagerInterface" type="Magento\Framework\Session\Generic" />
-    <preference for="Magento\Framework\App\Config\ScopeConfigInterface" type="Magento\Framework\App\Config" />
-    <preference for="Magento\Framework\App\Config\ReinitableConfigInterface" type="Magento\Framework\App\ReinitableConfig" />
-    <preference for="Magento\Framework\App\Config\MutableScopeConfigInterface" type="Magento\Framework\App\MutableScopeConfig" />
-    <preference for="Magento\Framework\App\Config\Storage\WriterInterface" type="Magento\Framework\App\Config\Storage\Writer" />
-    <preference for="Magento\Framework\View\Design\Theme\FileInterface" type="Magento\Theme\Model\Theme\File" />
-    <preference for="Magento\Framework\Config\ConverterInterface" type="Magento\Framework\Config\Converter\Dom"/>
-    <preference for="Magento\Framework\App\DefaultPathInterface" type="Magento\Framework\App\DefaultPath\DefaultPath" />
-    <preference for="Magento\Framework\Encryption\EncryptorInterface" type="Magento\Framework\Encryption\Encryptor" />
-    <preference for="Magento\Framework\Filter\Encrypt\AdapterInterface" type="Magento\Framework\Filter\Encrypt\Basic" />
-    <preference for="Magento\Framework\Cache\ConfigInterface" type="Magento\Framework\Cache\Config" />
-    <preference for="Magento\Framework\View\Design\Theme\ThemeProviderInterface" type="Magento\Theme\Model\Theme\ThemeProvider" />
-    <preference for="Magento\Framework\View\Design\Theme\FileProviderInterface" type="Magento\Theme\Model\Theme\FileProvider" />
-    <preference for="Magento\Framework\View\Design\Theme\Customization\ConfigInterface" type="Magento\Theme\Model\Theme\Customization\Config" />
-    <preference for="Magento\Framework\View\Asset\ConfigInterface" type="Magento\Framework\View\Asset\Config" />
-    <preference for="Magento\Framework\View\Asset\MergeStrategyInterface" type="Magento\Framework\View\Asset\MergeStrategy\Direct" />
-    <preference for="Magento\Framework\App\ViewInterface" type="Magento\Framework\App\View" />
-    <preference for="Magento\Framework\TranslateInterface" type="Magento\Framework\Translate" />
-    <preference for="Magento\Framework\App\Response\RedirectInterface" type="Magento\Store\App\Response\Redirect" />
-    <preference for="Magento\Framework\Data\Collection\EntityFactoryInterface" type="Magento\Framework\Data\Collection\EntityFactory" />
-    <preference for="Magento\Framework\Translate\InlineInterface" type="Magento\Framework\Translate\Inline" />
-    <preference for="Magento\Framework\Translate\Inline\ConfigInterface" type="Magento\Translation\Model\Inline\Config" />
-    <preference for="Magento\Framework\Translate\Inline\ParserInterface" type="Magento\Translation\Model\Inline\Parser" />
-    <preference for="Magento\Framework\Session\ValidatorInterface" type="Magento\Framework\Session\Validator" />
-    <preference for="Magento\Framework\Session\StorageInterface" type="Magento\Framework\Session\Storage" />
-    <preference for="Magento\Framework\Url\RouteParamsResolverInterface" type="Magento\Framework\Url\RouteParamsResolver" />
-    <preference for="Magento\Framework\Url\QueryParamsResolverInterface" type="Magento\Framework\Url\QueryParamsResolver" />
-    <preference for="Magento\Framework\Url\ScopeResolverInterface" type="Magento\Framework\Url\ScopeResolver" />
-    <preference for="Magento\Framework\Url\SecurityInfoInterface" type="Magento\Framework\Url\SecurityInfo\Proxy" />
-    <preference for="Magento\Framework\Mview\ConfigInterface" type="Magento\Framework\Mview\Config" />
-    <preference for="Magento\Framework\Mview\ViewInterface" type="Magento\Framework\Mview\View" />
-    <preference for="Magento\Framework\Mview\ProcessorInterface" type="Magento\Framework\Mview\Processor" />
-    <preference for="Magento\Framework\Mview\View\CollectionInterface" type="Magento\Framework\Mview\View\Collection" />
-    <preference for="Magento\Framework\Mview\View\SubscriptionInterface" type="Magento\Framework\Mview\View\Subscription" />
-    <preference for="Magento\Framework\Css\PreProcessor\AdapterInterface" type="Magento\Framework\Css\PreProcessor\Adapter\Oyejorge" />
-    <preference for="Magento\Framework\Translate\ResourceInterface" type="Magento\Translation\Model\Resource\Translate" />
-    <preference for="Magento\Framework\LocaleInterface" type="Magento\Framework\Locale" />
-    <preference for="Magento\Framework\Locale\CurrencyInterface" type="Magento\Framework\Locale\Currency" />
-    <preference for="Magento\Framework\CurrencyInterface" type="Magento\Framework\Currency" />
-    <preference for="Magento\Framework\Locale\FormatInterface" type="Magento\Framework\Locale\Format" />
-    <preference for="Magento\Framework\Locale\ResolverInterface" type="Magento\Framework\Locale\Resolver" />
-    <preference for="Magento\Framework\Stdlib\DateTime\TimezoneInterface" type="Magento\Framework\Stdlib\DateTime\Timezone" />
-    <preference for="Magento\Framework\Stdlib\DateTime\DateInterface" type="Magento\Framework\Stdlib\DateTime\Date" />
-    <preference for="Magento\Framework\Less\PreProcessor\ErrorHandlerInterface" type="Magento\Framework\Less\PreProcessor\ErrorHandler" />
-    <preference for="Magento\Framework\Module\ResourceInterface" type="Magento\Framework\Module\Resource" />
     <preference for="Magento\Framework\App\Config\Resource\ConfigInterface" type="Magento\Core\Model\Resource\Config" />
-    <preference for="Magento\Framework\App\DesignInterface" type="Magento\Theme\Model\Design" />
-    <preference for="Magento\Framework\Pricing\Amount\AmountInterface" type="Magento\Framework\Pricing\Amount\Base" />
-    <preference for="Magento\Framework\View\Page\FaviconInterface" type="Magento\Theme\Model\Favicon\Favicon" />
-    <preference for="Magento\Framework\Api\SearchResultsInterface" type="Magento\Framework\Api\SearchResults" />
-    <preference for="Magento\Framework\Api\SearchCriteriaInterface" type="Magento\Framework\Api\SearchCriteria" />
-    <preference for="Magento\Framework\Api\AttributeInterface" type="Magento\Framework\Api\AttributeValue" />
-    <preference for="Magento\Framework\View\Design\Theme\ListInterface" type="Magento\Theme\Model\Theme\Collection" />
-    <type name="Magento\Framework\App\DefaultPath\DefaultPath">
-        <arguments>
-            <argument name="parts" xsi:type="array">
-                <item name="module" xsi:type="string">core</item>
-                <item name="controller" xsi:type="string">index</item>
-                <item name="action" xsi:type="string">index</item>
-            </argument>
-        </arguments>
-    </type>
-    <type name="Magento\Framework\App\AreaList">
-        <arguments>
-            <argument name="areas" xsi:type="array">
-                <item name="frontend" xsi:type="array">
-                    <item name="frontName" xsi:type="null" />
-                    <item name="router" xsi:type="string">standard</item>
-                </item>
-            </argument>
-            <argument name="default" xsi:type="string">frontend</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Framework\Data\Structure" shared="false" />
-    <type name="Magento\Framework\Data\Collection\Db\FetchStrategy\Cache">
-        <arguments>
-            <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Collection</argument>
-            <argument name="cacheIdPrefix" xsi:type="string">collection_</argument>
-            <argument name="cacheLifetime" xsi:type="string">86400</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Framework\Event\Config\Data">
-        <arguments>
-            <argument name="reader" xsi:type="object">Magento\Framework\Event\Config\Reader\Proxy</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Framework\Acl\Cache">
-        <arguments>
-            <argument name="cacheKey" xsi:type="string">global_acl_resources</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Framework\View\Asset\Collection" shared="false" />
-    <type name="Magento\Theme\Model\Theme\Collection" shared="false" />
-    <type name="Magento\Core\Model\Layout\Merge">
-        <arguments>
-            <argument name="fileSource" xsi:type="object">Magento\Framework\View\Layout\File\Collector\Aggregated\Proxy</argument>
-            <argument name="pageLayoutFileSource" xsi:type="object">pageLayoutFileCollectorAggregated</argument>
-            <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Layout</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Core\Model\Resource\Layout\Update">
-        <arguments>
-            <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Layout</argument>
-        </arguments>
-    </type>
-
-    <virtualType name="layoutFileSourceBase" type="Magento\Framework\View\File\Collector\Base">
-        <arguments>
-            <argument name="subDir" xsi:type="string">layout</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="layoutFileSourceBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
-        <arguments>
-            <argument name="subject" xsi:type="object">layoutFileSourceBase</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="layoutFileSourceBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
-        <arguments>
-            <argument name="subject" xsi:type="object">layoutFileSourceBaseFiltered</argument>
-        </arguments>
-    </virtualType>
-
-    <virtualType name="layoutFileSourceTheme" type="Magento\Framework\View\File\Collector\ThemeModular">
-        <arguments>
-            <argument name="subDir" xsi:type="string">layout</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="layoutFileSourceThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
-        <arguments>
-            <argument name="subject" xsi:type="object">layoutFileSourceTheme</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="layoutFileSourceThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
-        <arguments>
-            <argument name="subject" xsi:type="object">layoutFileSourceThemeFiltered</argument>
-        </arguments>
-    </virtualType>
-
-    <virtualType name="layoutFileSourceOverrideBase" type="Magento\Framework\View\File\Collector\Override\Base">
-        <arguments>
-            <argument name="subDir" xsi:type="string">layout/override/base</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="layoutFileSourceOverrideBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
-        <arguments>
-            <argument name="subject" xsi:type="object">layoutFileSourceOverrideBase</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="layoutFileSourceOverrideBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
-        <arguments>
-            <argument name="subject" xsi:type="object">layoutFileSourceOverrideBaseFiltered</argument>
-        </arguments>
-    </virtualType>
-
-    <virtualType name="layoutFileSourceOverrideTheme" type="Magento\Framework\View\File\Collector\Override\ThemeModular">
-        <arguments>
-            <argument name="subDir" xsi:type="string">layout/override/theme</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="layoutFileSourceOverrideThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
-        <arguments>
-            <argument name="subject" xsi:type="object">layoutFileSourceOverrideTheme</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="layoutFileSourceOverrideThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
-        <arguments>
-            <argument name="subject" xsi:type="object">layoutFileSourceOverrideThemeFiltered</argument>
-        </arguments>
-    </virtualType>
-
-    <type name="Magento\Framework\View\Layout\File\Collector\Aggregated">
-        <arguments>
-            <argument name="baseFiles" xsi:type="object">layoutFileSourceBaseSorted</argument>
-            <argument name="themeFiles" xsi:type="object">layoutFileSourceThemeSorted</argument>
-            <argument name="overrideBaseFiles" xsi:type="object">layoutFileSourceOverrideBaseSorted</argument>
-            <argument name="overrideThemeFiles" xsi:type="object">layoutFileSourceOverrideThemeSorted</argument>
-        </arguments>
-    </type>
-
-    <virtualType name="pageLayoutFileSourceBase" type="Magento\Framework\View\File\Collector\Base">
-        <arguments>
-            <argument name="subDir" xsi:type="string">page_layout</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="pageLayoutFileSourceBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
-        <arguments>
-            <argument name="subject" xsi:type="object">pageLayoutFileSourceBase</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="pageLayoutFileSourceBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
-        <arguments>
-            <argument name="subject" xsi:type="object">pageLayoutFileSourceBaseFiltered</argument>
-        </arguments>
-    </virtualType>
-
-    <virtualType name="pageLayoutFileSourceTheme" type="Magento\Framework\View\File\Collector\ThemeModular">
-        <arguments>
-            <argument name="subDir" xsi:type="string">page_layout</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="pageLayoutFileSourceThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
-        <arguments>
-            <argument name="subject" xsi:type="object">pageLayoutFileSourceTheme</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="pageLayoutFileSourceThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
-        <arguments>
-            <argument name="subject" xsi:type="object">pageLayoutFileSourceThemeFiltered</argument>
-        </arguments>
-    </virtualType>
-
-    <virtualType name="pageLayoutFileSourceOverrideBase" type="Magento\Framework\View\File\Collector\Override\Base">
-        <arguments>
-            <argument name="subDir" xsi:type="string">page_layout/override/base</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="pageLayoutFileSourceOverrideBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
-        <arguments>
-            <argument name="subject" xsi:type="object">pageLayoutFileSourceOverrideBase</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="pageLayoutFileSourceOverrideBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
-        <arguments>
-            <argument name="subject" xsi:type="object">pageLayoutFileSourceOverrideBaseFiltered</argument>
-        </arguments>
-    </virtualType>
-
-    <virtualType name="pageLayoutFileSourceOverrideTheme" type="Magento\Framework\View\File\Collector\Override\ThemeModular">
-        <arguments>
-            <argument name="subDir" xsi:type="string">page_layout/override/theme</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="pageLayoutFileSourceOverrideThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
-        <arguments>
-            <argument name="subject" xsi:type="object">pageLayoutFileSourceOverrideTheme</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="pageLayoutFileSourceOverrideThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
-        <arguments>
-            <argument name="subject" xsi:type="object">pageLayoutFileSourceOverrideThemeFiltered</argument>
-        </arguments>
-    </virtualType>
-
-    <virtualType name="pageLayoutFileCollectorAggregated" type="Magento\Framework\View\Layout\File\Collector\Aggregated">
-        <arguments>
-            <argument name="baseFiles" xsi:type="object">pageLayoutFileSourceBaseSorted</argument>
-            <argument name="themeFiles" xsi:type="object">pageLayoutFileSourceThemeSorted</argument>
-            <argument name="overrideBaseFiles" xsi:type="object">pageLayoutFileSourceOverrideBaseSorted</argument>
-            <argument name="overrideThemeFiles" xsi:type="object">pageLayoutFileSourceOverrideThemeSorted</argument>
-        </arguments>
-    </virtualType>
-
-    <virtualType name="pageFileSourceBase" type="Magento\Framework\View\File\Collector\Base"/>
-    <virtualType name="pageFileSourceBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
-        <arguments>
-            <argument name="subject" xsi:type="object">pageFileSourceBase</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="pageFileSourceBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
-        <arguments>
-            <argument name="subject" xsi:type="object">pageFileSourceBaseFiltered</argument>
-        </arguments>
-    </virtualType>
-
-    <virtualType name="pageFileSourceTheme" type="Magento\Framework\View\File\Collector\ThemeModular"/>
-    <virtualType name="pageFileSourceThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
-        <arguments>
-            <argument name="subject" xsi:type="object">pageFileSourceTheme</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="pageFileSourceThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
-        <arguments>
-            <argument name="subject" xsi:type="object">pageFileSourceThemeFiltered</argument>
-        </arguments>
-    </virtualType>
-
-    <virtualType name="pageFileSourceOverrideBase" type="Magento\Framework\View\File\Collector\Override\Base">
-        <arguments>
-            <argument name="subDir" xsi:type="string">page/override</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="pageFileSourceOverrideBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
-        <arguments>
-            <argument name="subject" xsi:type="object">pageFileSourceOverrideBase</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="pageFileSourceOverrideBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
-        <arguments>
-            <argument name="subject" xsi:type="object">pageFileSourceOverrideBaseFiltered</argument>
-        </arguments>
-    </virtualType>
-
-    <virtualType name="pageFileSourceOverrideTheme" type="Magento\Framework\View\File\Collector\Override\ThemeModular">
-        <arguments>
-            <argument name="subDir" xsi:type="string">override/theme</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="pageFileSourceOverrideThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
-        <arguments>
-            <argument name="subject" xsi:type="object">pageFileSourceOverrideTheme</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="pageFileSourceOverrideThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
-        <arguments>
-            <argument name="subject" xsi:type="object">pageFileSourceOverrideThemeFiltered</argument>
-        </arguments>
-    </virtualType>
-
-    <virtualType name="pageLayoutRenderPool" type="Magento\Framework\View\Layout\ReaderPool">
-        <arguments>
-            <argument name="readers" xsi:type="array">
-                <item name="container" xsi:type="string">Magento\Framework\View\Layout\Reader\Container</item>
-                <item name="move" xsi:type="string">Magento\Framework\View\Layout\Reader\Move</item>
-                <item name="remove" xsi:type="string">Magento\Framework\View\Layout\Reader\Remove</item>
-            </argument>
-        </arguments>
-    </virtualType>
-    <type name="Magento\Framework\View\Page\Layout\Reader">
-        <arguments>
-            <argument name="pageLayoutFileSource" xsi:type="object">pageLayoutFileCollectorAggregated</argument>
-            <argument name="reader" xsi:type="object">pageLayoutRenderPool</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Framework\View\PageLayout\File\Collector\Aggregated">
-        <arguments>
-            <argument name="baseFiles" xsi:type="object">pageFileSourceBaseSorted</argument>
-            <argument name="themeFiles" xsi:type="object">pageFileSourceThemeSorted</argument>
-            <argument name="overrideBaseFiles" xsi:type="object">pageFileSourceOverrideBaseSorted</argument>
-            <argument name="overrideThemeFiles" xsi:type="object">pageFileSourceOverrideThemeSorted</argument>
-        </arguments>
-    </type>
-
-    <type name="Magento\Framework\View\Design\Theme\Image">
-        <arguments>
-            <argument name="uploader" xsi:type="object">Magento\Framework\View\Design\Theme\Image\Uploader\Proxy</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Framework\App\Config\ScopePool">
-        <arguments>
-            <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Framework\App\Config\Initial">
-        <arguments>
-            <argument name="reader" xsi:type="object">Magento\Framework\App\Config\Initial\Reader\Proxy</argument>
-        </arguments>
-    </type>
     <type name="Magento\Framework\App\Config\Initial\SchemaLocator">
         <arguments>
             <argument name="moduleName" xsi:type="string">Magento_Core</argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\App\Config\Initial\Reader">
-        <arguments>
-            <argument name="converter" xsi:type="object">Magento\Framework\App\Config\Initial\Converter</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Framework\App\Route\Config">
-        <arguments>
-            <argument name="reader" xsi:type="object">Magento\Framework\App\Route\Config\Reader\Proxy</argument>
-        </arguments>
-    </type>
     <type name="Magento\Core\App\Router\Base">
         <arguments>
             <argument name="routerId" xsi:type="string">standard</argument>
@@ -390,40 +27,6 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\Session\Validator">
-        <arguments>
-            <argument name="skippedUserAgentList" xsi:type="array">
-                <item name="flash" xsi:type="string">Shockwave Flash</item>
-                <item name="flash_mac" xsi:type="string"><![CDATA[Adobe Flash Player\s{1,}\w{1,10}]]></item>
-            </argument>
-        </arguments>
-    </type>
-    <type name="Magento\Theme\Model\View\Design">
-        <arguments>
-            <argument name="themes" xsi:type="array">
-                <item name="frontend" xsi:type="string">Magento/blank</item>
-                <item name="adminhtml" xsi:type="string">Magento/backend</item>
-            </argument>
-        </arguments>
-    </type>
-    <type name="Magento\Framework\Object\Copy\Config\Reader">
-        <arguments>
-            <argument name="fileName" xsi:type="string">fieldset.xml</argument>
-            <argument name="schemaLocator" xsi:type="object">Magento\Framework\Object\Copy\Config\SchemaLocator</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Framework\Object\Copy\Config\SchemaLocator">
-        <arguments>
-            <argument name="schema" xsi:type="string">lib/internal/Magento/Framework/Object/etc/fieldset.xsd</argument>
-            <argument name="perFileSchema" xsi:type="string">lib/internal/Magento/Framework/Object/etc/fieldset_file.xsd</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Framework\Object\Copy\Config\Data">
-        <arguments>
-            <argument name="reader" xsi:type="object">Magento\Framework\Object\Copy\Config\Reader\Proxy</argument>
-            <argument name="cacheId" xsi:type="string">fieldset_config</argument>
-        </arguments>
-    </type>
     <type name="Magento\Framework\DB\Helper">
         <arguments>
             <argument name="modulePrefix" xsi:type="string">core</argument>
@@ -437,12 +40,6 @@
             <argument name="connectionName" xsi:type="string">\Magento\Framework\Module\Updater\SetupInterface::DEFAULT_SETUP_CONNECTION</argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\App\Helper\Context">
-        <arguments>
-            <argument name="urlBuilder" xsi:type="object">Magento\Framework\UrlInterface\Proxy</argument>
-            <argument name="httpRequest" xsi:type="object">Magento\Framework\App\Request\Http\Proxy</argument>
-        </arguments>
-    </type>
     <type name="Magento\Core\Helper\File\Storage">
         <arguments>
             <argument name="storage" xsi:type="object">Magento\Core\Model\File\Storage\Proxy</argument>
@@ -453,46 +50,7 @@
             <argument name="fileStorage" xsi:type="object">Magento\Core\Model\File\Storage\File\Proxy</argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\Image">
-        <arguments>
-            <argument name="adapter" xsi:type="object">Magento\Framework\Image\Adapter\Gd2</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Framework\View\Layout\PageType\Config\Reader">
-        <arguments>
-            <argument name="fileName" xsi:type="string">page_types.xml</argument>
-            <argument name="converter" xsi:type="object">Magento\Framework\View\Layout\PageType\Config\Converter</argument>
-            <argument name="schemaLocator" xsi:type="object">Magento\Framework\View\Layout\PageType\Config\SchemaLocator</argument>
-            <argument name="defaultScope" xsi:type="string">frontend</argument>
-        </arguments>
-    </type>
-    <virtualType name="Magento\Framework\View\Layout\PageType\Config\Data" type="Magento\Framework\Config\Data">
-        <arguments>
-            <argument name="reader" xsi:type="object">Magento\Framework\View\Layout\PageType\Config\Reader</argument>
-            <argument name="cacheId" xsi:type="string">page_types_config</argument>
-        </arguments>
-    </virtualType>
-    <type name="Magento\Framework\View\Layout\PageType\Config">
-        <arguments>
-            <argument name="dataStorage" xsi:type="object">Magento\Framework\View\Layout\PageType\Config\Data</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Framework\App\Area">
-        <arguments>
-            <argument name="translator" xsi:type="object">Magento\Framework\Translate</argument>
-            <argument name="design" xsi:type="object">Magento\Theme\Model\Design\Proxy</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Framework\App\FrontController">
-        <plugin name="install" type="Magento\Framework\Module\Plugin\DbStatusValidator" sortOrder="40"/>
-    </type>
-    <type name="Magento\Framework\Module\Plugin\DbStatusValidator">
-        <arguments>
-            <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
-        </arguments>
-    </type>
     <type name="Magento\Framework\App\Action\Action">
-        <plugin name="storeCheck" type="Magento\Store\App\Action\Plugin\StoreCheck" sortOrder="10"/>
         <plugin name="designLoader" type="Magento\Core\App\Action\Plugin\Design" sortOrder="30"/>
     </type>
     <virtualType name="Magento\Core\Model\Session\Storage" type="Magento\Framework\Session\Storage">
@@ -505,137 +63,20 @@
             <argument name="storage" xsi:type="object">Magento\Core\Model\Session\Storage</argument>
         </arguments>
     </type>
-    <virtualType name="Magento\Framework\Message\Session\Storage" type="Magento\Framework\Session\Storage">
-        <arguments>
-            <argument name="namespace" xsi:type="string">message</argument>
-        </arguments>
-    </virtualType>
-    <type name="Magento\Framework\Message\Session">
-        <arguments>
-            <argument name="storage" xsi:type="object">Magento\Framework\Message\Session\Storage</argument>
-        </arguments>
-    </type>
     <type name="Magento\Framework\View\Asset\MergeService">
         <plugin name="cleanMergedJsCss" type="Magento\Core\Model\Asset\Plugin\CleanMergedJsCss"/>
     </type>
-    <type name="Magento\Framework\Url\ScopeResolver">
-        <arguments>
-            <argument name="areaCode" xsi:type="string">frontend</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Framework\Less\PreProcessor\Instruction\MagentoImport">
-        <arguments>
-            <argument name="fileSource" xsi:type="object">Magento\Framework\Less\File\Collector\Aggregated</argument>
-        </arguments>
-    </type>
-    <virtualType name="lessFileSourceBase" type="Magento\Framework\View\File\Collector\Base">
-        <arguments>
-            <argument name="subDir" xsi:type="string">web</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="lessFileSourceBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
-        <arguments>
-            <argument name="subject" xsi:type="object">lessFileSourceBase</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="lessFileSourceBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
-        <arguments>
-            <argument name="subject" xsi:type="object">lessFileSourceBaseFiltered</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="lessFileOverriddenBase" type="Magento\Framework\View\File\Collector\Override\Base">
-        <arguments>
-            <argument name="subDir" xsi:type="string">web</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="lessFileSourceThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
-        <arguments>
-            <argument name="subject" xsi:type="object">lessFileSourceTheme</argument>
-        </arguments>
-    </virtualType>
-    <virtualType name="lessFileSourceThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
-        <arguments>
-            <argument name="subject" xsi:type="object">lessFileSourceThemeFiltered</argument>
-        </arguments>
-    </virtualType>
-    <type name="Magento\Framework\Less\File\Collector\Aggregated">
-        <arguments>
-            <argument name="libraryFiles" xsi:type="object">Magento\Framework\Less\File\Collector\Library</argument>
-            <argument name="baseFiles" xsi:type="object">lessFileSourceBaseSorted</argument>
-            <argument name="overriddenBaseFiles" xsi:type="object">lessFileOverriddenBase</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Framework\App\Config\Initial\Converter">
-        <arguments>
-            <argument name="nodeMap" xsi:type="array">
-                <item name="default" xsi:type="string">/config/default</item>
-                <item name="stores" xsi:type="string">/config/stores</item>
-                <item name="websites" xsi:type="string">/config/websites</item>
-            </argument>
-        </arguments>
-    </type>
     <type name="Magento\Framework\Stdlib\DateTime\Timezone">
         <arguments>
             <argument name="defaultTimezonePath" xsi:type="const">Magento\Core\Helper\Data::XML_PATH_DEFAULT_TIMEZONE</argument>
-            <argument name="scopeType" xsi:type="const">Magento\Framework\Store\ScopeInterface::SCOPE_STORE</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Framework\Url">
-        <arguments>
-            <argument name="scopeType" xsi:type="const">Magento\Framework\Store\ScopeInterface::SCOPE_STORE</argument>
+            <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
         </arguments>
     </type>
     <type name="Magento\Framework\Locale\Resolver">
         <plugin name="initLocale" type="Magento\Framework\Translate\Locale\Resolver\Plugin" sortOrder="10"/>
         <arguments>
             <argument name="defaultLocalePath" xsi:type="const">Magento\Core\Helper\Data::XML_PATH_DEFAULT_LOCALE</argument>
-            <argument name="scopeType" xsi:type="const">Magento\Framework\Store\ScopeInterface::SCOPE_STORE</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Framework\App\ScopeResolverPool">
-        <arguments>
-            <argument name="scopeResolvers" xsi:type="array">
-                <item name="store" xsi:type="object">Magento\Store\Model\Resolver\Store</item>
-                <item name="stores" xsi:type="object">Magento\Store\Model\Resolver\Store</item>
-                <item name="website" xsi:type="object">Magento\Store\Model\Resolver\Website</item>
-                <item name="websites" xsi:type="object">Magento\Store\Model\Resolver\Website</item>
-            </argument>
-        </arguments>
-    </type>
-    <type name="Magento\Framework\Model\ActionValidator\RemoveAction">
-        <arguments>
-            <argument name="protectedModels" xsi:type="array">
-                <item name="store" xsi:type="string">Magento\Store\Model\Store</item>
-                <item name="website" xsi:type="string">Magento\Store\Model\Website</item>
-                <item name="storeGroup" xsi:type="string">Magento\Store\Model\Group</item>
-            </argument>
-        </arguments>
-    </type>
-    <type name="Magento\Framework\App\PageCache\Identifier">
-        <plugin name="core-app-area-design-exception-plugin"
-                type="Magento\PageCache\Model\App\CacheIdentifierPlugin" sortOrder="10"/>
-    </type>
-    <type name="Magento\Framework\Module\Setup\MigrationData">
-        <arguments>
-            <argument name="data" xsi:type="array">
-                <item name="plain" xsi:type="string"><![CDATA[/^(?P<alias>[a-z]+[_a-z\d]*?\/[a-z]+[_a-z\d]*?)::.*?$/sui]]></item>
-                <item name="wiki" xsi:type="string"><![CDATA[/{{(block|widget).*?(class|type)=\"(?P<alias>[a-z]+[_a-z\d]*?\/[a-z]+[_a-z\d]*?)\".*?}}/sui]]></item>
-                <item name="xml" xsi:type="string"><![CDATA[/<block.*?class=\"(?P<alias>[a-z]+[_a-z\d]*?\/[a-z]+[_a-z\d]*?)\".*?>/sui]]></item>
-                <item name="serialized" xsi:type="string"><![CDATA[#(?P<string>s:\d+:"(?P<alias>[a-z]+[_a-z\d]*?/[a-z]+[_a-z\d]*?)")#sui]]></item>
-            </argument>
-        </arguments>
-    </type>
-    <type name="Magento\Framework\Module\Updater\SetupFactory">
-        <arguments>
-            <argument name="resourceTypes" xsi:type="array">
-                <item name="core_setup" xsi:type="string">Magento\Framework\Module\DataSetup</item>
-            </argument>
-        </arguments>
-    </type>
-    <type name="Magento\Framework\Module\DataSetup">
-        <arguments>
-            <argument name="resourceName" xsi:type="string">core_setup</argument>
-            <argument name="connectionName" xsi:type="string">Magento\Framework\Module\Updater::DEFAULT_SETUP_CONNECTION</argument>
+            <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
         </arguments>
     </type>
     <type name="Magento\Framework\App\Config\Value">
diff --git a/app/code/Magento/Core/etc/frontend/di.xml b/app/code/Magento/Core/etc/frontend/di.xml
index 5e4f205f7ecb1..724bc250b6656 100644
--- a/app/code/Magento/Core/etc/frontend/di.xml
+++ b/app/code/Magento/Core/etc/frontend/di.xml
@@ -6,10 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
-    <type name="Magento\Framework\View\Layout">
-        <plugin name="core-session-depersonalize"
-                type="Magento\Core\Model\Layout\DepersonalizePlugin" sortOrder="1"/>
-    </type>
     <type name="Magento\Framework\App\FrontController">
         <plugin name="requestPreprocessor" type="Magento\Store\App\FrontController\Plugin\RequestPreprocessor" sortOrder="50"/>
     </type>
diff --git a/app/code/Magento/Core/sql/core_setup/install-2.0.0.php b/app/code/Magento/Core/sql/core_setup/install-2.0.0.php
index b9ae57c745961..3db748ab808f6 100644
--- a/app/code/Magento/Core/sql/core_setup/install-2.0.0.php
+++ b/app/code/Magento/Core/sql/core_setup/install-2.0.0.php
@@ -88,120 +88,6 @@
 );
 $connection->createTable($table);
 
-/**
- * Create table 'core_layout_update'
- */
-$table = $connection->newTable(
-    $installer->getTable('core_layout_update')
-)->addColumn(
-    'layout_update_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-    'Layout Update Id'
-)->addColumn(
-    'handle',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    255,
-    [],
-    'Handle'
-)->addColumn(
-    'xml',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
-    '64k',
-    [],
-    'Xml'
-)->addColumn(
-    'sort_order',
-    \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-    null,
-    ['nullable' => false, 'default' => '0'],
-    'Sort Order'
-)->addColumn(
-    'updated_at',
-    \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-    null,
-    ['nullable' => true],
-    'Last Update Timestamp'
-)->addIndex(
-    $installer->getIdxName('core_layout_update', ['handle']),
-    ['handle']
-)->setComment(
-    'Layout Updates'
-);
-$connection->createTable($table);
-
-/**
- * Create table 'core_layout_link'
- */
-$table = $connection->newTable(
-    $installer->getTable('core_layout_link')
-)->addColumn(
-    'layout_link_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
-    'Link Id'
-)->addColumn(
-    'store_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
-    null,
-    ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-    'Store Id'
-)->addColumn(
-    'theme_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    ['unsigned' => true, 'nullable' => false],
-    'Theme id'
-)->addColumn(
-    'layout_update_id',
-    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-    null,
-    ['unsigned' => true, 'nullable' => false, 'default' => '0'],
-    'Layout Update Id'
-)->addColumn(
-    'is_temporary',
-    \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN,
-    null,
-    ['nullable' => false, 'default' => '0'],
-    'Defines whether Layout Update is Temporary'
-)->addIndex(
-    $installer->getIdxName('core_layout_link', ['layout_update_id']),
-    ['layout_update_id']
-)->addForeignKey(
-    $installer->getFkName('core_layout_link', 'layout_update_id', 'core_layout_update', 'layout_update_id'),
-    'layout_update_id',
-    $installer->getTable('core_layout_update'),
-    'layout_update_id',
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-)->addIndex(
-    $installer->getIdxName(
-        'core_layout_link',
-        ['store_id', 'theme_id', 'layout_update_id', 'is_temporary'],
-        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
-    ),
-    ['store_id', 'theme_id', 'layout_update_id', 'is_temporary']
-)->addForeignKey(
-    $installer->getFkName('core_layout_link', 'store_id', 'store', 'store_id'),
-    'store_id',
-    $installer->getTable('store'),
-    'store_id',
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-)->addForeignKey(
-    $installer->getFkName('core_layout_link', 'theme_id', 'theme', 'theme_id'),
-    'theme_id',
-    $installer->getTable('theme'),
-    'theme_id',
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
-    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
-)->setComment(
-    'Layout Link'
-);
-$connection->createTable($table);
-
 /**
  * Create table 'core_session'
  */
diff --git a/app/code/Magento/Core/view/adminhtml/web/prototype/magento/window_close.png b/app/code/Magento/Core/view/adminhtml/web/prototype/magento/window_close.png
deleted file mode 100644
index 8eec3e768bba0..0000000000000
Binary files a/app/code/Magento/Core/view/adminhtml/web/prototype/magento/window_close.png and /dev/null differ
diff --git a/app/code/Magento/Core/view/frontend/templates/messages.phtml b/app/code/Magento/Core/view/frontend/templates/messages.phtml
deleted file mode 100644
index df7e9cdd588e8..0000000000000
--- a/app/code/Magento/Core/view/frontend/templates/messages.phtml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-// @codingStandardsIgnoreFile
-
-?>
-<?php  foreach ($types as $type) {
-     if ($messages = $block->getMessages($type)) {
-         if (!$html) {
-             $html .= '<div class="messages">';
-         }
-         $html .= '<div class="message ' . $type . '">';
-
-         foreach ($messages as $message) {
-             $html .= '<div>';
-             $html .= $message->getText();
-             $html .= '</div>';
-         }
-         $html .= '</div>';
-     }
- }
-if ($html) {
-    $html .= '</div>';
-}
-?>
diff --git a/app/code/Magento/Cron/Model/Observer.php b/app/code/Magento/Cron/Model/Observer.php
index 5431168a28cb0..2f8a1dafaa0a4 100644
--- a/app/code/Magento/Cron/Model/Observer.php
+++ b/app/code/Magento/Cron/Model/Observer.php
@@ -136,7 +136,7 @@ public function dispatch($observer)
                 'group'
             ) === null && $this->_scopeConfig->getValue(
                 'system/cron/' . $groupId . '/use_separate_process',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             ) == 1
             ) {
                 $this->_shell->execute(
@@ -192,7 +192,7 @@ protected function _runJob($scheduledTime, $currentTime, $jobConfig, $schedule,
     {
         $scheduleLifetime = (int)$this->_scopeConfig->getValue(
             'system/cron/' . $groupId . '/' . self::XML_PATH_SCHEDULE_LIFETIME,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         $scheduleLifetime = $scheduleLifetime * self::SECONDS_IN_MINUTE;
         if ($scheduledTime < $currentTime - $scheduleLifetime) {
@@ -250,7 +250,7 @@ protected function _generate($groupId)
         $lastRun = (int)$this->_cache->load(self::CACHE_KEY_LAST_SCHEDULE_GENERATE_AT . $groupId);
         $rawSchedulePeriod = (int)$this->_scopeConfig->getValue(
             'system/cron/' . $groupId . '/' . self::XML_PATH_SCHEDULE_GENERATE_EVERY,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         $schedulePeriod = $rawSchedulePeriod * self::SECONDS_IN_MINUTE;
         if ($lastRun > time() - $schedulePeriod) {
@@ -322,7 +322,7 @@ protected function _cleanup($groupId)
         $lastCleanup = (int)$this->_cache->load(self::CACHE_KEY_LAST_HISTORY_CLEANUP_AT . $groupId);
         $historyCleanUp = (int)$this->_scopeConfig->getValue(
             'system/cron/' . $groupId . '/' . self::XML_PATH_HISTORY_CLEANUP_EVERY,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         if ($lastCleanup > time() - $historyCleanUp * self::SECONDS_IN_MINUTE) {
             return $this;
@@ -338,11 +338,11 @@ protected function _cleanup($groupId)
 
         $historySuccess = (int)$this->_scopeConfig->getValue(
             'system/cron/' . $groupId . '/' . self::XML_PATH_HISTORY_SUCCESS,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         $historyFailure = (int)$this->_scopeConfig->getValue(
             'system/cron/' . $groupId . '/' . self::XML_PATH_HISTORY_FAILURE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         $historyLifetimes = [
             Schedule::STATUS_SUCCESS => $historySuccess * self::SECONDS_IN_MINUTE,
@@ -372,7 +372,7 @@ protected function getConfigSchedule($jobConfig)
     {
         $cronExpr = $this->_scopeConfig->getValue(
             $jobConfig['config_path'],
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
 
         return $cronExpr;
@@ -430,7 +430,7 @@ protected function getScheduleTimeInterval($groupId)
     {
         $scheduleAheadFor = (int)$this->_scopeConfig->getValue(
             'system/cron/' . $groupId . '/' . self::XML_PATH_SCHEDULE_AHEAD_FOR,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         $scheduleAheadFor = $scheduleAheadFor * self::SECONDS_IN_MINUTE;
 
diff --git a/app/code/Magento/Cron/composer.json b/app/code/Magento/Cron/composer.json
index f591ff7f63a90..4e6ffb6220fde 100644
--- a/app/code/Magento/Cron/composer.json
+++ b/app/code/Magento/Cron/composer.json
@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
+        "magento/module-store": "0.42.0-beta7",
         "magento/module-backend": "0.42.0-beta7",
         "magento/framework": "0.42.0-beta7",
         "magento/magento-composer-installer": "*"
diff --git a/app/code/Magento/Cron/etc/module.xml b/app/code/Magento/Cron/etc/module.xml
index d88d54d09f131..a715d334b05cb 100644
--- a/app/code/Magento/Cron/etc/module.xml
+++ b/app/code/Magento/Cron/etc/module.xml
@@ -7,5 +7,8 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
     <module name="Magento_Cron" schema_version="2.0.0">
+        <sequence>
+            <module name="Magento_Store"/>
+        </sequence>
     </module>
 </config>
diff --git a/app/code/Magento/CurrencySymbol/Helper/Data.php b/app/code/Magento/CurrencySymbol/Helper/Data.php
index a26fb87826f97..690ec4b6aa523 100644
--- a/app/code/Magento/CurrencySymbol/Helper/Data.php
+++ b/app/code/Magento/CurrencySymbol/Helper/Data.php
@@ -21,7 +21,7 @@ class Data extends \Magento\Core\Helper\Data
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\State $appState
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param \Magento\CurrencySymbol\Model\System\CurrencysymbolFactory $symbolFactory
@@ -30,7 +30,7 @@ class Data extends \Magento\Core\Helper\Data
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\State $appState,
         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
         \Magento\CurrencySymbol\Model\System\CurrencysymbolFactory $symbolFactory,
diff --git a/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php b/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
index 89ba3f06436e4..19261b5ba0c89 100644
--- a/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
+++ b/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
@@ -84,7 +84,7 @@ class Currencysymbol
     protected $_systemStore;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -110,7 +110,7 @@ class Currencysymbol
      * @param \Magento\Framework\App\Config\ReinitableConfigInterface $coreConfig
      * @param \Magento\Backend\Model\Config\Factory $configFactory
      * @param \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param \Magento\Store\Model\System\Store $systemStore
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -120,7 +120,7 @@ public function __construct(
         \Magento\Framework\App\Config\ReinitableConfigInterface $coreConfig,
         \Magento\Backend\Model\Config\Factory $configFactory,
         \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
         \Magento\Store\Model\System\Store $systemStore,
         \Magento\Framework\Event\ManagerInterface $eventManager
@@ -154,7 +154,7 @@ public function getCurrencySymbolsData()
             self::ALLOWED_CURRENCIES_CONFIG_SEPARATOR,
             $this->_scopeConfig->getValue(
                 self::XML_PATH_ALLOWED_CURRENCIES,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 null
             )
         );
@@ -181,7 +181,7 @@ public function getCurrencySymbolsData()
                     }
                     $storeSymbols = $this->_scopeConfig->getValue(
                         self::XML_PATH_ALLOWED_CURRENCIES,
-                        \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                         $store
                     );
                     $allowedCurrencies = array_merge(
@@ -314,7 +314,7 @@ protected function _unserializeStoreConfig($configPath, $storeId = null)
         $result = [];
         $configData = (string)$this->_scopeConfig->getValue(
             $configPath,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeId
         );
         if ($configData) {
diff --git a/app/code/Magento/CurrencySymbol/etc/acl.xml b/app/code/Magento/CurrencySymbol/etc/acl.xml
index 60b154659bbb4..98eba2a12defc 100644
--- a/app/code/Magento/CurrencySymbol/etc/acl.xml
+++ b/app/code/Magento/CurrencySymbol/etc/acl.xml
@@ -8,8 +8,8 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::stores">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::stores">
                     <resource id="Magento_CurrencySymbol::system_currency" title="Currency" sortOrder="30">
                         <resource id="Magento_CurrencySymbol::currency_rates" title="Currency Rates" sortOrder="10" />
                         <resource id="Magento_CurrencySymbol::symbols" title="Currency Symbols" sortOrder="20" />
diff --git a/app/code/Magento/Customer/Block/Address/Edit.php b/app/code/Magento/Customer/Block/Address/Edit.php
index fb35dad44d242..b2e7476743729 100644
--- a/app/code/Magento/Customer/Block/Address/Edit.php
+++ b/app/code/Magento/Customer/Block/Address/Edit.php
@@ -349,6 +349,6 @@ public function getBackButtonUrl()
      */
     public function getConfig($path)
     {
-        return $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 }
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Attribute/Sendemail.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Attribute/Sendemail.php
index 2e87ba6d8f640..6ab83f2f7d5a7 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Attribute/Sendemail.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Attribute/Sendemail.php
@@ -18,7 +18,7 @@ class Sendemail extends Element
     protected $_template = 'edit/tab/account/form/renderer/sendemail.phtml';
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|null
+     * @var \Magento\Store\Model\StoreManagerInterface|null
      */
     protected $_storeManager = null;
 
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php
index 9ad6b0cefbe5d..2ea02b24ab271 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php
@@ -152,7 +152,7 @@ public function getStoreCreateDateTimezone()
     {
         return $this->_scopeConfig->getValue(
             $this->_localeDate->getDefaultTimezonePath(),
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->getCustomer()->getStoreId()
         );
     }
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Sales.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Sales.php
index 9c0f25d8798dc..582fb3b44b92c 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Sales.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Sales.php
@@ -98,7 +98,7 @@ public function _beforeToHtml()
         $this->_currency = $this->_currencyFactory->create()->load(
             $this->_scopeConfig->getValue(
                 Currency::XML_PATH_CURRENCY_BASE,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
         );
 
diff --git a/app/code/Magento/Customer/Block/Form/Register.php b/app/code/Magento/Customer/Block/Form/Register.php
index 0e8699643a973..10745089fdefe 100644
--- a/app/code/Magento/Customer/Block/Form/Register.php
+++ b/app/code/Magento/Customer/Block/Form/Register.php
@@ -74,7 +74,7 @@ public function __construct(
      */
     public function getConfig($path)
     {
-        return $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
diff --git a/app/code/Magento/Customer/Block/Widget/Dob.php b/app/code/Magento/Customer/Block/Widget/Dob.php
index f367c115fab08..61d24dcc78e49 100644
--- a/app/code/Magento/Customer/Block/Widget/Dob.php
+++ b/app/code/Magento/Customer/Block/Widget/Dob.php
@@ -138,7 +138,7 @@ public function getFieldHtml()
             'class' => $this->getHtmlClass(),
             'value' => $this->getValue(),
             'date_format' => $this->getDateFormat(),
-            'image' => $this->getViewFileUrl('Magento_Core::calendar.png'),
+            'image' => $this->getViewFileUrl('Magento_Theme::calendar.png'),
         ]);
         return $this->dateElement->getHtml();
     }
diff --git a/app/code/Magento/Customer/Controller/Account/Confirm.php b/app/code/Magento/Customer/Controller/Account/Confirm.php
index 01b1a631fc04a..a42a81c43f858 100644
--- a/app/code/Magento/Customer/Controller/Account/Confirm.php
+++ b/app/code/Magento/Customer/Controller/Account/Confirm.php
@@ -12,13 +12,13 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Controller\Result\RedirectFactory;
 use Magento\Framework\View\Result\PageFactory;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Helper\Address;
 use Magento\Framework\UrlFactory;
 use Magento\Framework\Exception\StateException;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Class Confirm
diff --git a/app/code/Magento/Customer/Controller/Account/Confirmation.php b/app/code/Magento/Customer/Controller/Account/Confirmation.php
index 8d2f65b6f4406..ba7ee81e3eaf8 100644
--- a/app/code/Magento/Customer/Controller/Account/Confirmation.php
+++ b/app/code/Magento/Customer/Controller/Account/Confirmation.php
@@ -10,13 +10,13 @@
 use Magento\Customer\Model\Session;
 use Magento\Framework\Controller\Result\RedirectFactory;
 use Magento\Framework\View\Result\PageFactory;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Framework\Exception\State\InvalidTransitionException;
 
 class Confirmation extends \Magento\Customer\Controller\Account
 {
-    /** @var \Magento\Framework\Store\StoreManagerInterface */
+    /** @var StoreManagerInterface */
     protected $storeManager;
 
     /** @var AccountManagementInterface  */
diff --git a/app/code/Magento/Customer/Controller/Account/CreatePost.php b/app/code/Magento/Customer/Controller/Account/CreatePost.php
index 6a23122b3ecc6..d9ad0aecebb24 100644
--- a/app/code/Magento/Customer/Controller/Account/CreatePost.php
+++ b/app/code/Magento/Customer/Controller/Account/CreatePost.php
@@ -13,7 +13,7 @@
 use Magento\Framework\Controller\Result\RedirectFactory;
 use Magento\Framework\View\Result\PageFactory;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Helper\Address;
 use Magento\Framework\UrlFactory;
@@ -28,7 +28,7 @@
 use Magento\Customer\Model\CustomerExtractor;
 use Magento\Framework\Exception\StateException;
 use Magento\Framework\Exception\InputException;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/app/code/Magento/Customer/Controller/Account/LoginPost.php b/app/code/Magento/Customer/Controller/Account/LoginPost.php
index cbefdec2ed4ca..b7948e9f95bee 100644
--- a/app/code/Magento/Customer/Controller/Account/LoginPost.php
+++ b/app/code/Magento/Customer/Controller/Account/LoginPost.php
@@ -11,7 +11,7 @@
 use Magento\Framework\Controller\Result\RedirectFactory;
 use Magento\Framework\View\Result\PageFactory;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Framework\Url\DecoderInterface;
 use Magento\Customer\Model\Url as CustomerUrl;
@@ -27,7 +27,7 @@ class LoginPost extends \Magento\Customer\Controller\Account
     /** @var ScopeConfigInterface */
     protected $scopeConfig;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface */
+    /** @var StoreManagerInterface */
     protected $storeManager;
 
     /** @var AccountManagementInterface */
@@ -101,7 +101,7 @@ protected function loginPostRedirect()
             if ($this->_getSession()->isLoggedIn()) {
                 if (!$this->scopeConfig->isSetFlag(
                     CustomerUrl::XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 )
                 ) {
                     $referer = $this->getRequest()->getParam(CustomerUrl::REFERER_QUERY_PARAM_NAME);
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart.php b/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart.php
index 591141720c71a..b95e9b1af53d7 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Cart/Product/Composite/Cart.php
@@ -75,7 +75,7 @@ protected function _initData()
             $this->_quote = $this->quoteRepository->create();
         }
         $this->_quote->setWebsite(
-            $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getWebsite($websiteId)
+            $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getWebsite($websiteId)
         );
 
         $this->_quoteItem = $this->_quote->getItemById($quoteItemId);
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php
index c4a1403b87e45..3050408cda037 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/Cart.php
@@ -33,7 +33,7 @@ public function execute()
                 $quote = $quoteRepository->create();
             }
             $quote->setWebsite(
-                $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getWebsite($websiteId)
+                $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getWebsite($websiteId)
             );
             $item = $quote->getItemById($deleteItemId);
             if ($item && $item->getId()) {
diff --git a/app/code/Magento/Customer/Helper/Address.php b/app/code/Magento/Customer/Helper/Address.php
index d09f027e4bfaa..398522e04a458 100644
--- a/app/code/Magento/Customer/Helper/Address.php
+++ b/app/code/Magento/Customer/Helper/Address.php
@@ -68,7 +68,7 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
     /** @var \Magento\Framework\View\Element\BlockFactory */
     protected $_blockFactory;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface */
+    /** @var \Magento\Store\Model\StoreManagerInterface */
     protected $_storeManager;
 
     /** @var \Magento\Framework\App\Config\ScopeConfigInterface */
@@ -86,7 +86,7 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Framework\View\Element\BlockFactory $blockFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param CustomerMetadataInterface $customerMetadataService
      * @param AddressMetadataInterface $addressMetadataService
@@ -95,7 +95,7 @@ class Address extends \Magento\Framework\App\Helper\AbstractHelper
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Framework\View\Element\BlockFactory $blockFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         CustomerMetadataInterface $customerMetadataService,
         AddressMetadataInterface $addressMetadataService,
@@ -167,7 +167,7 @@ public function getConfig($key, $store = null)
         if (!isset($this->_config[$websiteId])) {
             $this->_config[$websiteId] = $this->_scopeConfig->getValue(
                 'customer/address',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $store
             );
         }
@@ -319,7 +319,7 @@ public function isVatValidationEnabled($store = null)
     {
         return (bool)$this->_scopeConfig->getValue(
             self::XML_PATH_VAT_VALIDATION_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -333,7 +333,7 @@ public function isDisableAutoGroupAssignDefaultValue()
     {
         return (bool)$this->_scopeConfig->getValue(
             self::XML_PATH_VIV_DISABLE_AUTO_ASSIGN_DEFAULT,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
@@ -347,7 +347,7 @@ public function hasValidateOnEachTransaction($store = null)
     {
         return (bool)$this->_scopeConfig->getValue(
             self::XML_PATH_VIV_ON_EACH_TRANSACTION,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -362,7 +362,7 @@ public function getTaxCalculationAddressType($store = null)
     {
         return (string)$this->_scopeConfig->getValue(
             self::XML_PATH_VIV_TAX_CALCULATION_ADDRESS_TYPE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -376,7 +376,7 @@ public function isVatAttributeVisible()
     {
         return (bool)$this->_scopeConfig->getValue(
             self::XML_PATH_VAT_FRONTEND_VISIBILITY,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 }
diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php
index 190efb84e084b..34b9102493067 100644
--- a/app/code/Magento/Customer/Model/AccountManagement.php
+++ b/app/code/Magento/Customer/Model/AccountManagement.php
@@ -35,7 +35,7 @@
 use Magento\Framework\Reflection\DataObjectProcessor;
 use Magento\Framework\Stdlib\DateTime;
 use Magento\Framework\Stdlib\String as StringHelper;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Handle various customer account actions
@@ -105,7 +105,7 @@ class AccountManagement implements AccountManagementInterface
     private $eventManager;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     private $storeManager;
 
@@ -840,7 +840,7 @@ protected function sendPasswordResetNotificationEmail($customer)
         $transport = $this->transportBuilder->setTemplateIdentifier(
             $this->scopeConfig->getValue(
                 self::XML_PATH_RESET_PASSWORD_TEMPLATE,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $storeId
             )
         )->setTemplateOptions(
@@ -850,7 +850,7 @@ protected function sendPasswordResetNotificationEmail($customer)
         )->setFrom(
             $this->scopeConfig->getValue(
                 self::XML_PATH_FORGOT_EMAIL_IDENTITY,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $storeId
             )
         )->addTo(
@@ -911,13 +911,13 @@ protected function sendEmailTemplate($customer, $template, $sender, $templatePar
     {
         /** @var \Magento\Framework\Mail\TransportInterface $transport */
         $transport = $this->transportBuilder->setTemplateIdentifier(
-            $this->scopeConfig->getValue($template, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId)
+            $this->scopeConfig->getValue($template, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $storeId)
         )->setTemplateOptions(
             ['area' => \Magento\Framework\App\Area::AREA_FRONTEND, 'store' => $storeId]
         )->setTemplateVars(
             $templateParams
         )->setFrom(
-            $this->scopeConfig->getValue($sender, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId)
+            $this->scopeConfig->getValue($sender, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $storeId)
         )->addTo(
             $customer->getEmail(),
             $this->customerViewHelper->getCustomerName($customer)
@@ -942,7 +942,7 @@ protected function isConfirmationRequired($customer)
 
         return (bool)$this->scopeConfig->getValue(
             self::XML_PATH_IS_CONFIRM,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeId
         );
     }
diff --git a/app/code/Magento/Customer/Model/Address/Config.php b/app/code/Magento/Customer/Model/Address/Config.php
index 46eef9b39e044..c2cd8f0dba94b 100644
--- a/app/code/Magento/Customer/Model/Address/Config.php
+++ b/app/code/Magento/Customer/Model/Address/Config.php
@@ -41,7 +41,7 @@ class Config extends \Magento\Framework\Config\Data
     protected $_defaultTypes = [];
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -58,7 +58,7 @@ class Config extends \Magento\Framework\Config\Data
     /**
      * @param \Magento\Customer\Model\Address\Config\Reader $reader
      * @param \Magento\Framework\Config\CacheInterface $cache
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Customer\Helper\Address $addressHelper
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param string $cacheId
@@ -66,7 +66,7 @@ class Config extends \Magento\Framework\Config\Data
     public function __construct(
         \Magento\Customer\Model\Address\Config\Reader $reader,
         \Magento\Framework\Config\CacheInterface $cache,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Customer\Helper\Address $addressHelper,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         $cacheId = 'address_format'
@@ -130,7 +130,7 @@ public function getFormats()
                 )->setTitle(
                     (string)$typeConfig['title']
                 )->setDefaultFormat(
-                    $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store)
+                    $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)
                 )->setEscapeHtml(
                     $escapeHtml
                 );
diff --git a/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php b/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php
index 0947b65311163..fe286e314ec45 100644
--- a/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php
+++ b/app/code/Magento/Customer/Model/Config/Backend/Address/Street.php
@@ -17,14 +17,14 @@ class Street extends \Magento\Framework\App\Config\Value
      */
     protected $_eavConfig;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface */
+    /** @var \Magento\Store\Model\StoreManagerInterface */
     protected $_storeManager;
 
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\Db $resourceCollection
@@ -34,7 +34,7 @@ public function __construct(
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\Registry $registry,
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\Db $resourceCollection = null,
@@ -55,7 +55,7 @@ public function afterSave()
         $attribute = $this->_eavConfig->getAttribute('customer_address', 'street');
         $value = $this->getValue();
         switch ($this->getScope()) {
-            case \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITES:
+            case \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES:
                 $website = $this->_storeManager->getWebsite($this->getScopeCode());
                 $attribute->setWebsite($website);
                 $attribute->load($attribute->getId());
@@ -81,7 +81,7 @@ public function afterDelete()
     {
         $result = parent::afterDelete();
 
-        if ($this->getScope() == \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITES) {
+        if ($this->getScope() == \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES) {
             $attribute = $this->_eavConfig->getAttribute('customer_address', 'street');
             $website = $this->_storeManager->getWebsite($this->getScopeCode());
             $attribute->setWebsite($website);
diff --git a/app/code/Magento/Customer/Model/Config/Backend/Show/Customer.php b/app/code/Magento/Customer/Model/Config/Backend/Show/Customer.php
index df2b0563feaf0..639238500a6df 100644
--- a/app/code/Magento/Customer/Model/Config/Backend/Show/Customer.php
+++ b/app/code/Magento/Customer/Model/Config/Backend/Show/Customer.php
@@ -19,14 +19,14 @@ class Customer extends \Magento\Framework\App\Config\Value
      */
     protected $_eavConfig;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface */
+    /** @var \Magento\Store\Model\StoreManagerInterface */
     protected $storeManager;
 
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\Db $resourceCollection
@@ -36,7 +36,7 @@ public function __construct(
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\Registry $registry,
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\Db $resourceCollection = null,
diff --git a/app/code/Magento/Customer/Model/Config/Share.php b/app/code/Magento/Customer/Model/Config/Share.php
index b8961d32b50b3..bec6a49291d68 100644
--- a/app/code/Magento/Customer/Model/Config/Share.php
+++ b/app/code/Magento/Customer/Model/Config/Share.php
@@ -31,7 +31,7 @@ class Share extends \Magento\Framework\App\Config\Value implements \Magento\Fram
      */
     protected $_customerResource;
 
-    /** @var  \Magento\Framework\Store\StoreManagerInterface */
+    /** @var  \Magento\Store\Model\StoreManagerInterface */
     protected $_storeManager;
 
     /**
@@ -40,7 +40,7 @@ class Share extends \Magento\Framework\App\Config\Value implements \Magento\Fram
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Customer\Model\Resource\Customer $customerResource
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\Db $resourceCollection
@@ -50,7 +50,7 @@ public function __construct(
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\Registry $registry,
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Customer\Model\Resource\Customer $customerResource,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\Db $resourceCollection = null,
@@ -80,7 +80,7 @@ public function isWebsiteScope()
     {
         return $this->_config->getValue(
             self::XML_PATH_CUSTOMER_ACCOUNT_SHARE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         ) == self::SHARE_WEBSITE;
     }
 
diff --git a/app/code/Magento/Customer/Model/Customer.php b/app/code/Magento/Customer/Model/Customer.php
index 340a9ad95437a..6bda65fd95c5a 100644
--- a/app/code/Magento/Customer/Model/Customer.php
+++ b/app/code/Magento/Customer/Model/Customer.php
@@ -133,7 +133,7 @@ class Customer extends \Magento\Framework\Model\AbstractExtensibleModel
     protected $_isReadonly = false;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -212,7 +212,7 @@ class Customer extends \Magento\Framework\Model\AbstractExtensibleModel
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\Api\MetadataServiceInterface $metadataService
      * @param AttributeValueFactory $customAttributeFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Eav\Model\Config $config
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param Resource\Customer $resource
@@ -236,7 +236,7 @@ public function __construct(
         \Magento\Framework\Registry $registry,
         \Magento\Framework\Api\MetadataServiceInterface $metadataService,
         AttributeValueFactory $customAttributeFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Eav\Model\Config $config,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Customer\Model\Resource\Customer $resource,
@@ -816,7 +816,7 @@ public function isConfirmationRequired()
 
         return (bool)$this->_scopeConfig->getValue(
             self::XML_PATH_IS_CONFIRM,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeId
         );
     }
@@ -861,13 +861,13 @@ protected function _sendEmailTemplate($template, $sender, $templateParams = [],
     {
         /** @var \Magento\Framework\Mail\TransportInterface $transport */
         $transport = $this->_transportBuilder->setTemplateIdentifier(
-            $this->_scopeConfig->getValue($template, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId)
+            $this->_scopeConfig->getValue($template, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $storeId)
         )->setTemplateOptions(
             ['area' => \Magento\Framework\App\Area::AREA_FRONTEND, 'store' => $storeId]
         )->setTemplateVars(
             $templateParams
         )->setFrom(
-            $this->_scopeConfig->getValue($sender, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId)
+            $this->_scopeConfig->getValue($sender, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $storeId)
         )->addTo(
             $this->getEmail(),
             $this->getName()
@@ -910,7 +910,7 @@ public function getGroupId()
             $storeId = $this->getStoreId() ? $this->getStoreId() : $this->_storeManager->getStore()->getId();
             $groupId = $this->_scopeConfig->getValue(
                 GroupManagement::XML_PATH_DEFAULT_ID,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $storeId
             );
             $this->setData('group_id', $groupId);
diff --git a/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Store.php b/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Store.php
index 2907ff51187ac..a7932d37dda58 100644
--- a/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Store.php
+++ b/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Store.php
@@ -13,14 +13,14 @@
 class Store extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
-    public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
+    public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
     {
         $this->_storeManager = $storeManager;
     }
diff --git a/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Website.php b/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Website.php
index 8baa46f869d15..688be58110744 100644
--- a/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Website.php
+++ b/app/code/Magento/Customer/Model/Customer/Attribute/Backend/Website.php
@@ -13,14 +13,14 @@
 class Website extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
-    public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
+    public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
     {
         $this->_storeManager = $storeManager;
     }
diff --git a/app/code/Magento/Customer/Model/CustomerExtractor.php b/app/code/Magento/Customer/Model/CustomerExtractor.php
index fbfe36e7d32a7..7e16f8359a279 100644
--- a/app/code/Magento/Customer/Model/CustomerExtractor.php
+++ b/app/code/Magento/Customer/Model/CustomerExtractor.php
@@ -22,7 +22,7 @@ class CustomerExtractor
     protected $customerFactory;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -39,14 +39,14 @@ class CustomerExtractor
     /**
      * @param Metadata\FormFactory $formFactory
      * @param \Magento\Customer\Api\Data\CustomerInterfaceFactory $customerFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param GroupManagementInterface $customerGroupManagement
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
      */
     public function __construct(
         \Magento\Customer\Model\Metadata\FormFactory $formFactory,
         \Magento\Customer\Api\Data\CustomerInterfaceFactory $customerFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         GroupManagementInterface $customerGroupManagement,
         \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
     ) {
diff --git a/app/code/Magento/Customer/Model/CustomerRegistry.php b/app/code/Magento/Customer/Model/CustomerRegistry.php
index 1f33005f38d77..cc4ea04078b95 100644
--- a/app/code/Magento/Customer/Model/CustomerRegistry.php
+++ b/app/code/Magento/Customer/Model/CustomerRegistry.php
@@ -9,7 +9,7 @@
 use Magento\Customer\Model\Data\CustomerSecure;
 use Magento\Customer\Model\Data\CustomerSecureFactory;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Registry for \Magento\Customer\Model\Customer
@@ -44,7 +44,7 @@ class CustomerRegistry
     private $customerSecureRegistryById = [];
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     private $storeManager;
 
@@ -53,12 +53,12 @@ class CustomerRegistry
      *
      * @param CustomerFactory $customerFactory
      * @param CustomerSecureFactory $customerSecureFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         CustomerFactory $customerFactory,
         CustomerSecureFactory $customerSecureFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        StoreManagerInterface $storeManager
     ) {
         $this->customerFactory = $customerFactory;
         $this->customerSecureFactory = $customerSecureFactory;
diff --git a/app/code/Magento/Customer/Model/GroupManagement.php b/app/code/Magento/Customer/Model/GroupManagement.php
index 6e2f8727ffa9c..06127d3e48911 100644
--- a/app/code/Magento/Customer/Model/GroupManagement.php
+++ b/app/code/Magento/Customer/Model/GroupManagement.php
@@ -12,7 +12,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Api\FilterBuilder;
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Customer\Api\GroupRepositoryInterface;
 use Magento\Customer\Api\Data\GroupInterfaceFactory;
 use Magento\Customer\Model\GroupFactory;
@@ -31,7 +31,7 @@ class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
     const GROUP_CODE_MAX_LENGTH = 32;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $storeManager;
 
@@ -75,7 +75,7 @@ class GroupManagement implements \Magento\Customer\Api\GroupManagementInterface
      * @param FilterBuilder $filterBuilder
      */
     public function __construct(
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        StoreManagerInterface $storeManager,
         ScopeConfigInterface $scopeConfig,
         GroupFactory $groupFactory,
         GroupRepositoryInterface $groupRepository,
@@ -117,7 +117,7 @@ public function getDefaultGroup($storeId = null)
         try {
             $groupId = $this->scopeConfig->getValue(
                 self::XML_PATH_DEFAULT_ID,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $storeId
             );
         } catch (\Magento\Framework\App\InitException $e) {
diff --git a/app/code/Magento/Customer/Model/Resource/Customer.php b/app/code/Magento/Customer/Model/Resource/Customer.php
index d362545e7eeeb..63f8d37a6c67c 100644
--- a/app/code/Magento/Customer/Model/Resource/Customer.php
+++ b/app/code/Magento/Customer/Model/Resource/Customer.php
@@ -380,7 +380,7 @@ public function setNewIncrementId(\Magento\Framework\Object $object)
     {
         if ($this->_scopeConfig->getValue(
             \Magento\Customer\Model\Customer::XML_PATH_GENERATE_HUMAN_FRIENDLY_ID,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )
         ) {
             parent::setNewIncrementId($object);
diff --git a/app/code/Magento/Customer/Model/Resource/CustomerRepository.php b/app/code/Magento/Customer/Model/Resource/CustomerRepository.php
index 7e7e1d4e2525a..610870d48f195 100644
--- a/app/code/Magento/Customer/Model/Resource/CustomerRepository.php
+++ b/app/code/Magento/Customer/Model/Resource/CustomerRepository.php
@@ -58,7 +58,7 @@ class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInte
     protected $eventManager;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -76,7 +76,7 @@ class CustomerRepository implements \Magento\Customer\Api\CustomerRepositoryInte
      * @param \Magento\Customer\Api\CustomerMetadataInterface $customerMetadata
      * @param \Magento\Customer\Api\Data\CustomerSearchResultsDataBuilder $searchResultsDataBuilder
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -89,7 +89,7 @@ public function __construct(
         \Magento\Customer\Api\CustomerMetadataInterface $customerMetadata,
         \Magento\Customer\Api\Data\CustomerSearchResultsDataBuilder $searchResultsDataBuilder,
         \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Api\ExtensibleDataObjectConverter $extensibleDataObjectConverter
     ) {
         $this->customerFactory = $customerFactory;
diff --git a/app/code/Magento/Customer/Model/Session/Storage.php b/app/code/Magento/Customer/Model/Session/Storage.php
index b700cde7446cb..a29e6e55302d4 100644
--- a/app/code/Magento/Customer/Model/Session/Storage.php
+++ b/app/code/Magento/Customer/Model/Session/Storage.php
@@ -11,13 +11,13 @@ class Storage extends \Magento\Framework\Session\Storage
 {
     /**
      * @param \Magento\Customer\Model\Config\Share $configShare
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param string $namespace
      * @param array $data
      */
     public function __construct(
         \Magento\Customer\Model\Config\Share $configShare,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         $namespace = 'customer',
         array $data = []
     ) {
diff --git a/app/code/Magento/Customer/Model/Url.php b/app/code/Magento/Customer/Model/Url.php
index db980db3e36c7..1572e60414378 100644
--- a/app/code/Magento/Customer/Model/Url.php
+++ b/app/code/Magento/Customer/Model/Url.php
@@ -9,7 +9,7 @@
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Url\EncoderInterface;
 use Magento\Framework\UrlInterface;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Customer url model
diff --git a/app/code/Magento/Customer/Model/Vat.php b/app/code/Magento/Customer/Model/Vat.php
index 6462ff65732d1..c280d6c7addf6 100644
--- a/app/code/Magento/Customer/Model/Vat.php
+++ b/app/code/Magento/Customer/Model/Vat.php
@@ -7,7 +7,7 @@
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Psr\Log\LoggerInterface as Logger;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Customer VAT model
@@ -94,7 +94,7 @@ public function getMerchantCountryCode($store = null)
     {
         return (string)$this->scopeConfig->getValue(
             self::XML_PATH_MERCHANT_COUNTRY_CODE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -109,7 +109,7 @@ public function getMerchantVatNumber($store = null)
     {
         return (string)$this->scopeConfig->getValue(
             self::XML_PATH_MERCHANT_VAT_NUMBER,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -128,7 +128,7 @@ public function getCustomerGroupIdBasedOnVatNumber($customerCountryCode, $vatVal
 
         $isAutoGroupAssign = $this->scopeConfig->isSetFlag(
             self::XML_PATH_CUSTOMER_GROUP_AUTO_ASSIGN,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $store
         );
         if (!$isAutoGroupAssign) {
@@ -147,7 +147,7 @@ public function getCustomerGroupIdBasedOnVatNumber($customerCountryCode, $vatVal
         if (isset($vatClassToGroupXmlPathMap[$vatClass])) {
             $groupId = (int)$this->scopeConfig->getValue(
                 $vatClassToGroupXmlPathMap[$vatClass],
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                ScopeInterface::SCOPE_STORE,
                 $store
             );
         }
@@ -290,7 +290,7 @@ public function isCountryInEU($countryCode, $storeId = null)
             ',',
             $this->scopeConfig->getValue(
                 self::XML_PATH_EU_COUNTRIES_LIST,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $storeId
             )
         );
diff --git a/app/code/Magento/Customer/Model/Visitor.php b/app/code/Magento/Customer/Model/Visitor.php
index 130f1f2de28f0..158a5b3c23854 100644
--- a/app/code/Magento/Customer/Model/Visitor.php
+++ b/app/code/Magento/Customer/Model/Visitor.php
@@ -264,7 +264,7 @@ public function getCleanTime()
     {
         return $this->scopeConfig->getValue(
             \Magento\Framework\Session\Config::XML_PATH_COOKIE_LIFETIME,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         ) + 86400;
     }
 
diff --git a/app/code/Magento/Customer/etc/acl.xml b/app/code/Magento/Customer/etc/acl.xml
index 1390534d48247..1b9e7facbefcc 100644
--- a/app/code/Magento/Customer/etc/acl.xml
+++ b/app/code/Magento/Customer/etc/acl.xml
@@ -8,17 +8,17 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
+            <resource id="Magento_Backend::admin">
                 <resource id="Magento_Customer::customer" title="Customers" sortOrder="40">
                     <resource id="Magento_Customer::manage" title="All Customers" sortOrder="10" />
                 </resource>
-                <resource id="Magento_Adminhtml::stores">
-                    <resource id="Magento_Adminhtml::stores_settings">
-                        <resource id="Magento_Adminhtml::config">
+                <resource id="Magento_Backend::stores">
+                    <resource id="Magento_Backend::stores_settings">
+                        <resource id="Magento_Backend::config">
                             <resource id="Magento_Customer::config_customer" title="Customers Section" sortOrder="50" />
                         </resource>
                     </resource>
-                    <resource id="Magento_Adminhtml::stores_other_settings">
+                    <resource id="Magento_Backend::stores_other_settings">
                         <resource id="Magento_Customer::group" title="Customer Groups" sortOrder="10" />
                     </resource>
                 </resource>
diff --git a/app/code/Magento/CustomerImportExport/Model/Export/Address.php b/app/code/Magento/CustomerImportExport/Model/Export/Address.php
index 732ff997f7749..bfe77d3e13c45 100644
--- a/app/code/Magento/CustomerImportExport/Model/Export/Address.php
+++ b/app/code/Magento/CustomerImportExport/Model/Export/Address.php
@@ -103,7 +103,7 @@ class Address extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
      * @param \Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
@@ -116,7 +116,7 @@ class Address extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\ImportExport\Model\Export\Factory $collectionFactory,
         \Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
diff --git a/app/code/Magento/CustomerImportExport/Model/Export/Customer.php b/app/code/Magento/CustomerImportExport/Model/Export/Customer.php
index 3cbdb1b452cbd..f611129b7aa9d 100644
--- a/app/code/Magento/CustomerImportExport/Model/Export/Customer.php
+++ b/app/code/Magento/CustomerImportExport/Model/Export/Customer.php
@@ -81,7 +81,7 @@ class Customer extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
      * @param \Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
@@ -91,7 +91,7 @@ class Customer extends \Magento\ImportExport\Model\Export\Entity\AbstractEav
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\ImportExport\Model\Export\Factory $collectionFactory,
         \Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php b/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php
index fbf84628545a3..fd577239948e5 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/AbstractCustomer.php
@@ -75,7 +75,7 @@ abstract class AbstractCustomer extends \Magento\ImportExport\Model\Import\Entit
      * @param \Magento\ImportExport\Model\ImportFactory $importFactory
      * @param \Magento\ImportExport\Model\Resource\Helper $resourceHelper
      * @param \Magento\Framework\App\Resource $resource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\CustomerImportExport\Model\Resource\Import\Customer\StorageFactory $storageFactory
@@ -89,7 +89,7 @@ public function __construct(
         \Magento\ImportExport\Model\ImportFactory $importFactory,
         \Magento\ImportExport\Model\Resource\Helper $resourceHelper,
         \Magento\Framework\App\Resource $resource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\ImportExport\Model\Export\Factory $collectionFactory,
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\CustomerImportExport\Model\Resource\Import\Customer\StorageFactory $storageFactory,
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Address.php b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
index 64b60c632b54b..425c3bab09f30 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/Address.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/Address.php
@@ -219,7 +219,7 @@ class Address extends AbstractCustomer
      * @param \Magento\ImportExport\Model\ImportFactory $importFactory
      * @param \Magento\ImportExport\Model\Resource\Helper $resourceHelper
      * @param \Magento\Framework\App\Resource $resource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\CustomerImportExport\Model\Resource\Import\Customer\StorageFactory $storageFactory
@@ -240,7 +240,7 @@ public function __construct(
         \Magento\ImportExport\Model\ImportFactory $importFactory,
         \Magento\ImportExport\Model\Resource\Helper $resourceHelper,
         \Magento\Framework\App\Resource $resource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\ImportExport\Model\Export\Factory $collectionFactory,
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\CustomerImportExport\Model\Resource\Import\Customer\StorageFactory $storageFactory,
diff --git a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
index b2dace60d35f8..a498218c67381 100644
--- a/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
+++ b/app/code/Magento/CustomerImportExport/Model/Import/Customer.php
@@ -124,7 +124,7 @@ class Customer extends AbstractCustomer
      * @param \Magento\ImportExport\Model\ImportFactory $importFactory
      * @param \Magento\ImportExport\Model\Resource\Helper $resourceHelper
      * @param \Magento\Framework\App\Resource $resource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\CustomerImportExport\Model\Resource\Import\Customer\StorageFactory $storageFactory
@@ -140,7 +140,7 @@ public function __construct(
         \Magento\ImportExport\Model\ImportFactory $importFactory,
         \Magento\ImportExport\Model\Resource\Helper $resourceHelper,
         \Magento\Framework\App\Resource $resource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\ImportExport\Model\Export\Factory $collectionFactory,
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\CustomerImportExport\Model\Resource\Import\Customer\StorageFactory $storageFactory,
diff --git a/app/code/Magento/CustomerImportExport/composer.json b/app/code/Magento/CustomerImportExport/composer.json
index 5b17cd7fdea2e..ace76834ed5f1 100644
--- a/app/code/Magento/CustomerImportExport/composer.json
+++ b/app/code/Magento/CustomerImportExport/composer.json
@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
+        "magento/module-store": "0.42.0-beta7",
         "magento/module-backend": "0.42.0-beta7",
         "magento/module-core": "0.42.0-beta7",
         "magento/module-customer": "0.42.0-beta7",
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Renderer/LogoUploader.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Renderer/LogoUploader.php
index 2e7b74bca7417..28db136b67d8f 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Renderer/LogoUploader.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Form/Renderer/LogoUploader.php
@@ -96,7 +96,7 @@ public function getLogoImage($store)
     {
         $image = null;
         if (null !== $store) {
-            $image = basename($this->_scopeConfig->getValue('design/header/logo_src', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store->getId()));
+            $image = basename($this->_scopeConfig->getValue('design/header/logo_src', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store->getId()));
         }
         return $image;
     }
diff --git a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/AssignThemeToStore.php b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/AssignThemeToStore.php
index 452e1efbb634e..dd512bd0c91b4 100644
--- a/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/AssignThemeToStore.php
+++ b/app/code/Magento/DesignEditor/Controller/Adminhtml/System/Design/Editor/AssignThemeToStore.php
@@ -26,8 +26,8 @@ protected function _getStores()
         $defaultStore = -1;
         $emptyStores = -2;
         if ($stores == $defaultStore) {
-            /** @var \Magento\Framework\Store\StoreManagerInterface $storeManager */
-            $storeManager = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface');
+            /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
+            $storeManager = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface');
             $ids = array_keys($storeManager->getStores());
             $stores = [array_shift($ids)];
         } elseif ($stores == $emptyStores) {
diff --git a/app/code/Magento/DesignEditor/Controller/Varien/Router/Standard.php b/app/code/Magento/DesignEditor/Controller/Varien/Router/Standard.php
index 5e4e7c539a0d1..9fcc813836edf 100644
--- a/app/code/Magento/DesignEditor/Controller/Varien/Router/Standard.php
+++ b/app/code/Magento/DesignEditor/Controller/Varien/Router/Standard.php
@@ -47,7 +47,7 @@ class Standard extends \Magento\Core\App\Router\Base
      * @param \Magento\Framework\App\ResponseFactory $responseFactory
      * @param \Magento\Framework\App\Route\Config $routeConfig
      * @param \Magento\Framework\UrlInterface $url
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo
      * @param string $routerId
@@ -66,7 +66,7 @@ public function __construct(
         \Magento\Framework\App\ResponseFactory $responseFactory,
         \Magento\Framework\App\Route\Config $routeConfig,
         \Magento\Framework\UrlInterface $url,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\Url\SecurityInfoInterface $urlSecurityInfo,
         $routerId,
diff --git a/app/code/Magento/DesignEditor/Model/State.php b/app/code/Magento/DesignEditor/Model/State.php
index 99ee39bab1922..3e284ed2fd264 100644
--- a/app/code/Magento/DesignEditor/Model/State.php
+++ b/app/code/Magento/DesignEditor/Model/State.php
@@ -186,7 +186,7 @@ protected function _setTheme()
             $this->_mutableConfig->setValue(
                 \Magento\Framework\View\DesignInterface::XML_PATH_THEME_ID,
                 $themeId,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
             $this->_configuration->setValue(\Magento\Framework\View\DesignInterface::XML_PATH_THEME_ID, $themeId);
         }
diff --git a/app/code/Magento/DesignEditor/composer.json b/app/code/Magento/DesignEditor/composer.json
index 86d5316860ac9..9ecd7c8969c73 100644
--- a/app/code/Magento/DesignEditor/composer.json
+++ b/app/code/Magento/DesignEditor/composer.json
@@ -8,6 +8,7 @@
         "magento/module-backend": "0.42.0-beta7",
         "magento/module-core": "0.42.0-beta7",
         "magento/module-eav": "0.42.0-beta7",
+        "magento/module-translation": "0.42.0-beta7",
         "magento/framework": "0.42.0-beta7",
         "magento/magento-composer-installer": "*"
     },
diff --git a/app/code/Magento/DesignEditor/etc/acl.xml b/app/code/Magento/DesignEditor/etc/acl.xml
index 785ba266c94d3..ac1ca9d5a54e7 100644
--- a/app/code/Magento/DesignEditor/etc/acl.xml
+++ b/app/code/Magento/DesignEditor/etc/acl.xml
@@ -8,9 +8,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::content">
-                    <resource id="Magento_Adminhtml::design">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::content">
+                    <resource id="Magento_Backend::design">
                         <resource id="Magento_DesignEditor::editor" title="The Designer" sortOrder="10" />
                     </resource>
                 </resource>
diff --git a/app/code/Magento/DesignEditor/etc/adminhtml/routes.xml b/app/code/Magento/DesignEditor/etc/adminhtml/routes.xml
index 6e63320b28c7e..742c284617623 100644
--- a/app/code/Magento/DesignEditor/etc/adminhtml/routes.xml
+++ b/app/code/Magento/DesignEditor/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
     <router id="admin">
         <route id="adminhtml">
-            <module name="Magento_DesignEditor" before="Magento_Adminhtml" />
+            <module name="Magento_DesignEditor" before="Magento_Backend" />
         </route>
     </router>
 </config>
diff --git a/app/code/Magento/DesignEditor/etc/di.xml b/app/code/Magento/DesignEditor/etc/di.xml
index 8653a423d851d..3b3824539d759 100644
--- a/app/code/Magento/DesignEditor/etc/di.xml
+++ b/app/code/Magento/DesignEditor/etc/di.xml
@@ -37,7 +37,7 @@
     </type>
     <type name="Magento\DesignEditor\Model\Url\NavigationMode">
         <arguments>
-            <argument name="scopeType" xsi:type="const">Magento\Framework\Store\ScopeInterface::SCOPE_STORE</argument>
+            <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
         </arguments>
     </type>
     <type name="Magento\DesignEditor\Model\State">
diff --git a/app/code/Magento/DesignEditor/view/frontend/templates/translate_inline.phtml b/app/code/Magento/DesignEditor/view/frontend/templates/translate_inline.phtml
index 3140404b2223c..23f609877c26a 100644
--- a/app/code/Magento/DesignEditor/view/frontend/templates/translate_inline.phtml
+++ b/app/code/Magento/DesignEditor/view/frontend/templates/translate_inline.phtml
@@ -64,8 +64,8 @@ require([
             var dialogVde = $('#translate-dialog');
 
             $textTranslations.translateInlineVde({
-                img: '<?php echo $block->getViewFileUrl('Magento_Core::translate_edit_icon.png') ?>',
-                imgHover: '<?php echo $block->getViewFileUrl('Magento_Core::translate_edit_icon_hover.png') ?>',
+                img: '<?php echo $block->getViewFileUrl('Magento_Translation::translate_edit_icon.png') ?>',
+                imgHover: '<?php echo $block->getViewFileUrl('Magento_Translation::translate_edit_icon_hover.png') ?>',
                 translateMode: '<?php echo $block->getTranslateMode() ?>',
                 onClick: function(e, widget) {
                     $body.removeClass('trnslate-inline-' + widget.options.translateMode + '-area');
@@ -80,8 +80,8 @@ require([
             });
 
             $imageTranslations.translateInlineImageVde({
-                img: '<?php echo $block->getViewFileUrl('Magento_Core::translate_edit_icon.png') ?>',
-                imgHover: '<?php echo $block->getViewFileUrl('Magento_Core::translate_edit_icon_hover.png') ?>',
+                img: '<?php echo $block->getViewFileUrl('Magento_Translation::translate_edit_icon.png') ?>',
+                imgHover: '<?php echo $block->getViewFileUrl('Magento_Translation::translate_edit_icon_hover.png') ?>',
                 translateMode: '<?php echo $block->getTranslateMode() ?>',
                 onClick: function(e, widget) {
                     $body.removeClass('trnslate-inline-' + widget.options.translateMode + '-area');
@@ -96,8 +96,8 @@ require([
             });
 
             $scriptTranslations.translateInlineScriptVde({
-                img: '<?php echo $block->getViewFileUrl('Magento_Core::translate_edit_icon.png') ?>',
-                imgHover: '<?php echo $block->getViewFileUrl('Magento_Core::translate_edit_icon_hover.png') ?>',
+                img: '<?php echo $block->getViewFileUrl('Magento_Translation::translate_edit_icon.png') ?>',
+                imgHover: '<?php echo $block->getViewFileUrl('Magento_Translation::translate_edit_icon_hover.png') ?>',
                 translateMode: '<?php echo $block->getTranslateMode() ?>',
                 onClick: function(e, widget) {
                     $body.removeClass('trnslate-inline-' + widget.options.translateMode + '-area');
diff --git a/app/code/Magento/Developer/LICENSE.txt b/app/code/Magento/Developer/LICENSE.txt
new file mode 100644
index 0000000000000..49525fd99da9c
--- /dev/null
+++ b/app/code/Magento/Developer/LICENSE.txt
@@ -0,0 +1,48 @@
+
+Open Software License ("OSL") v. 3.0
+
+This Open Software License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Open Software License version 3.0
+
+   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, with the proviso that copies of Original Work or Derivative Works that You distribute or communicate shall be licensed under this Open Software License;
+
+         4. to perform the Original Work publicly; and
+
+         5. to display the Original Work publicly. 
+
+   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including 'fair use' or 'fair dealing'). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+  16. Modification of This License. This License is Copyright (C) 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Open Software License" or "OSL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
\ No newline at end of file
diff --git a/app/code/Magento/Developer/LICENSE_AFL.txt b/app/code/Magento/Developer/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..87943b95d43a5
--- /dev/null
+++ b/app/code/Magento/Developer/LICENSE_AFL.txt
@@ -0,0 +1,48 @@
+
+Academic Free License ("AFL") v. 3.0
+
+This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Academic Free License version 3.0
+
+   1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+         1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+         2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+         3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License;
+
+         4. to perform the Original Work publicly; and
+
+         5. to display the Original Work publicly.
+
+   2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+   3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+   4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+   5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+   6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+   7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+   8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+   9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+  10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+  11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+  12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+  13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+  14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+  15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+  16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
\ No newline at end of file
diff --git a/app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php b/app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php
index 61683433a3eba..9e40d6f9cd1a7 100644
--- a/app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php
+++ b/app/code/Magento/Developer/Model/TemplateEngine/Plugin/DebugHints.php
@@ -64,8 +64,8 @@ public function afterCreate(
         \Magento\Framework\View\TemplateEngineFactory $subject,
         \Magento\Framework\View\TemplateEngineInterface $invocationResult
     ) {
-        if ($this->_scopeConfig->getValue(self::XML_PATH_DEBUG_TEMPLATE_HINTS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE) && $this->_coreData->isDevAllowed()) {
-            $showBlockHints = $this->_scopeConfig->getValue(self::XML_PATH_DEBUG_TEMPLATE_HINTS_BLOCKS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        if ($this->_scopeConfig->getValue(self::XML_PATH_DEBUG_TEMPLATE_HINTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE) && $this->_coreData->isDevAllowed()) {
+            $showBlockHints = $this->_scopeConfig->getValue(self::XML_PATH_DEBUG_TEMPLATE_HINTS_BLOCKS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
             return $this->_objectManager->create(
                 'Magento\Developer\Model\TemplateEngine\Decorator\DebugHints',
                 ['subject' => $invocationResult, 'showBlockHints' => $showBlockHints]
diff --git a/app/code/Magento/Developer/composer.json b/app/code/Magento/Developer/composer.json
index 196f233fd3c0b..4436480fa389f 100644
--- a/app/code/Magento/Developer/composer.json
+++ b/app/code/Magento/Developer/composer.json
@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
+        "magento/module-store": "0.42.0-beta7",
         "magento/module-core": "0.42.0-beta7",
         "magento/framework": "0.42.0-beta7",
         "magento/magento-composer-installer": "*"
diff --git a/app/code/Magento/Dhl/Model/Carrier.php b/app/code/Magento/Dhl/Model/Carrier.php
index 03e53d36c5449..6b82978549bf8 100644
--- a/app/code/Magento/Dhl/Model/Carrier.php
+++ b/app/code/Magento/Dhl/Model/Carrier.php
@@ -157,7 +157,7 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
     protected $_coreDate;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -205,7 +205,7 @@ class Carrier extends \Magento\Dhl\Model\AbstractDhl implements \Magento\Shippin
      * @param \Magento\Shipping\Helper\Carrier $carrierHelper
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $coreDate
      * @param \Magento\Framework\Module\Dir\Reader $configReader
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Stdlib\String $string
      * @param \Magento\Framework\Math\Division $mathDivision
      * @param \Magento\Framework\Filesystem $filesystem
@@ -233,7 +233,7 @@ public function __construct(
         \Magento\Shipping\Helper\Carrier $carrierHelper,
         \Magento\Framework\Stdlib\DateTime\DateTime $coreDate,
         \Magento\Framework\Module\Dir\Reader $configReader,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Stdlib\String $string,
         \Magento\Framework\Math\Division $mathDivision,
         \Magento\Framework\Filesystem $filesystem,
@@ -284,7 +284,7 @@ protected function _getDefaultValue($origValue, $pathToValue)
         if (!$origValue) {
             $origValue = $this->_scopeConfig->getValue(
                 $pathToValue,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $this->getStore()
             );
         }
@@ -422,7 +422,7 @@ public function setRequest(\Magento\Framework\Object $request)
             ->setOrigEmail(
                 $this->_scopeConfig->getValue(
                     'trans_email/ident_general/email',
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                     $requestObject->getStoreId()
                 )
             )
@@ -435,7 +435,7 @@ public function setRequest(\Magento\Framework\Object $request)
 
         $originStreet2 = $this->_scopeConfig->getValue(
             Shipment::XML_PATH_STORE_ADDRESS2,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $requestObject->getStoreId()
         );
 
@@ -1265,7 +1265,7 @@ public function proccessAdditionalValidation(RateRequest $request)
         $countryParams = $this->getCountryParams(
             $this->_scopeConfig->getValue(
                 Shipment::XML_PATH_STORE_COUNTRY_ID,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $request->getStoreId()
             )
         );
@@ -1388,7 +1388,7 @@ protected function _doRequest()
         $originRegion = $this->getCountryParams(
             $this->_scopeConfig->getValue(
                 Shipment::XML_PATH_STORE_COUNTRY_ID,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $this->getStore()
             )
         )->getRegion();
diff --git a/app/code/Magento/Dhl/Model/Plugin/Checkout/Block/Cart/Shipping.php b/app/code/Magento/Dhl/Model/Plugin/Checkout/Block/Cart/Shipping.php
index 0f66031a62e79..43ed90ffedcdc 100644
--- a/app/code/Magento/Dhl/Model/Plugin/Checkout/Block/Cart/Shipping.php
+++ b/app/code/Magento/Dhl/Model/Plugin/Checkout/Block/Cart/Shipping.php
@@ -34,7 +34,7 @@ public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $
      */
     public function afterGetStateActive(\Magento\Checkout\Block\Cart\Shipping $subject, $result)
     {
-        return (bool)$result || (bool)$this->_scopeConfig->getValue('carriers/dhl/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return (bool)$result || (bool)$this->_scopeConfig->getValue('carriers/dhl/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
@@ -45,6 +45,6 @@ public function afterGetStateActive(\Magento\Checkout\Block\Cart\Shipping $subje
      */
     public function afterGetCityActive(\Magento\Checkout\Block\Cart\Shipping $subject, $result)
     {
-        return (bool)$result || (bool)$this->_scopeConfig->getValue('carriers/dhl/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return (bool)$result || (bool)$this->_scopeConfig->getValue('carriers/dhl/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 }
diff --git a/app/code/Magento/Directory/Block/Adminhtml/Frontend/Currency/Base.php b/app/code/Magento/Directory/Block/Adminhtml/Frontend/Currency/Base.php
index 1f67df4a13055..c99cba86d9e1f 100644
--- a/app/code/Magento/Directory/Block/Adminhtml/Frontend/Currency/Base.php
+++ b/app/code/Magento/Directory/Block/Adminhtml/Frontend/Currency/Base.php
@@ -20,7 +20,7 @@ public function render(\Magento\Framework\Data\Form\Element\AbstractElement $ele
         if ($this->getRequest()->getParam('website') != '') {
             $priceScope = $this->_scopeConfig->getValue(
                 \Magento\Store\Model\Store::XML_PATH_PRICE_SCOPE,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
             if ($priceScope == \Magento\Store\Model\Store::PRICE_SCOPE_GLOBAL) {
                 return '';
diff --git a/app/code/Magento/Directory/Controller/Currency/SwitchAction.php b/app/code/Magento/Directory/Controller/Currency/SwitchAction.php
index 8162705c6e791..b8aada56cf7fd 100644
--- a/app/code/Magento/Directory/Controller/Currency/SwitchAction.php
+++ b/app/code/Magento/Directory/Controller/Currency/SwitchAction.php
@@ -13,8 +13,8 @@ class SwitchAction extends \Magento\Framework\App\Action\Action
      */
     public function execute()
     {
-        /** @var \Magento\Framework\Store\StoreManagerInterface $storeManager */
-        $storeManager = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface');
+        /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
+        $storeManager = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface');
         $currency = (string)$this->getRequest()->getParam('currency');
         if ($currency) {
             $storeManager->getStore()->setCurrentCurrencyCode($currency);
diff --git a/app/code/Magento/Directory/Helper/Data.php b/app/code/Magento/Directory/Helper/Data.php
index 40b4f42406c0c..9f9f9977bef05 100644
--- a/app/code/Magento/Directory/Helper/Data.php
+++ b/app/code/Magento/Directory/Helper/Data.php
@@ -77,7 +77,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     protected $_coreHelper;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -97,7 +97,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Directory\Model\Resource\Country\Collection $countryCollection
      * @param \Magento\Directory\Model\Resource\Region\CollectionFactory $regCollectionFactory,
      * @param \Magento\Core\Helper\Data $coreHelper
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      */
@@ -107,7 +107,7 @@ public function __construct(
         \Magento\Directory\Model\Resource\Country\Collection $countryCollection,
         \Magento\Directory\Model\Resource\Region\CollectionFactory $regCollectionFactory,
         \Magento\Core\Helper\Data $coreHelper,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Directory\Model\CurrencyFactory $currencyFactory,
         \Magento\Framework\App\Config\ScopeConfigInterface $config
     ) {
@@ -228,7 +228,7 @@ public function getCountriesWithOptionalZip($asJson = false)
             $value = trim(
                 $this->_config->getValue(
                     self::OPTIONAL_ZIP_COUNTRIES_CONFIG_PATH,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 )
             );
             $this->_optZipCountries = preg_split('/\,/', $value, 0, PREG_SPLIT_NO_EMPTY);
@@ -260,10 +260,7 @@ public function isZipCodeOptional($countryCode)
     public function getCountriesWithStatesRequired($asJson = false)
     {
         $value = trim(
-            $this->_config->getValue(
-                self::XML_PATH_STATES_REQUIRED,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
-            )
+            $this->_config->getValue(self::XML_PATH_STATES_REQUIRED, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
         );
         $countryList = preg_split('/\,/', $value, 0, PREG_SPLIT_NO_EMPTY);
         if ($asJson) {
@@ -281,7 +278,7 @@ public function isShowNonRequiredState()
     {
         return (bool)$this->_config->getValue(
             self::XML_PATH_DISPLAY_ALL_STATES,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
diff --git a/app/code/Magento/Directory/Model/Currency.php b/app/code/Magento/Directory/Model/Currency.php
index 129d1f976761e..3b5ec26325abc 100644
--- a/app/code/Magento/Directory/Model/Currency.php
+++ b/app/code/Magento/Directory/Model/Currency.php
@@ -46,7 +46,7 @@ class Currency extends \Magento\Framework\Model\AbstractModel
     protected $_localeFormat;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -69,7 +69,7 @@ class Currency extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\Locale\FormatInterface $localeFormat
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Directory\Helper\Data $directoryHelper
      * @param Currency\FilterFactory $currencyFilterFactory
      * @param \Magento\Framework\Locale\CurrencyInterface $localeCurrency
@@ -82,7 +82,7 @@ public function __construct(
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\Registry $registry,
         \Magento\Framework\Locale\FormatInterface $localeFormat,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Directory\Helper\Data $directoryHelper,
         \Magento\Directory\Model\Currency\FilterFactory $currencyFilterFactory,
         \Magento\Framework\Locale\CurrencyInterface $localeCurrency,
diff --git a/app/code/Magento/Directory/Model/Currency/DefaultLocator.php b/app/code/Magento/Directory/Model/Currency/DefaultLocator.php
index 29fe6747dbbed..d9ccfa0b263b5 100644
--- a/app/code/Magento/Directory/Model/Currency/DefaultLocator.php
+++ b/app/code/Magento/Directory/Model/Currency/DefaultLocator.php
@@ -17,17 +17,17 @@ class DefaultLocator
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $configuration
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $configuration,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->_configuration = $configuration;
         $this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Directory/Model/Currency/Filter.php b/app/code/Magento/Directory/Model/Currency/Filter.php
index 7670fac88b029..b15eee9c3aa35 100644
--- a/app/code/Magento/Directory/Model/Currency/Filter.php
+++ b/app/code/Magento/Directory/Model/Currency/Filter.php
@@ -33,7 +33,7 @@ class Filter implements \Zend_Filter_Interface
     protected $_localeFormat;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -51,7 +51,7 @@ class Filter implements \Zend_Filter_Interface
 
     /**
      * @param \Magento\Framework\Locale\FormatInterface $localeFormat
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Locale\CurrencyInterface $localeCurrency
      * @param PriceCurrencyInterface $priceCurrency
      * @param string $code
@@ -59,7 +59,7 @@ class Filter implements \Zend_Filter_Interface
      */
     public function __construct(
         \Magento\Framework\Locale\FormatInterface $localeFormat,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Locale\CurrencyInterface $localeCurrency,
         PriceCurrencyInterface $priceCurrency,
         $code,
diff --git a/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php b/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php
index 5fd5e279bbe63..9068c4429d792 100644
--- a/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php
+++ b/app/code/Magento/Directory/Model/Currency/Import/Webservicex.php
@@ -63,7 +63,7 @@ protected function _convert($currencyFrom, $currencyTo, $retry = 0)
                 [
                     'timeout' => $this->_scopeConfig->getValue(
                         'currency/webservicex/timeout',
-                        \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                     ),
                 ]
             )->request(
diff --git a/app/code/Magento/Directory/Model/Observer.php b/app/code/Magento/Directory/Model/Observer.php
index c1892ec452505..23d0b5c52f010 100644
--- a/app/code/Magento/Directory/Model/Observer.php
+++ b/app/code/Magento/Directory/Model/Observer.php
@@ -43,7 +43,7 @@ class Observer
     protected $_transportBuilder;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -61,7 +61,7 @@ class Observer
      * @param \Magento\Directory\Model\Currency\Import\Factory $importFactory
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
      * @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
      */
@@ -69,7 +69,7 @@ public function __construct(
         \Magento\Directory\Model\Currency\Import\Factory $importFactory,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Directory\Model\CurrencyFactory $currencyFactory,
         \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
     ) {
@@ -91,10 +91,10 @@ public function scheduledUpdateCurrencyRates($schedule)
         $importWarnings = [];
         if (!$this->_scopeConfig->getValue(
             self::IMPORT_ENABLE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         ) || !$this->_scopeConfig->getValue(
             self::CRON_STRING_PATH,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )
         ) {
             return;
@@ -104,7 +104,7 @@ public function scheduledUpdateCurrencyRates($schedule)
         $rates = [];
         $service = $this->_scopeConfig->getValue(
             self::IMPORT_SERVICE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         if ($service) {
             try {
@@ -132,7 +132,7 @@ public function scheduledUpdateCurrencyRates($schedule)
             $this->_transportBuilder->setTemplateIdentifier(
                 $this->_scopeConfig->getValue(
                     self::XML_PATH_ERROR_TEMPLATE,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 )
             )->setTemplateOptions(
                 [
@@ -144,12 +144,12 @@ public function scheduledUpdateCurrencyRates($schedule)
             )->setFrom(
                 $this->_scopeConfig->getValue(
                     self::XML_PATH_ERROR_IDENTITY,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 )
             )->addTo(
                 $this->_scopeConfig->getValue(
                     self::XML_PATH_ERROR_RECIPIENT,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 )
             );
             $transport = $this->_transportBuilder->getTransport();
diff --git a/app/code/Magento/Directory/Model/PriceCurrency.php b/app/code/Magento/Directory/Model/PriceCurrency.php
index 967634c6ada66..8232d9220b412 100644
--- a/app/code/Magento/Directory/Model/PriceCurrency.php
+++ b/app/code/Magento/Directory/Model/PriceCurrency.php
@@ -6,7 +6,7 @@
 namespace Magento\Directory\Model;
 
 use Magento\Framework\App\ScopeInterface;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Psr\Log\LoggerInterface as Logger;
 use Magento\Store\Model\Store;
 
@@ -16,7 +16,7 @@
 class PriceCurrency implements \Magento\Framework\Pricing\PriceCurrencyInterface
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -31,7 +31,7 @@ class PriceCurrency implements \Magento\Framework\Pricing\PriceCurrencyInterface
     protected $logger;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param StoreManagerInterface $storeManager
      * @param CurrencyFactory $currencyFactory
      * @param Logger $logger
      */
diff --git a/app/code/Magento/Directory/Model/Resource/Country/Collection.php b/app/code/Magento/Directory/Model/Resource/Country/Collection.php
index acafaa8ff1318..99e1306287d0a 100644
--- a/app/code/Magento/Directory/Model/Resource/Country/Collection.php
+++ b/app/code/Magento/Directory/Model/Resource/Country/Collection.php
@@ -104,7 +104,7 @@ protected function _construct()
      */
     public function loadByStore($store = null)
     {
-        $allowCountries = explode(',', (string)$this->_scopeConfig->getValue('general/country/allow', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store));
+        $allowCountries = explode(',', (string)$this->_scopeConfig->getValue('general/country/allow', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store));
         if (!empty($allowCountries)) {
             $this->addFieldToFilter("country_id", ['in' => $allowCountries]);
         }
diff --git a/app/code/Magento/Directory/etc/adminhtml/routes.xml b/app/code/Magento/Directory/etc/adminhtml/routes.xml
index d192fd983744e..3659f78c7e838 100644
--- a/app/code/Magento/Directory/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Directory/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
     <router id="admin">
         <route id="directory" frontName="directory">
-            <module name="Magento_Directory" before="Magento_Adminhtml" />
+            <module name="Magento_Directory" before="Magento_Backend" />
         </route>
     </router>
 </config>
diff --git a/app/code/Magento/Directory/etc/adminhtml/system.xml b/app/code/Magento/Directory/etc/adminhtml/system.xml
index 251a33ec635f5..0bd0e0eb90359 100644
--- a/app/code/Magento/Directory/etc/adminhtml/system.xml
+++ b/app/code/Magento/Directory/etc/adminhtml/system.xml
@@ -10,7 +10,7 @@
         <section id="currency" translate="label" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Currency Setup</label>
             <tab>general</tab>
-            <resource>Magento_Adminhtml::currency</resource>
+            <resource>Magento_Backend::currency</resource>
             <group id="options" translate="label" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Currency Options</label>
                 <field id="base" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0">
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
index a6e1757d635ce..50cdaebedacbc 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
@@ -209,7 +209,7 @@ public function getLinksTitle()
             $this->getProduct()->getTypeId() ==
             'downloadable' ? $this->getProduct()->getLinksTitle() : $this->_scopeConfig->getValue(
                 \Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
     }
 
@@ -234,7 +234,7 @@ public function getIsPriceWebsiteScope()
     {
         $scope = (int)$this->_scopeConfig->getValue(
             \Magento\Store\Model\Store::XML_PATH_PRICE_SCOPE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         if ($scope == \Magento\Store\Model\Store::PRICE_SCOPE_WEBSITE) {
             return true;
@@ -355,7 +355,7 @@ public function getConfigMaxDownloads()
     {
         return $this->_scopeConfig->getValue(
             \Magento\Downloadable\Model\Link::XML_PATH_DEFAULT_DOWNLOADS_NUMBER,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
index 5ae2d6cf91ee3..8725016bcd3eb 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
@@ -207,7 +207,7 @@ public function getSamplesTitle()
         && $this->getProduct()->getTypeId() == 'downloadable' ? $this->getProduct()->getSamplesTitle() :
             $this->_scopeConfig->getValue(
                 \Magento\Downloadable\Model\Sample::XML_PATH_SAMPLES_TITLE,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
     }
 
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php b/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php
index 6e0e1921643db..f2724cdfbd8c6 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Sales/Items/Column/Downloadable/Name.php
@@ -77,6 +77,6 @@ public function getLinksTitle()
         if ($this->_purchased && $this->_purchased->getLinkSectionTitle()) {
             return $this->_purchased->getLinkSectionTitle();
         }
-        return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 }
diff --git a/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php b/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
index f380a109c61d9..544d9c091faf6 100644
--- a/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
+++ b/app/code/Magento/Downloadable/Block/Catalog/Product/Links.php
@@ -131,7 +131,7 @@ public function getLinksTitle()
         }
         return $this->_scopeConfig->getValue(
             \Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
@@ -145,7 +145,7 @@ public function getIsOpenInNewWindow()
     {
         return $this->_scopeConfig->isSetFlag(
             \Magento\Downloadable\Model\Link::XML_PATH_TARGET_NEW_WINDOW,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
diff --git a/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php b/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php
index c0403fbaf81a7..179b2816b92e3 100644
--- a/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php
+++ b/app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php
@@ -56,7 +56,7 @@ public function getSamplesTitle()
         if ($this->getProduct()->getSamplesTitle()) {
             return $this->getProduct()->getSamplesTitle();
         }
-        return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Sample::XML_PATH_SAMPLES_TITLE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Sample::XML_PATH_SAMPLES_TITLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
@@ -67,6 +67,6 @@ public function getSamplesTitle()
      */
     public function getIsOpenInNewWindow()
     {
-        return $this->_scopeConfig->isSetFlag(\Magento\Downloadable\Model\Link::XML_PATH_TARGET_NEW_WINDOW, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->isSetFlag(\Magento\Downloadable\Model\Link::XML_PATH_TARGET_NEW_WINDOW, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 }
diff --git a/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php b/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php
index b485eb81b0a6b..5b6c1b0960b4d 100644
--- a/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php
+++ b/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php
@@ -166,6 +166,6 @@ public function getDownloadUrl($item)
      */
     public function getIsOpenInNewWindow()
     {
-        return $this->_scopeConfig->isSetFlag(\Magento\Downloadable\Model\Link::XML_PATH_TARGET_NEW_WINDOW, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->isSetFlag(\Magento\Downloadable\Model\Link::XML_PATH_TARGET_NEW_WINDOW, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 }
diff --git a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
index dfceb5f25c04f..80c7998839e1f 100644
--- a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Downloadable.php
@@ -83,7 +83,7 @@ public function getLinksTitle()
         if ($this->_purchased->getLinkSectionTitle()) {
             return $this->_purchased->getLinkSectionTitle();
         }
-        return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
diff --git a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php
index 617cb173de3e3..2def86d9c63e0 100644
--- a/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Sales/Order/Email/Items/Order/Downloadable.php
@@ -74,7 +74,7 @@ public function getLinksTitle()
         if ($this->_purchased->getLinkSectionTitle()) {
             return $this->_purchased->getLinkSectionTitle();
         }
-        return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
diff --git a/app/code/Magento/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php b/app/code/Magento/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php
index cea241327648f..7176465cae443 100644
--- a/app/code/Magento/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Sales/Order/Item/Renderer/Downloadable.php
@@ -77,6 +77,6 @@ public function getLinksTitle()
         if ($this->_purchasedLinks->getLinkSectionTitle()) {
             return $this->_purchasedLinks->getLinkSectionTitle();
         }
-        return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 }
diff --git a/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php b/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php
index 2beaed9036c40..8d4df3c04791a 100644
--- a/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php
+++ b/app/code/Magento/Downloadable/Helper/Catalog/Product/Configuration.php
@@ -79,7 +79,7 @@ public function getLinksTitle($product)
         if (strlen($title)) {
             return $title;
         }
-        return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
diff --git a/app/code/Magento/Downloadable/Helper/Data.php b/app/code/Magento/Downloadable/Helper/Data.php
index cbb96e9d4fb1e..faab224de0f9e 100644
--- a/app/code/Magento/Downloadable/Helper/Data.php
+++ b/app/code/Magento/Downloadable/Helper/Data.php
@@ -51,7 +51,7 @@ public function getIsShareable($link)
             case \Magento\Downloadable\Model\Link::LINK_SHAREABLE_CONFIG:
                 $shareable = (bool)$this->_scopeConfig->isSetFlag(
                     \Magento\Downloadable\Model\Link::XML_PATH_CONFIG_IS_SHAREABLE,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 );
         }
         return $shareable;
diff --git a/app/code/Magento/Downloadable/Helper/Download.php b/app/code/Magento/Downloadable/Helper/Download.php
index ed7200dff8e70..4351cf3dccbf5 100644
--- a/app/code/Magento/Downloadable/Helper/Download.php
+++ b/app/code/Magento/Downloadable/Helper/Download.php
@@ -302,6 +302,6 @@ public function output()
      */
     public function getContentDisposition($store = null)
     {
-        return $this->_scopeConfig->getValue(self::XML_PATH_CONTENT_DISPOSITION, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+        return $this->_scopeConfig->getValue(self::XML_PATH_CONTENT_DISPOSITION, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
     }
 }
diff --git a/app/code/Magento/Downloadable/Model/Observer.php b/app/code/Magento/Downloadable/Model/Observer.php
index 080630fc984fd..87fce9c49a4dd 100644
--- a/app/code/Magento/Downloadable/Model/Observer.php
+++ b/app/code/Magento/Downloadable/Model/Observer.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Downloadable\Model;
 
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Downloadable Products Observer
@@ -158,7 +158,7 @@ public function saveDownloadableOrderItem($observer)
                     ->_scopeConfig
                     ->getValue(
                         \Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE,
-                        \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                        ScopeInterface::SCOPE_STORE
                     );
                 $linkPurchased->setLinkSectionTitle($linkSectionTitle)->save();
                 foreach ($linkIds as $linkId) {
@@ -258,7 +258,7 @@ public function setLinkStatus($observer)
         $downloadableItemsStatuses = [];
         $orderItemStatusToEnable = $this->_scopeConfig->getValue(
             \Magento\Downloadable\Model\Link\Purchased\Item::XML_PATH_ORDER_ITEM_STATUS,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $order->getStoreId()
         );
 
@@ -351,7 +351,7 @@ public function isAllowedGuestCheckout(\Magento\Framework\Event\Observer $observ
 
         if (!$this->_scopeConfig->isSetFlag(
             self::XML_PATH_DISABLE_GUEST_CHECKOUT,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $store
         )) {
             return $this;
diff --git a/app/code/Magento/Downloadable/Model/Resource/Link.php b/app/code/Magento/Downloadable/Model/Resource/Link.php
index 1b9da79852e18..758401cb4b2e7 100644
--- a/app/code/Magento/Downloadable/Model/Resource/Link.php
+++ b/app/code/Magento/Downloadable/Model/Resource/Link.php
@@ -30,7 +30,7 @@ class Link extends \Magento\Framework\Model\Resource\Db\AbstractDb
     protected $_currencyFactory;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -39,14 +39,14 @@ class Link extends \Magento\Framework\Model\Resource\Db\AbstractDb
      * @param \Magento\Catalog\Helper\Data $catalogData
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $configuration
      * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
         \Magento\Catalog\Helper\Data $catalogData,
         \Magento\Framework\App\Config\ScopeConfigInterface $configuration,
         \Magento\Directory\Model\CurrencyFactory $currencyFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->_catalogData = $catalogData;
         $this->_configuration = $configuration;
diff --git a/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php b/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php
index e8bf82f84fbd0..913d2f31f15cf 100644
--- a/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php
+++ b/app/code/Magento/Downloadable/Model/Sales/Order/Pdf/Items/AbstractItems.php
@@ -107,6 +107,6 @@ public function getLinksTitle()
         if ($this->_purchasedLinks->getLinkSectionTitle()) {
             return $this->_purchasedLinks->getLinkSectionTitle();
         }
-        return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue(\Magento\Downloadable\Model\Link::XML_PATH_LINKS_TITLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 }
diff --git a/app/code/Magento/Downloadable/etc/acl.xml b/app/code/Magento/Downloadable/etc/acl.xml
index 6ba91097d5dfc..0602ba9835628 100644
--- a/app/code/Magento/Downloadable/etc/acl.xml
+++ b/app/code/Magento/Downloadable/etc/acl.xml
@@ -8,10 +8,10 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::stores">
-                    <resource id="Magento_Adminhtml::stores_settings">
-                        <resource id="Magento_Adminhtml::config">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::stores">
+                    <resource id="Magento_Backend::stores_settings">
+                        <resource id="Magento_Backend::config">
                             <resource id="Magento_Downloadable::downloadable" title="Downloadable Product Section" />
                         </resource>
                     </resource>
diff --git a/app/code/Magento/Downloadable/etc/adminhtml/routes.xml b/app/code/Magento/Downloadable/etc/adminhtml/routes.xml
index e52d15b879599..11aec011d1343 100644
--- a/app/code/Magento/Downloadable/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Downloadable/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
     <router id="admin">
         <route id="adminhtml">
-            <module name="Magento_Downloadable" before="Magento_Adminhtml" />
+            <module name="Magento_Downloadable" before="Magento_Backend" />
         </route>
     </router>
 </config>
diff --git a/app/code/Magento/Eav/Helper/Data.php b/app/code/Magento/Eav/Helper/Data.php
index 92b8999be8b09..851c189bc9f06 100644
--- a/app/code/Magento/Eav/Helper/Data.php
+++ b/app/code/Magento/Eav/Helper/Data.php
@@ -129,7 +129,7 @@ public function getAttributeLockedFields($entityTypeCode)
      */
     public function getInputTypesValidatorData()
     {
-        return $this->_scopeConfig->getValue(self::XML_PATH_VALIDATOR_DATA_INPUT_TYPES, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue(self::XML_PATH_VALIDATOR_DATA_INPUT_TYPES, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute.php b/app/code/Magento/Eav/Model/Entity/Attribute.php
index a385e9baec54f..efe61c256b20b 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute.php
@@ -71,7 +71,7 @@ class Attribute extends \Magento\Eav\Model\Entity\Attribute\AbstractAttribute im
      * @param \Magento\Core\Helper\Data $coreData
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param TypeFactory $eavTypeFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Eav\Model\Resource\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
      * @param \Magento\Eav\Api\Data\AttributeOptionDataBuilder $optionDataBuilder
@@ -91,7 +91,7 @@ public function __construct(
         \Magento\Core\Helper\Data $coreData,
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Eav\Model\Entity\TypeFactory $eavTypeFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Eav\Model\Resource\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
         \Magento\Eav\Api\Data\AttributeOptionDataBuilder $optionDataBuilder,
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php b/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
index 6543051fd86f3..4c1c663da69e0 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/AbstractAttribute.php
@@ -87,7 +87,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
     protected $_eavTypeFactory;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -114,7 +114,7 @@ abstract class AbstractAttribute extends \Magento\Framework\Model\AbstractExtens
      * @param \Magento\Core\Helper\Data $coreData
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Eav\Model\Entity\TypeFactory $eavTypeFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Eav\Model\Resource\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
      * @param \Magento\Eav\Api\Data\AttributeOptionDataBuilder $optionDataBuilder
@@ -131,7 +131,7 @@ public function __construct(
         \Magento\Core\Helper\Data $coreData,
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Eav\Model\Entity\TypeFactory $eavTypeFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Eav\Model\Resource\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
         \Magento\Eav\Api\Data\AttributeOptionDataBuilder $optionDataBuilder,
diff --git a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Store.php b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Store.php
index 386a6a26dddd5..a9f56c983ac28 100644
--- a/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Store.php
+++ b/app/code/Magento/Eav/Model/Entity/Attribute/Backend/Store.php
@@ -8,14 +8,14 @@
 class Store extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
-    public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
+    public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
     {
         $this->_storeManager = $storeManager;
     }
diff --git a/app/code/Magento/Eav/Model/Form.php b/app/code/Magento/Eav/Model/Form.php
index 21a0b2cdb875a..919985062333e 100644
--- a/app/code/Magento/Eav/Model/Form.php
+++ b/app/code/Magento/Eav/Model/Form.php
@@ -106,7 +106,7 @@ abstract class Form
     protected $_validator = null;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -141,7 +141,7 @@ abstract class Form
     protected $_validatorConfigFactory;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Framework\Module\Dir\Reader $modulesReader
      * @param \Magento\Eav\Model\AttributeDataFactory $attrDataFactory
@@ -152,7 +152,7 @@ abstract class Form
      * @throws \Magento\Framework\Model\Exception
      */
     public function __construct(
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Framework\Module\Dir\Reader $modulesReader,
         \Magento\Eav\Model\AttributeDataFactory $attrDataFactory,
diff --git a/app/code/Magento/Eav/Model/Form/Fieldset.php b/app/code/Magento/Eav/Model/Form/Fieldset.php
index c9d91a2fae92a..61ce2fb0e3fb4 100644
--- a/app/code/Magento/Eav/Model/Form/Fieldset.php
+++ b/app/code/Magento/Eav/Model/Form/Fieldset.php
@@ -28,14 +28,14 @@ class Fieldset extends \Magento\Framework\Model\AbstractModel
     protected $_eventPrefix = 'eav_form_fieldset';
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\Db $resourceCollection
      * @param array $data
@@ -43,7 +43,7 @@ class Fieldset extends \Magento\Framework\Model\AbstractModel
     public function __construct(
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\Registry $registry,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\Db $resourceCollection = null,
         array $data = []
diff --git a/app/code/Magento/Eav/Model/Resource/Attribute/Collection.php b/app/code/Magento/Eav/Model/Resource/Attribute/Collection.php
index 466788144ce7e..e82817160f177 100644
--- a/app/code/Magento/Eav/Model/Resource/Attribute/Collection.php
+++ b/app/code/Magento/Eav/Model/Resource/Attribute/Collection.php
@@ -34,7 +34,7 @@ abstract class Collection extends \Magento\Eav\Model\Resource\Entity\Attribute\C
     protected $_entityType;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -44,7 +44,7 @@ abstract class Collection extends \Magento\Eav\Model\Resource\Entity\Attribute\C
      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Eav\Model\Config $eavConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param mixed $connection
      * @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
      */
@@ -54,7 +54,7 @@ public function __construct(
         \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Eav\Model\Config $eavConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         $connection = null,
         \Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
     ) {
diff --git a/app/code/Magento/Eav/Model/Resource/Entity/Attribute.php b/app/code/Magento/Eav/Model/Resource/Entity/Attribute.php
index 66dd3594cc6b0..0d10528a5ae92 100644
--- a/app/code/Magento/Eav/Model/Resource/Entity/Attribute.php
+++ b/app/code/Magento/Eav/Model/Resource/Entity/Attribute.php
@@ -25,7 +25,7 @@ class Attribute extends \Magento\Framework\Model\Resource\Db\AbstractDb
     protected static $_entityAttributes = [];
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -38,12 +38,12 @@ class Attribute extends \Magento\Framework\Model\Resource\Db\AbstractDb
      * Class constructor
      *
      * @param \Magento\Framework\App\Resource $resource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param Type $eavEntityType
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         Type $eavEntityType
     ) {
         $this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Option/Collection.php b/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Option/Collection.php
index ced22f1a4f799..ac3dd682afef8 100644
--- a/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Option/Collection.php
+++ b/app/code/Magento/Eav/Model/Resource/Entity/Attribute/Option/Collection.php
@@ -25,7 +25,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
     protected $_coreResource;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -35,7 +35,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Framework\App\Resource $coreResource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param mixed $connection
      * @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
      */
@@ -45,7 +45,7 @@ public function __construct(
         \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Framework\App\Resource $coreResource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         $connection = null,
         \Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
     ) {
diff --git a/app/code/Magento/Eav/Model/Resource/Form/Attribute/Collection.php b/app/code/Magento/Eav/Model/Resource/Form/Attribute/Collection.php
index dd521294b40fc..1ae31e5992976 100644
--- a/app/code/Magento/Eav/Model/Resource/Form/Attribute/Collection.php
+++ b/app/code/Magento/Eav/Model/Resource/Form/Attribute/Collection.php
@@ -41,7 +41,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
     protected $_entityType;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -56,7 +56,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Eav\Model\Config $eavConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param mixed $connection
      * @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
      */
@@ -66,7 +66,7 @@ public function __construct(
         \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Eav\Model\Config $eavConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         $connection = null,
         \Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
     ) {
diff --git a/app/code/Magento/Eav/Model/Resource/Form/Fieldset/Collection.php b/app/code/Magento/Eav/Model/Resource/Form/Fieldset/Collection.php
index 824ec8712ce7b..4b0deed191746 100644
--- a/app/code/Magento/Eav/Model/Resource/Form/Fieldset/Collection.php
+++ b/app/code/Magento/Eav/Model/Resource/Form/Fieldset/Collection.php
@@ -18,7 +18,7 @@
 use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
 use Magento\Framework\Model\Resource\Db\AbstractDb;
 use Psr\Log\LoggerInterface as Logger;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 class Collection extends \Magento\Framework\Model\Resource\Db\Collection\AbstractCollection
 {
@@ -39,7 +39,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
      * @param Logger $logger
      * @param FetchStrategyInterface $fetchStrategy
      * @param ManagerInterface $eventManager
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param mixed $connection
      * @param AbstractDb $resource
      */
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Edit/Form.php b/app/code/Magento/Email/Block/Adminhtml/Template/Edit/Form.php
index e36aaf6c4c8ab..b4e6ecf4eac5b 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template/Edit/Form.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Edit/Form.php
@@ -52,7 +52,7 @@ protected function _prepareLayout()
     {
         $this->pageConfig->addPageAsset('prototype/window.js');
         $this->pageConfig->addPageAsset('prototype/windows/themes/default.css');
-        $this->pageConfig->addPageAsset('Magento_Core::prototype/magento.css');
+        $this->pageConfig->addPageAsset('Magento_Theme::prototype/magento.css');
         return parent::_prepareLayout();
     }
 
diff --git a/app/code/Magento/Email/Model/AbstractTemplate.php b/app/code/Magento/Email/Model/AbstractTemplate.php
index 733e8e73e4583..dbc58086db9bc 100644
--- a/app/code/Magento/Email/Model/AbstractTemplate.php
+++ b/app/code/Magento/Email/Model/AbstractTemplate.php
@@ -61,7 +61,7 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
     protected $_appEmulation;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -70,7 +70,7 @@ abstract class AbstractTemplate extends AbstractModel implements TemplateTypesIn
      * @param \Magento\Framework\View\DesignInterface $design
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Store\Model\App\Emulation $appEmulation
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param array $data
      */
     public function __construct(
@@ -78,7 +78,7 @@ public function __construct(
         \Magento\Framework\View\DesignInterface $design,
         \Magento\Framework\Registry $registry,
         \Magento\Store\Model\App\Emulation $appEmulation,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         array $data = []
     ) {
         $this->_design = $design;
diff --git a/app/code/Magento/Email/Model/BackendTemplate.php b/app/code/Magento/Email/Model/BackendTemplate.php
index 1484e8bc8ebec..27c6084b4382f 100644
--- a/app/code/Magento/Email/Model/BackendTemplate.php
+++ b/app/code/Magento/Email/Model/BackendTemplate.php
@@ -22,7 +22,7 @@ class BackendTemplate extends Template
      * @param \Magento\Framework\View\DesignInterface $design
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Store\Model\App\Emulation $appEmulation
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      * @param \Magento\Framework\View\FileSystem $viewFileSystem
@@ -39,7 +39,7 @@ public function __construct(
         \Magento\Framework\View\DesignInterface $design,
         \Magento\Framework\Registry $registry,
         \Magento\Store\Model\App\Emulation $appEmulation,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Filesystem $filesystem,
         \Magento\Framework\View\Asset\Repository $assetRepo,
         \Magento\Framework\View\FileSystem $viewFileSystem,
diff --git a/app/code/Magento/Email/Model/Template.php b/app/code/Magento/Email/Model/Template.php
index cdedc30f72a7e..75969ae91239b 100644
--- a/app/code/Magento/Email/Model/Template.php
+++ b/app/code/Magento/Email/Model/Template.php
@@ -8,7 +8,7 @@
 use Magento\Email\Model\Template\Filter;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Filter\Template as FilterTemplate;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Template model
@@ -19,7 +19,7 @@
  * \Magento\Email\Model\TemplateFactory $templateFactory
  * $templateFactory->create()->load($this->_scopeConfig->getValue(
  *  'path_to_email_template_id_config',
- *  \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+ *  \Magento\Store\Model\ScopeInterface::SCOPE_STORE
  *  ));
  * $variables = array(
  *    'someObject' => $this->_coreResourceEmailTemplate
@@ -158,7 +158,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate implements \Magento
      * @param \Magento\Framework\View\DesignInterface $design
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Store\Model\App\Emulation $appEmulation
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      * @param \Magento\Framework\View\FileSystem $viewFileSystem
@@ -213,7 +213,7 @@ protected function _getLogoUrl($store)
         $store = $this->_storeManager->getStore($store);
         $fileName = $this->_scopeConfig->getValue(
             self::XML_PATH_DESIGN_EMAIL_LOGO,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
         if ($fileName) {
@@ -252,7 +252,7 @@ protected function _getLogoAlt($store)
         $store = $this->_storeManager->getStore($store);
         $alt = $this->_scopeConfig->getValue(
             self::XML_PATH_DESIGN_EMAIL_LOGO_ALT,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
         if ($alt) {
diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
index 47762cc92c293..cb2309aadf837 100644
--- a/app/code/Magento/Email/Model/Template/Filter.php
+++ b/app/code/Magento/Email/Model/Template/Filter.php
@@ -70,7 +70,7 @@ class Filter extends \Magento\Framework\Filter\Template
     protected $_variableFactory;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -117,7 +117,7 @@ class Filter extends \Magento\Framework\Filter\Template
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Core\Model\VariableFactory $coreVariableFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\View\LayoutInterface $layout
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
      * @param \Magento\Framework\App\State $appState
@@ -133,7 +133,7 @@ public function __construct(
         \Magento\Framework\View\Asset\Repository $assetRepo,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Core\Model\VariableFactory $coreVariableFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\View\LayoutInterface $layout,
         \Magento\Framework\View\LayoutFactory $layoutFactory,
         \Magento\Framework\App\State $appState,
@@ -568,7 +568,7 @@ public function configDirective($construction)
         if (isset($params['path'])) {
             $configValue = $this->_scopeConfig->getValue(
                 $params['path'],
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $storeId
             );
         }
diff --git a/app/code/Magento/Email/Model/Template/SenderResolver.php b/app/code/Magento/Email/Model/Template/SenderResolver.php
index 04bf336e92432..f1e1a4b659883 100644
--- a/app/code/Magento/Email/Model/Template/SenderResolver.php
+++ b/app/code/Magento/Email/Model/Template/SenderResolver.php
@@ -32,12 +32,12 @@ public function resolve($sender, $scopeId = null)
         if (!is_array($sender)) {
             $result['name'] = $this->_scopeConfig->getValue(
                 'trans_email/ident_' . $sender . '/name',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $scopeId
             );
             $result['email'] = $this->_scopeConfig->getValue(
                 'trans_email/ident_' . $sender . '/email',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $scopeId
             );
         } else {
diff --git a/app/code/Magento/Email/composer.json b/app/code/Magento/Email/composer.json
index 81cb65ab1235e..55b98136b8982 100644
--- a/app/code/Magento/Email/composer.json
+++ b/app/code/Magento/Email/composer.json
@@ -7,6 +7,7 @@
         "magento/module-core": "0.42.0-beta7",
         "magento/module-cms": "0.42.0-beta7",
         "magento/module-backend": "0.42.0-beta7",
+        "magento/module-theme": "0.42.0-beta7",
         "magento/framework": "0.42.0-beta7",
         "magento/magento-composer-installer": "*"
     },
diff --git a/app/code/Magento/Email/etc/acl.xml b/app/code/Magento/Email/etc/acl.xml
index c9e8fc65bda5c..43c654d5b6e23 100644
--- a/app/code/Magento/Email/etc/acl.xml
+++ b/app/code/Magento/Email/etc/acl.xml
@@ -8,9 +8,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::marketing">
-                    <resource id="Magento_Adminhtml::marketing_communications" title="Communications" sortOrder="30">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::marketing">
+                    <resource id="Magento_Backend::marketing_communications" title="Communications" sortOrder="30">
                         <resource id="Magento_Email::template" title="Email Templates" sortOrder="10" />
                     </resource>
                 </resource>
diff --git a/app/code/Magento/Email/etc/adminhtml/routes.xml b/app/code/Magento/Email/etc/adminhtml/routes.xml
index 0d88127a9e075..e09e11132fce3 100644
--- a/app/code/Magento/Email/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Email/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
     <router id="admin">
         <route id="adminhtml">
-            <module name="Magento_Email" before="Magento_Adminhtml" />
+            <module name="Magento_Email" before="Magento_Backend" />
         </route>
     </router>
 </config>
diff --git a/app/code/Magento/Fedex/Model/Carrier.php b/app/code/Magento/Fedex/Model/Carrier.php
index a9a6176f5c1cd..f3767390c046a 100644
--- a/app/code/Magento/Fedex/Model/Carrier.php
+++ b/app/code/Magento/Fedex/Model/Carrier.php
@@ -108,7 +108,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
     protected $_customizableContainerTypes = ['YOUR_PACKAGING'];
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -132,7 +132,7 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
      * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
      * @param \Magento\Directory\Helper\Data $directoryData
      * @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Module\Dir\Reader $configReader
      * @param \Magento\Catalog\Model\Resource\Product\CollectionFactory $productCollectionFactory
      * @param array $data
@@ -154,7 +154,7 @@ public function __construct(
         \Magento\Directory\Model\CurrencyFactory $currencyFactory,
         \Magento\Directory\Helper\Data $directoryData,
         \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Module\Dir\Reader $configReader,
         \Magento\Catalog\Model\Resource\Product\CollectionFactory $productCollectionFactory,
         array $data = []
@@ -297,7 +297,7 @@ public function setRequest(RateRequest $request)
         } else {
             $origCountry = $this->_scopeConfig->getValue(
                 \Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_COUNTRY_ID,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $request->getStoreId()
             );
         }
@@ -309,7 +309,7 @@ public function setRequest(RateRequest $request)
             $r->setOrigPostal(
                 $this->_scopeConfig->getValue(
                     \Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_ZIP,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                     $request->getStoreId()
                 )
             );
@@ -1329,7 +1329,7 @@ protected function _formShipmentRequest(\Magento\Framework\Object $request)
                         'AccountNumber' => $this->getConfigData('account'),
                         'CountryCode' => $this->_scopeConfig->getValue(
                             \Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_COUNTRY_ID,
-                            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                             $request->getStoreId()
                         ),
                     ],
@@ -1366,7 +1366,7 @@ protected function _formShipmentRequest(\Magento\Framework\Object $request)
                         'AccountNumber' => $this->getConfigData('account'),
                         'CountryCode' => $this->_scopeConfig->getValue(
                             \Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_COUNTRY_ID,
-                            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                             $request->getStoreId()
                         ),
                     ],
diff --git a/app/code/Magento/Fedex/composer.json b/app/code/Magento/Fedex/composer.json
index 50deaa73e057a..8d06f716ca36d 100644
--- a/app/code/Magento/Fedex/composer.json
+++ b/app/code/Magento/Fedex/composer.json
@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
+        "magento/module-store": "0.42.0-beta7",
         "magento/module-shipping": "0.42.0-beta7",
         "magento/module-directory": "0.42.0-beta7",
         "magento/module-core": "0.42.0-beta7",
diff --git a/app/code/Magento/GiftMessage/Block/Adminhtml/Product/Helper/Form/Config.php b/app/code/Magento/GiftMessage/Block/Adminhtml/Product/Helper/Form/Config.php
index 71f9fdea4cebb..83207d1c87424 100644
--- a/app/code/Magento/GiftMessage/Block/Adminhtml/Product/Helper/Form/Config.php
+++ b/app/code/Magento/GiftMessage/Block/Adminhtml/Product/Helper/Form/Config.php
@@ -46,7 +46,7 @@ protected function _getValueFromConfig()
     {
         return $this->_scopeConfig->getValue(
             \Magento\GiftMessage\Helper\Message::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ITEMS,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 }
diff --git a/app/code/Magento/GiftMessage/Helper/Message.php b/app/code/Magento/GiftMessage/Helper/Message.php
index 3477c675ca05c..7672d3f08763e 100644
--- a/app/code/Magento/GiftMessage/Helper/Message.php
+++ b/app/code/Magento/GiftMessage/Helper/Message.php
@@ -66,7 +66,7 @@ class Message extends \Magento\Core\Helper\Data
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\State $appState
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
@@ -80,7 +80,7 @@ class Message extends \Magento\Core\Helper\Data
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\State $appState,
         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
@@ -148,7 +148,7 @@ public function isMessagesAvailable($type, \Magento\Framework\Object $entity, $s
         if ($type == 'items') {
             $items = $entity->getAllItems();
             if (!is_array($items) || empty($items)) {
-                return $this->_scopeConfig->getValue(self::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ITEMS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+                return $this->_scopeConfig->getValue(self::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ITEMS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
             }
             if ($entity instanceof \Magento\Quote\Model\Quote) {
                 $_type = $entity->getIsMultiShipping() ? 'address_item' : 'item';
@@ -183,7 +183,7 @@ public function isMessagesAvailable($type, \Magento\Framework\Object $entity, $s
                 $store
             );
         } else {
-            return $this->_scopeConfig->getValue(self::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ORDER, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+            return $this->_scopeConfig->getValue(self::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ORDER, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
         }
         return false;
     }
@@ -197,7 +197,7 @@ public function isMessagesAvailable($type, \Magento\Framework\Object $entity, $s
      */
     protected function _getDependenceFromStoreConfig($productGiftMessageAllow, $store = null)
     {
-        $result = $this->_scopeConfig->getValue(self::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ITEMS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+        $result = $this->_scopeConfig->getValue(self::XPATH_CONFIG_GIFT_MESSAGE_ALLOW_ITEMS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
         if ($productGiftMessageAllow === '' || is_null($productGiftMessageAllow)) {
             return $result;
         } else {
diff --git a/app/code/Magento/GiftMessage/Model/CartRepository.php b/app/code/Magento/GiftMessage/Model/CartRepository.php
index 505561535030c..528ccf78320b6 100644
--- a/app/code/Magento/GiftMessage/Model/CartRepository.php
+++ b/app/code/Magento/GiftMessage/Model/CartRepository.php
@@ -26,7 +26,7 @@ class CartRepository implements \Magento\GiftMessage\Api\CartRepositoryInterface
     /**
      * Store manager interface.
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -53,14 +53,14 @@ class CartRepository implements \Magento\GiftMessage\Api\CartRepositoryInterface
 
     /**
      * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param GiftMessageManager $giftMessageManager
      * @param \Magento\GiftMessage\Helper\Message $helper
      * @param MessageFactory $messageFactory
      */
     public function __construct(
         \Magento\Quote\Model\QuoteRepository $quoteRepository,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\GiftMessage\Model\GiftMessageManager $giftMessageManager,
         \Magento\GiftMessage\Helper\Message $helper,
         \Magento\GiftMessage\Model\MessageFactory $messageFactory
diff --git a/app/code/Magento/GiftMessage/Model/ItemRepository.php b/app/code/Magento/GiftMessage/Model/ItemRepository.php
index 9174a7174c140..90db371ca8fbd 100644
--- a/app/code/Magento/GiftMessage/Model/ItemRepository.php
+++ b/app/code/Magento/GiftMessage/Model/ItemRepository.php
@@ -27,7 +27,7 @@ class ItemRepository implements \Magento\GiftMessage\Api\ItemRepositoryInterface
     /**
      * Store manager interface.
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -54,14 +54,14 @@ class ItemRepository implements \Magento\GiftMessage\Api\ItemRepositoryInterface
 
     /**
      * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param GiftMessageManager $giftMessageManager
      * @param \Magento\GiftMessage\Helper\Message $helper
      * @param MessageFactory $messageFactory
      */
     public function __construct(
         \Magento\Quote\Model\QuoteRepository $quoteRepository,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\GiftMessage\Model\GiftMessageManager $giftMessageManager,
         \Magento\GiftMessage\Helper\Message $helper,
         \Magento\GiftMessage\Model\MessageFactory $messageFactory
diff --git a/app/code/Magento/GiftMessage/composer.json b/app/code/Magento/GiftMessage/composer.json
index c87e4b22dc589..40334a864ac69 100644
--- a/app/code/Magento/GiftMessage/composer.json
+++ b/app/code/Magento/GiftMessage/composer.json
@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
+        "magento/module-store": "0.42.0-beta7",
         "magento/module-catalog": "0.42.0-beta7",
         "magento/module-checkout": "0.42.0-beta7",
         "magento/module-multishipping": "0.42.0-beta7",
diff --git a/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_view.xml b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_view.xml
index 8c2858a924c50..2ccc9b94c477c 100644
--- a/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_view.xml
+++ b/app/code/Magento/GiftMessage/view/adminhtml/layout/sales_order_view.xml
@@ -7,7 +7,7 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
     <head>
-        <css src="Magento_Core::prototype/magento.css"/>
+        <css src="Magento_Theme::prototype/magento.css"/>
     </head>
     <body>
         <referenceBlock name="order_item_extra_info">
diff --git a/app/code/Magento/GoogleAdwords/Helper/Data.php b/app/code/Magento/GoogleAdwords/Helper/Data.php
index 693ba8dfa66d6..f2a97d5a07b09 100644
--- a/app/code/Magento/GoogleAdwords/Helper/Data.php
+++ b/app/code/Magento/GoogleAdwords/Helper/Data.php
@@ -109,7 +109,7 @@ public function isGoogleAdwordsActive()
     {
         return $this->_scopeConfig->isSetFlag(
             self::XML_PATH_ACTIVE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         ) &&
             $this->getConversionId() &&
             $this->getConversionLanguage() &&
@@ -173,7 +173,7 @@ public function getConversionId()
     {
         return (int)$this->_scopeConfig->getValue(
             self::XML_PATH_CONVERSION_ID,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
@@ -186,7 +186,7 @@ public function getConversionLanguage()
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_CONVERSION_LANGUAGE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
@@ -199,7 +199,7 @@ public function getConversionFormat()
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_CONVERSION_FORMAT,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
@@ -212,7 +212,7 @@ public function getConversionColor()
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_CONVERSION_COLOR,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
@@ -225,7 +225,7 @@ public function getConversionLabel()
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_CONVERSION_LABEL,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
@@ -238,7 +238,7 @@ public function getConversionValueType()
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_CONVERSION_VALUE_TYPE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
@@ -261,7 +261,7 @@ public function getConversionValueConstant()
     {
         return (double)$this->_scopeConfig->getValue(
             self::XML_PATH_CONVERSION_VALUE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
diff --git a/app/code/Magento/GoogleAdwords/composer.json b/app/code/Magento/GoogleAdwords/composer.json
index 8ee65d9f0b77c..a79ee0d97ac01 100644
--- a/app/code/Magento/GoogleAdwords/composer.json
+++ b/app/code/Magento/GoogleAdwords/composer.json
@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
+        "magento/module-store": "0.42.0-beta7",
         "magento/module-sales": "0.42.0-beta7",
         "magento/framework": "0.42.0-beta7",
         "magento/magento-composer-installer": "*"
diff --git a/app/code/Magento/GoogleAnalytics/Block/Ga.php b/app/code/Magento/GoogleAnalytics/Block/Ga.php
index 04bb7196fa61d..8236e5fac9e54 100644
--- a/app/code/Magento/GoogleAnalytics/Block/Ga.php
+++ b/app/code/Magento/GoogleAnalytics/Block/Ga.php
@@ -50,7 +50,7 @@ public function __construct(
      */
     public function getConfig($path)
     {
-        return $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
diff --git a/app/code/Magento/GoogleAnalytics/Helper/Data.php b/app/code/Magento/GoogleAnalytics/Helper/Data.php
index 9e32e1aff2526..49b29bc28cf3e 100644
--- a/app/code/Magento/GoogleAnalytics/Helper/Data.php
+++ b/app/code/Magento/GoogleAnalytics/Helper/Data.php
@@ -50,7 +50,7 @@ public function __construct(
      */
     public function isGoogleAnalyticsAvailable($store = null)
     {
-        $accountId = $this->_scopeConfig->getValue(self::XML_PATH_ACCOUNT, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
-        return $accountId && $this->_scopeConfig->isSetFlag(self::XML_PATH_ACTIVE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+        $accountId = $this->_scopeConfig->getValue(self::XML_PATH_ACCOUNT, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
+        return $accountId && $this->_scopeConfig->isSetFlag(self::XML_PATH_ACTIVE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
     }
 }
diff --git a/app/code/Magento/GoogleAnalytics/Model/Observer.php b/app/code/Magento/GoogleAnalytics/Model/Observer.php
index 8bd837b511dc5..b8c916189fa2b 100644
--- a/app/code/Magento/GoogleAnalytics/Model/Observer.php
+++ b/app/code/Magento/GoogleAnalytics/Model/Observer.php
@@ -26,17 +26,17 @@ class Observer
     protected $_layout;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\View\LayoutInterface $layout
      * @param \Magento\GoogleAnalytics\Helper\Data $googleAnalyticsData
      */
     public function __construct(
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\View\LayoutInterface $layout,
         \Magento\GoogleAnalytics\Helper\Data $googleAnalyticsData
     ) {
diff --git a/app/code/Magento/GoogleAnalytics/etc/acl.xml b/app/code/Magento/GoogleAnalytics/etc/acl.xml
index 15685bce0c57e..8263667164d50 100644
--- a/app/code/Magento/GoogleAnalytics/etc/acl.xml
+++ b/app/code/Magento/GoogleAnalytics/etc/acl.xml
@@ -8,10 +8,10 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::stores">
-                    <resource id="Magento_Adminhtml::stores_settings">
-                        <resource id="Magento_Adminhtml::config">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::stores">
+                    <resource id="Magento_Backend::stores_settings">
+                        <resource id="Magento_Backend::config">
                             <resource id="Magento_GoogleAnalytics::google" title="Google API" />
                         </resource>
                     </resource>
diff --git a/app/code/Magento/GoogleOptimizer/Helper/Data.php b/app/code/Magento/GoogleOptimizer/Helper/Data.php
index 601c5423add16..8010a5fc27292 100644
--- a/app/code/Magento/GoogleOptimizer/Helper/Data.php
+++ b/app/code/Magento/GoogleOptimizer/Helper/Data.php
@@ -55,7 +55,7 @@ public function __construct(
      */
     public function isGoogleExperimentEnabled($store = null)
     {
-        return (bool)$this->_scopeConfig->isSetFlag(self::XML_PATH_ENABLED, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+        return (bool)$this->_scopeConfig->isSetFlag(self::XML_PATH_ENABLED, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
     }
 
     /**
diff --git a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items.php b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items.php
index e3d713530184e..aa95f8a884c12 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items.php
@@ -85,7 +85,7 @@ protected function _redirectToCaptcha($e)
     public function _getStore()
     {
         $store = $this->_objectManager->get(
-            'Magento\Framework\Store\StoreManagerInterface'
+            'Magento\Store\Model\StoreManagerInterface'
         )->getStore(
             (int)$this->getRequest()->getParam('store', 0)
         );
diff --git a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Index.php b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Index.php
index 022290b7d40fc..56380c2148cfa 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Index.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/Index.php
@@ -67,7 +67,7 @@ public function execute()
                 'adminhtml/*/',
                 [
                     'store' => $this->_objectManager->get(
-                        'Magento\Framework\Store\StoreManagerInterface'
+                        'Magento\Store\Model\StoreManagerInterface'
                     )->getStore()->getId(),
                     '_current' => true
                 ]
diff --git a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types.php b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types.php
index 755c3dc4b0844..c22b04e12e022 100644
--- a/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types.php
+++ b/app/code/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Types.php
@@ -93,7 +93,7 @@ protected function _initAction()
     public function _getStore()
     {
         $storeId = (int)$this->getRequest()->getParam('store', 0);
-        $storeManager = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface');
+        $storeManager = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface');
         if ($storeId == 0) {
             $defaultStore = $storeManager->getDefaultStoreView();
             if (!$defaultStore) {
diff --git a/app/code/Magento/GoogleShopping/Helper/Data.php b/app/code/Magento/GoogleShopping/Helper/Data.php
index 31ecda5a3c65e..04f617eb913c7 100644
--- a/app/code/Magento/GoogleShopping/Helper/Data.php
+++ b/app/code/Magento/GoogleShopping/Helper/Data.php
@@ -22,19 +22,19 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Framework\Stdlib\String $string
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Framework\Stdlib\String $string,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->string = $string;
         $this->_storeManager = $storeManager;
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute/Link.php b/app/code/Magento/GoogleShopping/Model/Attribute/Link.php
index 7f63f63f7eccf..1e9b15cd96b55 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute/Link.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute/Link.php
@@ -69,7 +69,7 @@ public function convertAttribute($product, $entry)
         if ($url) {
             $isStoreInUrl = $this->_scopeConfig->isSetFlag(
                 \Magento\Store\Model\Store::XML_PATH_STORE_IN_URL,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
             if (!$isStoreInUrl) {
                 $urlInfo = parse_url($url);
diff --git a/app/code/Magento/GoogleShopping/Model/Attribute/Price.php b/app/code/Magento/GoogleShopping/Model/Attribute/Price.php
index f6843bbabe708..a75a1f1a774fb 100644
--- a/app/code/Magento/GoogleShopping/Model/Attribute/Price.php
+++ b/app/code/Magento/GoogleShopping/Model/Attribute/Price.php
@@ -42,7 +42,7 @@ class Price extends DefaultAttribute
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -71,7 +71,7 @@ class Price extends DefaultAttribute
      * @param \Magento\GoogleShopping\Helper\Product $gsProduct
      * @param \Magento\Catalog\Model\Product\CatalogPrice $catalogPrice
      * @param \Magento\GoogleShopping\Model\Resource\Attribute $resource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Tax\Helper\Data $taxData
      * @param \Magento\GoogleShopping\Model\Config $config
      * @param \Magento\Catalog\Helper\Data $catalogData
@@ -90,7 +90,7 @@ public function __construct(
         \Magento\GoogleShopping\Helper\Product $gsProduct,
         \Magento\Catalog\Model\Product\CatalogPrice $catalogPrice,
         \Magento\GoogleShopping\Model\Resource\Attribute $resource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Tax\Helper\Data $taxData,
         \Magento\GoogleShopping\Model\Config $config,
         \Magento\Catalog\Helper\Data $catalogData,
diff --git a/app/code/Magento/GoogleShopping/Model/Config.php b/app/code/Magento/GoogleShopping/Model/Config.php
index 7227f933f278d..5e4ef7014d13d 100644
--- a/app/code/Magento/GoogleShopping/Model/Config.php
+++ b/app/code/Magento/GoogleShopping/Model/Config.php
@@ -32,7 +32,7 @@ class Config extends \Magento\Framework\Object
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -43,13 +43,13 @@ class Config extends \Magento\Framework\Object
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Encryption\EncryptorInterface $encryptor
      * @param array $data
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Encryption\EncryptorInterface $encryptor,
         array $data = []
     ) {
@@ -69,7 +69,7 @@ public function __construct(
     public function getConfigData($key, $storeId = null)
     {
         if (!isset($this->_config[$key][$storeId])) {
-            $value = $this->_scopeConfig->getValue('google/googleshopping/' . $key, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId);
+            $value = $this->_scopeConfig->getValue('google/googleshopping/' . $key, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $storeId);
             $this->_config[$key][$storeId] = $value;
         }
         return $this->_config[$key][$storeId];
diff --git a/app/code/Magento/GoogleShopping/Model/MassOperations.php b/app/code/Magento/GoogleShopping/Model/MassOperations.php
index 143c966a8b212..7cabe18ba1a86 100644
--- a/app/code/Magento/GoogleShopping/Model/MassOperations.php
+++ b/app/code/Magento/GoogleShopping/Model/MassOperations.php
@@ -33,7 +33,7 @@ class MassOperations
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -70,7 +70,7 @@ class MassOperations
      * @param \Magento\GoogleShopping\Model\ItemFactory $itemFactory
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
      * @param \Magento\Framework\Notification\NotifierInterface $notifier
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\GoogleShopping\Helper\Data $gleShoppingData
      * @param \Magento\GoogleShopping\Helper\Category $gleShoppingCategory
@@ -82,7 +82,7 @@ public function __construct(
         \Magento\GoogleShopping\Model\ItemFactory $itemFactory,
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
         \Magento\Framework\Notification\NotifierInterface $notifier,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Psr\Log\LoggerInterface $logger,
         \Magento\GoogleShopping\Helper\Data $gleShoppingData,
         \Magento\GoogleShopping\Helper\Category $gleShoppingCategory,
diff --git a/app/code/Magento/GoogleShopping/Model/Observer.php b/app/code/Magento/GoogleShopping/Model/Observer.php
index 19fb3d9da9305..3fc97c0a8991d 100644
--- a/app/code/Magento/GoogleShopping/Model/Observer.php
+++ b/app/code/Magento/GoogleShopping/Model/Observer.php
@@ -130,7 +130,7 @@ protected function _getItemsCollection($product)
         foreach ($items as $item) {
             $flag = $this->_scopeConfig->isSetFlag(
                 'google/googleshopping/observed',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $item->getStoreId()
             );
             if (!$flag) {
diff --git a/app/code/Magento/GoogleShopping/etc/acl.xml b/app/code/Magento/GoogleShopping/etc/acl.xml
index 263ba2cebff76..8391a7ff774cc 100644
--- a/app/code/Magento/GoogleShopping/etc/acl.xml
+++ b/app/code/Magento/GoogleShopping/etc/acl.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
+            <resource id="Magento_Backend::admin">
                 <resource id="Magento_Catalog::catalog">
                     <resource id="Magento_GoogleShopping::googleshopping" title="Google Content" sortOrder="20">
                         <resource id="Magento_GoogleShopping::types" title="Attributes" sortOrder="10" />
diff --git a/app/code/Magento/GoogleShopping/etc/adminhtml/routes.xml b/app/code/Magento/GoogleShopping/etc/adminhtml/routes.xml
index c4c968ce5e21a..a1e9f6e6c9fda 100644
--- a/app/code/Magento/GoogleShopping/etc/adminhtml/routes.xml
+++ b/app/code/Magento/GoogleShopping/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
     <router id="admin">
         <route id="adminhtml">
-            <module name="Magento_GoogleShopping" before="Magento_Adminhtml" />
+            <module name="Magento_GoogleShopping" before="Magento_Backend" />
         </route>
     </router>
 </config>
diff --git a/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php b/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php
index dc7cdbc273917..a6f28362cd08a 100644
--- a/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Block/Cart/Item/Renderer/Grouped.php
@@ -44,7 +44,7 @@ public function getProductForThumbnail()
          */
         if ($this->_scopeConfig->getValue(
             self::CONFIG_THUMBNAIL_SOURCE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         ) == ThumbnailSource::OPTION_USE_PARENT_IMAGE ||
             !($this->getProduct()->getThumbnail() && $this->getProduct()->getThumbnail() != 'no_selection')
         ) {
diff --git a/app/code/Magento/GroupedProduct/Model/Product/CatalogPrice.php b/app/code/Magento/GroupedProduct/Model/Product/CatalogPrice.php
index b879fba84643d..316e6e382e312 100644
--- a/app/code/Magento/GroupedProduct/Model/Product/CatalogPrice.php
+++ b/app/code/Magento/GroupedProduct/Model/Product/CatalogPrice.php
@@ -11,7 +11,7 @@
 class CatalogPrice implements \Magento\Catalog\Model\Product\CatalogPriceInterface
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -21,11 +21,11 @@ class CatalogPrice implements \Magento\Catalog\Model\Product\CatalogPriceInterfa
     protected $commonPriceModel;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Product\CatalogPrice $commonPriceModel
      */
     public function __construct(
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Product\CatalogPrice $commonPriceModel
     ) {
         $this->storeManager = $storeManager;
diff --git a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
index ebc22bb271cc8..8801faf0fcec5 100644
--- a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
@@ -61,7 +61,7 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -92,7 +92,7 @@ class Grouped extends \Magento\Catalog\Model\Product\Type\AbstractType
      * @param \Psr\Log\LoggerInterface $logger
      * @param ProductRepositoryInterface $productRepository
      * @param \Magento\GroupedProduct\Model\Resource\Product\Link $catalogProductLink
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Product\Attribute\Source\Status $catalogProductStatus
      * @param \Magento\Framework\App\State $appState
      * @param \Magento\Msrp\Helper\Data $msrpData
@@ -111,7 +111,7 @@ public function __construct(
         \Psr\Log\LoggerInterface $logger,
         ProductRepositoryInterface $productRepository,
         \Magento\GroupedProduct\Model\Resource\Product\Link $catalogProductLink,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Product\Attribute\Source\Status $catalogProductStatus,
         \Magento\Framework\App\State $appState,
         \Magento\Msrp\Helper\Data $msrpData
diff --git a/app/code/Magento/GroupedProduct/Model/Resource/Product/Type/Grouped/AssociatedProductsCollection.php b/app/code/Magento/GroupedProduct/Model/Resource/Product/Type/Grouped/AssociatedProductsCollection.php
index 0344038d8d630..3d594a711f249 100644
--- a/app/code/Magento/GroupedProduct/Model/Resource/Product/Type/Grouped/AssociatedProductsCollection.php
+++ b/app/code/Magento/GroupedProduct/Model/Resource/Product/Type/Grouped/AssociatedProductsCollection.php
@@ -36,7 +36,7 @@ class AssociatedProductsCollection extends \Magento\Catalog\Model\Resource\Produ
      * @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
      * @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -62,7 +62,7 @@ public function __construct(
         \Magento\Eav\Model\EntityFactory $eavEntityFactory,
         \Magento\Catalog\Model\Resource\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/ImportExport/Helper/Data.php b/app/code/Magento/ImportExport/Helper/Data.php
index a2923476b7df3..43ec77d4f66f1 100644
--- a/app/code/Magento/ImportExport/Helper/Data.php
+++ b/app/code/Magento/ImportExport/Helper/Data.php
@@ -32,7 +32,7 @@ class Data extends \Magento\Core\Helper\Data
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\State $appState
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param \Magento\Framework\File\Size $fileSize
@@ -41,7 +41,7 @@ class Data extends \Magento\Core\Helper\Data
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\State $appState,
         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
         \Magento\Framework\File\Size $fileSize,
@@ -81,7 +81,7 @@ public function getMaxUploadSizeMessage()
      */
     public function getLocalValidPaths()
     {
-        $paths = $this->_scopeConfig->getValue(self::XML_PATH_EXPORT_LOCAL_VALID_PATH, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        $paths = $this->_scopeConfig->getValue(self::XML_PATH_EXPORT_LOCAL_VALID_PATH, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
         return $paths;
     }
 
@@ -92,6 +92,6 @@ public function getLocalValidPaths()
      */
     public function getBunchSize()
     {
-        return (int)$this->_scopeConfig->getValue(self::XML_PATH_BUNCH_SIZE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return (int)$this->_scopeConfig->getValue(self::XML_PATH_BUNCH_SIZE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 }
diff --git a/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php
index acf1cb9419416..7241c25053d9d 100644
--- a/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Export/AbstractEntity.php
@@ -34,7 +34,7 @@ abstract class AbstractEntity
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -173,7 +173,7 @@ abstract class AbstractEntity
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
      * @param \Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory
      * @param array $data
@@ -181,7 +181,7 @@ abstract class AbstractEntity
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\ImportExport\Model\Export\Factory $collectionFactory,
         \Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory,
         array $data = []
@@ -197,7 +197,7 @@ public function __construct(
             $data['page_size']
         ) ? $data['page_size'] : (static::XML_PATH_PAGE_SIZE ? (int)$this->_scopeConfig->getValue(
             static::XML_PATH_PAGE_SIZE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         ) : 0);
         $this->_byPagesIterator = isset(
             $data['collection_by_pages_iterator']
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
index e24cbe371cbcb..8803d34fc3d70 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
@@ -46,7 +46,7 @@ abstract class AbstractEav extends \Magento\ImportExport\Model\Export\AbstractEn
 
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
      * @param \Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
@@ -55,7 +55,7 @@ abstract class AbstractEav extends \Magento\ImportExport\Model\Export\AbstractEn
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\ImportExport\Model\Export\Factory $collectionFactory,
         \Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php
index da249dfa425e5..584b19dc90893 100644
--- a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php
@@ -141,7 +141,7 @@ abstract class AbstractEntity
     protected $_localeDate;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -149,13 +149,13 @@ abstract class AbstractEntity
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Eav\Model\Config $config
      * @param \Magento\Framework\App\Resource $resource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Eav\Model\Config $config,
         \Magento\Framework\App\Resource $resource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->_localeDate = $localeDate;
         $this->_storeManager = $storeManager;
diff --git a/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php
index bcf90b1527a7f..4285ddd422405 100644
--- a/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php
@@ -268,7 +268,7 @@ public function __construct(
             $data['page_size']
         ) ? $data['page_size'] : (static::XML_PATH_PAGE_SIZE ? (int)$this->_scopeConfig->getValue(
             static::XML_PATH_PAGE_SIZE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         ) : 0);
         $this->_maxDataSize = isset(
             $data['max_data_size']
@@ -277,7 +277,7 @@ public function __construct(
             $data['bunch_size']
         ) ? $data['bunch_size'] : (static::XML_PATH_BUNCH_SIZE ? (int)$this->_scopeConfig->getValue(
             static::XML_PATH_BUNCH_SIZE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         ) : 0);
     }
 
diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php
index f6a1783a08396..1345aa9c341d2 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEav.php
@@ -19,7 +19,7 @@ abstract class AbstractEav extends \Magento\ImportExport\Model\Import\AbstractEn
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -79,7 +79,7 @@ abstract class AbstractEav extends \Magento\ImportExport\Model\Import\AbstractEn
      * @param \Magento\ImportExport\Model\ImportFactory $importFactory
      * @param \Magento\ImportExport\Model\Resource\Helper $resourceHelper
      * @param \Magento\Framework\App\Resource $resource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\ImportExport\Model\Export\Factory $collectionFactory
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param array $data
@@ -92,7 +92,7 @@ public function __construct(
         \Magento\ImportExport\Model\ImportFactory $importFactory,
         \Magento\ImportExport\Model\Resource\Helper $resourceHelper,
         \Magento\Framework\App\Resource $resource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\ImportExport\Model\Export\Factory $collectionFactory,
         \Magento\Eav\Model\Config $eavConfig,
         array $data = []
diff --git a/app/code/Magento/ImportExport/etc/acl.xml b/app/code/Magento/ImportExport/etc/acl.xml
index 7b2e4a03c3639..20d76086a0502 100644
--- a/app/code/Magento/ImportExport/etc/acl.xml
+++ b/app/code/Magento/ImportExport/etc/acl.xml
@@ -8,9 +8,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::system">
-                    <resource id="Magento_Adminhtml::convert">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::system">
+                    <resource id="Magento_Backend::convert">
                         <resource id="Magento_ImportExport::import" title="Import" sortOrder="10" />
                         <resource id="Magento_ImportExport::export" title="Export" sortOrder="20" />
                     </resource>
diff --git a/app/code/Magento/ImportExport/etc/adminhtml/routes.xml b/app/code/Magento/ImportExport/etc/adminhtml/routes.xml
index da01c87a4ab24..34c4c0dfdd7da 100644
--- a/app/code/Magento/ImportExport/etc/adminhtml/routes.xml
+++ b/app/code/Magento/ImportExport/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
     <router id="admin">
         <route id="adminhtml">
-            <module name="Magento_ImportExport" before="Magento_Adminhtml" />
+            <module name="Magento_ImportExport" before="Magento_Backend" />
         </route>
     </router>
 </config>
diff --git a/app/code/Magento/Indexer/etc/acl.xml b/app/code/Magento/Indexer/etc/acl.xml
index d072048ba0118..bc1801d89cf83 100644
--- a/app/code/Magento/Indexer/etc/acl.xml
+++ b/app/code/Magento/Indexer/etc/acl.xml
@@ -8,9 +8,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::system">
-                    <resource id="Magento_Adminhtml::tools">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::system">
+                    <resource id="Magento_Backend::tools">
                         <resource id="Magento_Indexer::index" title="Index Management" sortOrder="30" />
                         <resource id="Magento_Indexer::changeMode" title="Change indexer mode" sortOrder="40" />
                     </resource>
diff --git a/app/code/Magento/Integration/Helper/Oauth/Data.php b/app/code/Magento/Integration/Helper/Oauth/Data.php
index 125ffb3ffcebc..466c7ff509a4e 100644
--- a/app/code/Magento/Integration/Helper/Oauth/Data.php
+++ b/app/code/Magento/Integration/Helper/Oauth/Data.php
@@ -65,7 +65,7 @@ public function isCleanupProbability()
         // Safe get cleanup probability value from system configuration
         $configValue = (int)$this->_scopeConfig->getValue(
             self::XML_PATH_CLEANUP_PROBABILITY,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         return $configValue > 0 ? 1 == \Magento\Framework\Math\Random::getRandomNumber(1, $configValue) : false;
     }
@@ -79,7 +79,7 @@ public function getCleanupExpirationPeriod()
     {
         $minutes = (int)$this->_scopeConfig->getValue(
             self::XML_PATH_CLEANUP_EXPIRATION_PERIOD,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         return $minutes > 0 ? $minutes : self::CLEANUP_EXPIRATION_PERIOD_DEFAULT;
     }
@@ -93,7 +93,7 @@ public function getConsumerExpirationPeriod()
     {
         $seconds = (int)$this->_scopeConfig->getValue(
             self::XML_PATH_CONSUMER_EXPIRATION_PERIOD,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         return $seconds > 0 ? $seconds : self::CONSUMER_EXPIRATION_PERIOD_DEFAULT;
     }
@@ -107,7 +107,7 @@ public function getConsumerPostMaxRedirects()
     {
         $redirects = (int)$this->_scopeConfig->getValue(
             self::XML_PATH_CONSUMER_POST_MAXREDIRECTS,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         return $redirects > 0 ? $redirects : 0;
     }
@@ -121,7 +121,7 @@ public function getConsumerPostTimeout()
     {
         $seconds = (int)$this->_scopeConfig->getValue(
             self::XML_PATH_CONSUMER_POST_TIMEOUT,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         return $seconds > 0 ? $seconds : self::CONSUMER_POST_TIMEOUT_DEFAULT;
     }
diff --git a/app/code/Magento/Integration/Service/V1/Oauth.php b/app/code/Magento/Integration/Service/V1/Oauth.php
index 442a7cd2b5d23..5816700e8eb7d 100644
--- a/app/code/Magento/Integration/Service/V1/Oauth.php
+++ b/app/code/Magento/Integration/Service/V1/Oauth.php
@@ -21,7 +21,7 @@
 class Oauth implements OauthInterface
 {
     /**
-     * @var  \Magento\Framework\Store\StoreManagerInterface
+     * @var  \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -63,7 +63,7 @@ class Oauth implements OauthInterface
     /**
      * Initialize dependencies.
      *
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param ConsumerFactory $consumerFactory
      * @param TokenFactory $tokenFactory
      * @param IntegrationOauthHelper $dataHelper
@@ -73,7 +73,7 @@ class Oauth implements OauthInterface
      * @param TokenProvider $tokenProvider
      */
     public function __construct(
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         ConsumerFactory $consumerFactory,
         TokenFactory $tokenFactory,
         IntegrationOauthHelper $dataHelper,
diff --git a/app/code/Magento/Integration/composer.json b/app/code/Magento/Integration/composer.json
index b5fdeb988b4a8..33ee89f877519 100644
--- a/app/code/Magento/Integration/composer.json
+++ b/app/code/Magento/Integration/composer.json
@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
+        "magento/module-store": "0.42.0-beta7",
         "magento/module-core": "0.42.0-beta7",
         "magento/module-backend": "0.42.0-beta7",
         "magento/module-customer": "0.42.0-beta7",
diff --git a/app/code/Magento/Integration/etc/adminhtml/routes.xml b/app/code/Magento/Integration/etc/adminhtml/routes.xml
index 8713db0e27e04..6547865b6865e 100644
--- a/app/code/Magento/Integration/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Integration/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
     <router id="admin">
         <route id="adminhtml">
-            <module name="Magento_Integration" before="Magento_Adminhtml" />
+            <module name="Magento_Integration" before="Magento_Backend" />
         </route>
     </router>
 </config>
diff --git a/app/code/Magento/Integration/etc/module.xml b/app/code/Magento/Integration/etc/module.xml
index 6723cfcff2370..9266394d39487 100644
--- a/app/code/Magento/Integration/etc/module.xml
+++ b/app/code/Magento/Integration/etc/module.xml
@@ -9,6 +9,7 @@
     <module name="Magento_Integration" schema_version="2.0.0">
         <sequence>
             <module name="Magento_Core"/>
+            <module name="Magento_Store"/>
             <module name="Magento_User"/>
         </sequence>
     </module>
diff --git a/app/code/Magento/Log/Block/Adminhtml/Customer/Edit/Tab/View/Status.php b/app/code/Magento/Log/Block/Adminhtml/Customer/Edit/Tab/View/Status.php
index 1b6599af19c14..a79bb9e48809f 100644
--- a/app/code/Magento/Log/Block/Adminhtml/Customer/Edit/Tab/View/Status.php
+++ b/app/code/Magento/Log/Block/Adminhtml/Customer/Edit/Tab/View/Status.php
@@ -76,7 +76,7 @@ public function getStoreLastLoginDateTimezone()
     {
         return $this->_scopeConfig->getValue(
             $this->_localeDate->getDefaultTimezonePath(),
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->getCustomer()->getStoreId()
         );
     }
diff --git a/app/code/Magento/Log/Model/Aggregation.php b/app/code/Magento/Log/Model/Aggregation.php
index 714e8d62c56c8..30046eeb81353 100644
--- a/app/code/Magento/Log/Model/Aggregation.php
+++ b/app/code/Magento/Log/Model/Aggregation.php
@@ -23,14 +23,14 @@ class Aggregation extends \Magento\Framework\Model\AbstractModel
     protected $_lastRecord;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\Db $resourceCollection
      * @param array $data
@@ -38,7 +38,7 @@ class Aggregation extends \Magento\Framework\Model\AbstractModel
     public function __construct(
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\Registry $registry,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\Db $resourceCollection = null,
         array $data = []
diff --git a/app/code/Magento/Log/Model/Cron.php b/app/code/Magento/Log/Model/Cron.php
index 9ee04b5a31e1f..80396b78c15d6 100644
--- a/app/code/Magento/Log/Model/Cron.php
+++ b/app/code/Magento/Log/Model/Cron.php
@@ -36,7 +36,7 @@ class Cron extends \Magento\Framework\Model\AbstractModel
     protected $_scopeConfig;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -60,7 +60,7 @@ class Cron extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
      * @param \Magento\Log\Model\Log $log
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
@@ -73,7 +73,7 @@ public function __construct(
         \Magento\Framework\Registry $registry,
         \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
         \Magento\Log\Model\Log $log,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
@@ -100,7 +100,7 @@ protected function _sendLogCleanEmail()
         }
         if (!$this->_scopeConfig->getValue(
             self::XML_PATH_EMAIL_LOG_CLEAN_RECIPIENT,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )
         ) {
             return $this;
@@ -110,7 +110,7 @@ protected function _sendLogCleanEmail()
         $transport = $this->_transportBuilder->setTemplateIdentifier(
             $this->_scopeConfig->getValue(
                 self::XML_PATH_EMAIL_LOG_CLEAN_TEMPLATE,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
         )->setTemplateOptions(
             [
@@ -122,12 +122,12 @@ protected function _sendLogCleanEmail()
         )->setFrom(
             $this->_scopeConfig->getValue(
                 self::XML_PATH_EMAIL_LOG_CLEAN_IDENTITY,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
         )->addTo(
             $this->_scopeConfig->getValue(
                 self::XML_PATH_EMAIL_LOG_CLEAN_RECIPIENT,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
         )->getTransport();
 
@@ -147,7 +147,7 @@ public function logClean()
     {
         if (!$this->_scopeConfig->isSetFlag(
             self::XML_PATH_LOG_CLEAN_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )
         ) {
             return $this;
diff --git a/app/code/Magento/Log/Model/Log.php b/app/code/Magento/Log/Model/Log.php
index 2962878e3493a..e82acd114d341 100644
--- a/app/code/Magento/Log/Model/Log.php
+++ b/app/code/Magento/Log/Model/Log.php
@@ -73,7 +73,7 @@ public function getLogCleanTime()
     {
         return $this->_scopeConfig->getValue(
             self::XML_LOG_CLEAN_DAYS,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         ) * 60 * 60 * 24;
     }
 
@@ -97,7 +97,7 @@ public function getOnlineMinutesInterval()
     {
         $configValue = $this->_scopeConfig->getValue(
             'customer/online_customers/online_minutes_interval',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         return intval($configValue) > 0 ? intval($configValue) : self::DEFAULT_ONLINE_MINUTES_INTERVAL;
     }
diff --git a/app/code/Magento/Log/Model/Resource/Visitor.php b/app/code/Magento/Log/Model/Resource/Visitor.php
index 0631f7db84ca2..c11527b8462a7 100644
--- a/app/code/Magento/Log/Model/Resource/Visitor.php
+++ b/app/code/Magento/Log/Model/Resource/Visitor.php
@@ -30,20 +30,20 @@ class Visitor extends \Magento\Framework\Model\Resource\Db\AbstractDb
     protected $_date;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Framework\App\Resource $resource
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Stdlib\String $string
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
         \Magento\Framework\Stdlib\DateTime\DateTime $date,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Stdlib\String $string
     ) {
         $this->_date = $date;
diff --git a/app/code/Magento/Log/Model/Shell/Command/Clean.php b/app/code/Magento/Log/Model/Shell/Command/Clean.php
index 4ffdc812adcda..65415c82f489b 100644
--- a/app/code/Magento/Log/Model/Shell/Command/Clean.php
+++ b/app/code/Magento/Log/Model/Shell/Command/Clean.php
@@ -54,7 +54,7 @@ public function execute()
             $this->_mutableConfig->setValue(
                 \Magento\Log\Model\Log::XML_LOG_CLEAN_DAYS,
                 $this->_days,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
         /** @var $model \Magento\Log\Model\Log */
diff --git a/app/code/Magento/Log/Model/Visitor.php b/app/code/Magento/Log/Model/Visitor.php
index 6b1679a3e8cab..ddd051f7ba5c3 100644
--- a/app/code/Magento/Log/Model/Visitor.php
+++ b/app/code/Magento/Log/Model/Visitor.php
@@ -22,7 +22,7 @@
 class Visitor extends \Magento\Framework\Model\AbstractModel
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -55,7 +55,7 @@ class Visitor extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\Session\SessionManagerInterface $session
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\HTTP\Header $httpHeader
      * @param \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress $remoteAddress
      * @param \Magento\Framework\HTTP\PhpEnvironment\ServerAddress $serverAddress
@@ -69,7 +69,7 @@ public function __construct(
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\Registry $registry,
         \Magento\Framework\Session\SessionManagerInterface $session,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\HTTP\Header $httpHeader,
         \Magento\Framework\HTTP\PhpEnvironment\RemoteAddress $remoteAddress,
         \Magento\Framework\HTTP\PhpEnvironment\ServerAddress $serverAddress,
diff --git a/app/code/Magento/Log/Model/Visitor/Online.php b/app/code/Magento/Log/Model/Visitor/Online.php
index 490b75ba616e4..ea1f7e47b0343 100644
--- a/app/code/Magento/Log/Model/Visitor/Online.php
+++ b/app/code/Magento/Log/Model/Visitor/Online.php
@@ -122,7 +122,7 @@ public function getUpdateFrequency()
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_UPDATE_FREQUENCY,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
@@ -136,7 +136,7 @@ public function getOnlineInterval()
         $value = intval(
             $this->_scopeConfig->getValue(
                 self::XML_PATH_ONLINE_INTERVAL,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
         );
         if (!$value) {
diff --git a/app/code/Magento/Log/composer.json b/app/code/Magento/Log/composer.json
index 8738223809a94..e7046103a86fb 100644
--- a/app/code/Magento/Log/composer.json
+++ b/app/code/Magento/Log/composer.json
@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
+        "magento/module-store": "0.42.0-beta7",
         "magento/module-customer": "0.42.0-beta7",
         "magento/module-eav": "0.42.0-beta7",
         "magento/module-backend": "0.42.0-beta7",
diff --git a/app/code/Magento/Log/etc/acl.xml b/app/code/Magento/Log/etc/acl.xml
index 65893d1bcc639..626a8d7d04431 100644
--- a/app/code/Magento/Log/etc/acl.xml
+++ b/app/code/Magento/Log/etc/acl.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
+            <resource id="Magento_Backend::admin">
                 <resource id="Magento_Customer::customer">
                     <resource id="Magento_Log::online" title="Now Online" sortOrder="20" />
                 </resource>
diff --git a/app/code/Magento/Log/etc/module.xml b/app/code/Magento/Log/etc/module.xml
index 6b905f3f2e358..7eb861d5a0edf 100644
--- a/app/code/Magento/Log/etc/module.xml
+++ b/app/code/Magento/Log/etc/module.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
     <module name="Magento_Log" schema_version="2.0.0">
         <sequence>
+            <module name="Magento_Store"/>
             <module name="Magento_Customer"/>
         </sequence>
     </module>
diff --git a/app/code/Magento/Msrp/Block/Adminhtml/Product/Helper/Form/Type.php b/app/code/Magento/Msrp/Block/Adminhtml/Product/Helper/Form/Type.php
index 55d0dc5fb679c..b8191d6778be7 100644
--- a/app/code/Magento/Msrp/Block/Adminhtml/Product/Helper/Form/Type.php
+++ b/app/code/Magento/Msrp/Block/Adminhtml/Product/Helper/Form/Type.php
@@ -17,7 +17,7 @@ class Type extends \Magento\Catalog\Block\Adminhtml\Product\Helper\Form\Price
      * @param \Magento\Framework\Data\Form\Element\Factory $factoryElement
      * @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
      * @param \Magento\Framework\Escaper $escaper
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Locale\CurrencyInterface $localeCurrency
      * @param \Magento\Tax\Helper\Data $taxData
      * @param \Magento\Msrp\Model\Config $config
@@ -27,7 +27,7 @@ public function __construct(
         \Magento\Framework\Data\Form\Element\Factory $factoryElement,
         \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection,
         \Magento\Framework\Escaper $escaper,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Locale\CurrencyInterface $localeCurrency,
         \Magento\Tax\Helper\Data $taxData,
         \Magento\Msrp\Model\Config $config,
diff --git a/app/code/Magento/Msrp/Helper/Data.php b/app/code/Magento/Msrp/Helper/Data.php
index 2fa8a659592f9..e316672f2cce7 100644
--- a/app/code/Magento/Msrp/Helper/Data.php
+++ b/app/code/Magento/Msrp/Helper/Data.php
@@ -8,7 +8,7 @@
 use Magento\Framework\App\Helper\AbstractHelper;
 use Magento\Framework\App\Helper\Context;
 use Magento\Msrp\Model\Product\Attribute\Source\Type;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 
@@ -18,7 +18,7 @@
 class Data extends AbstractHelper
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $storeManager;
 
@@ -44,7 +44,7 @@ class Data extends AbstractHelper
 
     /**
      * @param Context $context
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param StoreManagerInterface $storeManager
      * @param \Magento\Msrp\Model\Product\Options $productOptions
      * @param \Magento\Msrp\Model\Msrp $msrp
      * @param \Magento\Msrp\Model\Config $config
diff --git a/app/code/Magento/Msrp/Model/Config.php b/app/code/Magento/Msrp/Model/Config.php
index b63cbd82b2ecd..be5d39d56523b 100644
--- a/app/code/Magento/Msrp/Model/Config.php
+++ b/app/code/Magento/Msrp/Model/Config.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Msrp\Model;
 
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\Escaper;
 
 class Config
@@ -27,7 +27,7 @@ class Config
     protected $scopeConfig;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $storeManager;
 
@@ -43,12 +43,12 @@ class Config
 
     /**
      * @param ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param StoreManagerInterface $storeManager
      * @param Escaper $escaper
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        StoreManagerInterface $storeManager,
         Escaper $escaper
     ) {
         $this->scopeConfig = $scopeConfig;
@@ -77,7 +77,7 @@ public function isEnabled()
     {
         return (bool)$this->scopeConfig->getValue(
             self::XML_PATH_MSRP_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $this->storeId
         );
     }
@@ -91,7 +91,7 @@ public function getDisplayActualPriceType()
     {
         return $this->scopeConfig->getValue(
             self::XML_PATH_MSRP_DISPLAY_ACTUAL_PRICE_TYPE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             $this->storeId
         );
     }
@@ -106,7 +106,7 @@ public function getExplanationMessage()
         return $this->escaper->escapeHtml(
             $this->scopeConfig->getValue(
                 self::XML_PATH_MSRP_EXPLANATION_MESSAGE,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                ScopeInterface::SCOPE_STORE,
                 $this->storeId
             ),
             ['b', 'br', 'strong', 'i', 'u', 'p', 'span']
@@ -123,7 +123,7 @@ public function getExplanationMessageWhatsThis()
         return $this->escaper->escapeHtml(
             $this->scopeConfig->getValue(
                 self::XML_PATH_MSRP_EXPLANATION_MESSAGE_WHATS_THIS,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                ScopeInterface::SCOPE_STORE,
                 $this->storeId
             ),
             ['b', 'br', 'strong', 'i', 'u', 'p', 'span']
diff --git a/app/code/Magento/Msrp/composer.json b/app/code/Magento/Msrp/composer.json
index 365cf15d47ce6..56ed88b5119ec 100644
--- a/app/code/Magento/Msrp/composer.json
+++ b/app/code/Magento/Msrp/composer.json
@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
+        "magento/module-store": "0.42.0-beta7",
         "magento/module-bundle": "0.42.0-beta7",
         "magento/module-catalog": "0.42.0-beta7",
         "magento/module-core": "0.42.0-beta7",
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Shipping.php b/app/code/Magento/Multishipping/Block/Checkout/Shipping.php
index a6bd847b469c1..33e18d922427d 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/Shipping.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/Shipping.php
@@ -142,7 +142,7 @@ public function getCarrierName($carrierCode)
     {
         if ($name = $this->_scopeConfig->getValue(
             'carriers/' . $carrierCode . '/title',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )
         ) {
             return $name;
diff --git a/app/code/Magento/Multishipping/Helper/Data.php b/app/code/Magento/Multishipping/Helper/Data.php
index fd217c5ee95ab..d7458c1e1a047 100644
--- a/app/code/Magento/Multishipping/Helper/Data.php
+++ b/app/code/Magento/Multishipping/Helper/Data.php
@@ -70,7 +70,7 @@ public function getQuote()
      */
     public function getMaximumQty()
     {
-        return (int)$this->scopeConfig->getValue(self::XML_PATH_CHECKOUT_MULTIPLE_MAXIMUM_QUANTITY, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return (int)$this->scopeConfig->getValue(self::XML_PATH_CHECKOUT_MULTIPLE_MAXIMUM_QUANTITY, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
@@ -82,7 +82,7 @@ public function getMaximumQty()
     public function isMultishippingCheckoutAvailable()
     {
         $quote = $this->getQuote();
-        $isMultiShipping = $this->scopeConfig->isSetFlag(self::XML_PATH_CHECKOUT_MULTIPLE_AVAILABLE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        $isMultiShipping = $this->scopeConfig->isSetFlag(self::XML_PATH_CHECKOUT_MULTIPLE_AVAILABLE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
         if (!$quote || !$quote->hasItems()) {
             return $isMultiShipping;
         }
diff --git a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
index 7cf624fb5a580..809ec11f824c0 100644
--- a/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
+++ b/app/code/Magento/Multishipping/Model/Checkout/Type/Multishipping.php
@@ -47,7 +47,7 @@ class Multishipping extends \Magento\Framework\Object
     protected $_session;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -146,7 +146,7 @@ class Multishipping extends \Magento\Framework\Object
      * @param \Magento\Quote\Model\Quote\Address\ToOrderAddress $quoteAddressToOrderAddress
      * @param \Magento\Quote\Model\Quote\Payment\ToOrderPayment $quotePaymentToOrderPayment
      * @param \Magento\Quote\Model\Quote\Item\ToOrderItem $quoteItemToOrderItem
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Payment\Model\Method\SpecificationInterface $paymentSpecification
      * @param \Magento\Multishipping\Helper\Data $helper
      * @param OrderSender $orderSender
@@ -170,7 +170,7 @@ public function __construct(
         \Magento\Quote\Model\Quote\Address\ToOrderAddress $quoteAddressToOrderAddress,
         \Magento\Quote\Model\Quote\Payment\ToOrderPayment $quotePaymentToOrderPayment,
         \Magento\Quote\Model\Quote\Item\ToOrderItem $quoteItemToOrderItem,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Payment\Model\Method\SpecificationInterface $paymentSpecification,
         \Magento\Multishipping\Helper\Data $helper,
         OrderSender $orderSender,
@@ -766,10 +766,10 @@ public function validateMinimumAmount()
     {
         return !($this->_scopeConfig->isSetFlag(
             'sales/minimum_order/active',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         ) && $this->_scopeConfig->isSetFlag(
             'sales/minimum_order/multi_address',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         ) && !$this->getQuote()->validateMinimumAmount());
     }
 
@@ -782,12 +782,12 @@ public function getMinimumAmountDescription()
     {
         $descr = $this->_scopeConfig->getValue(
             'sales/minimum_order/multi_address_description',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         if (empty($descr)) {
             $descr = $this->_scopeConfig->getValue(
                 'sales/minimum_order/description',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
         return $descr;
@@ -800,12 +800,12 @@ public function getMinimumAmountError()
     {
         $error = $this->_scopeConfig->getValue(
             'sales/minimum_order/multi_address_error_message',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         if (empty($error)) {
             $error = $this->_scopeConfig->getValue(
                 'sales/minimum_order/error_message',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
         return $error;
diff --git a/app/code/Magento/Multishipping/Model/Payment/Method/Specification/Is3DSecure.php b/app/code/Magento/Multishipping/Model/Payment/Method/Specification/Is3DSecure.php
index f9ff5b6a7302a..5d2045ed68e95 100644
--- a/app/code/Magento/Multishipping/Model/Payment/Method/Specification/Is3DSecure.php
+++ b/app/code/Magento/Multishipping/Model/Payment/Method/Specification/Is3DSecure.php
@@ -67,9 +67,9 @@ public function isSatisfiedBy($paymentMethod)
     protected function is3DSecureEnabled($paymentMethod)
     {
         return $this->scopeConfig->isSetFlag(
-            sprintf(self::PATH_PAYMENT_3DSECURE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $paymentMethod)
+            sprintf(self::PATH_PAYMENT_3DSECURE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $paymentMethod)
         ) || $this->scopeConfig->isSetFlag(
-            sprintf(self::PATH_PAYMENT_CENTINEL, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $paymentMethod)
+            sprintf(self::PATH_PAYMENT_CENTINEL, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $paymentMethod)
         );
     }
 }
diff --git a/app/code/Magento/Multishipping/composer.json b/app/code/Magento/Multishipping/composer.json
index fe95ee4b288b1..3c78da1132c11 100644
--- a/app/code/Magento/Multishipping/composer.json
+++ b/app/code/Magento/Multishipping/composer.json
@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
+        "magento/module-store": "0.42.0-beta7",
         "magento/module-core": "0.42.0-beta7",
         "magento/module-checkout": "0.42.0-beta7",
         "magento/module-sales": "0.42.0-beta7",
diff --git a/app/code/Magento/Multishipping/etc/acl.xml b/app/code/Magento/Multishipping/etc/acl.xml
index 2563dd54b9236..477af62823cba 100644
--- a/app/code/Magento/Multishipping/etc/acl.xml
+++ b/app/code/Magento/Multishipping/etc/acl.xml
@@ -8,10 +8,10 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::stores">
-                    <resource id="Magento_Adminhtml::stores_settings">
-                        <resource id="Magento_Adminhtml::config">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::stores">
+                    <resource id="Magento_Backend::stores_settings">
+                        <resource id="Magento_Backend::config">
                             <resource id="Magento_Multishipping::config_multishipping" title="Multishipping Settings Section" sortOrder="6" />
                         </resource>
                     </resource>
diff --git a/app/code/Magento/Multishipping/etc/module.xml b/app/code/Magento/Multishipping/etc/module.xml
index 27d308c3eba56..0973c6781782d 100644
--- a/app/code/Magento/Multishipping/etc/module.xml
+++ b/app/code/Magento/Multishipping/etc/module.xml
@@ -9,6 +9,7 @@
     <module name="Magento_Multishipping" schema_version="2.0.0.0">
         <sequence>
             <module name="Magento_Core"/>
+            <module name="Magento_Store"/>
             <module name="Magento_Catalog"/>
         </sequence>
     </module>
diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_addresses.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_addresses.xml
index d657fa9186e89..e00f3dc665c49 100644
--- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_addresses.xml
+++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_addresses.xml
@@ -22,7 +22,7 @@
                 <block class="Magento\Framework\View\Element\RendererList" name="checkout.cart.item.renderers" as="renderer.list"/>
             </block>
         </referenceContainer>
-        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
         <referenceBlock name="head.components">
             <block class="Magento\Framework\View\Element\Template" name="multishipping_checkout_addresses_page_head_components" template="Magento_Multishipping::js/components.phtml"/>
         </referenceBlock>
diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_overview.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_overview.xml
index 199c65996f8fd..b71e35b9b4c70 100644
--- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_overview.xml
+++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_overview.xml
@@ -31,6 +31,6 @@
                 <container name="checkout.multishipping.overview.items.after" as="items_after" label="Overview Items After"/>
             </block>
         </referenceContainer>
-        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
     </body>
 </page>
diff --git a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_shipping.xml b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_shipping.xml
index 933fc87f59a0f..8020a79055261 100644
--- a/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_shipping.xml
+++ b/app/code/Magento/Multishipping/view/frontend/layout/multishipping_checkout_shipping.xml
@@ -28,6 +28,6 @@
                 </block>
             </block>
         </referenceContainer>
-        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
     </body>
 </page>
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Website.php b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Website.php
index d0343d4584854..f6abfc399c74c 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Website.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Subscriber/Grid/Filter/Website.php
@@ -28,7 +28,7 @@ class Website extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
     protected $_coreRegistry;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -41,7 +41,7 @@ class Website extends \Magento\Backend\Block\Widget\Grid\Column\Filter\Select
      * @param \Magento\Backend\Block\Context $context
      * @param \Magento\Framework\DB\Helper $resourceHelper
      * @param \Magento\Store\Model\Resource\Website\CollectionFactory $websitesFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Registry $registry
      * @param array $data
      */
@@ -49,7 +49,7 @@ public function __construct(
         \Magento\Backend\Block\Context $context,
         \Magento\Framework\DB\Helper $resourceHelper,
         \Magento\Store\Model\Resource\Website\CollectionFactory $websitesFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Registry $registry,
         array $data = []
     ) {
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit/Form.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit/Form.php
index e62c103ab9829..18de6a18d03c5 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit/Form.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit/Form.php
@@ -58,15 +58,15 @@ protected function _prepareForm()
         $model = $this->getModel();
         $identity = $this->_scopeConfig->getValue(
             \Magento\Newsletter\Model\Subscriber::XML_PATH_UNSUBSCRIBE_EMAIL_IDENTITY,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         $identityName = $this->_scopeConfig->getValue(
             'trans_email/ident_' . $identity . '/name',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         $identityEmail = $this->_scopeConfig->getValue(
             'trans_email/ident_' . $identity . '/email',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
 
         /** @var \Magento\Framework\Data\Form $form */
diff --git a/app/code/Magento/Newsletter/Controller/Manage/Save.php b/app/code/Magento/Newsletter/Controller/Manage/Save.php
index 3f278ba31e041..9fd0fb9fa4a08 100644
--- a/app/code/Magento/Newsletter/Controller/Manage/Save.php
+++ b/app/code/Magento/Newsletter/Controller/Manage/Save.php
@@ -16,7 +16,7 @@ class Save extends \Magento\Newsletter\Controller\Manage
     protected $formKeyValidator;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -36,7 +36,7 @@ class Save extends \Magento\Newsletter\Controller\Manage
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param CustomerRepository $customerRepository
      * @param \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory
      */
@@ -44,7 +44,7 @@ public function __construct(
         \Magento\Framework\App\Action\Context $context,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         CustomerRepository $customerRepository,
         \Magento\Newsletter\Model\SubscriberFactory $subscriberFactory
     ) {
diff --git a/app/code/Magento/Newsletter/Controller/Subscriber.php b/app/code/Magento/Newsletter/Controller/Subscriber.php
index d1fcf3f4ec174..ecebc482b444e 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber.php
@@ -10,7 +10,7 @@
 namespace Magento\Newsletter\Controller;
 
 use Magento\Framework\App\Action\Context;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Customer\Model\Session;
 use Magento\Newsletter\Model\SubscriberFactory;
 use Magento\Customer\Model\Url as CustomerUrl;
@@ -32,7 +32,7 @@ class Subscriber extends \Magento\Framework\App\Action\Action
     protected $_subscriberFactory;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -45,7 +45,7 @@ class Subscriber extends \Magento\Framework\App\Action\Action
      * @param Context $context
      * @param SubscriberFactory $subscriberFactory
      * @param Session $customerSession
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param StoreManagerInterface $storeManager
      * @param CustomerUrl $customerUrl
      */
     public function __construct(
diff --git a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
index c55d26f11b5bf..3d787c4479500 100644
--- a/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
+++ b/app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php
@@ -10,7 +10,7 @@
 use Magento\Customer\Model\Session;
 use Magento\Customer\Model\Url as CustomerUrl;
 use Magento\Framework\App\Action\Context;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Newsletter\Model\SubscriberFactory;
 
 class NewAction extends \Magento\Newsletter\Controller\Subscriber
@@ -76,7 +76,7 @@ protected function validateGuestSubscription()
         if ($this->_objectManager->get('Magento\Framework\App\Config\ScopeConfigInterface')
                 ->getValue(
                     \Magento\Newsletter\Model\Subscriber::XML_PATH_ALLOW_GUEST_SUBSCRIBE_FLAG,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 ) != 1
             && !$this->_customerSession->isLoggedIn()
         ) {
diff --git a/app/code/Magento/Newsletter/Model/Queue.php b/app/code/Magento/Newsletter/Model/Queue.php
index 35b9305945a31..72239c7dcfabd 100644
--- a/app/code/Magento/Newsletter/Model/Queue.php
+++ b/app/code/Magento/Newsletter/Model/Queue.php
@@ -116,7 +116,7 @@ class Queue extends \Magento\Email\Model\AbstractTemplate
      * @param \Magento\Framework\View\DesignInterface $design
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Store\Model\App\Emulation $appEmulation
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Newsletter\Model\Template\Filter $templateFilter
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
@@ -132,7 +132,7 @@ public function __construct(
         \Magento\Framework\View\DesignInterface $design,
         \Magento\Framework\Registry $registry,
         \Magento\Store\Model\App\Emulation $appEmulation,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Newsletter\Model\Template\Filter $templateFilter,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Framework\Stdlib\DateTime\DateTime $date,
diff --git a/app/code/Magento/Newsletter/Model/Subscriber.php b/app/code/Magento/Newsletter/Model/Subscriber.php
index 0da823146252c..a201e88646585 100644
--- a/app/code/Magento/Newsletter/Model/Subscriber.php
+++ b/app/code/Magento/Newsletter/Model/Subscriber.php
@@ -96,7 +96,7 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -128,7 +128,7 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Newsletter\Helper\Data $newsletterData
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Customer\Model\Session $customerSession
      * @param CustomerRepositoryInterface $customerRepository
      * @param AccountManagementInterface $customerAccountManagement
@@ -144,7 +144,7 @@ public function __construct(
         \Magento\Newsletter\Helper\Data $newsletterData,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Customer\Model\Session $customerSession,
         CustomerRepositoryInterface $customerRepository,
         AccountManagementInterface $customerAccountManagement,
@@ -401,7 +401,7 @@ public function subscribe($email)
 
         $isConfirmNeed = $this->_scopeConfig->getValue(
             self::XML_PATH_CONFIRMATION_FLAG,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         ) == 1 ? true : false;
         $isOwnSubscribes = false;
 
@@ -634,10 +634,10 @@ public function sendConfirmationRequestEmail()
 
         if (!$this->_scopeConfig->getValue(
             self::XML_PATH_CONFIRM_EMAIL_TEMPLATE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         ) || !$this->_scopeConfig->getValue(
             self::XML_PATH_CONFIRM_EMAIL_IDENTITY,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )
         ) {
             return $this;
@@ -648,7 +648,7 @@ public function sendConfirmationRequestEmail()
         $this->_transportBuilder->setTemplateIdentifier(
             $this->_scopeConfig->getValue(
                 self::XML_PATH_CONFIRM_EMAIL_TEMPLATE,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
         )->setTemplateOptions(
             [
@@ -660,7 +660,7 @@ public function sendConfirmationRequestEmail()
         )->setFrom(
             $this->_scopeConfig->getValue(
                 self::XML_PATH_CONFIRM_EMAIL_IDENTITY,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
         )->addTo(
             $this->getEmail(),
@@ -687,10 +687,10 @@ public function sendConfirmationSuccessEmail()
 
         if (!$this->_scopeConfig->getValue(
             self::XML_PATH_SUCCESS_EMAIL_TEMPLATE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         ) || !$this->_scopeConfig->getValue(
             self::XML_PATH_SUCCESS_EMAIL_IDENTITY,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )
         ) {
             return $this;
@@ -701,7 +701,7 @@ public function sendConfirmationSuccessEmail()
         $this->_transportBuilder->setTemplateIdentifier(
             $this->_scopeConfig->getValue(
                 self::XML_PATH_SUCCESS_EMAIL_TEMPLATE,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
         )->setTemplateOptions(
             [
@@ -713,7 +713,7 @@ public function sendConfirmationSuccessEmail()
         )->setFrom(
             $this->_scopeConfig->getValue(
                 self::XML_PATH_SUCCESS_EMAIL_IDENTITY,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
         )->addTo(
             $this->getEmail(),
@@ -739,10 +739,10 @@ public function sendUnsubscriptionEmail()
         }
         if (!$this->_scopeConfig->getValue(
             self::XML_PATH_UNSUBSCRIBE_EMAIL_TEMPLATE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         ) || !$this->_scopeConfig->getValue(
             self::XML_PATH_UNSUBSCRIBE_EMAIL_IDENTITY,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )
         ) {
             return $this;
@@ -753,7 +753,7 @@ public function sendUnsubscriptionEmail()
         $this->_transportBuilder->setTemplateIdentifier(
             $this->_scopeConfig->getValue(
                 self::XML_PATH_UNSUBSCRIBE_EMAIL_TEMPLATE,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
         )->setTemplateOptions(
             [
@@ -765,7 +765,7 @@ public function sendUnsubscriptionEmail()
         )->setFrom(
             $this->_scopeConfig->getValue(
                 self::XML_PATH_UNSUBSCRIBE_EMAIL_IDENTITY,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
         )->addTo(
             $this->getEmail(),
diff --git a/app/code/Magento/Newsletter/Model/Template.php b/app/code/Magento/Newsletter/Model/Template.php
index cc3d409ed2a47..4ff5e4d526c66 100644
--- a/app/code/Magento/Newsletter/Model/Template.php
+++ b/app/code/Magento/Newsletter/Model/Template.php
@@ -53,7 +53,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate
     /**
      * Store manager to emulate design
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -95,7 +95,7 @@ class Template extends \Magento\Email\Model\AbstractTemplate
      * @param \Magento\Framework\View\DesignInterface $design
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Store\Model\App\Emulation $appEmulation
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\RequestInterface $request
      * @param \Magento\Newsletter\Model\Template\Filter $filter
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -109,7 +109,7 @@ public function __construct(
         \Magento\Framework\View\DesignInterface $design,
         \Magento\Framework\Registry $registry,
         \Magento\Store\Model\App\Emulation $appEmulation,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\RequestInterface $request,
         \Magento\Newsletter\Model\Template\Filter $filter,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
@@ -335,7 +335,7 @@ public function isValidForSend()
     {
         return !$this->_scopeConfig->isSetFlag(
             \Magento\Email\Model\Template::XML_PATH_SYSTEM_SMTP_DISABLE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         ) && $this->getTemplateSenderName() && $this->getTemplateSenderEmail() && $this->getTemplateSubject();
     }
 }
diff --git a/app/code/Magento/Newsletter/etc/acl.xml b/app/code/Magento/Newsletter/etc/acl.xml
index 333c73272cf23..05e452828724a 100644
--- a/app/code/Magento/Newsletter/etc/acl.xml
+++ b/app/code/Magento/Newsletter/etc/acl.xml
@@ -8,9 +8,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::marketing">
-                    <resource id="Magento_Adminhtml::marketing_communications">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::marketing">
+                    <resource id="Magento_Backend::marketing_communications">
                         <resource id="Magento_Newsletter::template" title="Newsletter Template" sortOrder="20" />
                         <resource id="Magento_Newsletter::queue" title="Newsletter Queue" sortOrder="30"/>
                         <resource id="Magento_Newsletter::subscriber" title="Newsletter Subscribers" sortOrder="40"/>
@@ -21,9 +21,9 @@
                         <resource id="Magento_Newsletter::problem" title="Newsletter Problem Reports" sortOrder="40"/>
                     </resource>
                 </resource>
-                <resource id="Magento_Adminhtml::stores">
-                    <resource id="Magento_Adminhtml::stores_settings">
-                        <resource id="Magento_Adminhtml::config">
+                <resource id="Magento_Backend::stores">
+                    <resource id="Magento_Backend::stores_settings">
+                        <resource id="Magento_Backend::config">
                             <resource id="Magento_Newsletter::newsletter" title="Newsletter Section" />
                         </resource>
                     </resource>
diff --git a/app/code/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ExportTablerates.php b/app/code/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ExportTablerates.php
index b0adb7297f688..f56fac0e30b25 100644
--- a/app/code/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ExportTablerates.php
+++ b/app/code/Magento/OfflineShipping/Controller/Adminhtml/System/Config/ExportTablerates.php
@@ -18,7 +18,7 @@ class ExportTablerates extends \Magento\Backend\Controller\Adminhtml\System\Abst
     protected $_fileFactory;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -27,14 +27,14 @@ class ExportTablerates extends \Magento\Backend\Controller\Adminhtml\System\Abst
      * @param \Magento\Backend\Model\Config\Structure $configStructure
      * @param ConfigSectionChecker $sectionChecker
      * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Backend\Model\Config\Structure $configStructure,
         ConfigSectionChecker $sectionChecker,
         \Magento\Framework\App\Response\Http\FileFactory $fileFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->_storeManager = $storeManager;
         $this->_fileFactory = $fileFactory;
diff --git a/app/code/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/Shipping.php b/app/code/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/Shipping.php
index 55b4fc70e1f24..b3bc246030b93 100644
--- a/app/code/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/Shipping.php
+++ b/app/code/Magento/OfflineShipping/Model/Plugin/Checkout/Block/Cart/Shipping.php
@@ -36,6 +36,6 @@ public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $
      */
     public function afterGetStateActive(\Magento\Checkout\Block\Cart\Shipping $subject, $result)
     {
-        return (bool)$result || (bool)$this->_scopeConfig->getValue('carriers/tablerate/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return (bool)$result || (bool)$this->_scopeConfig->getValue('carriers/tablerate/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 }
diff --git a/app/code/Magento/OfflineShipping/Model/Quote/Freeshipping.php b/app/code/Magento/OfflineShipping/Model/Quote/Freeshipping.php
index 511672f40d86d..efe7c7f63f406 100644
--- a/app/code/Magento/OfflineShipping/Model/Quote/Freeshipping.php
+++ b/app/code/Magento/OfflineShipping/Model/Quote/Freeshipping.php
@@ -17,16 +17,16 @@ class Freeshipping extends \Magento\Quote\Model\Quote\Address\Total\AbstractTota
     protected $_calculator;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\OfflineShipping\Model\SalesRule\Calculator $calculator
      */
     public function __construct(
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\OfflineShipping\Model\SalesRule\Calculator $calculator
     ) {
         $this->setCode('discount');
diff --git a/app/code/Magento/OfflineShipping/Model/Resource/Carrier/Tablerate.php b/app/code/Magento/OfflineShipping/Model/Resource/Carrier/Tablerate.php
index 6c5869c7bd2e0..23985af45cddc 100644
--- a/app/code/Magento/OfflineShipping/Model/Resource/Carrier/Tablerate.php
+++ b/app/code/Magento/OfflineShipping/Model/Resource/Carrier/Tablerate.php
@@ -95,7 +95,7 @@ class Tablerate extends \Magento\Framework\Model\Resource\Db\AbstractDb
     protected $_logger;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -125,7 +125,7 @@ class Tablerate extends \Magento\Framework\Model\Resource\Db\AbstractDb
      * @param \Magento\Framework\App\Resource $resource
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $coreConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\OfflineShipping\Model\Carrier\Tablerate $carrierTablerate
      * @param \Magento\Directory\Model\Resource\Country\CollectionFactory $countryCollectionFactory
      * @param \Magento\Directory\Model\Resource\Region\CollectionFactory $regionCollectionFactory
@@ -135,7 +135,7 @@ public function __construct(
         \Magento\Framework\App\Resource $resource,
         \Psr\Log\LoggerInterface $logger,
         \Magento\Framework\App\Config\ScopeConfigInterface $coreConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\OfflineShipping\Model\Carrier\Tablerate $carrierTablerate,
         \Magento\Directory\Model\Resource\Country\CollectionFactory $countryCollectionFactory,
         \Magento\Directory\Model\Resource\Region\CollectionFactory $regionCollectionFactory,
diff --git a/app/code/Magento/OfflineShipping/composer.json b/app/code/Magento/OfflineShipping/composer.json
index 010d62358c35b..cec1708ee2706 100644
--- a/app/code/Magento/OfflineShipping/composer.json
+++ b/app/code/Magento/OfflineShipping/composer.json
@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
+        "magento/module-store": "0.42.0-beta7",
         "magento/module-backend": "0.42.0-beta7",
         "magento/module-shipping": "0.42.0-beta7",
         "magento/module-catalog": "0.42.0-beta7",
diff --git a/app/code/Magento/OfflineShipping/etc/module.xml b/app/code/Magento/OfflineShipping/etc/module.xml
index fa87ce91d4ecb..84e7bb228b473 100644
--- a/app/code/Magento/OfflineShipping/etc/module.xml
+++ b/app/code/Magento/OfflineShipping/etc/module.xml
@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
     <module name="Magento_OfflineShipping" schema_version="2.0.0">
         <sequence>
+            <module name="Magento_Store"/>
             <module name="Magento_Sales"/>
             <module name="Magento_Quote"/>
             <module name="Magento_SalesRule"/>
diff --git a/app/code/Magento/PageCache/Model/Config.php b/app/code/Magento/PageCache/Model/Config.php
index 55f70ea787a6e..56d46f7111fcc 100644
--- a/app/code/Magento/PageCache/Model/Config.php
+++ b/app/code/Magento/PageCache/Model/Config.php
@@ -125,11 +125,11 @@ protected function _getReplacements()
         return [
             '/* {{ host }} */' => $this->_scopeConfig->getValue(
                 self::XML_VARNISH_PAGECACHE_BACKEND_HOST,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             ),
             '/* {{ port }} */' => $this->_scopeConfig->getValue(
                 self::XML_VARNISH_PAGECACHE_BACKEND_PORT,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             ),
             '/* {{ ips }} */' => $this->_getAccessList(),
             '/* {{ design_exceptions_code }} */' => $this->_getDesignExceptions()
@@ -152,7 +152,7 @@ protected function _getAccessList()
         $tpl = "    \"%s\";";
         $accessList = $this->_scopeConfig->getValue(
             self::XML_VARNISH_PAGECACHE_ACCESS_LIST,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         if (!empty($accessList)) {
             $ips = explode(',', $accessList);
@@ -179,7 +179,7 @@ protected function _getDesignExceptions()
 
         $expressions = $this->_scopeConfig->getValue(
             self::XML_VARNISH_PAGECACHE_DESIGN_THEME_REGEX,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         if ($expressions) {
             $rules = array_values(unserialize($expressions));
diff --git a/app/code/Magento/Core/Model/Layout/DepersonalizePlugin.php b/app/code/Magento/PageCache/Model/Layout/DepersonalizePlugin.php
similarity index 98%
rename from app/code/Magento/Core/Model/Layout/DepersonalizePlugin.php
rename to app/code/Magento/PageCache/Model/Layout/DepersonalizePlugin.php
index b1719655c33aa..79b5dcc9f84c6 100644
--- a/app/code/Magento/Core/Model/Layout/DepersonalizePlugin.php
+++ b/app/code/Magento/PageCache/Model/Layout/DepersonalizePlugin.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Core\Model\Layout;
+namespace Magento\PageCache\Model\Layout;
 
 /**
  * Class DepersonalizePlugin
diff --git a/app/code/Magento/PageCache/composer.json b/app/code/Magento/PageCache/composer.json
index 17febf0f61ea6..3fa0e00ae9b79 100644
--- a/app/code/Magento/PageCache/composer.json
+++ b/app/code/Magento/PageCache/composer.json
@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
+        "magento/module-store": "0.42.0-beta7",
         "magento/module-backend": "0.42.0-beta7",
         "magento/framework": "0.42.0-beta7",
         "magento/magento-composer-installer": "*"
diff --git a/app/code/Magento/PageCache/etc/adminhtml/routes.xml b/app/code/Magento/PageCache/etc/adminhtml/routes.xml
index 3479efeeaaec5..384b2f4df3a43 100644
--- a/app/code/Magento/PageCache/etc/adminhtml/routes.xml
+++ b/app/code/Magento/PageCache/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
     <router id="admin">
         <route id="adminhtml">
-            <module name="Magento_PageCache" before="Magento_Adminhtml" />
+            <module name="Magento_PageCache" before="Magento_Backend" />
         </route>
     </router>
 </config>
diff --git a/app/code/Magento/PageCache/etc/di.xml b/app/code/Magento/PageCache/etc/di.xml
new file mode 100644
index 0000000000000..6e694f4729967
--- /dev/null
+++ b/app/code/Magento/PageCache/etc/di.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
+    <type name="Magento\Framework\App\PageCache\Identifier">
+        <plugin name="core-app-area-design-exception-plugin"
+                type="Magento\PageCache\Model\App\CacheIdentifierPlugin" sortOrder="10"/>
+    </type>
+</config>
diff --git a/app/code/Magento/PageCache/etc/frontend/di.xml b/app/code/Magento/PageCache/etc/frontend/di.xml
index 860fab8f451a3..50779f57dd331 100644
--- a/app/code/Magento/PageCache/etc/frontend/di.xml
+++ b/app/code/Magento/PageCache/etc/frontend/di.xml
@@ -17,5 +17,7 @@
     </type>
     <type name="Magento\Framework\View\Layout">
         <plugin name="layout-model-caching-unique-name" type="Magento\PageCache\Model\Layout\LayoutPlugin"/>
+        <plugin name="core-session-depersonalize"
+                type="Magento\PageCache\Model\Layout\DepersonalizePlugin" sortOrder="1"/>
     </type>
 </config>
diff --git a/app/code/Magento/PageCache/etc/module.xml b/app/code/Magento/PageCache/etc/module.xml
index a6f9421bc9311..a94c5335ea937 100644
--- a/app/code/Magento/PageCache/etc/module.xml
+++ b/app/code/Magento/PageCache/etc/module.xml
@@ -9,6 +9,7 @@
     <module name="Magento_PageCache" schema_version="1.6.0.0">
         <sequence>
             <module name="Magento_Core"/>
+            <module name="Magento_Store"/>
         </sequence>
     </module>
 </config>
diff --git a/app/code/Magento/Payment/Helper/Data.php b/app/code/Magento/Payment/Helper/Data.php
index f4a4812ac77c3..6f77f919472e8 100644
--- a/app/code/Magento/Payment/Helper/Data.php
+++ b/app/code/Magento/Payment/Helper/Data.php
@@ -112,7 +112,7 @@ public function getMethodInstance($code)
     {
         $class = $this->_scopeConfig->getValue(
             $this->getMethodModelConfigName($code),
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
 
         if (!$class) {
@@ -137,7 +137,7 @@ public function getStoreMethods($store = null, $quote = null)
         foreach (array_keys($methods) as $code) {
             $model = $this->_scopeConfig->getValue(
                 $this->getMethodModelConfigName($code),
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $store
             );
             if (!$model) {
@@ -325,7 +325,7 @@ public function isZeroSubTotal($store = null)
     {
         return $this->_scopeConfig->getValue(
             \Magento\Payment\Model\Method\Free::XML_PATH_PAYMENT_FREE_ACTIVE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -340,7 +340,7 @@ public function getZeroSubTotalOrderStatus($store = null)
     {
         return $this->_scopeConfig->getValue(
             \Magento\Payment\Model\Method\Free::XML_PATH_PAYMENT_FREE_ORDER_STATUS,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -355,7 +355,7 @@ public function getZeroSubTotalPaymentAutomaticInvoice($store = null)
     {
         return $this->_scopeConfig->getValue(
             \Magento\Payment\Model\Method\Free::XML_PATH_PAYMENT_FREE_PAYMENT_ACTION,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
diff --git a/app/code/Magento/Payment/Model/Config.php b/app/code/Magento/Payment/Model/Config.php
index 6acbd23ab21df..a36c3dff9ec97 100644
--- a/app/code/Magento/Payment/Model/Config.php
+++ b/app/code/Magento/Payment/Model/Config.php
@@ -6,7 +6,7 @@
 namespace Magento\Payment\Model;
 
 use Magento\Payment\Model\Method\AbstractMethod;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Payment configuration model
diff --git a/app/code/Magento/Payment/Model/Method/AbstractMethod.php b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
index bc32ea93f8daf..8e913f3b5332a 100644
--- a/app/code/Magento/Payment/Model/Method/AbstractMethod.php
+++ b/app/code/Magento/Payment/Model/Method/AbstractMethod.php
@@ -736,7 +736,7 @@ public function getConfigData($field, $storeId = null)
             $storeId = $this->getStore();
         }
         $path = 'payment/' . $this->getCode() . '/' . $field;
-        return $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId);
+        return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $storeId);
     }
 
     /**
diff --git a/app/code/Magento/Payment/etc/acl.xml b/app/code/Magento/Payment/etc/acl.xml
index 36d1497d07035..3f3e5dd65fc12 100644
--- a/app/code/Magento/Payment/etc/acl.xml
+++ b/app/code/Magento/Payment/etc/acl.xml
@@ -8,10 +8,10 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::stores">
-                    <resource id="Magento_Adminhtml::stores_settings">
-                        <resource id="Magento_Adminhtml::config">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::stores">
+                    <resource id="Magento_Backend::stores_settings">
+                        <resource id="Magento_Backend::config">
                             <resource id="Magento_Payment::payment" title="Payment Methods Section" />
                             <resource id="Magento_Payment::payment_services" title="Payment Services" />
                         </resource>
diff --git a/app/code/Magento/Persistent/Helper/Data.php b/app/code/Magento/Persistent/Helper/Data.php
index 6f88ed3e21339..b5b23229d7270 100644
--- a/app/code/Magento/Persistent/Helper/Data.php
+++ b/app/code/Magento/Persistent/Helper/Data.php
@@ -9,7 +9,7 @@
  */
 namespace Magento\Persistent\Helper;
 
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 class Data extends \Magento\Core\Helper\Data
 {
@@ -45,7 +45,7 @@ class Data extends \Magento\Core\Helper\Data
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\State $appState
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param \Magento\Framework\Module\Dir\Reader $modulesReader
@@ -55,7 +55,7 @@ class Data extends \Magento\Core\Helper\Data
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\State $appState,
         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
         \Magento\Framework\Module\Dir\Reader $modulesReader,
diff --git a/app/code/Magento/Persistent/Helper/Session.php b/app/code/Magento/Persistent/Helper/Session.php
index ab25d9913eaae..57a880e30f431 100644
--- a/app/code/Magento/Persistent/Helper/Session.php
+++ b/app/code/Magento/Persistent/Helper/Session.php
@@ -48,7 +48,7 @@ class Session extends \Magento\Core\Helper\Data
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\State $appState
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param Data $persistentData
@@ -59,7 +59,7 @@ class Session extends \Magento\Core\Helper\Data
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\State $appState,
         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
         \Magento\Persistent\Helper\Data $persistentData,
diff --git a/app/code/Magento/Persistent/Model/Session.php b/app/code/Magento/Persistent/Model/Session.php
index 2e1e18e3fad72..afd932a75f714 100644
--- a/app/code/Magento/Persistent/Model/Session.php
+++ b/app/code/Magento/Persistent/Model/Session.php
@@ -66,7 +66,7 @@ class Session extends \Magento\Framework\Model\AbstractModel
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -104,7 +104,7 @@ class Session extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Persistent\Helper\Data $persistentData
      * @param \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager
      * @param \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Math\Random $mathRandom
      * @param \Magento\Framework\Session\Config\ConfigInterface $sessionConfig
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
@@ -120,7 +120,7 @@ public function __construct(
         \Magento\Persistent\Helper\Data $persistentData,
         \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager,
         \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Math\Random $mathRandom,
         \Magento\Framework\Session\Config\ConfigInterface $sessionConfig,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
diff --git a/app/code/Magento/Persistent/etc/acl.xml b/app/code/Magento/Persistent/etc/acl.xml
index 37a1d36736278..cf8102fcb3ff4 100644
--- a/app/code/Magento/Persistent/etc/acl.xml
+++ b/app/code/Magento/Persistent/etc/acl.xml
@@ -8,10 +8,10 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::stores">
-                    <resource id="Magento_Adminhtml::stores_settings">
-                        <resource id="Magento_Adminhtml::config">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::stores">
+                    <resource id="Magento_Backend::stores_settings">
+                        <resource id="Magento_Backend::config">
                             <resource id="Magento_Persistent::persistent" title="Persistent Shopping Cart" sortOrder="60" />
                         </resource>
                     </resource>
diff --git a/app/code/Magento/ProductAlert/Controller/Add/Price.php b/app/code/Magento/ProductAlert/Controller/Add/Price.php
index ebb601f68bd9f..5a9fdd0e38d1d 100644
--- a/app/code/Magento/ProductAlert/Controller/Add/Price.php
+++ b/app/code/Magento/ProductAlert/Controller/Add/Price.php
@@ -12,7 +12,7 @@
 class Price extends \Magento\ProductAlert\Controller\Add
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -22,13 +22,13 @@ class Price extends \Magento\ProductAlert\Controller\Add
     /**
      * @param Context $context
      * @param \Magento\Customer\Model\Session $customerSession
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
      */
     public function __construct(
         Context $context,
         \Magento\Customer\Model\Session $customerSession,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
     ) {
         parent::__construct($context, $customerSession);
@@ -81,7 +81,7 @@ public function execute()
             )->setPrice(
                 $product->getFinalPrice()
             )->setWebsiteId(
-                $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getWebsiteId()
+                $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getWebsiteId()
             );
             $model->save();
             $this->messageManager->addSuccess(__('You saved the alert subscription.'));
diff --git a/app/code/Magento/ProductAlert/Controller/Add/Stock.php b/app/code/Magento/ProductAlert/Controller/Add/Stock.php
index 62bfac2e92845..3e47cd66b2527 100644
--- a/app/code/Magento/ProductAlert/Controller/Add/Stock.php
+++ b/app/code/Magento/ProductAlert/Controller/Add/Stock.php
@@ -49,7 +49,7 @@ public function execute()
             )->setProductId(
                 $product->getId()
             )->setWebsiteId(
-                $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getWebsiteId()
+                $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getWebsiteId()
             );
             $model->save();
             $this->messageManager->addSuccess(__('Alert subscription has been saved.'));
diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php
index 338021740a776..8d6b92fd56fc2 100644
--- a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php
+++ b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Price.php
@@ -52,7 +52,7 @@ public function execute()
             )->setProductId(
                 $product->getId()
             )->setWebsiteId(
-                $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getWebsiteId()
+                $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getWebsiteId()
             )->loadByParam();
             if ($model->getId()) {
                 $model->delete();
diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe/PriceAll.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe/PriceAll.php
index 5cf0a186da5f1..aacabec010c73 100644
--- a/app/code/Magento/ProductAlert/Controller/Unsubscribe/PriceAll.php
+++ b/app/code/Magento/ProductAlert/Controller/Unsubscribe/PriceAll.php
@@ -18,7 +18,7 @@ public function execute()
                 'Magento\ProductAlert\Model\Price'
             )->deleteCustomer(
                 $this->_customerSession->getCustomerId(),
-                $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getWebsiteId()
+                $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getWebsiteId()
             );
             $this->messageManager->addSuccess(__('You will no longer receive price alerts for this product.'));
         } catch (\Exception $e) {
diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php
index 65e8695bb3f82..2d29c9993fc18 100644
--- a/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php
+++ b/app/code/Magento/ProductAlert/Controller/Unsubscribe/Stock.php
@@ -52,7 +52,7 @@ public function execute()
             )->setProductId(
                 $product->getId()
             )->setWebsiteId(
-                $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getWebsiteId()
+                $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getWebsiteId()
             )->loadByParam();
             if ($model->getId()) {
                 $model->delete();
diff --git a/app/code/Magento/ProductAlert/Controller/Unsubscribe/StockAll.php b/app/code/Magento/ProductAlert/Controller/Unsubscribe/StockAll.php
index 8688ccf698055..3d9b989cdbb8c 100644
--- a/app/code/Magento/ProductAlert/Controller/Unsubscribe/StockAll.php
+++ b/app/code/Magento/ProductAlert/Controller/Unsubscribe/StockAll.php
@@ -18,7 +18,7 @@ public function execute()
                 'Magento\ProductAlert\Model\Stock'
             )->deleteCustomer(
                 $this->_customerSession->getCustomerId(),
-                $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getWebsiteId()
+                $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getWebsiteId()
             );
             $this->messageManager->addSuccess(__('You will no longer receive stock alerts.'));
         } catch (\Exception $e) {
diff --git a/app/code/Magento/ProductAlert/Helper/Data.php b/app/code/Magento/ProductAlert/Helper/Data.php
index d2cac1b0b48ca..4ffb1cae8b9ea 100644
--- a/app/code/Magento/ProductAlert/Helper/Data.php
+++ b/app/code/Magento/ProductAlert/Helper/Data.php
@@ -42,14 +42,14 @@ class Data extends \Magento\Core\Helper\Url
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\View\LayoutInterface $layout
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Registry $coreRegistry,
         \Magento\Framework\View\LayoutInterface $layout,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -137,7 +137,7 @@ public function isStockAlertAllowed()
     {
         return $this->_scopeConfig->isSetFlag(
             \Magento\ProductAlert\Model\Observer::XML_PATH_STOCK_ALLOW,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
@@ -150,7 +150,7 @@ public function isPriceAlertAllowed()
     {
         return $this->_scopeConfig->isSetFlag(
             \Magento\ProductAlert\Model\Observer::XML_PATH_PRICE_ALLOW,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 }
diff --git a/app/code/Magento/ProductAlert/Model/Email.php b/app/code/Magento/ProductAlert/Model/Email.php
index 3f75ca489f935..395d2d9bef141 100644
--- a/app/code/Magento/ProductAlert/Model/Email.php
+++ b/app/code/Magento/ProductAlert/Model/Email.php
@@ -83,7 +83,7 @@ class Email extends \Magento\Framework\Model\AbstractModel
     protected $_scopeConfig;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -112,7 +112,7 @@ class Email extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\ProductAlert\Helper\Data $productAlertData
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
      * @param \Magento\Customer\Helper\View $customerHelper
      * @param \Magento\Store\Model\App\Emulation $appEmulation
@@ -127,7 +127,7 @@ public function __construct(
         \Magento\Framework\Registry $registry,
         \Magento\ProductAlert\Helper\Data $productAlertData,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
         \Magento\Customer\Helper\View $customerHelper,
         \Magento\Store\Model\App\Emulation $appEmulation,
@@ -313,14 +313,14 @@ public function send()
 
         if ($this->_type == 'price' && !$this->_scopeConfig->getValue(
             self::XML_PATH_EMAIL_PRICE_TEMPLATE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeId
         )
         ) {
             return false;
         } elseif ($this->_type == 'stock' && !$this->_scopeConfig->getValue(
             self::XML_PATH_EMAIL_STOCK_TEMPLATE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeId
         )
         ) {
@@ -342,7 +342,7 @@ public function send()
             $block = $this->_getPriceBlock();
             $templateId = $this->_scopeConfig->getValue(
                 self::XML_PATH_EMAIL_PRICE_TEMPLATE,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $storeId
             );
         } else {
@@ -354,7 +354,7 @@ public function send()
             $block = $this->_getStockBlock();
             $templateId = $this->_scopeConfig->getValue(
                 self::XML_PATH_EMAIL_STOCK_TEMPLATE,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $storeId
             );
         }
@@ -377,7 +377,7 @@ public function send()
         )->setFrom(
             $this->_scopeConfig->getValue(
                 self::XML_PATH_EMAIL_IDENTITY,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $storeId
             )
         )->addTo(
diff --git a/app/code/Magento/ProductAlert/Model/Observer.php b/app/code/Magento/ProductAlert/Model/Observer.php
index 5d2211ae48d6f..3a601e4518b66 100644
--- a/app/code/Magento/ProductAlert/Model/Observer.php
+++ b/app/code/Magento/ProductAlert/Model/Observer.php
@@ -69,7 +69,7 @@ class Observer
     protected $_scopeConfig;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -116,7 +116,7 @@ class Observer
     /**
      * @param \Magento\Catalog\Helper\Data $catalogData
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\ProductAlert\Model\Resource\Price\CollectionFactory $priceColFactory
      * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
@@ -130,7 +130,7 @@ class Observer
     public function __construct(
         \Magento\Catalog\Helper\Data $catalogData,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\ProductAlert\Model\Resource\Price\CollectionFactory $priceColFactory,
         \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
@@ -189,7 +189,7 @@ protected function _processPrice(\Magento\ProductAlert\Model\Email $email)
             }
             if (!$this->_scopeConfig->getValue(
                 self::XML_PATH_PRICE_ALLOW,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $website->getDefaultGroup()->getDefaultStore()->getId()
             )
             ) {
@@ -277,7 +277,7 @@ protected function _processStock(\Magento\ProductAlert\Model\Email $email)
             }
             if (!$this->_scopeConfig->getValue(
                 self::XML_PATH_STOCK_ALLOW,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $website->getDefaultGroup()->getDefaultStore()->getId()
             )
             ) {
@@ -356,7 +356,7 @@ protected function _sendErrorEmail()
         if (count($this->_errors)) {
             if (!$this->_scopeConfig->getValue(
                 self::XML_PATH_ERROR_TEMPLATE,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
             ) {
                 return $this;
@@ -367,7 +367,7 @@ protected function _sendErrorEmail()
             $transport = $this->_transportBuilder->setTemplateIdentifier(
                 $this->_scopeConfig->getValue(
                     self::XML_PATH_ERROR_TEMPLATE,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 )
             )->setTemplateOptions(
                 [
@@ -379,12 +379,12 @@ protected function _sendErrorEmail()
             )->setFrom(
                 $this->_scopeConfig->getValue(
                     self::XML_PATH_ERROR_IDENTITY,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 )
             )->addTo(
                 $this->_scopeConfig->getValue(
                     self::XML_PATH_ERROR_RECIPIENT,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 )
             )->getTransport();
 
diff --git a/app/code/Magento/Quote/Model/Cart/ShippingMethodConverter.php b/app/code/Magento/Quote/Model/Cart/ShippingMethodConverter.php
index 5d787e4296885..6a41f4a20ab26 100644
--- a/app/code/Magento/Quote/Model/Cart/ShippingMethodConverter.php
+++ b/app/code/Magento/Quote/Model/Cart/ShippingMethodConverter.php
@@ -22,11 +22,11 @@ class ShippingMethodConverter
      * Constructs a shipping method builder object.
      *
      * @param \Magento\Quote\Api\Data\ShippingMethodDataBuilder $builder Shipping method builder.
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager Store manager interface.
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager Store manager interface.
      */
     public function __construct(
         \Magento\Quote\Api\Data\ShippingMethodDataBuilder $builder,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->builder = $builder;
         $this->storeManager = $storeManager;
diff --git a/app/code/Magento/Quote/Model/Observer/Backend/CustomerQuote.php b/app/code/Magento/Quote/Model/Observer/Backend/CustomerQuote.php
index e93079c972b78..f5221834db63d 100644
--- a/app/code/Magento/Quote/Model/Observer/Backend/CustomerQuote.php
+++ b/app/code/Magento/Quote/Model/Observer/Backend/CustomerQuote.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Quote\Model\Observer\Backend;
 
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Customer\Model\Config\Share as ShareConfig;
 use Magento\Quote\Model\QuoteRepository;
 use Magento\Framework\Event\Observer;
diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
index b717b12f5dfa7..b7d93ae762c1e 100644
--- a/app/code/Magento/Quote/Model/Quote.php
+++ b/app/code/Magento/Quote/Model/Quote.php
@@ -203,7 +203,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
     protected $_scopeConfig;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -343,7 +343,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
      * @param QuoteValidator $quoteValidator
      * @param \Magento\Catalog\Helper\Product $catalogProduct
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      * @param Quote\AddressFactory $quoteAddressFactory
      * @param \Magento\Customer\Model\CustomerFactory $customerFactory
@@ -381,7 +381,7 @@ public function __construct(
         \Magento\Quote\Model\QuoteValidator $quoteValidator,
         \Magento\Catalog\Helper\Product $catalogProduct,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
         \Magento\Quote\Model\Quote\AddressFactory $quoteAddressFactory,
         \Magento\Customer\Model\CustomerFactory $customerFactory,
@@ -2168,7 +2168,7 @@ public function validateMinimumAmount($multishipping = false)
         $storeId = $this->getStoreId();
         $minOrderActive = $this->_scopeConfig->isSetFlag(
             'sales/minimum_order/active',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeId
         );
         if (!$minOrderActive) {
@@ -2176,17 +2176,17 @@ public function validateMinimumAmount($multishipping = false)
         }
         $minOrderMulti = $this->_scopeConfig->isSetFlag(
             'sales/minimum_order/multi_address',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeId
         );
         $minAmount = $this->_scopeConfig->getValue(
             'sales/minimum_order/amount',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeId
         );
         $taxInclude = $this->_scopeConfig->getValue(
             'sales/minimum_order/tax_including',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeId
         );
 
diff --git a/app/code/Magento/Quote/Model/Quote/Address.php b/app/code/Magento/Quote/Model/Quote/Address.php
index 4691bfbea93a5..4d0b03bfb41d2 100644
--- a/app/code/Magento/Quote/Model/Quote/Address.php
+++ b/app/code/Magento/Quote/Model/Quote/Address.php
@@ -1139,7 +1139,7 @@ public function validateMinimumAmount()
         $storeId = $this->getQuote()->getStoreId();
         $validateEnabled = $this->_scopeConfig->isSetFlag(
             'sales/minimum_order/active',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeId
         );
         if (!$validateEnabled) {
@@ -1152,12 +1152,12 @@ public function validateMinimumAmount()
 
         $amount = $this->_scopeConfig->getValue(
             'sales/minimum_order/amount',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeId
         );
         $taxInclude = $this->_scopeConfig->getValue(
             'sales/minimum_order/tax_including',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeId
         );
         $taxes = $taxInclude ? $this->getBaseTaxAmount() : 0;
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total/Collector.php b/app/code/Magento/Quote/Model/Quote/Address/Total/Collector.php
index 8399e7e95151f..bc19616dd902f 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total/Collector.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total/Collector.php
@@ -68,7 +68,7 @@ class Collector extends \Magento\Sales\Model\Config\Ordered
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Sales\Model\Config $salesConfig
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Quote\Model\Quote\Address\TotalFactory $totalFactory
      * @param mixed $sourceData
      * @param mixed $store
@@ -78,7 +78,7 @@ public function __construct(
         \Psr\Log\LoggerInterface $logger,
         \Magento\Sales\Model\Config $salesConfig,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Quote\Model\Quote\Address\TotalFactory $totalFactory,
         $sourceData = null,
         $store = null
@@ -147,7 +147,7 @@ private function _initRetrievers()
     {
         $sorts = $this->_scopeConfig->getValue(
             self::XML_PATH_SALES_TOTALS_SORT,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->_store
         );
         foreach ($sorts as $code => $sortOrder) {
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total/Discount.php b/app/code/Magento/Quote/Model/Quote/Address/Total/Discount.php
index 6d4216c30b9ad..aa50ef3fbe822 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total/Discount.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total/Discount.php
@@ -15,17 +15,17 @@ class Discount extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
     protected $_eventManager = null;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->_eventManager = $eventManager;
         $this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total/Tax.php b/app/code/Magento/Quote/Model/Quote/Address/Total/Tax.php
index 4fb37eff461a3..d2ed16c319f8f 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total/Tax.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total/Tax.php
@@ -177,7 +177,7 @@ public function collect(\Magento\Quote\Model\Quote\Address $address)
 
         $shippingTaxClass = $this->_scopeConfig->getValue(
             \Magento\Tax\Model\Config::CONFIG_XML_PATH_SHIPPING_TAX_CLASS,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
 
diff --git a/app/code/Magento/Quote/Model/Quote/Item/Processor.php b/app/code/Magento/Quote/Model/Quote/Item/Processor.php
index 8c7a3205db46d..3e62bc5cc8c49 100644
--- a/app/code/Magento/Quote/Model/Quote/Item/Processor.php
+++ b/app/code/Magento/Quote/Model/Quote/Item/Processor.php
@@ -8,7 +8,7 @@
 use \Magento\Catalog\Model\Product;
 use Magento\Quote\Model\Quote\ItemFactory;
 use Magento\Quote\Model\Quote\Item;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\App\State;
 use Magento\Framework\Object;
 
@@ -25,7 +25,7 @@ class Processor
     protected $quoteItemFactory;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -36,7 +36,7 @@ class Processor
 
     /**
      * @param ItemFactory $quoteItemFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param StoreManagerInterface $storeManager
      * @param State $appState
      */
     public function __construct(
diff --git a/app/code/Magento/Quote/Model/QuoteRepository.php b/app/code/Magento/Quote/Model/QuoteRepository.php
index 97a25fe47a8cf..82c02292af678 100644
--- a/app/code/Magento/Quote/Model/QuoteRepository.php
+++ b/app/code/Magento/Quote/Model/QuoteRepository.php
@@ -7,7 +7,7 @@
 
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Quote\Model\Quote;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\Api\SearchCriteria;
 use Magento\Framework\Api\Search\FilterGroup;
 use Magento\Quote\Model\Resource\Quote\Collection as QuoteCollection;
@@ -31,7 +31,7 @@ class QuoteRepository implements \Magento\Quote\Api\CartRepositoryInterface
     protected $quoteFactory;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $storeManager;
 
diff --git a/app/code/Magento/Reports/Block/Product/Compared.php b/app/code/Magento/Reports/Block/Product/Compared.php
index c25678aa360d7..6693d0053ea87 100644
--- a/app/code/Magento/Reports/Block/Product/Compared.php
+++ b/app/code/Magento/Reports/Block/Product/Compared.php
@@ -34,7 +34,7 @@ public function getPageSize()
         if ($this->hasData('page_size')) {
             return $this->getData('page_size');
         }
-        return $this->_scopeConfig->getValue(self::XML_PATH_RECENTLY_COMPARED_COUNT, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue(self::XML_PATH_RECENTLY_COMPARED_COUNT, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
diff --git a/app/code/Magento/Reports/Block/Product/Viewed.php b/app/code/Magento/Reports/Block/Product/Viewed.php
index e3b5460eb79e9..addfa8cafd53a 100644
--- a/app/code/Magento/Reports/Block/Product/Viewed.php
+++ b/app/code/Magento/Reports/Block/Product/Viewed.php
@@ -34,7 +34,7 @@ public function getPageSize()
         if ($this->hasData('page_size')) {
             return $this->getData('page_size');
         }
-        return $this->_scopeConfig->getValue(self::XML_PATH_RECENTLY_VIEWED_COUNT, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue(self::XML_PATH_RECENTLY_VIEWED_COUNT, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
diff --git a/app/code/Magento/Reports/Model/Config.php b/app/code/Magento/Reports/Model/Config.php
index 5d82666c16b2e..12fa3befcf7a0 100644
--- a/app/code/Magento/Reports/Model/Config.php
+++ b/app/code/Magento/Reports/Model/Config.php
@@ -16,18 +16,18 @@ class Config extends \Magento\Framework\Object
     protected $_moduleReader;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Framework\Module\Dir\Reader $moduleReader
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param array $data
      */
     public function __construct(
         \Magento\Framework\Module\Dir\Reader $moduleReader,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         array $data = []
     ) {
         parent::__construct($data);
diff --git a/app/code/Magento/Reports/Model/Event/Observer.php b/app/code/Magento/Reports/Model/Event/Observer.php
index 89ffef07ff9d3..0283cf6e15df5 100644
--- a/app/code/Magento/Reports/Model/Event/Observer.php
+++ b/app/code/Magento/Reports/Model/Event/Observer.php
@@ -11,7 +11,7 @@
 class Observer
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -41,7 +41,7 @@ class Observer
     protected $_customerVisitor;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Reports\Model\EventFactory $event
      * @param \Magento\Reports\Model\Product\Index\ComparedFactory $productCompFactory
      * @param \Magento\Reports\Model\Product\Index\ViewedFactory $productIndxFactory
@@ -49,7 +49,7 @@ class Observer
      * @param \Magento\Customer\Model\Visitor $customerVisitor
      */
     public function __construct(
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Reports\Model\EventFactory $event,
         \Magento\Reports\Model\Product\Index\ComparedFactory $productCompFactory,
         \Magento\Reports\Model\Product\Index\ViewedFactory $productIndxFactory,
diff --git a/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php b/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php
index 59250994238a5..4d3ca4716833f 100644
--- a/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php
+++ b/app/code/Magento/Reports/Model/Product/Index/AbstractIndex.php
@@ -18,7 +18,7 @@ abstract class AbstractIndex extends \Magento\Framework\Model\AbstractModel
     protected $_countCacheKey;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -50,7 +50,7 @@ abstract class AbstractIndex extends \Magento\Framework\Model\AbstractModel
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Customer\Model\Visitor $customerVisitor
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Framework\Session\Generic $reportSession
@@ -64,7 +64,7 @@ abstract class AbstractIndex extends \Magento\Framework\Model\AbstractModel
     public function __construct(
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\Registry $registry,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Customer\Model\Visitor $customerVisitor,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Framework\Session\Generic $reportSession,
diff --git a/app/code/Magento/Reports/Model/Product/Index/Compared.php b/app/code/Magento/Reports/Model/Product/Index/Compared.php
index 1d8a7b4fd0df6..2bf6917f34878 100644
--- a/app/code/Magento/Reports/Model/Product/Index/Compared.php
+++ b/app/code/Magento/Reports/Model/Product/Index/Compared.php
@@ -39,7 +39,7 @@ class Compared extends \Magento\Reports\Model\Product\Index\AbstractIndex
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Customer\Model\Visitor $customerVisitor
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Framework\Session\Generic $reportSession
@@ -54,7 +54,7 @@ class Compared extends \Magento\Reports\Model\Product\Index\AbstractIndex
     public function __construct(
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\Registry $registry,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Customer\Model\Visitor $customerVisitor,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Framework\Session\Generic $reportSession,
diff --git a/app/code/Magento/Reports/Model/Resource/Event.php b/app/code/Magento/Reports/Model/Resource/Event.php
index 0897d524090db..313876eb8d89a 100644
--- a/app/code/Magento/Reports/Model/Resource/Event.php
+++ b/app/code/Magento/Reports/Model/Resource/Event.php
@@ -18,19 +18,19 @@ class Event extends \Magento\Framework\Model\Resource\Db\AbstractDb
     protected $_scopeConfig;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Framework\App\Resource $resource
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         parent::__construct($resource);
         $this->_scopeConfig = $scopeConfig;
@@ -140,7 +140,7 @@ public function getCurrentStoreIds(array $predefinedStoreIds = null)
             // get all stores, required by configuration in current store scope
             $productsScope = $this->_scopeConfig->getValue(
                 'catalog/recently_products/scope',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
             switch ($productsScope) {
                 case 'website':
diff --git a/app/code/Magento/Reports/Model/Resource/Order/Collection.php b/app/code/Magento/Reports/Model/Resource/Order/Collection.php
index d767bb8d539e7..107112fb91026 100644
--- a/app/code/Magento/Reports/Model/Resource/Order/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Order/Collection.php
@@ -40,7 +40,7 @@ class Collection extends \Magento\Sales\Model\Resource\Order\Collection
     protected $_scopeConfig;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -66,7 +66,7 @@ class Collection extends \Magento\Sales\Model\Resource\Order\Collection
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Framework\DB\Helper $coreResourceHelper
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Sales\Model\Order\Config $orderConfig
      * @param \Magento\Sales\Model\Resource\Report\OrderFactory $reportOrderFactory
@@ -82,7 +82,7 @@ public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Framework\DB\Helper $coreResourceHelper,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Sales\Model\Order\Config $orderConfig,
         \Magento\Sales\Model\Resource\Report\OrderFactory $reportOrderFactory,
@@ -116,7 +116,7 @@ public function checkIsLive($range)
     {
         $this->_isLive = (bool)(!$this->_scopeConfig->getValue(
             'sales/dashboard/use_aggregated_data',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         ));
         return $this;
     }
@@ -424,7 +424,7 @@ public function getDateRange($range, $customStart, $customEnd, $returnObjects =
                 $dateStart->setDay(
                     $this->_scopeConfig->getValue(
                         'reports/dashboard/mtd_start',
-                        \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                     )
                 );
                 break;
@@ -440,7 +440,7 @@ public function getDateRange($range, $customStart, $customEnd, $returnObjects =
                     ',',
                     $this->_scopeConfig->getValue(
                         'reports/dashboard/ytd_start',
-                        \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                     )
                 );
                 $startMonth = isset($startMonthDay[0]) ? (int)$startMonthDay[0] : 1;
@@ -591,7 +591,7 @@ public function calculateSales($isFilter = 0)
 
         if ($this->_scopeConfig->getValue(
             'sales/dashboard/use_aggregated_data',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )
         ) {
             $this->setMainTable('sales_order_aggregated_created');
diff --git a/app/code/Magento/Reports/Model/Resource/Product/Collection.php b/app/code/Magento/Reports/Model/Resource/Product/Collection.php
index 32865c968cf4d..37336a9287103 100644
--- a/app/code/Magento/Reports/Model/Resource/Product/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Product/Collection.php
@@ -66,7 +66,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
      * @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
      * @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -93,7 +93,7 @@ public function __construct(
         \Magento\Eav\Model\EntityFactory $eavEntityFactory,
         \Magento\Catalog\Model\Resource\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/Reports/Model/Resource/Product/Index/Collection/AbstractCollection.php b/app/code/Magento/Reports/Model/Resource/Product/Index/Collection/AbstractCollection.php
index 318f7d88f3a24..b172b4e053c27 100644
--- a/app/code/Magento/Reports/Model/Resource/Product/Index/Collection/AbstractCollection.php
+++ b/app/code/Magento/Reports/Model/Resource/Product/Index/Collection/AbstractCollection.php
@@ -38,7 +38,7 @@ abstract class AbstractCollection extends \Magento\Catalog\Model\Resource\Produc
      * @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
      * @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -63,7 +63,7 @@ public function __construct(
         \Magento\Eav\Model\EntityFactory $eavEntityFactory,
         \Magento\Catalog\Model\Resource\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/Reports/Model/Resource/Product/Lowstock/Collection.php b/app/code/Magento/Reports/Model/Resource/Product/Lowstock/Collection.php
index 4e904c051ca83..d0085c397c382 100644
--- a/app/code/Magento/Reports/Model/Resource/Product/Lowstock/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Product/Lowstock/Collection.php
@@ -55,7 +55,7 @@ class Collection extends \Magento\Reports\Model\Resource\Product\Collection
      * @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
      * @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -85,7 +85,7 @@ public function __construct(
         \Magento\Eav\Model\EntityFactory $eavEntityFactory,
         \Magento\Catalog\Model\Resource\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/Reports/Model/Resource/Review/Customer/Collection.php b/app/code/Magento/Reports/Model/Resource/Review/Customer/Collection.php
index 5a2993bcb919e..c65cfead0e20e 100644
--- a/app/code/Magento/Reports/Model/Resource/Review/Customer/Collection.php
+++ b/app/code/Magento/Reports/Model/Resource/Review/Customer/Collection.php
@@ -25,7 +25,7 @@ class Collection extends \Magento\Review\Model\Resource\Review\Collection
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Review\Helper\Data $reviewData
      * @param \Magento\Review\Model\Rating\Option\VoteFactory $voteFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Customer\Model\Resource\Customer $customerResource
      * @param mixed $connection
      * @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
@@ -38,7 +38,7 @@ public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Review\Helper\Data $reviewData,
         \Magento\Review\Model\Rating\Option\VoteFactory $voteFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Customer\Model\Resource\Customer $customerResource,
         $connection = null,
         \Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
diff --git a/app/code/Magento/Reports/etc/acl.xml b/app/code/Magento/Reports/etc/acl.xml
index 04576d0b1cea0..8d159bc4ea74e 100644
--- a/app/code/Magento/Reports/etc/acl.xml
+++ b/app/code/Magento/Reports/etc/acl.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
+            <resource id="Magento_Backend::admin">
                 <resource id="Magento_Reports::report" title="Reports" sortOrder="70">
                     <resource id="Magento_Reports::report_marketing" title="Marketing" sortOrder="10">
                         <resource id="Magento_Reports::shopcart" title="Shopping Cart" sortOrder="10">
@@ -45,9 +45,9 @@
                         <resource id="Magento_Reports::statistics_refresh" title="Refresh statistics" sortOrder="10"/>
                     </resource>
                 </resource>
-                <resource id="Magento_Adminhtml::stores">
-                    <resource id="Magento_Adminhtml::stores_settings">
-                        <resource id="Magento_Adminhtml::config">
+                <resource id="Magento_Backend::stores">
+                    <resource id="Magento_Backend::stores_settings">
+                        <resource id="Magento_Backend::config">
                             <resource id="Magento_Reports::reports" title="Reports" sortOrder="70" />
                         </resource>
                     </resource>
diff --git a/app/code/Magento/Review/Block/Adminhtml/Rss.php b/app/code/Magento/Review/Block/Adminhtml/Rss.php
index b8ab6c14ed6bc..42f9ef5583d60 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Rss.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rss.php
@@ -14,7 +14,7 @@
 class Rss extends \Magento\Backend\Block\AbstractBlock implements DataProviderInterface
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -25,13 +25,13 @@ class Rss extends \Magento\Backend\Block\AbstractBlock implements DataProviderIn
 
     /**
      * @param \Magento\Backend\Block\Context $context
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Review\Model\Rss $rssModel
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Review\Model\Rss $rssModel,
         array $data = []
     ) {
diff --git a/app/code/Magento/Review/Block/Product/Compare/ListCompare/Plugin/Review.php b/app/code/Magento/Review/Block/Product/Compare/ListCompare/Plugin/Review.php
index f7eb4d6239373..a473acf9c5990 100644
--- a/app/code/Magento/Review/Block/Product/Compare/ListCompare/Plugin/Review.php
+++ b/app/code/Magento/Review/Block/Product/Compare/ListCompare/Plugin/Review.php
@@ -18,16 +18,16 @@ class Review
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Review\Model\ReviewFactory $reviewFactory
      */
     public function __construct(
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Review\Model\ReviewFactory $reviewFactory
     ) {
         $this->storeManager = $storeManager;
diff --git a/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php b/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php
index 70af771ccc330..e5d81e63f7729 100644
--- a/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php
+++ b/app/code/Magento/Review/Controller/Adminhtml/Product/Post.php
@@ -16,8 +16,8 @@ public function execute()
         $productId = $this->getRequest()->getParam('product_id', false);
 
         if ($data = $this->getRequest()->getPost()) {
-            /** @var \Magento\Framework\Store\StoreManagerInterface $storeManagerInterface */
-            $storeManager = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface');
+            /** @var \Magento\Store\Model\StoreManagerInterface $storeManagerInterface */
+            $storeManager = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface');
             if ($storeManager->hasSingleStore()) {
                 $data['stores'] = [
                     $storeManager->getStore(true)->getId(),
diff --git a/app/code/Magento/Review/Controller/Product.php b/app/code/Magento/Review/Controller/Product.php
index 41ef48198fa57..b44a29ec6c42f 100644
--- a/app/code/Magento/Review/Controller/Product.php
+++ b/app/code/Magento/Review/Controller/Product.php
@@ -84,7 +84,7 @@ class Product extends \Magento\Framework\App\Action\Action
     /**
      * Core model store manager interface
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -106,7 +106,7 @@ class Product extends \Magento\Framework\App\Action\Action
      * @param \Magento\Review\Model\RatingFactory $ratingFactory
      * @param \Magento\Catalog\Model\Design $catalogDesign
      * @param \Magento\Framework\Session\Generic $reviewSession
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -121,7 +121,7 @@ public function __construct(
         \Magento\Review\Model\RatingFactory $ratingFactory,
         \Magento\Catalog\Model\Design $catalogDesign,
         \Magento\Framework\Session\Generic $reviewSession,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
     ) {
         $this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Review/Helper/Data.php b/app/code/Magento/Review/Helper/Data.php
index ed72aea2966b2..a514519405b27 100644
--- a/app/code/Magento/Review/Helper/Data.php
+++ b/app/code/Magento/Review/Helper/Data.php
@@ -84,7 +84,7 @@ public function getDetailHtml($origDetail)
      */
     public function getIsGuestAllowToWrite()
     {
-        return $this->_scopeConfig->isSetFlag(self::XML_REVIEW_GUETS_ALLOW, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->isSetFlag(self::XML_REVIEW_GUETS_ALLOW, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
diff --git a/app/code/Magento/Review/Model/Resource/Rating.php b/app/code/Magento/Review/Model/Resource/Rating.php
index 6d067d4167ddc..1d203bebe666b 100644
--- a/app/code/Magento/Review/Model/Resource/Rating.php
+++ b/app/code/Magento/Review/Model/Resource/Rating.php
@@ -17,7 +17,7 @@ class Rating extends \Magento\Framework\Model\Resource\Db\AbstractDb
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -35,14 +35,14 @@ class Rating extends \Magento\Framework\Model\Resource\Db\AbstractDb
      * @param \Magento\Framework\App\Resource $resource
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Module\Manager $moduleManager
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Review\Model\Resource\Review\Summary $reviewSummary
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
         \Psr\Log\LoggerInterface $logger,
         \Magento\Framework\Module\Manager $moduleManager,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Review\Model\Resource\Review\Summary $reviewSummary
     ) {
         $this->moduleManager = $moduleManager;
diff --git a/app/code/Magento/Review/Model/Resource/Rating/Collection.php b/app/code/Magento/Review/Model/Resource/Rating/Collection.php
index bdb6821cc6c0b..f46f7b3dfbeb1 100644
--- a/app/code/Magento/Review/Model/Resource/Rating/Collection.php
+++ b/app/code/Magento/Review/Model/Resource/Rating/Collection.php
@@ -13,7 +13,7 @@
 class Collection extends \Magento\Framework\Model\Resource\Db\Collection\AbstractCollection
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -33,7 +33,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Review\Model\Resource\Rating\Option\CollectionFactory $ratingCollectionF
      * @param mixed $connection
      * @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
@@ -43,7 +43,7 @@ public function __construct(
         \Psr\Log\LoggerInterface $logger,
         \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
         \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Review\Model\Resource\Rating\Option\CollectionFactory $ratingCollectionF,
         $connection = null,
         \Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
diff --git a/app/code/Magento/Review/Model/Resource/Rating/Grid/Collection.php b/app/code/Magento/Review/Model/Resource/Rating/Grid/Collection.php
index 993e7307d4d70..a13591bfc54eb 100644
--- a/app/code/Magento/Review/Model/Resource/Rating/Grid/Collection.php
+++ b/app/code/Magento/Review/Model/Resource/Rating/Grid/Collection.php
@@ -24,7 +24,7 @@ class Collection extends \Magento\Review\Model\Resource\Rating\Collection
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Review\Model\Resource\Rating\Option\CollectionFactory $ratingCollectionF
      * @param \Magento\Framework\Registry $coreRegistry
      * @param mixed $connection
@@ -35,7 +35,7 @@ public function __construct(
         \Psr\Log\LoggerInterface $logger,
         \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
         \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Review\Model\Resource\Rating\Option\CollectionFactory $ratingCollectionF,
         \Magento\Framework\Registry $coreRegistry,
         $connection = null,
diff --git a/app/code/Magento/Review/Model/Resource/Rating/Option/Vote/Collection.php b/app/code/Magento/Review/Model/Resource/Rating/Option/Vote/Collection.php
index d2db4048b8d1f..6a0b67dc11e90 100644
--- a/app/code/Magento/Review/Model/Resource/Rating/Option/Vote/Collection.php
+++ b/app/code/Magento/Review/Model/Resource/Rating/Option/Vote/Collection.php
@@ -15,7 +15,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
     /**
      * Store list manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -29,7 +29,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Review\Model\Resource\Rating\Option\CollectionFactory $ratingCollectionF
      * @param mixed $connection
      * @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
@@ -39,7 +39,7 @@ public function __construct(
         \Psr\Log\LoggerInterface $logger,
         \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
         \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Review\Model\Resource\Rating\Option\CollectionFactory $ratingCollectionF,
         $connection = null,
         \Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
diff --git a/app/code/Magento/Review/Model/Resource/Review.php b/app/code/Magento/Review/Model/Resource/Review.php
index 3060a7072f747..c6383852b817b 100644
--- a/app/code/Magento/Review/Model/Resource/Review.php
+++ b/app/code/Magento/Review/Model/Resource/Review.php
@@ -71,7 +71,7 @@ class Review extends \Magento\Framework\Model\Resource\Db\AbstractDb
     /**
      * Core model store manager interface
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -92,14 +92,14 @@ class Review extends \Magento\Framework\Model\Resource\Db\AbstractDb
     /**
      * @param \Magento\Framework\App\Resource $resource
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Review\Model\RatingFactory $ratingFactory
      * @param \Magento\Review\Model\Resource\Rating\Option $ratingOptions
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
         \Magento\Framework\Stdlib\DateTime\DateTime $date,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Review\Model\RatingFactory $ratingFactory,
         Rating\Option $ratingOptions
     ) {
diff --git a/app/code/Magento/Review/Model/Resource/Review/Collection.php b/app/code/Magento/Review/Model/Resource/Review/Collection.php
index 9fbdcecf2026c..7bd2de244b7ad 100644
--- a/app/code/Magento/Review/Model/Resource/Review/Collection.php
+++ b/app/code/Magento/Review/Model/Resource/Review/Collection.php
@@ -70,7 +70,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
     /**
      * Core model store manager interface
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -81,7 +81,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Review\Helper\Data $reviewData
      * @param \Magento\Review\Model\Rating\Option\VoteFactory $voteFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param mixed $connection
      * @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
      */
@@ -92,7 +92,7 @@ public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Review\Helper\Data $reviewData,
         \Magento\Review\Model\Rating\Option\VoteFactory $voteFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         $connection = null,
         \Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
     ) {
diff --git a/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php b/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php
index 0c5d9e603fb94..7ecc591ef53b1 100644
--- a/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php
+++ b/app/code/Magento/Review/Model/Resource/Review/Product/Collection.php
@@ -67,7 +67,7 @@ class Collection extends \Magento\Catalog\Model\Resource\Product\Collection
      * @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
      * @param \Magento\Catalog\Model\Resource\Helper $resourceHelper
      * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Module\Manager $moduleManager
      * @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -93,7 +93,7 @@ public function __construct(
         \Magento\Eav\Model\EntityFactory $eavEntityFactory,
         \Magento\Catalog\Model\Resource\Helper $resourceHelper,
         \Magento\Framework\Validator\UniversalFactory $universalFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Module\Manager $moduleManager,
         \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
diff --git a/app/code/Magento/Review/Model/Review.php b/app/code/Magento/Review/Model/Review.php
index e7658eb8a5a5b..3660815cf0249 100644
--- a/app/code/Magento/Review/Model/Review.php
+++ b/app/code/Magento/Review/Model/Review.php
@@ -98,7 +98,7 @@ class Review extends \Magento\Framework\Model\AbstractModel
     /**
      * Core model store manager interface
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -117,7 +117,7 @@ class Review extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Review\Model\Resource\Review\Summary\CollectionFactory $summaryFactory
      * @param \Magento\Review\Model\Review\SummaryFactory $summaryModFactory
      * @param \Magento\Review\Model\Review\Summary $reviewSummary
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\UrlInterface $urlModel
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\Db $resourceCollection
@@ -132,7 +132,7 @@ public function __construct(
         \Magento\Review\Model\Resource\Review\Summary\CollectionFactory $summaryFactory,
         \Magento\Review\Model\Review\SummaryFactory $summaryModFactory,
         \Magento\Review\Model\Review\Summary $reviewSummary,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\UrlInterface $urlModel,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\Db $resourceCollection = null,
diff --git a/app/code/Magento/Review/etc/acl.xml b/app/code/Magento/Review/etc/acl.xml
index c4ccbf934a13f..cee078f9e9bac 100644
--- a/app/code/Magento/Review/etc/acl.xml
+++ b/app/code/Magento/Review/etc/acl.xml
@@ -8,14 +8,14 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::stores">
-                    <resource id="Magento_Adminhtml::stores_attributes">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::stores">
+                    <resource id="Magento_Backend::stores_attributes">
                         <resource id="Magento_Review::ratings" title="Ratings" sortOrder="60" />
                     </resource>
                 </resource>
-                <resource id="Magento_Adminhtml::marketing">
-                    <resource id="Magento_Adminhtml::marketing_user_content">
+                <resource id="Magento_Backend::marketing">
+                    <resource id="Magento_Backend::marketing_user_content">
                         <resource id="Magento_Review::reviews_all" title="Reviews" sortOrder="10"/>
                     </resource>
                 </resource>
diff --git a/app/code/Magento/Rss/Controller/Adminhtml/Feed/Index.php b/app/code/Magento/Rss/Controller/Adminhtml/Feed/Index.php
index d2a1572b19919..ee2379d4e143c 100644
--- a/app/code/Magento/Rss/Controller/Adminhtml/Feed/Index.php
+++ b/app/code/Magento/Rss/Controller/Adminhtml/Feed/Index.php
@@ -22,7 +22,7 @@ class Index extends \Magento\Rss\Controller\Adminhtml\Feed
      */
     public function execute()
     {
-        if (!$this->scopeConfig->getValue('rss/config/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
+        if (!$this->scopeConfig->getValue('rss/config/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
             throw new NotFoundException();
         }
 
diff --git a/app/code/Magento/Rss/Controller/Feed/Index.php b/app/code/Magento/Rss/Controller/Feed/Index.php
index 86bceaedc1b03..e6bba8d7424c4 100644
--- a/app/code/Magento/Rss/Controller/Feed/Index.php
+++ b/app/code/Magento/Rss/Controller/Feed/Index.php
@@ -22,7 +22,7 @@ class Index extends \Magento\Rss\Controller\Feed
      */
     public function execute()
     {
-        if (!$this->scopeConfig->getValue('rss/config/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
+        if (!$this->scopeConfig->getValue('rss/config/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
             throw new NotFoundException();
         }
 
diff --git a/app/code/Magento/Rss/Controller/Index/Index.php b/app/code/Magento/Rss/Controller/Index/Index.php
index 1c38af252a541..4df5440a1700a 100644
--- a/app/code/Magento/Rss/Controller/Index/Index.php
+++ b/app/code/Magento/Rss/Controller/Index/Index.php
@@ -18,7 +18,7 @@ class Index extends \Magento\Rss\Controller\Index
      */
     public function execute()
     {
-        if ($this->_scopeConfig->getValue('rss/config/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
+        if ($this->_scopeConfig->getValue('rss/config/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
             $this->_view->loadLayout();
             $this->_view->renderLayout();
         } else {
diff --git a/app/code/Magento/Rss/Model/UrlBuilder.php b/app/code/Magento/Rss/Model/UrlBuilder.php
index 4d6174093a8cb..42c7aa502bde2 100644
--- a/app/code/Magento/Rss/Model/UrlBuilder.php
+++ b/app/code/Magento/Rss/Model/UrlBuilder.php
@@ -41,7 +41,7 @@ public function __construct(
      */
     public function getUrl(array $queryParams = [])
     {
-        if (!$this->config->getValue('rss/config/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
+        if (!$this->config->getValue('rss/config/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
             return '';
         }
 
diff --git a/app/code/Magento/Rss/composer.json b/app/code/Magento/Rss/composer.json
index e56b36bce394c..23eca1b0bbc84 100644
--- a/app/code/Magento/Rss/composer.json
+++ b/app/code/Magento/Rss/composer.json
@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
+        "magento/module-store": "0.42.0-beta7",
         "magento/module-backend": "0.42.0-beta7",
         "magento/framework": "0.42.0-beta7",
         "magento/module-customer": "0.42.0-beta7",
diff --git a/app/code/Magento/Rss/etc/acl.xml b/app/code/Magento/Rss/etc/acl.xml
index f95f1a905057f..db722e153bb2e 100644
--- a/app/code/Magento/Rss/etc/acl.xml
+++ b/app/code/Magento/Rss/etc/acl.xml
@@ -8,10 +8,10 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::stores">
-                    <resource id="Magento_Adminhtml::stores_settings">
-                        <resource id="Magento_Adminhtml::config">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::stores">
+                    <resource id="Magento_Backend::stores_settings">
+                        <resource id="Magento_Backend::config">
                             <resource id="Magento_Rss::rss" title="RSS Feeds Section" sortOrder="135" />
                         </resource>
                     </resource>
diff --git a/app/code/Magento/Rss/etc/adminhtml/routes.xml b/app/code/Magento/Rss/etc/adminhtml/routes.xml
index 3e3eec5048e4d..ccb2f2ebc18e0 100644
--- a/app/code/Magento/Rss/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Rss/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
     <router id="admin">
         <route id="rss" frontName="rss">
-            <module name="Magento_Rss" before="Magento_Adminhtml" />
+            <module name="Magento_Rss" before="Magento_Backend" />
         </route>
     </router>
 </config>
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
index 1b0d6bbc4fe6d..b139f03143526 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Address.php
@@ -144,7 +144,7 @@ public function __construct(
      */
     public function getConfig($path)
     {
-        return $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method/Form.php
index b3a7c1a15355b..8d448af893d0e 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method/Form.php
@@ -97,7 +97,7 @@ public function getCarrierName($carrierCode)
     {
         if ($name = $this->_scopeConfig->getValue(
             'carriers/' . $carrierCode . '/title',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->getStore()->getId()
         )
         ) {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php
index 20e2d6732c0c8..9994c1b8b3d86 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View/Info.php
@@ -228,7 +228,7 @@ public function shouldDisplayCustomerIp()
     {
         return !$this->_scopeConfig->isSetFlag(
             'sales/general/hide_customer_ip',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->getOrder()->getStoreId()
         );
     }
diff --git a/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php b/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
index 4903d475c2a71..935f3f37a3e23 100644
--- a/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
+++ b/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
@@ -67,7 +67,7 @@ public function isRssAllowed()
     {
         return $this->_scopeConfig->isSetFlag(
             'rss/order/status',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
diff --git a/app/code/Magento/Sales/Helper/Admin.php b/app/code/Magento/Sales/Helper/Admin.php
index 97b717690f250..3aca5adcd8320 100644
--- a/app/code/Magento/Sales/Helper/Admin.php
+++ b/app/code/Magento/Sales/Helper/Admin.php
@@ -13,7 +13,7 @@ class Admin extends \Magento\Framework\App\Helper\AbstractHelper
     protected $_salesConfig;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -24,13 +24,13 @@ class Admin extends \Magento\Framework\App\Helper\AbstractHelper
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Sales\Model\Config $salesConfig
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Sales\Model\Config $salesConfig,
         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
     ) {
diff --git a/app/code/Magento/Sales/Helper/Data.php b/app/code/Magento/Sales/Helper/Data.php
index c03ef874107cd..80a5f59a03e2c 100644
--- a/app/code/Magento/Sales/Helper/Data.php
+++ b/app/code/Magento/Sales/Helper/Data.php
@@ -24,7 +24,7 @@ public function canSendNewOrderConfirmationEmail($store = null)
     {
         return $this->_scopeConfig->isSetFlag(
             \Magento\Sales\Model\Order\Email\Container\OrderIdentity::XML_PATH_EMAIL_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -50,7 +50,7 @@ public function canSendOrderCommentEmail($store = null)
     {
         return $this->_scopeConfig->isSetFlag(
             \Magento\Sales\Model\Order\Email\Container\OrderCommentIdentity::XML_PATH_EMAIL_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -65,7 +65,7 @@ public function canSendNewShipmentEmail($store = null)
     {
         return $this->_scopeConfig->isSetFlag(
             \Magento\Sales\Model\Order\Email\Container\ShipmentIdentity::XML_PATH_EMAIL_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -80,7 +80,7 @@ public function canSendShipmentCommentEmail($store = null)
     {
         return $this->_scopeConfig->isSetFlag(
             \Magento\Sales\Model\Order\Email\Container\ShipmentCommentIdentity::XML_PATH_EMAIL_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -95,7 +95,7 @@ public function canSendNewInvoiceEmail($store = null)
     {
         return $this->_scopeConfig->isSetFlag(
             \Magento\Sales\Model\Order\Email\Container\InvoiceIdentity::XML_PATH_EMAIL_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -110,7 +110,7 @@ public function canSendInvoiceCommentEmail($store = null)
     {
         return $this->_scopeConfig->isSetFlag(
             \Magento\Sales\Model\Order\Email\Container\InvoiceCommentIdentity::XML_PATH_EMAIL_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -125,7 +125,7 @@ public function canSendNewCreditmemoEmail($store = null)
     {
         return $this->_scopeConfig->isSetFlag(
             \Magento\Sales\Model\Order\Email\Container\CreditmemoIdentity::XML_PATH_EMAIL_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -140,7 +140,7 @@ public function canSendCreditmemoCommentEmail($store = null)
     {
         return $this->_scopeConfig->isSetFlag(
             \Magento\Sales\Model\Order\Email\Container\CreditmemoCommentIdentity::XML_PATH_EMAIL_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
diff --git a/app/code/Magento/Sales/Helper/Guest.php b/app/code/Magento/Sales/Helper/Guest.php
index c88aed402b8aa..48424133a1981 100644
--- a/app/code/Magento/Sales/Helper/Guest.php
+++ b/app/code/Magento/Sales/Helper/Guest.php
@@ -69,7 +69,7 @@ class Guest extends \Magento\Core\Helper\Data
     /**
      * @param App\Helper\Context $context
      * @param App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\State $appState
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param \Magento\Framework\Registry $coreRegistry
@@ -86,7 +86,7 @@ class Guest extends \Magento\Core\Helper\Data
     public function __construct(
         App\Helper\Context $context,
         App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\State $appState,
         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
         \Magento\Framework\Registry $coreRegistry,
diff --git a/app/code/Magento/Sales/Helper/Reorder.php b/app/code/Magento/Sales/Helper/Reorder.php
index b8430c7ac8459..f93c02fccdef0 100644
--- a/app/code/Magento/Sales/Helper/Reorder.php
+++ b/app/code/Magento/Sales/Helper/Reorder.php
@@ -23,7 +23,7 @@ class Reorder extends \Magento\Core\Helper\Data
     /**
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\State $appState
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param \Magento\Customer\Model\Session $customerSession
@@ -32,7 +32,7 @@ class Reorder extends \Magento\Core\Helper\Data
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\State $appState,
         \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
         \Magento\Customer\Model\Session $customerSession,
@@ -65,7 +65,7 @@ public function isAllow()
      */
     public function isAllowed($store = null)
     {
-        if ($this->_scopeConfig->getValue(self::XML_PATH_SALES_REORDER_ALLOW, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store)) {
+        if ($this->_scopeConfig->getValue(self::XML_PATH_SALES_REORDER_ALLOW, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)) {
             return true;
         }
         return false;
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index 43b515834eca8..a0ff1d95c62ae 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -1932,7 +1932,7 @@ protected function _getNewCustomerEmail()
         if (empty($email)) {
             $host = $this->_scopeConfig->getValue(
                 self::XML_PATH_DEFAULT_EMAIL_DOMAIN,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
             $account = time();
             $email = $account . '@' . $host;
diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index 30d142566592a..72ee75a0ca0be 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -304,7 +304,7 @@ class Order extends AbstractModel implements EntityInterface, ApiOrderInterface
     protected $entityType = 'order';
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -395,7 +395,7 @@ class Order extends AbstractModel implements EntityInterface, ApiOrderInterface
      * @param AttributeValueFactory $customAttributeFactory
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param Order\Config $orderConfig
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
      * @param Resource\Order\Item\CollectionFactory $orderItemCollectionFactory
@@ -425,7 +425,7 @@ public function __construct(
         AttributeValueFactory $customAttributeFactory,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Framework\Stdlib\DateTime $dateTime,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Sales\Model\Order\Config $orderConfig,
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
         \Magento\Sales\Model\Resource\Order\Item\CollectionFactory $orderItemCollectionFactory,
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Creditmemo.php
index 12a9c9a0e3c5d..713a4c4826bbd 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo.php
@@ -134,7 +134,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
     protected $_calculatorFactory;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -164,7 +164,7 @@ class Creditmemo extends AbstractModel implements EntityInterface, CreditmemoInt
      * @param \Magento\Sales\Model\OrderFactory $orderFactory
      * @param \Magento\Sales\Model\Resource\Order\Creditmemo\Item\CollectionFactory $cmItemCollectionFactory
      * @param \Magento\Framework\Math\CalculatorFactory $calculatorFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param Creditmemo\CommentFactory $commentFactory
      * @param \Magento\Sales\Model\Resource\Order\Creditmemo\Comment\CollectionFactory $commentCollectionFactory
      * @param PriceCurrencyInterface $priceCurrency
@@ -184,7 +184,7 @@ public function __construct(
         \Magento\Sales\Model\OrderFactory $orderFactory,
         \Magento\Sales\Model\Resource\Order\Creditmemo\Item\CollectionFactory $cmItemCollectionFactory,
         \Magento\Framework\Math\CalculatorFactory $calculatorFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Sales\Model\Order\Creditmemo\CommentFactory $commentFactory,
         \Magento\Sales\Model\Resource\Order\Creditmemo\Comment\CollectionFactory $commentCollectionFactory,
         PriceCurrencyInterface $priceCurrency,
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Comment.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Comment.php
index 5484ca05db058..6324ae356a6cd 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Comment.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Comment.php
@@ -28,7 +28,7 @@ class Comment extends AbstractModel implements CreditmemoCommentInterface
     protected $_creditmemo;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -39,7 +39,7 @@ class Comment extends AbstractModel implements CreditmemoCommentInterface
      * @param AttributeValueFactory $customAttributeFactory
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\Db $resourceCollection
      * @param array $data
@@ -52,7 +52,7 @@ public function __construct(
         AttributeValueFactory $customAttributeFactory,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Framework\Stdlib\DateTime $dateTime,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\Db $resourceCollection = null,
         array $data = []
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Shipping.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Shipping.php
index a4849a4644a33..23d7edf6dfc18 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Shipping.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Total/Shipping.php
@@ -13,7 +13,7 @@
 class Shipping extends AbstractTotal
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -28,13 +28,13 @@ class Shipping extends AbstractTotal
     protected $priceCurrency;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Tax\Model\Config $taxConfig
      * @param PriceCurrencyInterface $priceCurrency
      * @param array $data
      */
     public function __construct(
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Tax\Model\Config $taxConfig,
         PriceCurrencyInterface $priceCurrency,
         array $data = []
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/Container.php b/app/code/Magento/Sales/Model/Order/Email/Container/Container.php
index e3c49b6b4a587..bb6c98f151975 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/Container.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/Container.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Sales\Model\Order\Email\Container;
 
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Model\Store;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 
@@ -60,7 +60,7 @@ protected function getConfigValue($path, $storeId)
     {
         return $this->scopeConfig->getValue(
             $path,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeId
         );
     }
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentity.php
index 9e9258bc0e1a3..dbcfd57d968c9 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentity.php
@@ -21,7 +21,7 @@ public function isEnabled()
     {
         return $this->scopeConfig->isSetFlag(
             self::XML_PATH_EMAIL_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->getStore()->getStoreId()
         );
     }
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentity.php
index a0734f725bc07..adb032dc1c864 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentity.php
@@ -21,7 +21,7 @@ public function isEnabled()
     {
         return $this->scopeConfig->isSetFlag(
             self::XML_PATH_EMAIL_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->getStore()->getStoreId()
         );
     }
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentity.php
index 2b8d5f9dda298..650b6a74db806 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentity.php
@@ -21,7 +21,7 @@ public function isEnabled()
     {
         return $this->scopeConfig->isSetFlag(
             self::XML_PATH_EMAIL_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->getStore()->getStoreId()
         );
     }
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceIdentity.php
index 6553b32dc9591..c233cb397e5a3 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/InvoiceIdentity.php
@@ -21,7 +21,7 @@ public function isEnabled()
     {
         return $this->scopeConfig->isSetFlag(
             self::XML_PATH_EMAIL_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->getStore()->getStoreId()
         );
     }
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentity.php
index ea8f8e92b3649..d965f8eb5b126 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentity.php
@@ -21,7 +21,7 @@ public function isEnabled()
     {
         return $this->scopeConfig->isSetFlag(
             self::XML_PATH_EMAIL_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->getStore()->getStoreId()
         );
     }
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/OrderIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/OrderIdentity.php
index ed5464cdf5a29..13b31fe6265b5 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/OrderIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/OrderIdentity.php
@@ -24,7 +24,7 @@ public function isEnabled()
     {
         return $this->scopeConfig->isSetFlag(
             self::XML_PATH_EMAIL_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->getStore()->getStoreId()
         );
     }
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentity.php
index 1390ad69027b9..4bef0bf311b97 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentity.php
@@ -21,7 +21,7 @@ public function isEnabled()
     {
         return $this->scopeConfig->isSetFlag(
             self::XML_PATH_EMAIL_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->getStore()->getStoreId()
         );
     }
diff --git a/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentIdentity.php b/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentIdentity.php
index 287f07c08623b..e70d5963c596d 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentIdentity.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Container/ShipmentIdentity.php
@@ -27,7 +27,7 @@ public function isEnabled()
     {
         return $this->scopeConfig->isSetFlag(
             self::XML_PATH_EMAIL_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->getStore()->getStoreId()
         );
     }
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Comment.php b/app/code/Magento/Sales/Model/Order/Invoice/Comment.php
index f6c7d74bb3a5d..bcecafbd7a319 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Comment.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Comment.php
@@ -28,7 +28,7 @@ class Comment extends AbstractModel implements InvoiceCommentInterface
     protected $_invoice;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -39,7 +39,7 @@ class Comment extends AbstractModel implements InvoiceCommentInterface
      * @param AttributeValueFactory $customAttributeFactory
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\Db $resourceCollection
      * @param array $data
@@ -52,7 +52,7 @@ public function __construct(
         AttributeValueFactory $customAttributeFactory,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Framework\Stdlib\DateTime $dateTime,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\Db $resourceCollection = null,
         array $data = []
diff --git a/app/code/Magento/Sales/Model/Order/Item.php b/app/code/Magento/Sales/Model/Order/Item.php
index 4283ad396461d..41841e00f19c2 100644
--- a/app/code/Magento/Sales/Model/Order/Item.php
+++ b/app/code/Magento/Sales/Model/Order/Item.php
@@ -167,7 +167,7 @@ class Item extends AbstractExtensibleModel implements OrderItemInterface
     protected $productRepository;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -182,7 +182,7 @@ class Item extends AbstractExtensibleModel implements OrderItemInterface
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\Db $resourceCollection
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -192,7 +192,7 @@ public function __construct(
         \Magento\Framework\Api\MetadataServiceInterface $metadataService,
         AttributeValueFactory $customAttributeFactory,
         \Magento\Sales\Model\OrderFactory $orderFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\Db $resourceCollection = null,
diff --git a/app/code/Magento/Sales/Model/Order/Payment.php b/app/code/Magento/Sales/Model/Order/Payment.php
index c2cb292d9ce6b..c4b9cacc98079 100644
--- a/app/code/Magento/Sales/Model/Order/Payment.php
+++ b/app/code/Magento/Sales/Model/Order/Payment.php
@@ -141,7 +141,7 @@ class Payment extends Info implements OrderPaymentInterface
     protected $_transactionCollectionFactory;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -160,7 +160,7 @@ class Payment extends Info implements OrderPaymentInterface
      * @param \Magento\Sales\Model\Service\OrderFactory $serviceOrderFactory
      * @param Payment\TransactionFactory $transactionFactory
      * @param \Magento\Sales\Model\Resource\Order\Payment\Transaction\CollectionFactory $transactionCollectionFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param PriceCurrencyInterface $priceCurrency
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\Db $resourceCollection
@@ -177,7 +177,7 @@ public function __construct(
         \Magento\Sales\Model\Service\OrderFactory $serviceOrderFactory,
         \Magento\Sales\Model\Order\Payment\TransactionFactory $transactionFactory,
         \Magento\Sales\Model\Resource\Order\Payment\Transaction\CollectionFactory $transactionCollectionFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         PriceCurrencyInterface $priceCurrency,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\Db $resourceCollection = null,
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
index 2dce8244dc739..a2c0b3de2f296 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
@@ -231,7 +231,7 @@ protected function insertLogo(&$page, $store = null)
         $this->y = $this->y ? $this->y : 815;
         $image = $this->_scopeConfig->getValue(
             'sales/identity/logo',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
         if ($image) {
@@ -291,7 +291,7 @@ protected function insertAddress(&$page, $store = null)
             "\n",
             $this->_scopeConfig->getValue(
                 'sales/identity/address',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $store
             )
         ) as $value) {
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Pdf/Creditmemo.php
index 9340fd423d1c7..acd8d3f9b6d78 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Creditmemo.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Creditmemo.php
@@ -12,7 +12,7 @@
 class Creditmemo extends AbstractPdf
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -26,7 +26,7 @@ class Creditmemo extends AbstractPdf
      * @param \Magento\Sales\Model\Order\Pdf\ItemsFactory $pdfItemsFactory
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param array $data
      *
@@ -43,7 +43,7 @@ public function __construct(
         \Magento\Sales\Model\Order\Pdf\ItemsFactory $pdfItemsFactory,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
         array $data = []
     ) {
@@ -158,7 +158,7 @@ public function getPdf($creditmemos = [])
                 $order,
                 $this->_scopeConfig->isSetFlag(
                     self::XML_PATH_SALES_PDF_CREDITMEMO_PUT_ORDER_ID,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                     $order->getStoreId()
                 )
             );
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Invoice.php b/app/code/Magento/Sales/Model/Order/Pdf/Invoice.php
index e260c2b044d74..79b3130b68449 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Invoice.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Invoice.php
@@ -12,7 +12,7 @@
 class Invoice extends AbstractPdf
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -30,7 +30,7 @@ class Invoice extends AbstractPdf
      * @param \Magento\Sales\Model\Order\Pdf\Total\Factory $pdfTotalFactory
      * @param \Magento\Sales\Model\Order\Pdf\ItemsFactory $pdfItemsFactory
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param array $data
@@ -47,7 +47,7 @@ public function __construct(
         \Magento\Sales\Model\Order\Pdf\ItemsFactory $pdfItemsFactory,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
         array $data = []
     ) {
@@ -137,7 +137,7 @@ public function getPdf($invoices = [])
                 $order,
                 $this->_scopeConfig->isSetFlag(
                     self::XML_PATH_SALES_PDF_INVOICE_PUT_ORDER_ID,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                     $order->getStoreId()
                 )
             );
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php b/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php
index a7a2d4a03259a..46594554ba69d 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Shipment.php
@@ -12,7 +12,7 @@
 class Shipment extends AbstractPdf
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -31,7 +31,7 @@ class Shipment extends AbstractPdf
      * @param \Magento\Sales\Model\Order\Pdf\ItemsFactory $pdfItemsFactory
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param array $data
      *
@@ -47,7 +47,7 @@ public function __construct(
         \Magento\Sales\Model\Order\Pdf\ItemsFactory $pdfItemsFactory,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
         array $data = []
     ) {
@@ -130,7 +130,7 @@ public function getPdf($shipments = [])
                 $shipment,
                 $this->_scopeConfig->isSetFlag(
                     self::XML_PATH_SALES_PDF_SHIPMENT_PUT_ORDER_ID,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                     $order->getStoreId()
                 )
             );
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Comment.php b/app/code/Magento/Sales/Model/Order/Shipment/Comment.php
index c81870b6fe8cb..f390d0b6d439b 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Comment.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Comment.php
@@ -28,7 +28,7 @@ class Comment extends AbstractModel implements ShipmentCommentInterface
     protected $_shipment;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -39,7 +39,7 @@ class Comment extends AbstractModel implements ShipmentCommentInterface
      * @param AttributeValueFactory $customAttributeFactory
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\Db $resourceCollection
      * @param array $data
@@ -52,7 +52,7 @@ public function __construct(
         AttributeValueFactory $customAttributeFactory,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Framework\Stdlib\DateTime $dateTime,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\Db $resourceCollection = null,
         array $data = []
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Track.php b/app/code/Magento/Sales/Model/Order/Shipment/Track.php
index 1544bdcf142e7..383de9275a0bc 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Track.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Track.php
@@ -48,7 +48,7 @@ class Track extends AbstractModel implements ShipmentTrackInterface
     protected $_eventObject = 'track';
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -64,7 +64,7 @@ class Track extends AbstractModel implements ShipmentTrackInterface
      * @param AttributeValueFactory $customAttributeFactory
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Sales\Model\Order\ShipmentFactory $shipmentFactory
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\Db $resourceCollection
@@ -78,7 +78,7 @@ public function __construct(
         AttributeValueFactory $customAttributeFactory,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Framework\Stdlib\DateTime $dateTime,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Sales\Model\Order\ShipmentFactory $shipmentFactory,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\Db $resourceCollection = null,
diff --git a/app/code/Magento/Sales/Model/Order/Status.php b/app/code/Magento/Sales/Model/Order/Status.php
index d62b06a167ca3..66397c68af520 100644
--- a/app/code/Magento/Sales/Model/Order/Status.php
+++ b/app/code/Magento/Sales/Model/Order/Status.php
@@ -16,14 +16,14 @@
 class Status extends \Magento\Framework\Model\AbstractModel
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\Db $resourceCollection
      * @param array $data
@@ -31,7 +31,7 @@ class Status extends \Magento\Framework\Model\AbstractModel
     public function __construct(
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\Registry $registry,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\Db $resourceCollection = null,
         array $data = []
diff --git a/app/code/Magento/Sales/Model/Order/Status/History.php b/app/code/Magento/Sales/Model/Order/Status/History.php
index 85ddf3ed47928..9a69714a8452e 100644
--- a/app/code/Magento/Sales/Model/Order/Status/History.php
+++ b/app/code/Magento/Sales/Model/Order/Status/History.php
@@ -42,7 +42,7 @@ class History extends AbstractModel implements OrderStatusHistoryInterface
     protected $_eventObject = 'status_history';
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -53,7 +53,7 @@ class History extends AbstractModel implements OrderStatusHistoryInterface
      * @param AttributeValueFactory $customAttributeFactory
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\Db $resourceCollection
      * @param array $data
@@ -66,7 +66,7 @@ public function __construct(
         AttributeValueFactory $customAttributeFactory,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Framework\Stdlib\DateTime $dateTime,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\Db $resourceCollection = null,
         array $data = []
diff --git a/app/code/Magento/Sales/Model/Resource/Sale/Collection.php b/app/code/Magento/Sales/Model/Resource/Sale/Collection.php
index 84f01cc9e9404..ad3d7ddaf8a83 100644
--- a/app/code/Magento/Sales/Model/Resource/Sale/Collection.php
+++ b/app/code/Magento/Sales/Model/Resource/Sale/Collection.php
@@ -6,7 +6,7 @@
 namespace Magento\Sales\Model\Resource\Sale;
 
 use Magento\Framework\Data\Collection\EntityFactory;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
 use Magento\Framework\Event\ManagerInterface;
 use Psr\Log\LoggerInterface as Logger;
@@ -74,7 +74,7 @@ class Collection extends \Magento\Framework\Data\Collection\Db
      * @param ManagerInterface $eventManager
      * @param Order $resource
      * @param \Magento\Store\Model\Resource\Store\CollectionFactory $storeCollectionFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         EntityFactory $entityFactory,
diff --git a/app/code/Magento/Sales/Model/Rss/OrderStatus.php b/app/code/Magento/Sales/Model/Rss/OrderStatus.php
index ae0eed109f1d3..a7ae287c8bf48 100644
--- a/app/code/Magento/Sales/Model/Rss/OrderStatus.php
+++ b/app/code/Magento/Sales/Model/Rss/OrderStatus.php
@@ -89,7 +89,7 @@ public function __construct(
      */
     public function isAllowed()
     {
-        if ($this->config->getValue('rss/order/status', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)) {
+        if ($this->config->getValue('rss/order/status', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)) {
             return true;
         }
         return false;
diff --git a/app/code/Magento/Sales/etc/acl.xml b/app/code/Magento/Sales/etc/acl.xml
index dc3657bebc27f..9d1911d695cbc 100644
--- a/app/code/Magento/Sales/etc/acl.xml
+++ b/app/code/Magento/Sales/etc/acl.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
+            <resource id="Magento_Backend::admin">
                 <resource id="Magento_Sales::sales" title="Sales" sortOrder="20">
                     <resource id="Magento_Sales::sales_operation" title="Operations" sortOrder="10">
                         <resource id="Magento_Sales::sales_order"  title="Orders" sortOrder="10">
@@ -38,10 +38,10 @@
                         </resource>
                     </resource>
                 </resource>
-                <resource id="Magento_Adminhtml::stores">
-                    <resource id="Magento_Adminhtml::stores_settings">
+                <resource id="Magento_Backend::stores">
+                    <resource id="Magento_Backend::stores_settings">
                         <resource id="Magento_Sales::order_statuses"  title="Order Status" sortOrder="40" />
-                        <resource id="Magento_Adminhtml::config">
+                        <resource id="Magento_Backend::config">
                             <resource id="Magento_Sales::config_sales" title="Sales Section" sortOrder="60" />
                             <resource id="Magento_Sales::sales_email" title="Sales Emails Section" sortOrder="65" />
                             <resource id="Magento_Sales::sales_pdf" title="PDF Print-outs" sortOrder="66" />
diff --git a/app/code/Magento/Sales/etc/adminhtml/routes.xml b/app/code/Magento/Sales/etc/adminhtml/routes.xml
index b7c900daea3a4..8e9b6be88593d 100644
--- a/app/code/Magento/Sales/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Sales/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
     <router id="admin">
         <route id="sales" frontName="sales">
-            <module name="Magento_Sales" before="Magento_Adminhtml" />
+            <module name="Magento_Sales" before="Magento_Backend" />
         </route>
     </router>
 </config>
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml
index c48c4ae275c01..1ff0f10b34380 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_index.xml
@@ -9,7 +9,7 @@
     <update handle="sales_order_create_customer_block"/>
     <head>
         <link src="Magento_Sales::js/bootstrap/order-create-index.js"/>
-        <css src="Magento_Core::prototype/magento.css"/>
+        <css src="Magento_Theme::prototype/magento.css"/>
     </head>
     <update handle="sales_order_create_item_price"/>
     <body>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_items.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_items.xml
index 57c948bf768ed..3e8d8c5b8c8d2 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_items.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_creditmemo_items.xml
@@ -19,6 +19,6 @@
                 <block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
             </block>
         </block>
-        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
     </body>
 </page>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_invoice_items.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_invoice_items.xml
index 57db7242d0462..7b033f1b5bd24 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_invoice_items.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_invoice_items.xml
@@ -19,6 +19,6 @@
                 <block class="Magento\Tax\Block\Sales\Order\Tax" name="tax" template="order/tax.phtml"/>
             </block>
         </block>
-        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
     </body>
 </page>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_items.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_items.xml
index 4aade444c27d5..e199fe989535f 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_items.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_items.xml
@@ -23,6 +23,6 @@
                 </block>
             </block>
         </block>
-        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
     </body>
 </page>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_items.xml b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_items.xml
index 81f0de61c6924..37738d058f564 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_items.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_email_order_shipment_items.xml
@@ -11,6 +11,6 @@
         <block class="Magento\Sales\Block\Order\Email\Shipment\Items" name="items" template="email/shipment/items.phtml">
             <block class="Magento\Framework\View\Element\RendererList" name="sales.email.order.shipment.renderers" as="renderer.list"/>
         </block>
-        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
     </body>
 </page>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_creditmemo.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_creditmemo.xml
index d4b114ec15c04..7937d5af75729 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_creditmemo.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_creditmemo.xml
@@ -36,6 +36,6 @@
         <referenceContainer name="sales.order.info.buttons">
             <block class="Magento\Sales\Block\Order\Info\Buttons\Rss" as="buttons.rss" name="sales.order.info.buttons.rss" cacheable="false"/>
         </referenceContainer>
-        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
     </body>
 </page>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_invoice.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_invoice.xml
index b07327bdf208b..8e8e25bebbdfe 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_invoice.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_invoice.xml
@@ -37,6 +37,6 @@
         <referenceContainer name="sales.order.info.buttons">
             <block class="Magento\Sales\Block\Order\Info\Buttons\Rss" as="buttons.rss" name="sales.order.info.buttons.rss" cacheable="false"/>
         </referenceContainer>
-        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
     </body>
 </page>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_print.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_print.xml
index 48d7e0f843521..d0b200edd474c 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_print.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_print.xml
@@ -34,6 +34,6 @@
             </block>
             <block class="Magento\Sales\Block\Order\PrintShipment" as="sales.order.print.info" name="sales.order.print.info" template="order/info.phtml"/>
         </referenceContainer>
-        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
     </body>
 </page>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_printcreditmemo.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_printcreditmemo.xml
index f545c7fd8c6f6..1f2c3f089151f 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_printcreditmemo.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_printcreditmemo.xml
@@ -27,6 +27,6 @@
                 </block>
             </block>
         </referenceContainer>
-        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
     </body>
 </page>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_printinvoice.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_printinvoice.xml
index 91cffc3c4cd23..f9d0eaa072653 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_printinvoice.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_printinvoice.xml
@@ -27,6 +27,6 @@
                 </block>
             </block>
         </referenceContainer>
-        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
     </body>
 </page>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_printshipment.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_printshipment.xml
index 49f19a8396ed9..5851807afa72f 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_printshipment.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_printshipment.xml
@@ -19,6 +19,6 @@
                 <block class="Magento\Framework\View\Element\RendererList" name="sales.order.print.shipment.renderers" as="renderer.list"/>
             </block>
         </referenceContainer>
-        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
     </body>
 </page>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_shipment.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_shipment.xml
index 11fe2123fbeb7..9876d1e42a5d8 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_shipment.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_shipment.xml
@@ -22,6 +22,6 @@
         <referenceContainer name="content">
             <block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info" after="sales.order.shipment"/>
         </referenceContainer>
-        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
     </body>
 </page>
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_view.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_view.xml
index ac830e79cbe51..11fdcef7991ef 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_view.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_view.xml
@@ -37,6 +37,6 @@
             </block>
             <block class="Magento\Sales\Block\Order\Info" as="info" name="sales.order.info" after="sales.order.view"/>
         </referenceContainer>
-        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Core::template.phtml"/>
+        <block class="Magento\Framework\View\Element\Template" name="additional.product.info" template="Magento_Theme::template.phtml"/>
     </body>
 </page>
diff --git a/app/code/Magento/SalesRule/Block/Rss/Discounts.php b/app/code/Magento/SalesRule/Block/Rss/Discounts.php
index fb6558e7992a2..8227baf46e6a1 100644
--- a/app/code/Magento/SalesRule/Block/Rss/Discounts.php
+++ b/app/code/Magento/SalesRule/Block/Rss/Discounts.php
@@ -14,7 +14,7 @@
 class Discounts extends \Magento\Framework\View\Element\AbstractBlock implements DataProviderInterface
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -76,7 +76,7 @@ public function getRssData()
         $title = __('%1 - Discounts and Coupons', $storeModel->getFrontendName());
         $lang = $this->_scopeConfig->getValue(
             'general/locale/code',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeModel
         );
 
@@ -150,7 +150,7 @@ public function isAllowed()
     {
         return $this->_scopeConfig->isSetFlag(
             'rss/catalog/discounts',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
diff --git a/app/code/Magento/SalesRule/Helper/Coupon.php b/app/code/Magento/SalesRule/Helper/Coupon.php
index 6724f2f9768bc..2b3282ae12e64 100644
--- a/app/code/Magento/SalesRule/Helper/Coupon.php
+++ b/app/code/Magento/SalesRule/Helper/Coupon.php
@@ -90,7 +90,7 @@ public function getFormatsList()
      */
     public function getDefaultLength()
     {
-        return (int)$this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_LENGTH, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return (int)$this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_LENGTH, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
@@ -100,7 +100,7 @@ public function getDefaultLength()
      */
     public function getDefaultFormat()
     {
-        return $this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_FORMAT, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_FORMAT, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
@@ -110,7 +110,7 @@ public function getDefaultFormat()
      */
     public function getDefaultPrefix()
     {
-        return $this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_PREFIX, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_PREFIX, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
@@ -120,7 +120,7 @@ public function getDefaultPrefix()
      */
     public function getDefaultSuffix()
     {
-        return $this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_SUFFIX, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_SUFFIX, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
@@ -130,7 +130,7 @@ public function getDefaultSuffix()
      */
     public function getDefaultDashInterval()
     {
-        return (int)$this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_DASH_INTERVAL, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return (int)$this->_scopeConfig->getValue(self::XML_PATH_SALES_RULE_COUPON_DASH_INTERVAL, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
diff --git a/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php b/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php
index 0f59da5f8ceda..7ad693c280c26 100644
--- a/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php
+++ b/app/code/Magento/SalesRule/Model/Plugin/QuoteConfigProductAttributes.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\SalesRule\Model\Plugin;
 
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Customer\Model\Session;
 use Magento\SalesRule\Model\Resource\Rule;
 
diff --git a/app/code/Magento/SalesRule/Model/Quote/Discount.php b/app/code/Magento/SalesRule/Model/Quote/Discount.php
index 19900252c073d..d108bb891e6ec 100644
--- a/app/code/Magento/SalesRule/Model/Quote/Discount.php
+++ b/app/code/Magento/SalesRule/Model/Quote/Discount.php
@@ -26,7 +26,7 @@ class Discount extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
     protected $_eventManager = null;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -37,13 +37,13 @@ class Discount extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
 
     /**
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\SalesRule\Model\Validator $validator
      * @param PriceCurrencyInterface $priceCurrency
      */
     public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\SalesRule\Model\Validator $validator,
         PriceCurrencyInterface $priceCurrency
     ) {
diff --git a/app/code/Magento/SalesRule/Model/Rule.php b/app/code/Magento/SalesRule/Model/Rule.php
index 669ab16528b83..66dd6c7f054fc 100644
--- a/app/code/Magento/SalesRule/Model/Rule.php
+++ b/app/code/Magento/SalesRule/Model/Rule.php
@@ -168,7 +168,7 @@ class Rule extends \Magento\Rule\Model\AbstractModel
     protected $_couponCollection;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -182,7 +182,7 @@ class Rule extends \Magento\Rule\Model\AbstractModel
      * @param \Magento\SalesRule\Model\Rule\Condition\CombineFactory $condCombineFactory
      * @param \Magento\SalesRule\Model\Rule\Condition\Product\CombineFactory $condProdCombineF
      * @param \Magento\SalesRule\Model\Resource\Coupon\Collection $couponCollection
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\Db $resourceCollection
      * @param array $data
@@ -198,7 +198,7 @@ public function __construct(
         \Magento\SalesRule\Model\Rule\Condition\CombineFactory $condCombineFactory,
         \Magento\SalesRule\Model\Rule\Condition\Product\CombineFactory $condProdCombineF,
         \Magento\SalesRule\Model\Resource\Coupon\Collection $couponCollection,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\Db $resourceCollection = null,
         array $data = []
diff --git a/app/code/Magento/SalesRule/etc/acl.xml b/app/code/Magento/SalesRule/etc/acl.xml
index eae627c320854..af385c56d4cba 100644
--- a/app/code/Magento/SalesRule/etc/acl.xml
+++ b/app/code/Magento/SalesRule/etc/acl.xml
@@ -8,15 +8,15 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::marketing">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::marketing">
                     <resource id="Magento_CatalogRule::promo">
                         <resource id="Magento_SalesRule::quote" sortOrder="30" title="Cart Price Rules" />
                     </resource>
                 </resource>
-                <resource id="Magento_Adminhtml::stores">
-                    <resource id="Magento_Adminhtml::stores_settings">
-                        <resource id="Magento_Adminhtml::config">
+                <resource id="Magento_Backend::stores">
+                    <resource id="Magento_Backend::stores_settings">
+                        <resource id="Magento_Backend::config">
                             <resource id="Magento_SalesRule::config_promo" title="Promotion" sortOrder="90"/>
                         </resource>
                     </resource>
diff --git a/app/code/Magento/SalesRule/etc/adminhtml/routes.xml b/app/code/Magento/SalesRule/etc/adminhtml/routes.xml
index daf9ef1b8586c..6de4f577cd2d9 100644
--- a/app/code/Magento/SalesRule/etc/adminhtml/routes.xml
+++ b/app/code/Magento/SalesRule/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
     <router id="admin">
         <route id="sales_rule" frontName="sales_rule">
-            <module name="Magento_SalesRule" before="Magento_Adminhtml" />
+            <module name="Magento_SalesRule" before="Magento_Backend" />
         </route>
     </router>
 </config>
diff --git a/app/code/Magento/Search/Controller/Term/Popular.php b/app/code/Magento/Search/Controller/Term/Popular.php
index 32a3e0d41aab1..8e4687542e2ff 100644
--- a/app/code/Magento/Search/Controller/Term/Popular.php
+++ b/app/code/Magento/Search/Controller/Term/Popular.php
@@ -36,7 +36,7 @@ public function dispatch(RequestInterface $request)
     {
         $searchTerms = $this->scopeConfig->getValue(
             'catalog/seo/search_terms',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         if (!$searchTerms) {
             $this->_redirect('noroute');
diff --git a/app/code/Magento/Search/Helper/Data.php b/app/code/Magento/Search/Helper/Data.php
index 378b5bb168346..603f9317fe2b3 100644
--- a/app/code/Magento/Search/Helper/Data.php
+++ b/app/code/Magento/Search/Helper/Data.php
@@ -11,7 +11,7 @@
 use Magento\Framework\Escaper;
 use Magento\Framework\Filter\FilterManager;
 use Magento\Framework\Stdlib\String;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Search\Model\Query as SearchQuery;
 use Magento\Search\Model\QueryFactory;
 use Magento\Search\Model\Resource\Query\Collection;
@@ -79,7 +79,7 @@ class Data extends AbstractHelper
     protected $filter;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -92,7 +92,7 @@ class Data extends AbstractHelper
      * @param QueryFactory $queryFactory
      * @param Escaper $escaper
      * @param FilterManager $filter
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         Context $context,
@@ -192,7 +192,7 @@ public function getMinQueryLength($store = null)
     {
         return $this->_scopeConfig->getValue(
             SearchQuery::XML_PATH_MIN_QUERY_LENGTH,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -207,7 +207,7 @@ public function getMaxQueryLength($store = null)
     {
         return $this->_scopeConfig->getValue(
             SearchQuery::XML_PATH_MAX_QUERY_LENGTH,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
diff --git a/app/code/Magento/Search/Model/Query.php b/app/code/Magento/Search/Model/Query.php
index 7da98d6eaec79..917abf841a7da 100644
--- a/app/code/Magento/Search/Model/Query.php
+++ b/app/code/Magento/Search/Model/Query.php
@@ -14,7 +14,7 @@
 use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\Model\Resource\AbstractResource;
 use Magento\Framework\Registry;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Search query model
@@ -74,7 +74,7 @@ class Query extends AbstractModel implements QueryInterface
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -99,7 +99,7 @@ class Query extends AbstractModel implements QueryInterface
      * @param Registry $registry
      * @param QueryCollectionFactory $queryCollectionFactory
      * @param CollectionFactory $searchCollectionFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param StoreManagerInterface $storeManager
      * @param Config $scopeConfig
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
      * @param Db $resourceCollection
@@ -110,7 +110,7 @@ public function __construct(
         Registry $registry,
         QueryCollectionFactory $queryCollectionFactory,
         CollectionFactory $searchCollectionFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        StoreManagerInterface $storeManager,
         ScopeConfigInterface $scopeConfig,
         AbstractResource $resource = null,
         Db $resourceCollection = null,
@@ -240,7 +240,7 @@ public function getMinQueryLength()
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_MIN_QUERY_LENGTH,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->getStoreId()
         );
     }
@@ -254,7 +254,7 @@ public function getMaxQueryLength()
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_MAX_QUERY_LENGTH,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->getStoreId()
         );
     }
diff --git a/app/code/Magento/Search/Model/QueryFactory.php b/app/code/Magento/Search/Model/QueryFactory.php
index 4aeb2208139d1..0a68112d86f64 100644
--- a/app/code/Magento/Search/Model/QueryFactory.php
+++ b/app/code/Magento/Search/Model/QueryFactory.php
@@ -9,7 +9,7 @@
 use Magento\Framework\App\Helper\Context;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Stdlib\String as StdlibString;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 class QueryFactory implements QueryFactoryInterface
 {
diff --git a/app/code/Magento/Search/Model/Resource/Query/Collection.php b/app/code/Magento/Search/Model/Resource/Query/Collection.php
index a7f3a12d99f82..c441ac7b760cc 100644
--- a/app/code/Magento/Search/Model/Resource/Query/Collection.php
+++ b/app/code/Magento/Search/Model/Resource/Query/Collection.php
@@ -23,7 +23,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -39,7 +39,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Search\Model\Resource\Helper $resourceHelper
      * @param \Zend_Db_Adapter_Abstract $connection
      * @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
@@ -49,7 +49,7 @@ public function __construct(
         \Psr\Log\LoggerInterface $logger,
         \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
         \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Search\Model\Resource\Helper $resourceHelper,
         $connection = null,
         \Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
diff --git a/app/code/Magento/Search/etc/acl.xml b/app/code/Magento/Search/etc/acl.xml
index 176d259a61afd..6280c716af0a3 100644
--- a/app/code/Magento/Search/etc/acl.xml
+++ b/app/code/Magento/Search/etc/acl.xml
@@ -8,9 +8,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::marketing">
-                    <resource id="Magento_Adminhtml::marketing_seo">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::marketing">
+                    <resource id="Magento_Backend::marketing_seo">
                         <resource id="Magento_Search::search" title="Search Terms" sortOrder="10" />
                     </resource>
                 </resource>
diff --git a/app/code/Magento/Search/etc/adminhtml/routes.xml b/app/code/Magento/Search/etc/adminhtml/routes.xml
index 2a7f9cd6312e8..bdeee326f35c5 100644
--- a/app/code/Magento/Search/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Search/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
     <router id="admin">
         <route id="search" frontName="search">
-            <module name="Magento_Search" before="Magento_Adminhtml" />
+            <module name="Magento_Search" before="Magento_Backend" />
         </route>
     </router>
 </config>
\ No newline at end of file
diff --git a/app/code/Magento/Sendfriend/Helper/Data.php b/app/code/Magento/Sendfriend/Helper/Data.php
index e1a4248f7486f..e7befbc90105f 100644
--- a/app/code/Magento/Sendfriend/Helper/Data.php
+++ b/app/code/Magento/Sendfriend/Helper/Data.php
@@ -60,7 +60,7 @@ public function __construct(
      */
     public function isEnabled($store = null)
     {
-        return $this->_scopeConfig->isSetFlag(self::XML_PATH_ENABLED, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+        return $this->_scopeConfig->isSetFlag(self::XML_PATH_ENABLED, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
     }
 
     /**
@@ -71,7 +71,7 @@ public function isEnabled($store = null)
      */
     public function isAllowForGuest($store = null)
     {
-        return $this->_scopeConfig->isSetFlag(self::XML_PATH_ALLOW_FOR_GUEST, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+        return $this->_scopeConfig->isSetFlag(self::XML_PATH_ALLOW_FOR_GUEST, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
     }
 
     /**
@@ -82,7 +82,7 @@ public function isAllowForGuest($store = null)
      */
     public function getMaxRecipients($store = null)
     {
-        return (int)$this->_scopeConfig->getValue(self::XML_PATH_MAX_RECIPIENTS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+        return (int)$this->_scopeConfig->getValue(self::XML_PATH_MAX_RECIPIENTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
     }
 
     /**
@@ -93,7 +93,7 @@ public function getMaxRecipients($store = null)
      */
     public function getMaxEmailPerPeriod($store = null)
     {
-        return (int)$this->_scopeConfig->getValue(self::XML_PATH_MAX_PER_HOUR, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+        return (int)$this->_scopeConfig->getValue(self::XML_PATH_MAX_PER_HOUR, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
     }
 
     /**
@@ -114,7 +114,7 @@ public function getPeriod()
      */
     public function getLimitBy($store = null)
     {
-        return (int)$this->_scopeConfig->getValue(self::XML_PATH_LIMIT_BY, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+        return (int)$this->_scopeConfig->getValue(self::XML_PATH_LIMIT_BY, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
     }
 
     /**
@@ -125,7 +125,7 @@ public function getLimitBy($store = null)
      */
     public function getEmailTemplate($store = null)
     {
-        return $this->_scopeConfig->getValue(self::XML_PATH_EMAIL_TEMPLATE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+        return $this->_scopeConfig->getValue(self::XML_PATH_EMAIL_TEMPLATE, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
     }
 
     /**
diff --git a/app/code/Magento/Sendfriend/Model/Sendfriend.php b/app/code/Magento/Sendfriend/Model/Sendfriend.php
index ee9afe9ed397e..5090b29eb94e6 100644
--- a/app/code/Magento/Sendfriend/Model/Sendfriend.php
+++ b/app/code/Magento/Sendfriend/Model/Sendfriend.php
@@ -84,7 +84,7 @@ class Sendfriend extends \Magento\Framework\Model\AbstractModel
     protected $_transportBuilder;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -111,7 +111,7 @@ class Sendfriend extends \Magento\Framework\Model\AbstractModel
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
      * @param \Magento\Catalog\Helper\Image $catalogImage
      * @param \Magento\Sendfriend\Helper\Data $sendfriendData
@@ -127,7 +127,7 @@ class Sendfriend extends \Magento\Framework\Model\AbstractModel
     public function __construct(
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\Registry $registry,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
         \Magento\Catalog\Helper\Image $catalogImage,
         \Magento\Sendfriend\Helper\Data $sendfriendData,
diff --git a/app/code/Magento/Sendfriend/composer.json b/app/code/Magento/Sendfriend/composer.json
index 0a759b8945b77..1ee7f403f0ac8 100644
--- a/app/code/Magento/Sendfriend/composer.json
+++ b/app/code/Magento/Sendfriend/composer.json
@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
+        "magento/module-store": "0.42.0-beta7",
         "magento/module-catalog": "0.42.0-beta7",
         "magento/module-core": "0.42.0-beta7",
         "magento/module-customer": "0.42.0-beta7",
diff --git a/app/code/Magento/Sendfriend/etc/adminhtml/system.xml b/app/code/Magento/Sendfriend/etc/adminhtml/system.xml
index 5d86402c57b1a..5b59675f2aff5 100644
--- a/app/code/Magento/Sendfriend/etc/adminhtml/system.xml
+++ b/app/code/Magento/Sendfriend/etc/adminhtml/system.xml
@@ -10,7 +10,7 @@
         <section id="sendfriend" translate="label" type="text" sortOrder="120" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Email to a Friend</label>
             <tab>catalog</tab>
-            <resource>Magento_Adminhtml::sendfriend</resource>
+            <resource>Magento_Backend::sendfriend</resource>
             <group id="email" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Email Templates</label>
                 <field id="enabled" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
index 74cbd5e918853..1a32585197863 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging.php
@@ -144,7 +144,7 @@ public function getContainers()
         $carrier = $this->_carrierFactory->create($order->getShippingMethod(true)->getCarrierCode());
         $countryShipper = $this->_scopeConfig->getValue(
             \Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_COUNTRY_ID,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeId
         );
         if ($carrier) {
@@ -272,7 +272,7 @@ public function displayCustomsValue()
         $address = $order->getShippingAddress();
         $shipperAddressCountryCode = $this->_scopeConfig->getValue(
             \Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_COUNTRY_ID,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeId
         );
         $recipientAddressCountryCode = $address->getCountryId();
@@ -350,7 +350,7 @@ public function getContentTypes()
         $carrier = $this->_carrierFactory->create($order->getShippingMethod(true)->getCarrierCode());
         $countryShipper = $this->_scopeConfig->getValue(
             \Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_COUNTRY_ID,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeId
         );
         if ($carrier) {
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php
index 913e4ce36dfd1..6167bc0292a1c 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Order/Packaging/Grid.php
@@ -80,7 +80,7 @@ public function displayCustomsValue()
         $address = $order->getShippingAddress();
         $shipperAddressCountryCode = $this->_scopeConfig->getValue(
             \Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_COUNTRY_ID,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeId
         );
         $recipientAddressCountryCode = $address->getCountryId();
diff --git a/app/code/Magento/Shipping/Block/Tracking/Popup.php b/app/code/Magento/Shipping/Block/Tracking/Popup.php
index 66559ec405fb0..2959384a80acd 100644
--- a/app/code/Magento/Shipping/Block/Tracking/Popup.php
+++ b/app/code/Magento/Shipping/Block/Tracking/Popup.php
@@ -95,7 +95,7 @@ public function getContactUsEnabled()
     {
         return (bool)$this->_scopeConfig->getValue(
             'contacts/contacts/enabled',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
@@ -106,7 +106,7 @@ public function getStoreSupportEmail()
     {
         return $this->_scopeConfig->getValue(
             'trans_email/ident_support/email',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
diff --git a/app/code/Magento/Shipping/Helper/Carrier.php b/app/code/Magento/Shipping/Helper/Carrier.php
index 72a107fbe2d9e..370c083fbe0c8 100644
--- a/app/code/Magento/Shipping/Helper/Carrier.php
+++ b/app/code/Magento/Shipping/Helper/Carrier.php
@@ -55,7 +55,7 @@ public function getOnlineCarrierCodes($store = null)
         $carriersCodes = [];
         foreach ($this->scopeConfig->getValue(
             self::XML_PATH_CARRIERS_ROOT,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         ) as $carrierCode => $carrier) {
             if (isset($carrier['is_online']) && $carrier['is_online']) {
@@ -77,7 +77,7 @@ public function getCarrierConfigValue($carrierCode, $configPath, $store = null)
     {
         return $this->scopeConfig->getValue(
             sprintf('%s/%s/%s', self::XML_PATH_CARRIERS_ROOT, $carrierCode, $configPath),
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
diff --git a/app/code/Magento/Shipping/Helper/Data.php b/app/code/Magento/Shipping/Helper/Data.php
index cf252a35c37b9..c7cddf2cab81c 100644
--- a/app/code/Magento/Shipping/Helper/Data.php
+++ b/app/code/Magento/Shipping/Helper/Data.php
@@ -35,7 +35,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     protected $_scopeConfig;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -43,13 +43,13 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\App\Helper\Context $context
      * @param \Magento\Core\Helper\Data $coreData
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Core\Helper\Data $coreData,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->_coreData = $coreData;
         $this->_scopeConfig = $scopeConfig;
diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
index b8a55919a2fbb..fd793ff3d03a7 100644
--- a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
+++ b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrier.php
@@ -126,7 +126,7 @@ public function getConfigData($field)
         $path = 'carriers/' . $this->_code . '/' . $field;
         return $this->_scopeConfig->getValue(
             $path,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->getStore()
         );
     }
@@ -146,7 +146,7 @@ public function getConfigFlag($field)
         $path = 'carriers/' . $this->_code . '/' . $field;
         return $this->_scopeConfig->isSetFlag(
             $path,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->getStore()
         );
     }
diff --git a/app/code/Magento/Shipping/Model/CarrierFactory.php b/app/code/Magento/Shipping/Model/CarrierFactory.php
index 9f7e9d45ae003..ac7dcc2514634 100644
--- a/app/code/Magento/Shipping/Model/CarrierFactory.php
+++ b/app/code/Magento/Shipping/Model/CarrierFactory.php
@@ -43,7 +43,7 @@ public function get($carrierCode)
     {
         $className = $this->_scopeConfig->getValue(
             'carriers/' . $carrierCode . '/model',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         if (!$className) {
             return false;
@@ -64,7 +64,7 @@ public function create($carrierCode, $storeId = null)
     {
         $className = $this->_scopeConfig->getValue(
             'carriers/' . $carrierCode . '/model',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeId
         );
         if (!$className) {
@@ -88,7 +88,7 @@ public function getIfActive($carrierCode)
     {
         return $this->_scopeConfig->isSetFlag(
             'carriers/' . $carrierCode . '/active',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         ) ? $this->get(
             $carrierCode
         ) : false;
@@ -105,7 +105,7 @@ public function createIfActive($carrierCode, $storeId = null)
     {
         return $this->_scopeConfig->isSetFlag(
             'carriers/' . $carrierCode . '/active',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         ) ? $this->create(
             $carrierCode,
             $storeId
diff --git a/app/code/Magento/Shipping/Model/Config.php b/app/code/Magento/Shipping/Model/Config.php
index 409d5b0ed551a..c5ac94f1ef5b3 100644
--- a/app/code/Magento/Shipping/Model/Config.php
+++ b/app/code/Magento/Shipping/Model/Config.php
@@ -59,9 +59,9 @@ public function __construct(
     public function getActiveCarriers($store = null)
     {
         $carriers = [];
-        $config = $this->_scopeConfig->getValue('carriers', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+        $config = $this->_scopeConfig->getValue('carriers', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
         foreach (array_keys($config) as $carrierCode) {
-            if ($this->_scopeConfig->isSetFlag('carriers/' . $carrierCode . '/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store)) {
+            if ($this->_scopeConfig->isSetFlag('carriers/' . $carrierCode . '/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)) {
                 $carrierModel = $this->_carrierFactory->create($carrierCode, $store);
                 if ($carrierModel) {
                     $carriers[$carrierCode] = $carrierModel;
@@ -80,7 +80,7 @@ public function getActiveCarriers($store = null)
     public function getAllCarriers($store = null)
     {
         $carriers = [];
-        $config = $this->_scopeConfig->getValue('carriers', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+        $config = $this->_scopeConfig->getValue('carriers', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
         foreach (array_keys($config) as $carrierCode) {
             $model = $this->_carrierFactory->create($carrierCode, $store);
             if ($model) {
diff --git a/app/code/Magento/Shipping/Model/Config/Source/Allmethods.php b/app/code/Magento/Shipping/Model/Config/Source/Allmethods.php
index 865607c0b5d38..00a7689b3ab4a 100644
--- a/app/code/Magento/Shipping/Model/Config/Source/Allmethods.php
+++ b/app/code/Magento/Shipping/Model/Config/Source/Allmethods.php
@@ -52,7 +52,7 @@ public function toOptionArray($isActiveOnlyFlag = false)
             }
             $carrierTitle = $this->_scopeConfig->getValue(
                 'carriers/' . $carrierCode . '/title',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
             $methods[$carrierCode] = ['label' => $carrierTitle, 'value' => []];
             foreach ($carrierMethods as $methodCode => $methodTitle) {
diff --git a/app/code/Magento/Shipping/Model/Order/Pdf/Packaging.php b/app/code/Magento/Shipping/Model/Order/Pdf/Packaging.php
index 149a44bea9b23..2e481201d7f10 100644
--- a/app/code/Magento/Shipping/Model/Order/Pdf/Packaging.php
+++ b/app/code/Magento/Shipping/Model/Order/Pdf/Packaging.php
@@ -20,7 +20,7 @@ class Packaging extends \Magento\Sales\Model\Order\Pdf\AbstractPdf
     protected $_carrierHelper;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -45,7 +45,7 @@ class Packaging extends \Magento\Sales\Model\Order\Pdf\AbstractPdf
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
      * @param \Magento\Shipping\Helper\Carrier $carrierHelper
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\View\LayoutInterface $layout
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
      * @param array $data
@@ -63,7 +63,7 @@ public function __construct(
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
         Carrier $carrierHelper,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\View\LayoutInterface $layout,
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
         array $data = []
diff --git a/app/code/Magento/Shipping/Model/Order/Track.php b/app/code/Magento/Shipping/Model/Order/Track.php
index f7dbebe3cc747..0c31d5fdd3318 100644
--- a/app/code/Magento/Shipping/Model/Order/Track.php
+++ b/app/code/Magento/Shipping/Model/Order/Track.php
@@ -45,7 +45,7 @@ class Track extends \Magento\Sales\Model\Order\Shipment\Track
      * @param AttributeValueFactory $customAttributeFactory
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Sales\Model\Order\ShipmentFactory $shipmentFactory
      * @param \Magento\Shipping\Model\CarrierFactory $carrierFactory
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
@@ -61,7 +61,7 @@ public function __construct(
         AttributeValueFactory $customAttributeFactory,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Framework\Stdlib\DateTime $dateTime,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Sales\Model\Order\ShipmentFactory $shipmentFactory,
         \Magento\Shipping\Model\CarrierFactory $carrierFactory,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
diff --git a/app/code/Magento/Shipping/Model/Rate/Result.php b/app/code/Magento/Shipping/Model/Rate/Result.php
index 1d851271b3289..697b91b4d5941 100644
--- a/app/code/Magento/Shipping/Model/Rate/Result.php
+++ b/app/code/Magento/Shipping/Model/Rate/Result.php
@@ -22,14 +22,14 @@ class Result
     protected $_error = null;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
-    public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
+    public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
     {
         $this->_storeManager = $storeManager;
     }
diff --git a/app/code/Magento/Shipping/Model/Shipping.php b/app/code/Magento/Shipping/Model/Shipping.php
index a1345b2c49bb7..bcb067aba82ed 100644
--- a/app/code/Magento/Shipping/Model/Shipping.php
+++ b/app/code/Magento/Shipping/Model/Shipping.php
@@ -42,7 +42,7 @@ class Shipping implements RateCollectorInterface
     protected $_scopeConfig;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -84,7 +84,7 @@ class Shipping implements RateCollectorInterface
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Shipping\Model\Config $shippingConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Shipping\Model\CarrierFactory $carrierFactory
      * @param \Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory
      * @param \Magento\Shipping\Model\Shipment\RequestFactory $shipmentRequestFactory
@@ -95,7 +95,7 @@ class Shipping implements RateCollectorInterface
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Shipping\Model\Config $shippingConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Shipping\Model\CarrierFactory $carrierFactory,
         \Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory,
         \Magento\Shipping\Model\Shipment\RequestFactory $shipmentRequestFactory,
@@ -173,25 +173,25 @@ public function collectRates(\Magento\Quote\Model\Quote\Address\RateRequest $req
             $request->setCountryId(
                 $this->_scopeConfig->getValue(
                     Shipment::XML_PATH_STORE_COUNTRY_ID,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                     $request->getStore()
                 )
             )->setRegionId(
                 $this->_scopeConfig->getValue(
                     Shipment::XML_PATH_STORE_REGION_ID,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                     $request->getStore()
                 )
             )->setCity(
                 $this->_scopeConfig->getValue(
                     Shipment::XML_PATH_STORE_CITY,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                     $request->getStore()
                 )
             )->setPostcode(
                 $this->_scopeConfig->getValue(
                     Shipment::XML_PATH_STORE_ZIP,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                     $request->getStore()
                 )
             );
@@ -201,7 +201,7 @@ public function collectRates(\Magento\Quote\Model\Quote\Address\RateRequest $req
         if (!$limitCarrier) {
             $carriers = $this->_scopeConfig->getValue(
                 'carriers',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $storeId
             );
 
@@ -215,7 +215,7 @@ public function collectRates(\Magento\Quote\Model\Quote\Address\RateRequest $req
             foreach ($limitCarrier as $carrierCode) {
                 $carrierConfig = $this->_scopeConfig->getValue(
                     'carriers/' . $carrierCode,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                     $storeId
                 );
                 if (!$carrierConfig) {
diff --git a/app/code/Magento/Shipping/Model/Shipping/LabelGenerator.php b/app/code/Magento/Shipping/Model/Shipping/LabelGenerator.php
index a8c01d74f9930..e51a5eb891f07 100644
--- a/app/code/Magento/Shipping/Model/Shipping/LabelGenerator.php
+++ b/app/code/Magento/Shipping/Model/Shipping/LabelGenerator.php
@@ -95,7 +95,7 @@ public function create(\Magento\Sales\Model\Order\Shipment $shipment, RequestInt
         $carrierCode = $carrier->getCarrierCode();
         $carrierTitle = $this->scopeConfig->getValue(
             'carriers/' . $carrierCode . '/title',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $shipment->getStoreId()
         );
         if (!empty($trackingNumbers)) {
diff --git a/app/code/Magento/Shipping/Model/Shipping/Labels.php b/app/code/Magento/Shipping/Model/Shipping/Labels.php
index aae0b8c863dfc..40b7add661e01 100644
--- a/app/code/Magento/Shipping/Model/Shipping/Labels.php
+++ b/app/code/Magento/Shipping/Model/Shipping/Labels.php
@@ -29,7 +29,7 @@ class Labels extends \Magento\Shipping\Model\Shipping
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Shipping\Model\Config $shippingConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Shipping\Model\CarrierFactory $carrierFactory
      * @param \Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory
      * @param \Magento\Shipping\Model\Shipment\RequestFactory $shipmentRequestFactory
@@ -43,7 +43,7 @@ class Labels extends \Magento\Shipping\Model\Shipping
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Shipping\Model\Config $shippingConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Shipping\Model\CarrierFactory $carrierFactory,
         \Magento\Shipping\Model\Rate\ResultFactory $rateResultFactory,
         \Magento\Shipping\Model\Shipment\RequestFactory $shipmentRequestFactory,
@@ -91,7 +91,7 @@ public function requestToShipment(Shipment $orderShipment)
         }
         $shipperRegionCode = $this->_scopeConfig->getValue(
             Shipment::XML_PATH_STORE_REGION_ID,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $shipmentStoreId
         );
         if (is_numeric($shipperRegionCode)) {
@@ -102,18 +102,18 @@ public function requestToShipment(Shipment $orderShipment)
 
         $originStreet1 = $this->_scopeConfig->getValue(
             Shipment::XML_PATH_STORE_ADDRESS1,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $shipmentStoreId
         );
         $originStreet2 = $this->_scopeConfig->getValue(
             Shipment::XML_PATH_STORE_ADDRESS2,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $shipmentStoreId
         );
         $storeInfo = new \Magento\Framework\Object(
             (array)$this->_scopeConfig->getValue(
                 'general/store_information',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $shipmentStoreId
             )
         );
@@ -126,17 +126,17 @@ public function requestToShipment(Shipment $orderShipment)
             || !$shipperRegionCode
             || !$this->_scopeConfig->getValue(
                 Shipment::XML_PATH_STORE_CITY,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $shipmentStoreId
             )
             || !$this->_scopeConfig->getValue(
                 Shipment::XML_PATH_STORE_ZIP,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $shipmentStoreId
             )
             || !$this->_scopeConfig->getValue(
                 Shipment::XML_PATH_STORE_COUNTRY_ID,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $shipmentStoreId
             )
         ) {
@@ -162,7 +162,7 @@ public function requestToShipment(Shipment $orderShipment)
         $request->setShipperAddressCity(
             $this->_scopeConfig->getValue(
                 Shipment::XML_PATH_STORE_CITY,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $shipmentStoreId
             )
         );
@@ -170,14 +170,14 @@ public function requestToShipment(Shipment $orderShipment)
         $request->setShipperAddressPostalCode(
             $this->_scopeConfig->getValue(
                 Shipment::XML_PATH_STORE_ZIP,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $shipmentStoreId
             )
         );
         $request->setShipperAddressCountryCode(
             $this->_scopeConfig->getValue(
                 Shipment::XML_PATH_STORE_COUNTRY_ID,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $shipmentStoreId
             )
         );
diff --git a/app/code/Magento/Shipping/composer.json b/app/code/Magento/Shipping/composer.json
index 194737c287bdd..77dc03aa13c11 100644
--- a/app/code/Magento/Shipping/composer.json
+++ b/app/code/Magento/Shipping/composer.json
@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
+        "magento/module-store": "0.42.0-beta7",
         "magento/module-core": "0.42.0-beta7",
         "magento/module-catalog": "0.42.0-beta7",
         "magento/module-sales": "0.42.0-beta7",
diff --git a/app/code/Magento/Shipping/etc/acl.xml b/app/code/Magento/Shipping/etc/acl.xml
index 688f440c72ff2..33ba4f281af93 100644
--- a/app/code/Magento/Shipping/etc/acl.xml
+++ b/app/code/Magento/Shipping/etc/acl.xml
@@ -8,10 +8,10 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::stores">
-                    <resource id="Magento_Adminhtml::stores_settings">
-                        <resource id="Magento_Adminhtml::config">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::stores">
+                    <resource id="Magento_Backend::stores_settings">
+                        <resource id="Magento_Backend::config">
                             <resource id="Magento_Shipping::config_shipping" title="Shipping Settings Section" sortOrder="5" />
                             <resource id="Magento_Shipping::carriers" title="Shipping Methods Section" sortOrder="5" />
                         </resource>
diff --git a/app/code/Magento/Shipping/etc/adminhtml/routes.xml b/app/code/Magento/Shipping/etc/adminhtml/routes.xml
index 3386f25e42796..84ec0473a9dd4 100644
--- a/app/code/Magento/Shipping/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Shipping/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
     <router id="admin">
         <route id="adminhtml">
-            <module name="Magento_Shipping" before="Magento_Adminhtml" />
+            <module name="Magento_Shipping" before="Magento_Backend" />
         </route>
     </router>
 </config>
diff --git a/app/code/Magento/Shipping/etc/module.xml b/app/code/Magento/Shipping/etc/module.xml
index 866bf77d0bb5e..f5eded9375898 100644
--- a/app/code/Magento/Shipping/etc/module.xml
+++ b/app/code/Magento/Shipping/etc/module.xml
@@ -9,6 +9,7 @@
     <module name="Magento_Shipping" schema_version="2.0.0">
         <sequence>
             <module name="Magento_Core"/>
+            <module name="Magento_Store"/>
             <module name="Magento_Catalog"/>
         </sequence>
     </module>
diff --git a/app/code/Magento/Sitemap/Helper/Data.php b/app/code/Magento/Sitemap/Helper/Data.php
index f0797809c1c07..2f12675550375 100644
--- a/app/code/Magento/Sitemap/Helper/Data.php
+++ b/app/code/Magento/Sitemap/Helper/Data.php
@@ -10,7 +10,7 @@
  */
 namespace Magento\Sitemap\Helper;
 
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
diff --git a/app/code/Magento/Sitemap/Model/Observer.php b/app/code/Magento/Sitemap/Model/Observer.php
index 42b33a2aebc33..f0f7066e7091e 100644
--- a/app/code/Magento/Sitemap/Model/Observer.php
+++ b/app/code/Magento/Sitemap/Model/Observer.php
@@ -55,7 +55,7 @@ class Observer
     protected $_transportBuilder;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -67,14 +67,14 @@ class Observer
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param Resource\Sitemap\CollectionFactory $collectionFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder
      * @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
      */
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Sitemap\Model\Resource\Sitemap\CollectionFactory $collectionFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
         \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
     ) {
@@ -100,7 +100,7 @@ public function scheduledGenerateSitemaps($schedule)
         // check if scheduled generation enabled
         if (!$this->_scopeConfig->isSetFlag(
             self::XML_PATH_GENERATION_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )
         ) {
             return;
@@ -120,7 +120,7 @@ public function scheduledGenerateSitemaps($schedule)
 
         if ($errors && $this->_scopeConfig->getValue(
             self::XML_PATH_ERROR_RECIPIENT,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )
         ) {
             $translate = $this->_translateModel->getTranslateInline();
@@ -129,7 +129,7 @@ public function scheduledGenerateSitemaps($schedule)
             $this->_transportBuilder->setTemplateIdentifier(
                 $this->_scopeConfig->getValue(
                     self::XML_PATH_ERROR_TEMPLATE,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 )
             )->setTemplateOptions(
                 [
@@ -141,12 +141,12 @@ public function scheduledGenerateSitemaps($schedule)
             )->setFrom(
                 $this->_scopeConfig->getValue(
                     self::XML_PATH_ERROR_IDENTITY,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 )
             )->addTo(
                 $this->_scopeConfig->getValue(
                     self::XML_PATH_ERROR_RECIPIENT,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 )
             );
             $transport = $this->_transportBuilder->getTransport();
diff --git a/app/code/Magento/Sitemap/Model/Resource/Catalog/Category.php b/app/code/Magento/Sitemap/Model/Resource/Catalog/Category.php
index 5b617eb4be1a3..acb50839e3132 100644
--- a/app/code/Magento/Sitemap/Model/Resource/Catalog/Category.php
+++ b/app/code/Magento/Sitemap/Model/Resource/Catalog/Category.php
@@ -29,7 +29,7 @@ class Category extends \Magento\Framework\Model\Resource\Db\AbstractDb
     protected $_attributesCache = [];
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -40,12 +40,12 @@ class Category extends \Magento\Framework\Model\Resource\Db\AbstractDb
 
     /**
      * @param \Magento\Framework\App\Resource $resource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Resource\Category $categoryResource
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Resource\Category $categoryResource
     ) {
         $this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Sitemap/Model/Resource/Catalog/Product.php b/app/code/Magento/Sitemap/Model/Resource/Catalog/Product.php
index 3e6f958844a9c..bd3741d3f5f41 100644
--- a/app/code/Magento/Sitemap/Model/Resource/Catalog/Product.php
+++ b/app/code/Magento/Sitemap/Model/Resource/Catalog/Product.php
@@ -53,7 +53,7 @@ class Product extends \Magento\Framework\Model\Resource\Db\AbstractDb
     protected $_productResource;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -86,7 +86,7 @@ class Product extends \Magento\Framework\Model\Resource\Db\AbstractDb
      * @param \Magento\Framework\App\Resource $resource
      * @param \Magento\Sitemap\Helper\Data $sitemapData
      * @param \Magento\Catalog\Model\Resource\Product $productResource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Product\Visibility $productVisibility
      * @param \Magento\Catalog\Model\Product\Attribute\Source\Status $productStatus
      * @param \Magento\Catalog\Model\Resource\Product\Attribute\Backend\Media $mediaAttribute
@@ -97,7 +97,7 @@ public function __construct(
         \Magento\Framework\App\Resource $resource,
         \Magento\Sitemap\Helper\Data $sitemapData,
         \Magento\Catalog\Model\Resource\Product $productResource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Product\Visibility $productVisibility,
         \Magento\Catalog\Model\Product\Attribute\Source\Status $productStatus,
         \Magento\Catalog\Model\Resource\Product\Attribute\Backend\Media $mediaAttribute,
diff --git a/app/code/Magento/Sitemap/Model/Sitemap.php b/app/code/Magento/Sitemap/Model/Sitemap.php
index 40647aa6460a1..4baabe60a907e 100644
--- a/app/code/Magento/Sitemap/Model/Sitemap.php
+++ b/app/code/Magento/Sitemap/Model/Sitemap.php
@@ -132,7 +132,7 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel
     protected $_dateModel;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -156,7 +156,7 @@ class Sitemap extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Sitemap\Model\Resource\Catalog\ProductFactory $productFactory
      * @param \Magento\Sitemap\Model\Resource\Cms\PageFactory $cmsFactory
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $modelDate
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\RequestInterface $request
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
@@ -174,7 +174,7 @@ public function __construct(
         \Magento\Sitemap\Model\Resource\Catalog\ProductFactory $productFactory,
         \Magento\Sitemap\Model\Resource\Cms\PageFactory $cmsFactory,
         \Magento\Framework\Stdlib\DateTime\DateTime $modelDate,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\RequestInterface $request,
         \Magento\Framework\Stdlib\DateTime $dateTime,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
diff --git a/app/code/Magento/Sitemap/etc/acl.xml b/app/code/Magento/Sitemap/etc/acl.xml
index a56ca7b98979d..f1435275d08de 100644
--- a/app/code/Magento/Sitemap/etc/acl.xml
+++ b/app/code/Magento/Sitemap/etc/acl.xml
@@ -8,15 +8,15 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::marketing">
-                    <resource id="Magento_Adminhtml::marketing_seo">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::marketing">
+                    <resource id="Magento_Backend::marketing_seo">
                         <resource id="Magento_Sitemap::sitemap" title="Site Map" sortOrder="30" />
                     </resource>
                 </resource>
-                <resource id="Magento_Adminhtml::stores">
-                    <resource id="Magento_Adminhtml::stores_settings">
-                        <resource id="Magento_Adminhtml::config">
+                <resource id="Magento_Backend::stores">
+                    <resource id="Magento_Backend::stores_settings">
+                        <resource id="Magento_Backend::config">
                             <resource id="Magento_Sitemap::config_sitemap" title="XML Sitemap Section" sortOrder="70"/>
                         </resource>
                     </resource>
diff --git a/app/code/Magento/Sitemap/etc/adminhtml/routes.xml b/app/code/Magento/Sitemap/etc/adminhtml/routes.xml
index e1184e5afa519..1ed9664209599 100644
--- a/app/code/Magento/Sitemap/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Sitemap/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
     <router id="admin">
         <route id="adminhtml">
-            <module name="Magento_Sitemap" before="Magento_Adminhtml" />
+            <module name="Magento_Sitemap" before="Magento_Backend" />
         </route>
     </router>
 </config>
diff --git a/app/code/Magento/Store/App/Action/Plugin/Context.php b/app/code/Magento/Store/App/Action/Plugin/Context.php
index 072b69c077e61..9ac06a3058ba9 100644
--- a/app/code/Magento/Store/App/Action/Plugin/Context.php
+++ b/app/code/Magento/Store/App/Action/Plugin/Context.php
@@ -27,7 +27,7 @@ class Context
     protected $httpRequest;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -35,13 +35,13 @@ class Context
      * @param \Magento\Framework\Session\SessionManagerInterface $session
      * @param \Magento\Framework\App\Http\Context $httpContext
      * @param \Magento\Framework\App\Request\Http $httpRequest
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Framework\Session\SessionManagerInterface $session,
         \Magento\Framework\App\Http\Context $httpContext,
         \Magento\Framework\App\Request\Http $httpRequest,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->session      = $session;
         $this->httpContext  = $httpContext;
diff --git a/app/code/Magento/Store/App/Action/Plugin/StoreCheck.php b/app/code/Magento/Store/App/Action/Plugin/StoreCheck.php
index fef3ede112218..048f66b3a1451 100644
--- a/app/code/Magento/Store/App/Action/Plugin/StoreCheck.php
+++ b/app/code/Magento/Store/App/Action/Plugin/StoreCheck.php
@@ -9,15 +9,15 @@
 class StoreCheck
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->_storeManager = $storeManager;
     }
diff --git a/app/code/Magento/Store/App/FrontController/Plugin/RequestPreprocessor.php b/app/code/Magento/Store/App/FrontController/Plugin/RequestPreprocessor.php
index 629a9fba8c317..57307c083d012 100644
--- a/app/code/Magento/Store/App/FrontController/Plugin/RequestPreprocessor.php
+++ b/app/code/Magento/Store/App/FrontController/Plugin/RequestPreprocessor.php
@@ -23,18 +23,18 @@ class RequestPreprocessor
     protected $_url;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\UrlInterface $url
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\App\ResponseFactory $responseFactory
      */
     public function __construct(
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\UrlInterface $url,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\App\ResponseFactory $responseFactory
@@ -74,7 +74,7 @@ public function aroundDispatch(
                     );
                     $redirectCode = (int)$this->_scopeConfig->getValue(
                         'web/url/redirect_to_base',
-                        \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                     ) !== 301 ? 302 : 301;
 
                     $response = $this->_responseFactory->create();
@@ -97,7 +97,7 @@ protected function _isBaseUrlCheckEnabled()
     {
         return (bool)$this->_scopeConfig->getValue(
             'web/url/redirect_to_base',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
diff --git a/app/code/Magento/Store/App/Request/PathInfoProcessor.php b/app/code/Magento/Store/App/Request/PathInfoProcessor.php
index 1a9491e3f60fe..2868f27a9dd7a 100644
--- a/app/code/Magento/Store/App/Request/PathInfoProcessor.php
+++ b/app/code/Magento/Store/App/Request/PathInfoProcessor.php
@@ -8,14 +8,14 @@
 class PathInfoProcessor implements \Magento\Framework\App\Request\PathInfoProcessorInterface
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     private $_storeManager;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
-    public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
+    public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
     {
         $this->_storeManager = $storeManager;
     }
diff --git a/app/code/Magento/Store/App/Response/Redirect.php b/app/code/Magento/Store/App/Response/Redirect.php
index 3254ec7f20656..6c156523c881a 100644
--- a/app/code/Magento/Store/App/Response/Redirect.php
+++ b/app/code/Magento/Store/App/Response/Redirect.php
@@ -15,7 +15,7 @@ class Redirect implements \Magento\Framework\App\Response\RedirectInterface
     protected $_request;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -48,7 +48,7 @@ class Redirect implements \Magento\Framework\App\Response\RedirectInterface
      * Constructor
      *
      * @param \Magento\Framework\App\RequestInterface $request
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Encryption\UrlCoder $urlCoder
      * @param \Magento\Framework\Session\SessionManagerInterface $session
      * @param \Magento\Framework\Session\SidResolverInterface $sidResolver
@@ -57,7 +57,7 @@ class Redirect implements \Magento\Framework\App\Response\RedirectInterface
      */
     public function __construct(
         \Magento\Framework\App\RequestInterface $request,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Encryption\UrlCoder $urlCoder,
         \Magento\Framework\Session\SessionManagerInterface $session,
         \Magento\Framework\Session\SidResolverInterface $sidResolver,
diff --git a/app/code/Magento/Store/Block/Store/Switcher.php b/app/code/Magento/Store/Block/Store/Switcher.php
index 9c76ffce01670..81cba0a463f18 100644
--- a/app/code/Magento/Store/Block/Store/Switcher.php
+++ b/app/code/Magento/Store/Block/Store/Switcher.php
@@ -89,7 +89,7 @@ protected function _loadData()
             }
             $store->setLocaleCode($this->_scopeConfig->getValue(
                 \Magento\Core\Helper\Data::XML_PATH_DEFAULT_LOCALE,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $store->getId()
             ));
             $this->_stores[$store->getGroupId()][$store->getId()] = $store;
@@ -108,7 +108,7 @@ public function getStoreCount()
         $stores = [];
         $localeCode = $this->_scopeConfig->getValue(
             \Magento\Core\Helper\Data::XML_PATH_DEFAULT_LOCALE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         foreach ($this->_groups as $group) {
             if (!isset($this->_stores[$group->getId()])) {
diff --git a/app/code/Magento/Store/Block/Switcher.php b/app/code/Magento/Store/Block/Switcher.php
index 4e0afa2811524..ffbcfec3868b8 100644
--- a/app/code/Magento/Store/Block/Switcher.php
+++ b/app/code/Magento/Store/Block/Switcher.php
@@ -95,7 +95,7 @@ public function getRawStores()
                 }
                 $localeCode = $this->_scopeConfig->getValue(
                     \Magento\Core\Helper\Data::XML_PATH_DEFAULT_LOCALE,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                     $store
                 );
                 $store->setLocaleCode($localeCode);
@@ -127,7 +127,7 @@ public function getGroups()
             $groups = [];
             $localeCode = $this->_scopeConfig->getValue(
                 \Magento\Core\Helper\Data::XML_PATH_DEFAULT_LOCALE,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
             foreach ($rawGroups as $group) {
                 /* @var $group Group */
diff --git a/app/code/Magento/Store/Model/App/Emulation.php b/app/code/Magento/Store/Model/App/Emulation.php
index 131a7a270db2c..5b64511218ac2 100644
--- a/app/code/Magento/Store/Model/App/Emulation.php
+++ b/app/code/Magento/Store/Model/App/Emulation.php
@@ -17,7 +17,7 @@
 class Emulation extends \Magento\Framework\Object
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -61,7 +61,7 @@ class Emulation extends \Magento\Framework\Object
     private $initialEnvironmentInfo;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\View\DesignInterface $viewDesign
      * @param \Magento\Framework\App\DesignInterface $design
      * @param \Magento\Framework\TranslateInterface $translate
@@ -72,7 +72,7 @@ class Emulation extends \Magento\Framework\Object
      * @param array $data
      */
     public function __construct(
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\View\DesignInterface $viewDesign,
         \Magento\Framework\App\DesignInterface $design,
         \Magento\Framework\TranslateInterface $translate,
@@ -131,7 +131,7 @@ public function startEnvironmentEmulation(
         // emulate locale
         $newLocaleCode = $this->_scopeConfig->getValue(
             $this->_localeResolver->getDefaultLocalePath(),
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $storeId
         );
         $this->_localeResolver->setLocaleCode($newLocaleCode);
diff --git a/app/code/Magento/Store/Model/Config/Reader/Store.php b/app/code/Magento/Store/Model/Config/Reader/Store.php
index d505a38b7820b..c5456bcb102f9 100644
--- a/app/code/Magento/Store/Model/Config/Reader/Store.php
+++ b/app/code/Magento/Store/Model/Config/Reader/Store.php
@@ -35,7 +35,7 @@ class Store implements \Magento\Framework\App\Config\Scope\ReaderInterface
     protected $_storeFactory;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -45,7 +45,7 @@ class Store implements \Magento\Framework\App\Config\Scope\ReaderInterface
      * @param \Magento\Store\Model\Config\Converter $converter
      * @param \Magento\Store\Model\Resource\Config\Collection\ScopedFactory $collectionFactory
      * @param \Magento\Store\Model\StoreFactory $storeFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Framework\App\Config\Initial $initialConfig,
@@ -53,7 +53,7 @@ public function __construct(
         \Magento\Store\Model\Config\Converter $converter,
         \Magento\Store\Model\Resource\Config\Collection\ScopedFactory $collectionFactory,
         \Magento\Store\Model\StoreFactory $storeFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->_initialConfig = $initialConfig;
         $this->_scopePool = $scopePool;
@@ -85,13 +85,13 @@ public function read($code = null)
             throw NoSuchEntityException::singleField('storeCode', $code);
         }
         $websiteConfig = $this->_scopePool->getScope(
-            \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE,
             $store->getWebsite()->getCode()
         )->getSource();
         $config = array_replace_recursive($websiteConfig, $this->_initialConfig->getData("stores|{$code}"));
 
         $collection = $this->_collectionFactory->create(
-            ['scope' => \Magento\Framework\Store\ScopeInterface::SCOPE_STORES, 'scopeId' => $store->getId()]
+            ['scope' => \Magento\Store\Model\ScopeInterface::SCOPE_STORES, 'scopeId' => $store->getId()]
         );
         $dbStoreConfig = [];
         foreach ($collection as $item) {
diff --git a/app/code/Magento/Store/Model/Config/Reader/Website.php b/app/code/Magento/Store/Model/Config/Reader/Website.php
index 1f67c4276b79e..1448b04bf9afb 100644
--- a/app/code/Magento/Store/Model/Config/Reader/Website.php
+++ b/app/code/Magento/Store/Model/Config/Reader/Website.php
@@ -69,7 +69,7 @@ public function read($code = null)
         $website = $this->_websiteFactory->create();
         $website->load($code);
         $collection = $this->_collectionFactory->create(
-            ['scope' => \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITES, 'scopeId' => $website->getId()]
+            ['scope' => \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES, 'scopeId' => $website->getId()]
         );
         $dbWebsiteConfig = [];
         foreach ($collection as $configValue) {
diff --git a/app/code/Magento/Store/Model/Group.php b/app/code/Magento/Store/Model/Group.php
index 4cc2707ee3bb8..03c7fdfd4206a 100644
--- a/app/code/Magento/Store/Model/Group.php
+++ b/app/code/Magento/Store/Model/Group.php
@@ -90,7 +90,7 @@ class Group extends \Magento\Framework\Model\AbstractModel implements \Magento\F
     protected $_storeListFactory;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -99,7 +99,7 @@ class Group extends \Magento\Framework\Model\AbstractModel implements \Magento\F
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Core\Model\Resource\Config\Data $configDataResource
      * @param \Magento\Store\Model\Store $store
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\Db $resourceCollection
      * @param array $data
@@ -109,7 +109,7 @@ public function __construct(
         \Magento\Framework\Registry $registry,
         \Magento\Core\Model\Resource\Config\Data $configDataResource,
         \Magento\Store\Model\Resource\Store\CollectionFactory $storeListFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\Db $resourceCollection = null,
         array $data = []
@@ -355,7 +355,7 @@ public function getWebsiteId()
     public function beforeDelete()
     {
         $this->_configDataResource->clearScopeData(
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORES,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORES,
             $this->getStoreIds()
         );
         return parent::beforeDelete();
diff --git a/app/code/Magento/Store/Model/Resolver/Store.php b/app/code/Magento/Store/Model/Resolver/Store.php
index 39f285b914b5c..2acf0aedb21cb 100644
--- a/app/code/Magento/Store/Model/Resolver/Store.php
+++ b/app/code/Magento/Store/Model/Resolver/Store.php
@@ -8,14 +8,14 @@
 class Store implements \Magento\Framework\App\ScopeResolverInterface
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
-    public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
+    public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
     {
         $this->_storeManager = $storeManager;
     }
@@ -33,4 +33,14 @@ public function getScope($scopeId = null)
 
         return $scope;
     }
+
+    /**
+     * Retrieve a list of available stores
+     *
+     * @return \Magento\Store\Model\Store[]
+     */
+    public function getScopes()
+    {
+        return $this->_storeManager->getStores();
+    }
 }
diff --git a/app/code/Magento/Store/Model/Resolver/Website.php b/app/code/Magento/Store/Model/Resolver/Website.php
index 3fd696712b028..cdfb825fc025c 100644
--- a/app/code/Magento/Store/Model/Resolver/Website.php
+++ b/app/code/Magento/Store/Model/Resolver/Website.php
@@ -8,15 +8,15 @@
 class Website implements \Magento\Framework\App\ScopeResolverInterface
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->_storeManager = $storeManager;
     }
@@ -34,4 +34,14 @@ public function getScope($scopeId = null)
 
         return $scope;
     }
+
+    /**
+     * Retrieve a list of available websites
+     *
+     * @return \Magento\Store\Model\Website[]
+     */
+    public function getScopes()
+    {
+        return $this->_storeManager->getWebsites();
+    }
 }
diff --git a/app/code/Magento/Store/Model/Resource/Store.php b/app/code/Magento/Store/Model/Resource/Store.php
index e7c3a0336ddfb..6add5aff1e660 100644
--- a/app/code/Magento/Store/Model/Resource/Store.php
+++ b/app/code/Magento/Store/Model/Resource/Store.php
@@ -73,7 +73,7 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     protected function _afterDelete(\Magento\Framework\Model\AbstractModel $model)
     {
         $where = [
-            'scope = ?' => \Magento\Framework\Store\ScopeInterface::SCOPE_STORES,
+            'scope = ?' => \Magento\Store\Model\ScopeInterface::SCOPE_STORES,
             'scope_id = ?' => $model->getStoreId(),
         ];
 
diff --git a/app/code/Magento/Store/Model/Resource/Website.php b/app/code/Magento/Store/Model/Resource/Website.php
index 82bd6f6ce9b2b..1213b6c8de7eb 100644
--- a/app/code/Magento/Store/Model/Resource/Website.php
+++ b/app/code/Magento/Store/Model/Resource/Website.php
@@ -79,7 +79,7 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
     protected function _afterDelete(\Magento\Framework\Model\AbstractModel $model)
     {
         $where = [
-            'scope = ?' => \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITES,
+            'scope = ?' => \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES,
             'scope_id = ?' => $model->getWebsiteId(),
         ];
 
diff --git a/lib/internal/Magento/Framework/Store/ScopeInterface.php b/app/code/Magento/Store/Model/ScopeInterface.php
similarity index 91%
rename from lib/internal/Magento/Framework/Store/ScopeInterface.php
rename to app/code/Magento/Store/Model/ScopeInterface.php
index 0f1cfc677ff6a..4699d335e8996 100644
--- a/lib/internal/Magento/Framework/Store/ScopeInterface.php
+++ b/app/code/Magento/Store/Model/ScopeInterface.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Framework\Store;
+namespace Magento\Store\Model;
 
 interface ScopeInterface
 {
diff --git a/app/code/Magento/Store/Model/Storage/Db.php b/app/code/Magento/Store/Model/Storage/Db.php
index c6713738d2459..f9cd545b5b1e7 100644
--- a/app/code/Magento/Store/Model/Storage/Db.php
+++ b/app/code/Magento/Store/Model/Storage/Db.php
@@ -18,7 +18,7 @@
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class Db implements \Magento\Framework\Store\StoreManagerInterface
+class Db implements \Magento\Store\Model\StoreManagerInterface
 {
     /**
      * Flag that shows that system has only one store view
@@ -534,7 +534,7 @@ protected function isSingleStoreModeEnabled()
     {
         return (bool)$this->_scopeConfig->getValue(
             \Magento\Store\Model\StoreManager::XML_PATH_SINGLE_STORE_MODE_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 }
diff --git a/app/code/Magento/Store/Model/Storage/DefaultStorage.php b/app/code/Magento/Store/Model/Storage/DefaultStorage.php
index 5afca24a7086f..1a55f0eef7cd3 100644
--- a/app/code/Magento/Store/Model/Storage/DefaultStorage.php
+++ b/app/code/Magento/Store/Model/Storage/DefaultStorage.php
@@ -7,7 +7,7 @@
  */
 namespace Magento\Store\Model\Storage;
 
-class DefaultStorage implements \Magento\Framework\Store\StoreManagerInterface
+class DefaultStorage implements \Magento\Store\Model\StoreManagerInterface
 {
     /**
      * Application store object
diff --git a/app/code/Magento/Store/Model/StorageFactory.php b/app/code/Magento/Store/Model/StorageFactory.php
index a8ade74ca0bc1..cf53216bd169c 100644
--- a/app/code/Magento/Store/Model/StorageFactory.php
+++ b/app/code/Magento/Store/Model/StorageFactory.php
@@ -6,8 +6,6 @@
 namespace Magento\Store\Model;
 
 use Magento\Framework\Profiler;
-use Magento\Framework\Store\ScopeInterface;
-use Magento\Framework\Store\StoreManagerInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -27,7 +25,7 @@ class StorageFactory
     protected $_storageClassName;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface[]
+     * @var \Magento\Store\Model\StoreManagerInterface[]
      */
     protected $_cache = [];
 
@@ -98,7 +96,7 @@ public function __construct(
      * Get storage instance
      *
      * @param array $arguments
-     * @return \Magento\Framework\Store\StoreManagerInterface
+     * @return \Magento\Store\Model\StoreManagerInterface
      * @throws \InvalidArgumentException
      */
     public function get(array $arguments = [])
@@ -106,12 +104,12 @@ public function get(array $arguments = [])
         $className = $this->_storageClassName;
 
         if (false == isset($this->_cache[$className])) {
-            /** @var $storage \Magento\Framework\Store\StoreManagerInterface */
+            /** @var $storage \Magento\Store\Model\StoreManagerInterface */
             $storage = $this->_objectManager->create($className, $arguments);
 
-            if (false === ($storage instanceof \Magento\Framework\Store\StoreManagerInterface)) {
+            if (false === ($storage instanceof \Magento\Store\Model\StoreManagerInterface)) {
                 throw new \InvalidArgumentException(
-                    $className . ' doesn\'t implement \Magento\Framework\Store\StoreManagerInterface'
+                    $className . ' doesn\'t implement \Magento\Store\Model\StoreManagerInterface'
                 );
             }
             $this->_cache[$className] = $storage;
@@ -119,7 +117,7 @@ public function get(array $arguments = [])
                 $this->_reinitStores($storage, $arguments);
                 $useSid = $this->_scopeConfig->isSetFlag(
                     \Magento\Framework\Session\SidResolver::XML_PATH_USE_FRONTEND_SID,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                     $storage->getStore()
                 );
                 $this->_sidResolver->setUseSessionInUrl($useSid);
@@ -133,12 +131,12 @@ public function get(array $arguments = [])
     /**
      * Initialize currently ran store
      *
-     * @param \Magento\Framework\Store\StoreManagerInterface $storage
+     * @param \Magento\Store\Model\StoreManagerInterface $storage
      * @param array $arguments
      * @return void
      * @throws \Magento\Framework\App\InitException
      */
-    protected function _reinitStores(\Magento\Framework\Store\StoreManagerInterface $storage, $arguments)
+    protected function _reinitStores(\Magento\Store\Model\StoreManagerInterface $storage, $arguments)
     {
         Profiler::start('init_stores');
         $storage->reinitStores();
@@ -174,11 +172,11 @@ protected function _reinitStores(\Magento\Framework\Store\StoreManagerInterface
     }
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storage
+     * @param \Magento\Store\Model\StoreManagerInterface $storage
      * @param string $scopeCode
      * @return null|string
      */
-    protected function _getStoreByGroup(\Magento\Framework\Store\StoreManagerInterface $storage, $scopeCode)
+    protected function _getStoreByGroup(\Magento\Store\Model\StoreManagerInterface $storage, $scopeCode)
     {
         $groups = $storage->getGroups(true);
         $stores = $storage->getStores(true);
@@ -192,11 +190,11 @@ protected function _getStoreByGroup(\Magento\Framework\Store\StoreManagerInterfa
     }
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storage
+     * @param \Magento\Store\Model\StoreManagerInterface $storage
      * @param string $scopeCode
      * @return null|string
      */
-    protected function _getStoreByWebsite(\Magento\Framework\Store\StoreManagerInterface $storage, $scopeCode)
+    protected function _getStoreByWebsite(\Magento\Store\Model\StoreManagerInterface $storage, $scopeCode)
     {
         $websites = $storage->getWebsites(true, true);
         if (!isset($websites[$scopeCode])) {
@@ -209,11 +207,11 @@ protected function _getStoreByWebsite(\Magento\Framework\Store\StoreManagerInter
     }
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storage
+     * @param \Magento\Store\Model\StoreManagerInterface $storage
      * @param string $scopeType
      * @return void
      */
-    protected function _checkCookieStore(\Magento\Framework\Store\StoreManagerInterface $storage, $scopeType)
+    protected function _checkCookieStore(\Magento\Store\Model\StoreManagerInterface $storage, $scopeType)
     {
         $storeCode = $storage->getStore()->getStoreCodeFromCookie();
         if (null != $storeCode) {
@@ -222,11 +220,11 @@ protected function _checkCookieStore(\Magento\Framework\Store\StoreManagerInterf
     }
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storage
+     * @param \Magento\Store\Model\StoreManagerInterface $storage
      * @param string $scopeType
      * @return void
      */
-    protected function _checkRequestStore(\Magento\Framework\Store\StoreManagerInterface $storage, $scopeType)
+    protected function _checkRequestStore(\Magento\Store\Model\StoreManagerInterface $storage, $scopeType)
     {
         $storeCode = $this->request->getParam('___store');
         if (empty($storeCode)) {
@@ -261,7 +259,7 @@ protected function _checkRequestStore(\Magento\Framework\Store\StoreManagerInter
      * @param string $scopeCode
      * @return bool|Store
      */
-    protected function getActiveStoreByCode(\Magento\Framework\Store\StoreManagerInterface $storage, $scopeCode)
+    protected function getActiveStoreByCode(\Magento\Store\Model\StoreManagerInterface $storage, $scopeCode)
     {
         $stores = $storage->getStores(true, true);
         if ($scopeCode && isset($stores[$scopeCode])
@@ -276,12 +274,12 @@ protected function getActiveStoreByCode(\Magento\Framework\Store\StoreManagerInt
     /**
      * Set current store
      *
-     * @param \Magento\Framework\Store\StoreManagerInterface $storage
+     * @param \Magento\Store\Model\StoreManagerInterface $storage
      * @param string $scopeCode
      * @param string $scopeType
      * @return bool
      */
-    protected function setCurrentStore(\Magento\Framework\Store\StoreManagerInterface $storage, $scopeCode, $scopeType)
+    protected function setCurrentStore(\Magento\Store\Model\StoreManagerInterface $storage, $scopeCode, $scopeType)
     {
         $store = $this->getActiveStoreByCode($storage, $scopeCode);
         if (!$store) {
@@ -295,13 +293,13 @@ protected function setCurrentStore(\Magento\Framework\Store\StoreManagerInterfac
          */
         $setStore = false;
         switch ($scopeType) {
-            case \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE:
+            case \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE:
                 $setStore = $store->getWebsiteId() == $curStoreObj->getWebsiteId();
                 break;
-            case \Magento\Framework\Store\ScopeInterface::SCOPE_GROUP:
+            case \Magento\Store\Model\ScopeInterface::SCOPE_GROUP:
                 $setStore = $store->getGroupId() == $curStoreObj->getGroupId();
                 break;
-            case \Magento\Framework\Store\ScopeInterface::SCOPE_STORE:
+            case \Magento\Store\Model\ScopeInterface::SCOPE_STORE:
                 $setStore = true;
                 break;
         }
diff --git a/app/code/Magento/Store/Model/Store.php b/app/code/Magento/Store/Model/Store.php
index 89beeac16ebd1..a3e374c9d3cde 100644
--- a/app/code/Magento/Store/Model/Store.php
+++ b/app/code/Magento/Store/Model/Store.php
@@ -7,7 +7,6 @@
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Model\AbstractModel;
-use Magento\Framework\Store\ScopeInterface;
 
 /**
  * Store model
@@ -311,7 +310,7 @@ class Store extends AbstractModel implements
      * @param \Magento\Core\Model\Resource\Config\Data $configDataResource
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\App\Config\ReinitableConfigInterface $config
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Session\SidResolverInterface $sidResolver
      * @param \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory
      * @param \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager,
@@ -335,7 +334,7 @@ public function __construct(
         \Magento\Core\Model\Resource\Config\Data $configDataResource,
         \Magento\Framework\Filesystem $filesystem,
         \Magento\Framework\App\Config\ReinitableConfigInterface $config,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Session\SidResolverInterface $sidResolver,
         \Magento\Framework\Stdlib\Cookie\CookieMetadataFactory $cookieMetadataFactory,
         \Magento\Framework\Stdlib\CookieManagerInterface $cookieManager,
@@ -721,7 +720,7 @@ public function isFrontUrlSecure()
         if ($this->_isFrontSecure === null) {
             $this->_isFrontSecure = $this->_config->isSetFlag(
                 self::XML_PATH_SECURE_IN_FRONTEND,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $this->getId()
             );
         }
@@ -749,7 +748,7 @@ public function isCurrentlySecure()
 
         $secureBaseUrl = $this->_config->getValue(
             self::XML_PATH_SECURE_BASE_URL,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
 
         if (!$secureBaseUrl) {
@@ -1126,7 +1125,7 @@ public function getName()
     public function beforeDelete()
     {
         $this->_configDataResource->clearScopeData(
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORES,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORES,
             $this->getId()
         );
 
@@ -1184,7 +1183,7 @@ public function getFrontendName()
         if (null === $this->_frontendName) {
             $storeGroupName = (string)$this->_config->getValue(
                 'general/store_information/name',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $this
             );
             $this->_frontendName = !empty($storeGroupName) ? $storeGroupName : $this->getGroup()->getName();
diff --git a/app/code/Magento/Store/Model/StoreManager.php b/app/code/Magento/Store/Model/StoreManager.php
index bc3184809baaa..44e953feb8469 100644
--- a/app/code/Magento/Store/Model/StoreManager.php
+++ b/app/code/Magento/Store/Model/StoreManager.php
@@ -5,9 +5,7 @@
  */
 namespace Magento\Store\Model;
 
-use Magento\Framework\Store\ScopeInterface;
-
-class StoreManager implements \Magento\Framework\Store\StoreManagerInterface
+class StoreManager implements \Magento\Store\Model\StoreManagerInterface
 {
     /**
      * Application run code
@@ -81,7 +79,7 @@ class StoreManager implements \Magento\Framework\Store\StoreManagerInterface
     protected $_scopeConfig;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storage;
 
@@ -109,11 +107,11 @@ public function __construct(
     /**
      * Get storage instance
      *
-     * @return \Magento\Framework\Store\StoreManagerInterface
+     * @return \Magento\Store\Model\StoreManagerInterface
      */
     protected function _getStorage()
     {
-        if (!$this->_storage instanceof \Magento\Framework\Store\StoreManagerInterface) {
+        if (!$this->_storage instanceof \Magento\Store\Model\StoreManagerInterface) {
             $arguments = [
                 'isSingleStoreAllowed' => $this->_isSingleStoreAllowed,
                 'currentStore' => $this->_currentStore,
@@ -278,7 +276,7 @@ protected function isSingleStoreModeEnabled()
     {
         return (bool)$this->_scopeConfig->getValue(
             self::XML_PATH_SINGLE_STORE_MODE_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 }
diff --git a/lib/internal/Magento/Framework/Store/StoreManagerInterface.php b/app/code/Magento/Store/Model/StoreManagerInterface.php
similarity index 98%
rename from lib/internal/Magento/Framework/Store/StoreManagerInterface.php
rename to app/code/Magento/Store/Model/StoreManagerInterface.php
index 44ea779d287f6..e0f9be67a13a9 100644
--- a/lib/internal/Magento/Framework/Store/StoreManagerInterface.php
+++ b/app/code/Magento/Store/Model/StoreManagerInterface.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Framework\Store;
+namespace Magento\Store\Model;
 
 interface StoreManagerInterface
 {
diff --git a/app/code/Magento/Store/Model/StoresConfig.php b/app/code/Magento/Store/Model/StoresConfig.php
index d5b9ce046574e..139c2ad56522a 100644
--- a/app/code/Magento/Store/Model/StoresConfig.php
+++ b/app/code/Magento/Store/Model/StoresConfig.php
@@ -7,12 +7,11 @@
 namespace Magento\Store\Model;
 
 use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\Store\ScopeInterface;
 
 class StoresConfig
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -22,11 +21,11 @@ class StoresConfig
     protected $_config;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      */
     public function __construct(
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\Config\ScopeConfigInterface $config
     ) {
         $this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Store/Model/System/Store.php b/app/code/Magento/Store/Model/System/Store.php
index 9cc19538e0c70..d12f4d791e310 100644
--- a/app/code/Magento/Store/Model/System/Store.php
+++ b/app/code/Magento/Store/Model/System/Store.php
@@ -40,7 +40,7 @@ class Store extends \Magento\Framework\Object
     private $_isAdminScopeAllowed = true;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -48,9 +48,9 @@ class Store extends \Magento\Framework\Object
      * Init model
      * Load Website, Group and Store collections
      *
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
-    public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
+    public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
     {
         $this->_storeManager = $storeManager;
         return $this->reload();
@@ -406,13 +406,13 @@ public function reload($type = null)
             $this->_loadStoreCollection();
         } else {
             switch ($type) {
-                case \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE:
+                case \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE:
                     $this->_loadWebsiteCollection();
                     break;
-                case \Magento\Framework\Store\ScopeInterface::SCOPE_GROUP:
+                case \Magento\Store\Model\ScopeInterface::SCOPE_GROUP:
                     $this->_loadGroupCollection();
                     break;
-                case \Magento\Framework\Store\ScopeInterface::SCOPE_STORE:
+                case \Magento\Store\Model\ScopeInterface::SCOPE_STORE:
                     $this->_loadStoreCollection();
                     break;
                 default:
diff --git a/app/code/Magento/Store/Model/Website.php b/app/code/Magento/Store/Model/Website.php
index 458d0d84e6f19..6299b99237f20 100644
--- a/app/code/Magento/Store/Model/Website.php
+++ b/app/code/Magento/Store/Model/Website.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Store\Model;
 
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Core Website model
@@ -172,7 +172,7 @@ class Website extends \Magento\Framework\Model\AbstractModel implements
      * @param \Magento\Store\Model\StoreFactory $storeFactory
      * @param \Magento\Store\Model\GroupFactory $storeGroupFactory
      * @param \Magento\Store\Model\WebsiteFactory $websiteFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\Db $resourceCollection
@@ -187,7 +187,7 @@ public function __construct(
         \Magento\Store\Model\StoreFactory $storeFactory,
         \Magento\Store\Model\GroupFactory $storeGroupFactory,
         \Magento\Store\Model\WebsiteFactory $websiteFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Directory\Model\CurrencyFactory $currencyFactory,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\Db $resourceCollection = null,
@@ -240,7 +240,7 @@ public function getConfig($path)
         if (!isset($this->_configCache[$path])) {
             $config = $this->_coreConfig->getValue(
                 $path,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE,
                 $this->getCode()
             );
             if (!$config) {
@@ -508,11 +508,11 @@ public function getCode()
     public function beforeDelete()
     {
         $this->_configDataResource->clearScopeData(
-            \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITES,
+            \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITES,
             $this->getId()
         );
         $this->_configDataResource->clearScopeData(
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORES,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORES,
             $this->getStoreIds()
         );
         return parent::beforeDelete();
diff --git a/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php b/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php
new file mode 100644
index 0000000000000..ba211003e53b2
--- /dev/null
+++ b/app/code/Magento/Store/Url/Plugin/RouteParamsResolver.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Store\Url\Plugin;
+
+use \Magento\Store\Model\Store;
+use \Magento\Store\Model\ScopeInterface as StoreScopeInterface;
+
+/**
+ * Plugin for \Magento\Framework\Url\RouteParamsResolver
+ */
+class RouteParamsResolver
+{
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    protected $scopeConfig;
+
+    /**
+     * @var \Magento\Store\Model\StoreManagerInterface
+     */
+    protected $storeManager;
+
+    /**
+     * @var \Magento\Framework\Url\QueryParamsResolverInterface
+     */
+    protected $queryParamsResolver;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Framework\Url\QueryParamsResolverInterface $queryParamsResolver
+     */
+    public function __construct(
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Framework\Url\QueryParamsResolverInterface $queryParamsResolver
+    ) {
+        $this->scopeConfig = $scopeConfig;
+        $this->storeManager = $storeManager;
+        $this->queryParamsResolver = $queryParamsResolver;
+    }
+
+    /**
+     * Process scope query parameters.
+     *
+     * @param \Magento\Framework\Url\RouteParamsResolver $subject
+     * @param callable $proceed
+     * @param array $data
+     * @param bool $unsetOldParams
+     * @return \Magento\Framework\Url\RouteParamsResolver
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function aroundSetRouteParams(
+        \Magento\Framework\Url\RouteParamsResolver $subject,
+        \Closure $proceed,
+        array $data,
+        $unsetOldParams = true
+    ) {
+        if (isset($data['_scope'])) {
+            $subject->setScope($data['_scope']);
+            unset($data['_scope']);
+        }
+        if (isset($data['_scope_to_url']) && (bool)$data['_scope_to_url'] === true) {
+            $storeCode = $subject->getScope() ?: $this->storeManager->getStore()->getCode();
+            $useStoreInUrl = $this->scopeConfig->getValue(
+                Store::XML_PATH_STORE_IN_URL,
+                StoreScopeInterface::SCOPE_STORE,
+                $storeCode
+            );
+            if (!$useStoreInUrl && !$this->storeManager->hasSingleStore()) {
+                $this->queryParamsResolver->setQueryParam('___store', $storeCode);
+            }
+        }
+        unset($data['_scope_to_url']);
+
+        return $proceed($data, $unsetOldParams);
+    }
+}
diff --git a/app/code/Magento/Store/Url/Plugin/SecurityInfo.php b/app/code/Magento/Store/Url/Plugin/SecurityInfo.php
new file mode 100644
index 0000000000000..3387c888f11df
--- /dev/null
+++ b/app/code/Magento/Store/Url/Plugin/SecurityInfo.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Store\Url\Plugin;
+
+use \Magento\Store\Model\Store;
+use \Magento\Store\Model\ScopeInterface as StoreScopeInterface;
+
+/**
+ * Plugin for \Magento\Framework\Url\SecurityInfo
+ */
+class SecurityInfo
+{
+    /**
+     * @var \Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    protected $scopeConfig;
+
+    /**
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     */
+    public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig)
+    {
+        $this->scopeConfig = $scopeConfig;
+    }
+
+    /**
+     * Check if secure URLs are enabled.
+     *
+     * @param \Magento\Framework\Url\SecurityInfo $subject
+     * @param callable $proceed
+     * @param string $url
+     * @return bool
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function aroundIsSecure(\Magento\Framework\Url\SecurityInfo $subject, \Closure $proceed, $url)
+    {
+        if ($this->scopeConfig->getValue(Store::XML_PATH_SECURE_IN_FRONTEND, StoreScopeInterface::SCOPE_STORE)) {
+            return $proceed($url);
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/app/code/Magento/Store/etc/di.xml b/app/code/Magento/Store/etc/di.xml
index 801973c00ad66..bdb2be6dbf61f 100644
--- a/app/code/Magento/Store/etc/di.xml
+++ b/app/code/Magento/Store/etc/di.xml
@@ -6,6 +6,9 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
+    <preference for="Magento\Framework\App\Request\PathInfoProcessorInterface" type="Magento\Store\App\Request\PathInfoProcessor" />
+    <preference for="Magento\Store\Model\StoreManagerInterface" type="Magento\Store\Model\StoreManager" />
+    <preference for="Magento\Framework\App\Response\RedirectInterface" type="Magento\Store\App\Response\Redirect" />
     <type name="Magento\Framework\Module\Updater\SetupFactory">
         <arguments>
             <argument name="resourceTypes" xsi:type="array">
@@ -16,6 +19,7 @@
     <type name="Magento\Framework\App\Config\ScopePool">
         <arguments>
             <argument name="readerPool" xsi:type="object">Magento\Store\Model\Config\Reader\ReaderPool\Proxy</argument>
+            <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
         </arguments>
     </type>
     <type name="Magento\Store\Model\Config\Reader\Website">
@@ -26,17 +30,17 @@
     <type name="Magento\Store\Model\Config\Reader\Store">
         <arguments>
             <argument name="scopePool" xsi:type="object">Magento\Framework\App\Config\ScopePool\Proxy</argument>
-            <argument name="storeManager" xsi:type="object">Magento\Framework\Store\StoreManagerInterface\Proxy</argument>
+            <argument name="storeManager" xsi:type="object">Magento\Store\Model\StoreManagerInterface\Proxy</argument>
         </arguments>
     </type>
     <type name="Magento\Store\Model\Resolver\Store">
         <arguments>
-            <argument name="storeManager" xsi:type="object">Magento\Framework\Store\StoreManagerInterface\Proxy</argument>
+            <argument name="storeManager" xsi:type="object">Magento\Store\Model\StoreManagerInterface\Proxy</argument>
         </arguments>
     </type>
     <type name="Magento\Store\Model\Resolver\Website">
         <arguments>
-            <argument name="storeManager" xsi:type="object">Magento\Framework\Store\StoreManagerInterface\Proxy</argument>
+            <argument name="storeManager" xsi:type="object">Magento\Store\Model\StoreManagerInterface\Proxy</argument>
         </arguments>
     </type>
     <type name="Magento\Store\Model\Config\Reader\ReaderPool">
@@ -52,10 +56,15 @@
     </type>
     <preference for="Magento\Framework\App\Config\Scope\ReaderPoolInterface" type="Magento\Store\Model\Config\Reader\ReaderPool"/>
     <preference for="Magento\Framework\App\ScopeResolverInterface" type="Magento\Store\Model\Resolver\Store" />
-    <preference for="Magento\Framework\Stdlib\CookieManagerInterface" type="Magento\Framework\Stdlib\Cookie\PhpCookieManager" />
     <type name="Magento\Framework\App\Action\Action">
         <plugin name="storeCheck" type="Magento\Store\App\Action\Plugin\StoreCheck" sortOrder="10"/>
     </type>
+    <type name="Magento\Framework\Url\SecurityInfo">
+        <plugin name="storeUrlSecurityInfo" type="Magento\Store\Url\Plugin\SecurityInfo"/>
+    </type>
+    <type name="Magento\Framework\Url\RouteParamsResolver">
+        <plugin name="storeUrlRouteParamsResolver" type="Magento\Store\Url\Plugin\RouteParamsResolver"/>
+    </type>
     <type name="Magento\Store\Model\Resource\Website\Collection">
         <arguments>
             <argument name="fetchStrategy" xsi:type="object">Magento\Store\Model\Resource\Website\Collection\FetchStrategy</argument>
@@ -126,33 +135,28 @@
     </type>
     <type name="Magento\Framework\Module\Output\Config">
         <arguments>
-            <argument name="scopeType" xsi:type="const">Magento\Framework\Store\ScopeInterface::SCOPE_STORE</argument>
+            <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
         </arguments>
     </type>
     <type name="Magento\Framework\Session\Config">
         <arguments>
-            <argument name="scopeType" xsi:type="const">Magento\Framework\Store\ScopeInterface::SCOPE_STORE</argument>
+            <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
         </arguments>
     </type>
     <type name="Magento\Framework\Session\SidResolver">
         <arguments>
-            <argument name="scopeType" xsi:type="const">Magento\Framework\Store\ScopeInterface::SCOPE_STORE</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Framework\Session\Validator">
-        <arguments>
-            <argument name="scopeType" xsi:type="const">Magento\Framework\Store\ScopeInterface::SCOPE_STORE</argument>
+            <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
         </arguments>
     </type>
     <type name="Magento\Framework\View\Layout\Element\Layout">
         <arguments>
-            <argument name="scopeType" xsi:type="const">Magento\Framework\Store\ScopeInterface::SCOPE_STORE</argument>
+            <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
         </arguments>
     </type>
     <type name="Magento\Framework\View\DesignExceptions">
         <arguments>
             <argument name="exceptionConfigPath" xsi:type="string">design/theme/ua_regexp</argument>
-            <argument name="scopeType" xsi:type="const">Magento\Framework\Store\ScopeInterface::SCOPE_STORE</argument>
+            <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
         </arguments>
     </type>
     <type name="Magento\Framework\View\TemplateEngineFactory">
@@ -162,4 +166,83 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\AreaList">
+        <arguments>
+            <argument name="areas" xsi:type="array">
+                <item name="frontend" xsi:type="array">
+                    <item name="frontName" xsi:type="null" />
+                    <item name="router" xsi:type="string">standard</item>
+                </item>
+            </argument>
+            <argument name="default" xsi:type="string">frontend</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Acl\Cache">
+        <arguments>
+            <argument name="cacheKey" xsi:type="string">global_acl_resources</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\App\Config\Initial\Converter">
+        <arguments>
+            <argument name="nodeMap" xsi:type="array">
+                <item name="default" xsi:type="string">/config/default</item>
+                <item name="stores" xsi:type="string">/config/stores</item>
+                <item name="websites" xsi:type="string">/config/websites</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Url">
+        <arguments>
+            <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\App\ScopeResolverPool">
+        <arguments>
+            <argument name="scopeResolvers" xsi:type="array">
+                <item name="store" xsi:type="object">Magento\Store\Model\Resolver\Store</item>
+                <item name="stores" xsi:type="object">Magento\Store\Model\Resolver\Store</item>
+                <item name="website" xsi:type="object">Magento\Store\Model\Resolver\Website</item>
+                <item name="websites" xsi:type="object">Magento\Store\Model\Resolver\Website</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Model\ActionValidator\RemoveAction">
+        <arguments>
+            <argument name="protectedModels" xsi:type="array">
+                <item name="store" xsi:type="string">Magento\Store\Model\Store</item>
+                <item name="website" xsi:type="string">Magento\Store\Model\Website</item>
+                <item name="storeGroup" xsi:type="string">Magento\Store\Model\Group</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Module\Setup\MigrationData">
+        <arguments>
+            <argument name="data" xsi:type="array">
+                <item name="plain" xsi:type="string"><![CDATA[/^(?P<alias>[a-z]+[_a-z\d]*?\/[a-z]+[_a-z\d]*?)::.*?$/sui]]></item>
+                <item name="wiki" xsi:type="string"><![CDATA[/{{(block|widget).*?(class|type)=\"(?P<alias>[a-z]+[_a-z\d]*?\/[a-z]+[_a-z\d]*?)\".*?}}/sui]]></item>
+                <item name="xml" xsi:type="string"><![CDATA[/<block.*?class=\"(?P<alias>[a-z]+[_a-z\d]*?\/[a-z]+[_a-z\d]*?)\".*?>/sui]]></item>
+                <item name="serialized" xsi:type="string"><![CDATA[#(?P<string>s:\d+:"(?P<alias>[a-z]+[_a-z\d]*?/[a-z]+[_a-z\d]*?)")#sui]]></item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Module\DataSetup">
+        <arguments>
+            <argument name="resourceName" xsi:type="string">core_setup</argument>
+            <argument name="connectionName" xsi:type="string">Magento\Framework\Module\Updater::DEFAULT_SETUP_CONNECTION</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\App\Helper\Context">
+        <arguments>
+            <argument name="urlBuilder" xsi:type="object">Magento\Framework\UrlInterface\Proxy</argument>
+            <argument name="httpRequest" xsi:type="object">Magento\Framework\App\Request\Http\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\App\FrontController">
+        <plugin name="install" type="Magento\Framework\Module\Plugin\DbStatusValidator" sortOrder="40"/>
+    </type>
+    <type name="Magento\Framework\Module\Plugin\DbStatusValidator">
+        <arguments>
+            <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
index 8acd7cc3591f8..7886702d51034 100644
--- a/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
+++ b/app/code/Magento/Tax/Block/Adminhtml/Rate/Form.php
@@ -143,14 +143,14 @@ protected function _prepareForm()
         if (!isset($formData['tax_country_id'])) {
             $formData['tax_country_id'] = $this->_scopeConfig->getValue(
                 \Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_COUNTRY,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
 
         if (!isset($formData['tax_region_id'])) {
             $formData['tax_region_id'] = $this->_scopeConfig->getValue(
                 \Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_REGION,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
 
@@ -197,7 +197,7 @@ protected function _prepareForm()
         if (!isset($formData['tax_postcode'])) {
             $formData['tax_postcode'] = $this->_scopeConfig->getValue(
                 \Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_POSTCODE,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
 
diff --git a/app/code/Magento/Tax/Helper/Data.php b/app/code/Magento/Tax/Helper/Data.php
index 5295a21c3037d..003b0dc7fac1f 100644
--- a/app/code/Magento/Tax/Helper/Data.php
+++ b/app/code/Magento/Tax/Helper/Data.php
@@ -73,7 +73,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     protected $_scopeConfig;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -137,7 +137,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\Registry                                   $coreRegistry
      * @param \Magento\Framework\App\Config\ScopeConfigInterface            $scopeConfig
      * @param Config                                                        $taxConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface                    $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface                    $storeManager
      * @param \Magento\Framework\Locale\FormatInterface                     $localeFormat
      * @param \Magento\Eav\Model\Entity\AttributeFactory                    $attributeFactory
      * @param \Magento\Tax\Model\Resource\Sales\Order\Tax\ItemFactory       $taxItemFactory
@@ -156,7 +156,7 @@ public function __construct(
         \Magento\Framework\Registry $coreRegistry,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         Config $taxConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Locale\FormatInterface $localeFormat,
         \Magento\Eav\Model\Entity\AttributeFactory $attributeFactory,
         \Magento\Tax\Model\Resource\Sales\Order\Tax\ItemFactory $taxItemFactory,
@@ -547,7 +547,7 @@ public function getTaxBasedOn($store = null)
     {
         return $this->_scopeConfig->getValue(
             Config::CONFIG_XML_PATH_BASED_ON,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -562,7 +562,7 @@ public function applyTaxOnCustomPrice($store = null)
     {
         return (int) $this->_scopeConfig->getValue(
             Config::CONFIG_XML_PATH_APPLY_ON,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         ) == 0;
     }
@@ -577,7 +577,7 @@ public function applyTaxOnOriginalPrice($store = null)
     {
         return (int) $this->_scopeConfig->getValue(
             Config::CONFIG_XML_PATH_APPLY_ON,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         ) == 1;
     }
@@ -710,7 +710,7 @@ public function getDefaultCustomerTaxClass()
     {
         return $this->_scopeConfig->getValue(
             self::CONFIG_DEFAULT_CUSTOMER_TAX_CLASS,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
@@ -723,7 +723,7 @@ public function getDefaultProductTaxClass()
     {
         return $this->_scopeConfig->getValue(
             self::CONFIG_DEFAULT_PRODUCT_TAX_CLASS,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
diff --git a/app/code/Magento/Tax/Model/Calculation.php b/app/code/Magento/Tax/Model/Calculation.php
index 1c04f6f5fb9f4..649fa87a3286c 100644
--- a/app/code/Magento/Tax/Model/Calculation.php
+++ b/app/code/Magento/Tax/Model/Calculation.php
@@ -114,7 +114,7 @@ class Calculation extends \Magento\Framework\Model\AbstractModel
     protected $_scopeConfig;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -170,7 +170,7 @@ class Calculation extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param Config $taxConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Customer\Model\CustomerFactory $customerFactory
      * @param Resource\TaxClass\CollectionFactory $classesFactory
@@ -189,7 +189,7 @@ public function __construct(
         \Magento\Framework\Registry $registry,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         Config $taxConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Customer\Model\CustomerFactory $customerFactory,
         \Magento\Tax\Model\Resource\TaxClass\CollectionFactory $classesFactory,
@@ -397,19 +397,19 @@ protected function getRateOriginRequest($store = null)
         $request->setCountryId(
             $this->_scopeConfig->getValue(
                 \Magento\Shipping\Model\Config::XML_PATH_ORIGIN_COUNTRY_ID,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $store
             )
         )->setRegionId(
             $this->_scopeConfig->getValue(
                 \Magento\Shipping\Model\Config::XML_PATH_ORIGIN_REGION_ID,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $store
             )
         )->setPostcode(
             $this->_scopeConfig->getValue(
                 \Magento\Shipping\Model\Config::XML_PATH_ORIGIN_POSTCODE,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $store
             )
         )->setCustomerClassId(
@@ -481,7 +481,7 @@ public function getRateRequest(
         $address = new \Magento\Framework\Object();
         $basedOn = $this->_scopeConfig->getValue(
             \Magento\Tax\Model\Config::CONFIG_XML_PATH_BASED_ON,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
 
@@ -533,19 +533,19 @@ public function getRateRequest(
                 $address->setCountryId(
                     $this->_scopeConfig->getValue(
                         \Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_COUNTRY,
-                        \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                         $store
                     )
                 )->setRegionId(
                     $this->_scopeConfig->getValue(
                         \Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_REGION,
-                        \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                         $store
                     )
                 )->setPostcode(
                     $this->_scopeConfig->getValue(
                         \Magento\Tax\Model\Config::CONFIG_XML_PATH_DEFAULT_POSTCODE,
-                        \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                         $store
                     )
                 );
diff --git a/app/code/Magento/Tax/Model/Config.php b/app/code/Magento/Tax/Model/Config.php
index 3c19011bd328a..116529a13b551 100644
--- a/app/code/Magento/Tax/Model/Config.php
+++ b/app/code/Magento/Tax/Model/Config.php
@@ -156,7 +156,7 @@ public function priceIncludesTax($store = null)
         }
         return (bool)$this->_scopeConfig->getValue(
             self::CONFIG_XML_PATH_PRICE_INCLUDES_TAX,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -187,7 +187,7 @@ public function applyTaxAfterDiscount($store = null)
     {
         return (bool)$this->_scopeConfig->getValue(
             self::CONFIG_XML_PATH_APPLY_AFTER_DISCOUNT,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -205,7 +205,7 @@ public function getPriceDisplayType($store = null)
     {
         return (int)$this->_scopeConfig->getValue(
             self::CONFIG_XML_PATH_PRICE_DISPLAY_TYPE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -220,7 +220,7 @@ public function discountTax($store = null)
     {
         return (int)$this->_scopeConfig->getValue(
             self::CONFIG_XML_PATH_DISCOUNT_TAX,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         ) == 1;
     }
@@ -283,7 +283,7 @@ public function getAlgorithm($store = null)
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_ALGORITHM,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -298,7 +298,7 @@ public function getShippingTaxClass($store = null)
     {
         return (int)$this->_scopeConfig->getValue(
             self::CONFIG_XML_PATH_SHIPPING_TAX_CLASS,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -313,7 +313,7 @@ public function getShippingPriceDisplayType($store = null)
     {
         return (int)$this->_scopeConfig->getValue(
             self::CONFIG_XML_PATH_DISPLAY_SHIPPING,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -329,7 +329,7 @@ public function shippingPriceIncludesTax($store = null)
         if ($this->_shippingPriceIncludeTax === null) {
             $this->_shippingPriceIncludeTax = (bool)$this->_scopeConfig->getValue(
                 self::CONFIG_XML_PATH_SHIPPING_INCLUDES_TAX,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $store
             );
         }
@@ -356,7 +356,7 @@ public function displayCartPricesInclTax($store = null)
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_CART_PRICE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         ) == self::DISPLAY_TYPE_INCLUDING_TAX;
     }
@@ -369,7 +369,7 @@ public function displayCartPricesExclTax($store = null)
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_CART_PRICE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         ) == self::DISPLAY_TYPE_EXCLUDING_TAX;
     }
@@ -382,7 +382,7 @@ public function displayCartPricesBoth($store = null)
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_CART_PRICE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         ) == self::DISPLAY_TYPE_BOTH;
     }
@@ -395,7 +395,7 @@ public function displayCartSubtotalInclTax($store = null)
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_CART_SUBTOTAL,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         ) == self::DISPLAY_TYPE_INCLUDING_TAX;
     }
@@ -408,7 +408,7 @@ public function displayCartSubtotalExclTax($store = null)
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_CART_SUBTOTAL,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         ) == self::DISPLAY_TYPE_EXCLUDING_TAX;
     }
@@ -421,7 +421,7 @@ public function displayCartSubtotalBoth($store = null)
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_CART_SUBTOTAL,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         ) == self::DISPLAY_TYPE_BOTH;
     }
@@ -434,7 +434,7 @@ public function displayCartShippingInclTax($store = null)
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_CART_SHIPPING,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         ) == self::DISPLAY_TYPE_INCLUDING_TAX;
     }
@@ -447,7 +447,7 @@ public function displayCartShippingExclTax($store = null)
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_CART_SHIPPING,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         ) == self::DISPLAY_TYPE_EXCLUDING_TAX;
     }
@@ -460,7 +460,7 @@ public function displayCartShippingBoth($store = null)
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_CART_SHIPPING,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         ) == self::DISPLAY_TYPE_BOTH;
     }
@@ -473,7 +473,7 @@ public function displayCartDiscountInclTax($store = null)
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_CART_DISCOUNT,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         ) == self::DISPLAY_TYPE_INCLUDING_TAX;
     }
@@ -486,7 +486,7 @@ public function displayCartDiscountExclTax($store = null)
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_CART_DISCOUNT,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         ) == self::DISPLAY_TYPE_EXCLUDING_TAX;
     }
@@ -499,7 +499,7 @@ public function displayCartDiscountBoth($store = null)
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_CART_DISCOUNT,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         ) == self::DISPLAY_TYPE_BOTH;
     }
@@ -512,7 +512,7 @@ public function displayCartTaxWithGrandTotal($store = null)
     {
         return (bool)$this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_CART_GRANDTOTAL,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -525,7 +525,7 @@ public function displayCartFullSummary($store = null)
     {
         return (bool)$this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_CART_FULL_SUMMARY,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -538,7 +538,7 @@ public function displayCartZeroTax($store = null)
     {
         return (bool)$this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_CART_ZERO_TAX,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -551,7 +551,7 @@ public function displaySalesPricesInclTax($store = null)
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_SALES_PRICE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         ) == self::DISPLAY_TYPE_INCLUDING_TAX;
     }
@@ -564,7 +564,7 @@ public function displaySalesPricesExclTax($store = null)
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_SALES_PRICE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         ) == self::DISPLAY_TYPE_EXCLUDING_TAX;
     }
@@ -577,7 +577,7 @@ public function displaySalesPricesBoth($store = null)
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_SALES_PRICE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         ) == self::DISPLAY_TYPE_BOTH;
     }
@@ -590,7 +590,7 @@ public function displaySalesSubtotalInclTax($store = null)
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_SALES_SUBTOTAL,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         ) == self::DISPLAY_TYPE_INCLUDING_TAX;
     }
@@ -603,7 +603,7 @@ public function displaySalesSubtotalExclTax($store = null)
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_SALES_SUBTOTAL,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         ) == self::DISPLAY_TYPE_EXCLUDING_TAX;
     }
@@ -616,7 +616,7 @@ public function displaySalesSubtotalBoth($store = null)
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_SALES_SUBTOTAL,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         ) == self::DISPLAY_TYPE_BOTH;
     }
@@ -629,7 +629,7 @@ public function displaySalesShippingInclTax($store = null)
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_SALES_SHIPPING,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         ) == self::DISPLAY_TYPE_INCLUDING_TAX;
     }
@@ -642,7 +642,7 @@ public function displaySalesShippingExclTax($store = null)
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_SALES_SHIPPING,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         ) == self::DISPLAY_TYPE_EXCLUDING_TAX;
     }
@@ -655,7 +655,7 @@ public function displaySalesShippingBoth($store = null)
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_SALES_SHIPPING,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         ) == self::DISPLAY_TYPE_BOTH;
     }
@@ -668,7 +668,7 @@ public function displaySalesDiscountInclTax($store = null)
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_SALES_DISCOUNT,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         ) == self::DISPLAY_TYPE_INCLUDING_TAX;
     }
@@ -681,7 +681,7 @@ public function displaySalesDiscountExclTax($store = null)
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_SALES_DISCOUNT,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         ) == self::DISPLAY_TYPE_EXCLUDING_TAX;
     }
@@ -694,7 +694,7 @@ public function displaySalesDiscountBoth($store = null)
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_SALES_DISCOUNT,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         ) == self::DISPLAY_TYPE_BOTH;
     }
@@ -707,7 +707,7 @@ public function displaySalesTaxWithGrandTotal($store = null)
     {
         return (bool)$this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_SALES_GRANDTOTAL,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -720,7 +720,7 @@ public function displaySalesFullSummary($store = null)
     {
         return (bool)$this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_SALES_FULL_SUMMARY,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -733,7 +733,7 @@ public function displaySalesZeroTax($store = null)
     {
         return (bool)$this->_scopeConfig->getValue(
             self::XML_PATH_DISPLAY_SALES_ZERO_TAX,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -748,7 +748,7 @@ public function crossBorderTradeEnabled($store = null)
     {
         return (bool)$this->_scopeConfig->getValue(
             self::CONFIG_XML_PATH_CROSS_BORDER_TRADE_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -763,7 +763,7 @@ public function isWrongDisplaySettingsIgnored($store = null)
     {
         return (bool)$this->_scopeConfig->getValue(
             self::XML_PATH_TAX_NOTIFICATION_IGNORE_PRICE_DISPLAY,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -778,7 +778,7 @@ public function isWrongDiscountSettingsIgnored($store = null)
     {
         return (bool)$this->_scopeConfig->getValue(
             self::XML_PATH_TAX_NOTIFICATION_IGNORE_DISCOUNT,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -794,7 +794,7 @@ public function getInfoUrl($store = null)
     {
         return (bool)$this->_scopeConfig->getValue(
             self::XML_PATH_TAX_NOTIFICATION_INFO_URL,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
diff --git a/app/code/Magento/Tax/Model/Resource/Calculation.php b/app/code/Magento/Tax/Model/Resource/Calculation.php
index bbaf80242bfd4..160bea26fe1f9 100644
--- a/app/code/Magento/Tax/Model/Resource/Calculation.php
+++ b/app/code/Magento/Tax/Model/Resource/Calculation.php
@@ -39,19 +39,19 @@ class Calculation extends \Magento\Framework\Model\Resource\Db\AbstractDb
     protected $_taxData;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Framework\App\Resource $resource
      * @param \Magento\Tax\Helper\Data $taxData
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
         \Magento\Tax\Helper\Data $taxData,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->_taxData = $taxData;
         $this->_storeManager = $storeManager;
diff --git a/app/code/Magento/Tax/Model/Resource/Calculation/Rate/Collection.php b/app/code/Magento/Tax/Model/Resource/Calculation/Rate/Collection.php
index 67cbe339981ea..ac4b99b02345e 100644
--- a/app/code/Magento/Tax/Model/Resource/Calculation/Rate/Collection.php
+++ b/app/code/Magento/Tax/Model/Resource/Calculation/Rate/Collection.php
@@ -17,7 +17,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
     const TAX_RULES_CHUNK_SIZE = 1000;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -26,7 +26,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param mixed $connection
      * @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
      */
@@ -35,7 +35,7 @@ public function __construct(
         \Psr\Log\LoggerInterface $logger,
         \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
         \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         $connection = null,
         \Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
     ) {
diff --git a/app/code/Magento/Tax/Model/System/Message/Notifications.php b/app/code/Magento/Tax/Model/System/Message/Notifications.php
index 5ce6b7dea38af..ae214839b1171 100644
--- a/app/code/Magento/Tax/Model/System/Message/Notifications.php
+++ b/app/code/Magento/Tax/Model/System/Message/Notifications.php
@@ -13,7 +13,7 @@ class Notifications implements \Magento\Framework\Notification\MessageInterface
     /**
      * Store manager object
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -44,12 +44,12 @@ class Notifications implements \Magento\Framework\Notification\MessageInterface
     protected $storesWithInvalidDiscountSettings;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\UrlInterface $urlBuilder
      * @param \Magento\Tax\Model\Config $taxConfig
      */
     public function __construct(
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\UrlInterface $urlBuilder,
         \Magento\Tax\Model\Config $taxConfig
     ) {
diff --git a/app/code/Magento/Tax/Model/TaxCalculation.php b/app/code/Magento/Tax/Model/TaxCalculation.php
index c4a2471d62689..4c465ca55d9b6 100644
--- a/app/code/Magento/Tax/Model/TaxCalculation.php
+++ b/app/code/Magento/Tax/Model/TaxCalculation.php
@@ -17,7 +17,7 @@
 use Magento\Tax\Model\Calculation\CalculatorFactory;
 use Magento\Tax\Model\Config;
 use Magento\Tax\Model\Calculation\AbstractCalculator;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Tax\Api\TaxCalculationInterface;
 
 /**
@@ -61,7 +61,7 @@ class TaxCalculation implements TaxCalculationInterface
     protected $taxDetailsItemDataObjectFactory;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
diff --git a/app/code/Magento/Tax/etc/acl.xml b/app/code/Magento/Tax/etc/acl.xml
index cb6de9574885e..e84396889f4dc 100644
--- a/app/code/Magento/Tax/etc/acl.xml
+++ b/app/code/Magento/Tax/etc/acl.xml
@@ -8,11 +8,11 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::stores">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::stores">
                     <resource id="Magento_Tax::manage_tax" title="Taxes" sortOrder="20" />
-                    <resource id="Magento_Adminhtml::stores_settings">
-                        <resource id="Magento_Adminhtml::config">
+                    <resource id="Magento_Backend::stores_settings">
+                        <resource id="Magento_Backend::config">
                             <resource id="Magento_Tax::config_tax" title="Tax Section" sortOrder="55" />
                         </resource>
                     </resource>
diff --git a/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_edit.xml b/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_edit.xml
index 171d492c915db..fa67d8474a7e9 100644
--- a/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_edit.xml
+++ b/app/code/Magento/Tax/view/adminhtml/layout/tax_rule_edit.xml
@@ -9,7 +9,7 @@
     <head>
         <link src="Magento_Tax::js/bootstrap.js"/>
         <css src="jquery/editableMultiselect/css/jquery.multiselect.css"/>
-        <css src="Magento_Core::prototype/magento.css"/>
+        <css src="Magento_Theme::prototype/magento.css"/>
     </head>
     <body>
         <referenceContainer name="content">
diff --git a/app/code/Magento/TaxImportExport/etc/acl.xml b/app/code/Magento/TaxImportExport/etc/acl.xml
index a5edf66dac851..6a5ea83cbcb19 100644
--- a/app/code/Magento/TaxImportExport/etc/acl.xml
+++ b/app/code/Magento/TaxImportExport/etc/acl.xml
@@ -8,9 +8,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::system">
-                    <resource id="Magento_Adminhtml::convert">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::system">
+                    <resource id="Magento_Backend::convert">
                         <resource id="Magento_TaxImportExport::import_export" title="Import/Export Tax Rates" sortOrder="30" />
                     </resource>
                 </resource>
diff --git a/app/code/Magento/Theme/Block/Html/Footer.php b/app/code/Magento/Theme/Block/Html/Footer.php
index 86ecbf7177c7d..f5dac383b3a8f 100644
--- a/app/code/Magento/Theme/Block/Html/Footer.php
+++ b/app/code/Magento/Theme/Block/Html/Footer.php
@@ -79,7 +79,7 @@ public function getCopyright()
         if (!$this->_copyright) {
             $this->_copyright = $this->_scopeConfig->getValue(
                 'design/footer/copyright',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
         return $this->_copyright;
diff --git a/app/code/Magento/Theme/Block/Html/Header.php b/app/code/Magento/Theme/Block/Html/Header.php
index b880ea217ae6d..dd74a7e49e8bc 100644
--- a/app/code/Magento/Theme/Block/Html/Header.php
+++ b/app/code/Magento/Theme/Block/Html/Header.php
@@ -76,7 +76,7 @@ public function getWelcome()
             } else {
                 $this->_data['welcome'] = $this->_scopeConfig->getValue(
                     'design/header/welcome',
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 );
             }
         }
diff --git a/app/code/Magento/Theme/Block/Html/Header/Logo.php b/app/code/Magento/Theme/Block/Html/Header/Logo.php
index 4610f2bb1973a..2956d9426b197 100644
--- a/app/code/Magento/Theme/Block/Html/Header/Logo.php
+++ b/app/code/Magento/Theme/Block/Html/Header/Logo.php
@@ -72,7 +72,7 @@ public function getLogoAlt()
         if (empty($this->_data['logo_alt'])) {
             $this->_data['logo_alt'] = $this->_scopeConfig->getValue(
                 'design/header/logo_alt',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
         return $this->_data['logo_alt'];
@@ -88,7 +88,7 @@ protected function _getLogoUrl()
         $folderName = \Magento\Backend\Model\Config\Backend\Image\Logo::UPLOAD_DIR;
         $storeLogoPath = $this->_scopeConfig->getValue(
             'design/header/logo_src',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         $path = $folderName . '/' . $storeLogoPath;
         $logoUrl = $this->_urlBuilder
diff --git a/app/code/Magento/Theme/Block/Html/Notices.php b/app/code/Magento/Theme/Block/Html/Notices.php
index 6cd8ef5ac95fb..8702634c39a2c 100644
--- a/app/code/Magento/Theme/Block/Html/Notices.php
+++ b/app/code/Magento/Theme/Block/Html/Notices.php
@@ -28,7 +28,7 @@ public function displayNoscriptNotice()
     {
         return $this->_scopeConfig->getValue(
             'web/browser_capabilities/javascript',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
@@ -41,7 +41,7 @@ public function displayNoLocalStorageNotice()
     {
         return $this->_scopeConfig->getValue(
             'web/browser_capabilities/local_storage',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
@@ -54,7 +54,7 @@ public function displayDemoNotice()
     {
         return $this->_scopeConfig->getValue(
             'design/head/demonotice',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 }
diff --git a/app/code/Magento/Theme/Block/Html/Pager.php b/app/code/Magento/Theme/Block/Html/Pager.php
index ca72861dfd12d..30f416f7fcd23 100644
--- a/app/code/Magento/Theme/Block/Html/Pager.php
+++ b/app/code/Magento/Theme/Block/Html/Pager.php
@@ -708,7 +708,7 @@ public function getAnchorTextForPrevious()
     {
         return $this->_scopeConfig->getValue(
             'design/pagination/anchor_text_for_previous',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
@@ -721,7 +721,7 @@ public function getAnchorTextForNext()
     {
         return $this->_scopeConfig->getValue(
             'design/pagination/anchor_text_for_next',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
diff --git a/app/code/Magento/Theme/Model/Config.php b/app/code/Magento/Theme/Model/Config.php
index d6204807af117..5d7c6cab55f37 100644
--- a/app/code/Magento/Theme/Model/Config.php
+++ b/app/code/Magento/Theme/Model/Config.php
@@ -22,7 +22,7 @@ class Config
     protected $_configData;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -46,7 +46,7 @@ class Config
     /**
      * @param \Magento\Framework\App\Config\ValueInterface $configData
      * @param \Magento\Framework\App\Config\Storage\WriterInterface $configWriter
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Framework\Cache\FrontendInterface $configCache
      * @param \Magento\Framework\Cache\FrontendInterface $layoutCache
@@ -54,7 +54,7 @@ class Config
     public function __construct(
         \Magento\Framework\App\Config\ValueInterface $configData,
         \Magento\Framework\App\Config\Storage\WriterInterface $configWriter,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Framework\Cache\FrontendInterface $configCache,
         \Magento\Framework\Cache\FrontendInterface $layoutCache
@@ -78,7 +78,7 @@ public function __construct(
     public function assignToStore(
         $theme,
         array $stores = [],
-        $scope = \Magento\Framework\Store\ScopeInterface::SCOPE_STORES
+        $scope = \Magento\Store\Model\ScopeInterface::SCOPE_STORES
     ) {
         $isReassigned = false;
 
diff --git a/app/code/Magento/Theme/Model/Config/Customization.php b/app/code/Magento/Theme/Model/Config/Customization.php
index f3c2b4888c4f2..c0c02830ffb80 100644
--- a/app/code/Magento/Theme/Model/Config/Customization.php
+++ b/app/code/Magento/Theme/Model/Config/Customization.php
@@ -11,7 +11,7 @@
 class Customization
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -42,12 +42,12 @@ class Customization
     protected $_unassignedTheme;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\View\DesignInterface $design
      * @param \Magento\Framework\View\Design\Theme\ThemeProviderInterface $themeProvider
      */
     public function __construct(
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\View\DesignInterface $design,
         \Magento\Framework\View\Design\Theme\ThemeProviderInterface $themeProvider
     ) {
diff --git a/app/code/Magento/Theme/Model/CopyService.php b/app/code/Magento/Theme/Model/CopyService.php
index be128b44af1fe..5fd2cea5f78e5 100644
--- a/app/code/Magento/Theme/Model/CopyService.php
+++ b/app/code/Magento/Theme/Model/CopyService.php
@@ -25,12 +25,12 @@ class CopyService
     protected $_fileFactory;
 
     /**
-     * @var \Magento\Core\Model\Layout\Link
+     * @var \Magento\Widget\Model\Layout\Link
      */
     protected $_link;
 
     /**
-     * @var \Magento\Core\Model\Layout\UpdateFactory
+     * @var \Magento\Widget\Model\Layout\UpdateFactory
      */
     protected $_updateFactory;
 
@@ -47,16 +47,16 @@ class CopyService
     /**
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\View\Design\Theme\FileFactory $fileFactory
-     * @param \Magento\Core\Model\Layout\Link $link
-     * @param \Magento\Core\Model\Layout\UpdateFactory $updateFactory
+     * @param \Magento\Widget\Model\Layout\Link $link
+     * @param \Magento\Widget\Model\Layout\UpdateFactory $updateFactory
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\Framework\View\Design\Theme\Customization\Path $customization
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
         \Magento\Framework\View\Design\Theme\FileFactory $fileFactory,
-        \Magento\Core\Model\Layout\Link $link,
-        \Magento\Core\Model\Layout\UpdateFactory $updateFactory,
+        \Magento\Widget\Model\Layout\Link $link,
+        \Magento\Widget\Model\Layout\UpdateFactory $updateFactory,
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Framework\View\Design\Theme\Customization\Path $customization
     ) {
@@ -122,17 +122,17 @@ protected function _copyDatabaseCustomization(ThemeInterface $source, ThemeInter
     protected function _copyLayoutCustomization(ThemeInterface $source, ThemeInterface $target)
     {
         $update = $this->_updateFactory->create();
-        /** @var $targetUpdates \Magento\Core\Model\Resource\Layout\Update\Collection */
+        /** @var $targetUpdates \Magento\Widget\Model\Resource\Layout\Update\Collection */
         $targetUpdates = $update->getCollection();
         $targetUpdates->addThemeFilter($target->getId());
         $targetUpdates->delete();
 
-        /** @var $sourceCollection \Magento\Core\Model\Resource\Layout\Link\Collection */
+        /** @var $sourceCollection \Magento\Widget\Model\Resource\Layout\Link\Collection */
         $sourceCollection = $this->_link->getCollection();
         $sourceCollection->addThemeFilter($source->getId());
-        /** @var $layoutLink \Magento\Core\Model\Layout\Link */
+        /** @var $layoutLink \Magento\Widget\Model\Layout\Link */
         foreach ($sourceCollection as $layoutLink) {
-            /** @var $update \Magento\Core\Model\Layout\Update */
+            /** @var $update \Magento\Widget\Model\Layout\Update */
             $update = $this->_updateFactory->create();
             $update->load($layoutLink->getLayoutUpdateId());
             if ($update->getId()) {
diff --git a/app/code/Magento/Theme/Model/Favicon/Favicon.php b/app/code/Magento/Theme/Model/Favicon/Favicon.php
index b4536ca8a59fd..38b655cad853b 100644
--- a/app/code/Magento/Theme/Model/Favicon/Favicon.php
+++ b/app/code/Magento/Theme/Model/Favicon/Favicon.php
@@ -18,7 +18,7 @@ class Favicon implements \Magento\Framework\View\Page\FaviconInterface
     protected $faviconFile;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -38,13 +38,13 @@ class Favicon implements \Magento\Framework\View\Page\FaviconInterface
     protected $mediaDirectory;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Core\Helper\File\Storage\Database $fileStorageDatabase
      * @param \Magento\Framework\Filesystem $filesystem
      */
     public function __construct(
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Core\Helper\File\Storage\Database $fileStorageDatabase,
         \Magento\Framework\Filesystem $filesystem
@@ -82,7 +82,7 @@ protected function prepareFaviconFile()
         $folderName = \Magento\Backend\Model\Config\Backend\Image\Favicon::UPLOAD_DIR;
         $scopeConfig = $this->scopeConfig->getValue(
             'design/head/shortcut_icon',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         $path = $folderName . '/' . $scopeConfig;
         $faviconUrl = $this->storeManager->getStore()
diff --git a/app/code/Magento/Theme/Model/Observer.php b/app/code/Magento/Theme/Model/Observer.php
index 6a471d81b69a0..29a8eb7c42deb 100644
--- a/app/code/Magento/Theme/Model/Observer.php
+++ b/app/code/Magento/Theme/Model/Observer.php
@@ -23,7 +23,7 @@ class Observer
     protected $themeImageFactory;
 
     /**
-     * @var \Magento\Core\Model\Resource\Layout\Update\Collection
+     * @var \Magento\Widget\Model\Resource\Layout\Update\Collection
      */
     protected $updateCollection;
 
@@ -66,7 +66,7 @@ class Observer
      * Initialize dependencies.
      *
      * @param \Magento\Framework\View\Design\Theme\ImageFactory $themeImageFactory
-     * @param \Magento\Core\Model\Resource\Layout\Update\Collection $updateCollection
+     * @param \Magento\Widget\Model\Resource\Layout\Update\Collection $updateCollection
      * @param \Magento\Theme\Model\Config\Customization $themeConfig
      * @param \Magento\Framework\Event\ManagerInterface $eventDispatcher
      * @param \Magento\Framework\View\DesignInterface $design
@@ -77,7 +77,7 @@ class Observer
      */
     public function __construct(
         \Magento\Framework\View\Design\Theme\ImageFactory $themeImageFactory,
-        \Magento\Core\Model\Resource\Layout\Update\Collection $updateCollection,
+        \Magento\Widget\Model\Resource\Layout\Update\Collection $updateCollection,
         \Magento\Theme\Model\Config\Customization $themeConfig,
         \Magento\Framework\Event\ManagerInterface $eventDispatcher,
         \Magento\Framework\View\DesignInterface $design,
diff --git a/app/code/Magento/Core/Model/PageLayout/Config/Builder.php b/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
similarity index 92%
rename from app/code/Magento/Core/Model/PageLayout/Config/Builder.php
rename to app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
index 1b00180a709ad..795740b042a18 100644
--- a/app/code/Magento/Core/Model/PageLayout/Config/Builder.php
+++ b/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
@@ -5,12 +5,12 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\Model\PageLayout\Config;
+namespace Magento\Theme\Model\PageLayout\Config;
 
 /**
  * Page layout config builder
  */
-class Builder
+class Builder implements \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface
 {
     /**
      * @var \Magento\Framework\ObjectManagerInterface
diff --git a/app/code/Magento/Theme/Model/Theme/Image/Path.php b/app/code/Magento/Theme/Model/Theme/Image/Path.php
index 55453dc27c21e..d5815ea78c997 100644
--- a/app/code/Magento/Theme/Model/Theme/Image/Path.php
+++ b/app/code/Magento/Theme/Model/Theme/Image/Path.php
@@ -17,7 +17,7 @@ class Path implements \Magento\Framework\View\Design\Theme\Image\PathInterface
     /**
      * Default theme preview image
      */
-    const DEFAULT_PREVIEW_IMAGE = 'Magento_Core::theme/default_preview.jpg';
+    const DEFAULT_PREVIEW_IMAGE = 'Magento_Theme::theme/default_preview.jpg';
 
     /**
      * Media Directory
@@ -32,7 +32,7 @@ class Path implements \Magento\Framework\View\Design\Theme\Image\PathInterface
     protected $assetRepo;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -41,12 +41,12 @@ class Path implements \Magento\Framework\View\Design\Theme\Image\PathInterface
      *
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Framework\Filesystem $filesystem,
         \Magento\Framework\View\Asset\Repository $assetRepo,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->mediaDirectory = $filesystem->getDirectoryRead(DirectoryList::MEDIA);
         $this->assetRepo = $assetRepo;
diff --git a/app/code/Magento/Theme/Model/View/Design.php b/app/code/Magento/Theme/Model/View/Design.php
index cbccc25cba247..3d7e2067cc3c8 100644
--- a/app/code/Magento/Theme/Model/View/Design.php
+++ b/app/code/Magento/Theme/Model/View/Design.php
@@ -36,7 +36,7 @@ class Design implements \Magento\Framework\View\DesignInterface
     /**
      * Store list manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -71,7 +71,7 @@ class Design implements \Magento\Framework\View\DesignInterface
     protected $_appState;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\View\Design\Theme\FlyweightFactory $flyweightFactory
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Theme\Model\ThemeFactory $themeFactory
@@ -80,7 +80,7 @@ class Design implements \Magento\Framework\View\DesignInterface
      * @param array $themes
      */
     public function __construct(
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\View\Design\Theme\FlyweightFactory $flyweightFactory,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Theme\Model\ThemeFactory $themeFactory,
@@ -172,7 +172,7 @@ public function getConfigurationDesignTheme($area = null, array $params = [])
             } else {
                 $theme = (string) $this->_scopeConfig->getValue(
                     self::XML_PATH_THEME_ID,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                     $store
                 );
             }
diff --git a/app/code/Magento/Theme/composer.json b/app/code/Magento/Theme/composer.json
index 05f4ff328579f..f6aeea48f1a1d 100644
--- a/app/code/Magento/Theme/composer.json
+++ b/app/code/Magento/Theme/composer.json
@@ -9,6 +9,7 @@
         "magento/module-backend": "0.42.0-beta7",
         "magento/module-cms": "0.42.0-beta7",
         "magento/module-eav": "0.42.0-beta7",
+        "magento/module-widget": "0.42.0-beta7",
         "magento/framework": "0.42.0-beta7",
         "magento/module-require-js": "0.42.0-beta7",
         "magento/magento-composer-installer": "*"
diff --git a/app/code/Magento/Theme/etc/acl.xml b/app/code/Magento/Theme/etc/acl.xml
index eea2ab2debd56..d2f3368a23312 100644
--- a/app/code/Magento/Theme/etc/acl.xml
+++ b/app/code/Magento/Theme/etc/acl.xml
@@ -8,9 +8,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::content">
-                    <resource id="Magento_Adminhtml::design">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::content">
+                    <resource id="Magento_Backend::design">
                         <resource id="Magento_Theme::theme" title="Themes" sortOrder="20" />
                     </resource>
                 </resource>
diff --git a/app/code/Magento/Theme/etc/di.xml b/app/code/Magento/Theme/etc/di.xml
index f7444ee959e32..e2a768983af84 100644
--- a/app/code/Magento/Theme/etc/di.xml
+++ b/app/code/Magento/Theme/etc/di.xml
@@ -6,6 +6,13 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
+    <preference for="Magento\Framework\View\Design\Theme\FileInterface" type="Magento\Theme\Model\Theme\File" />
+    <preference for="Magento\Framework\View\Design\Theme\ThemeProviderInterface" type="Magento\Theme\Model\Theme\ThemeProvider" />
+    <preference for="Magento\Framework\View\Design\Theme\FileProviderInterface" type="Magento\Theme\Model\Theme\FileProvider" />
+    <preference for="Magento\Framework\View\Design\Theme\Customization\ConfigInterface" type="Magento\Theme\Model\Theme\Customization\Config" />
+    <preference for="Magento\Framework\App\DesignInterface" type="Magento\Theme\Model\Design" />
+    <preference for="Magento\Framework\View\Page\FaviconInterface" type="Magento\Theme\Model\Favicon\Favicon" />
+    <preference for="Magento\Framework\View\Design\Theme\ListInterface" type="Magento\Theme\Model\Theme\Collection" />
     <type name="Magento\Theme\Model\Config">
         <arguments>
             <argument name="configCache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
@@ -60,4 +67,20 @@
     <type name="Magento\Framework\Url\ScopeInterface">
         <plugin name="urlSignature" type="Magento\Theme\Model\Url\Plugin\Signature"/>
     </type>
+    <type name="Magento\Theme\Model\Theme\Collection" shared="false" />
+    <type name="Magento\Theme\Model\View\Design">
+        <arguments>
+            <argument name="themes" xsi:type="array">
+                <item name="frontend" xsi:type="string">Magento/blank</item>
+                <item name="adminhtml" xsi:type="string">Magento/backend</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\App\Area">
+        <arguments>
+            <argument name="translator" xsi:type="object">Magento\Framework\Translate</argument>
+            <argument name="design" xsi:type="object">Magento\Theme\Model\Design\Proxy</argument>
+        </arguments>
+    </type>
+    <preference for="Magento\Framework\View\Model\PageLayout\Config\BuilderInterface" type="Magento\Theme\Model\PageLayout\Config\Builder"/>
 </config>
diff --git a/app/code/Magento/Core/etc/frontend/events.xml b/app/code/Magento/Theme/etc/frontend/events.xml
similarity index 100%
rename from app/code/Magento/Core/etc/frontend/events.xml
rename to app/code/Magento/Theme/etc/frontend/events.xml
diff --git a/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_edit.xml b/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_edit.xml
index c1b40f0519c6e..6df539955bce2 100644
--- a/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_edit.xml
+++ b/app/code/Magento/Theme/view/adminhtml/layout/adminhtml_system_design_theme_edit.xml
@@ -10,7 +10,7 @@
         <css src="jquery/fileUploader/css/jquery.fileupload-ui.css"/>
         <css src="Magento_Theme::css/theme.css"/>
         <css src="prototype/windows/themes/default.css"/>
-        <css src="Magento_Core::prototype/magento.css"/>
+        <css src="Magento_Theme::prototype/magento.css"/>
         <link src="Magento_Theme::js/bootstrap.js"/>
     </head>
     <body>
diff --git a/app/code/Magento/Core/view/adminhtml/web/calendar.png b/app/code/Magento/Theme/view/adminhtml/web/calendar.png
similarity index 100%
rename from app/code/Magento/Core/view/adminhtml/web/calendar.png
rename to app/code/Magento/Theme/view/adminhtml/web/calendar.png
diff --git a/app/code/Magento/Core/view/adminhtml/web/fam_book_open.png b/app/code/Magento/Theme/view/adminhtml/web/fam_book_open.png
similarity index 100%
rename from app/code/Magento/Core/view/adminhtml/web/fam_book_open.png
rename to app/code/Magento/Theme/view/adminhtml/web/fam_book_open.png
diff --git a/app/code/Magento/Core/view/adminhtml/web/prototype/magento.css b/app/code/Magento/Theme/view/adminhtml/web/prototype/magento.css
similarity index 100%
rename from app/code/Magento/Core/view/adminhtml/web/prototype/magento.css
rename to app/code/Magento/Theme/view/adminhtml/web/prototype/magento.css
diff --git a/app/code/Magento/Core/view/adminhtml/web/theme/default_preview.jpg b/app/code/Magento/Theme/view/adminhtml/web/theme/default_preview.jpg
similarity index 100%
rename from app/code/Magento/Core/view/adminhtml/web/theme/default_preview.jpg
rename to app/code/Magento/Theme/view/adminhtml/web/theme/default_preview.jpg
diff --git a/app/code/Magento/Core/view/frontend/templates/template.phtml b/app/code/Magento/Theme/view/frontend/templates/template.phtml
similarity index 100%
rename from app/code/Magento/Core/view/frontend/templates/template.phtml
rename to app/code/Magento/Theme/view/frontend/templates/template.phtml
diff --git a/app/code/Magento/Core/view/frontend/templates/text.phtml b/app/code/Magento/Theme/view/frontend/templates/text.phtml
similarity index 100%
rename from app/code/Magento/Core/view/frontend/templates/text.phtml
rename to app/code/Magento/Theme/view/frontend/templates/text.phtml
diff --git a/app/code/Magento/Core/view/frontend/web/calendar.png b/app/code/Magento/Theme/view/frontend/web/calendar.png
similarity index 100%
rename from app/code/Magento/Core/view/frontend/web/calendar.png
rename to app/code/Magento/Theme/view/frontend/web/calendar.png
diff --git a/app/code/Magento/Core/view/frontend/web/fam_book_open.png b/app/code/Magento/Theme/view/frontend/web/fam_book_open.png
similarity index 100%
rename from app/code/Magento/Core/view/frontend/web/fam_book_open.png
rename to app/code/Magento/Theme/view/frontend/web/fam_book_open.png
diff --git a/app/code/Magento/Core/view/frontend/web/prototype/magento.css b/app/code/Magento/Theme/view/frontend/web/prototype/magento.css
similarity index 100%
rename from app/code/Magento/Core/view/frontend/web/prototype/magento.css
rename to app/code/Magento/Theme/view/frontend/web/prototype/magento.css
diff --git a/app/code/Magento/Translation/Model/Inline/Config.php b/app/code/Magento/Translation/Model/Inline/Config.php
index a1b17671b574c..9545445dd9651 100644
--- a/app/code/Magento/Translation/Model/Inline/Config.php
+++ b/app/code/Magento/Translation/Model/Inline/Config.php
@@ -41,7 +41,7 @@ public function isActive($scope = null)
     {
         return $this->_scopeConfig->isSetFlag(
             'dev/translate_inline/active',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $scope
         );
     }
diff --git a/app/code/Magento/Translation/Model/Inline/Parser.php b/app/code/Magento/Translation/Model/Inline/Parser.php
index 02eade209c3ff..a7e7016904b11 100644
--- a/app/code/Magento/Translation/Model/Inline/Parser.php
+++ b/app/code/Magento/Translation/Model/Inline/Parser.php
@@ -4,12 +4,12 @@
  * See COPYING.txt for license details.
  */
 
+namespace Magento\Translation\Model\Inline;
+
 /**
  * This class is responsible for parsing content and applying necessary html element
  * wrapping and client scripts for inline translation.
  */
-namespace Magento\Translation\Model\Inline;
-
 class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
 {
     /**
@@ -95,7 +95,7 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
     protected $_resourceFactory;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -122,7 +122,7 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
     /**
      * Initialize base inline translation model
      *
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Translation\Model\Resource\StringFactory $resource
      * @param \Zend_Filter_Interface $inputFilter
      * @param \Magento\Framework\App\State $appState
@@ -131,7 +131,7 @@ class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
      */
     public function __construct(
         \Magento\Translation\Model\Resource\StringFactory $resource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Zend_Filter_Interface $inputFilter,
         \Magento\Framework\App\State $appState,
         \Magento\Framework\App\Cache\TypeListInterface $appCache,
diff --git a/app/code/Magento/Translation/composer.json b/app/code/Magento/Translation/composer.json
index 23f460bd411c0..299e8e76b34e0 100644
--- a/app/code/Magento/Translation/composer.json
+++ b/app/code/Magento/Translation/composer.json
@@ -3,9 +3,10 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
+        "magento/module-backend": "0.42.0-beta7",
         "magento/module-core": "0.42.0-beta7",
         "magento/module-store": "0.42.0-beta7",
-        "magento/module-backend": "0.42.0-beta7",
+        "magento/module-theme": "0.42.0-beta7",
         "magento/framework": "0.42.0-beta7",
         "magento/magento-composer-installer": "*"
     },
diff --git a/app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml b/app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml
index df1f13ded13f0..b537bf115636c 100644
--- a/app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml
+++ b/app/code/Magento/Translation/view/adminhtml/templates/translate_inline.phtml
@@ -9,7 +9,7 @@
 ?>
 
 <link rel="stylesheet" type="text/css" href="<?php echo $block->getViewFileUrl('prototype/windows/themes/default.css') ?>"/>
-<link rel="stylesheet" type="text/css" href="<?php echo $block->getViewFileUrl('Magento_Core::prototype/magento.css') ?>"/>
+<link rel="stylesheet" type="text/css" href="<?php echo $block->getViewFileUrl('Magento_Theme::prototype/magento.css') ?>"/>
 <link rel="stylesheet" type="text/css" href="<?php echo $block->getViewFileUrl('mage/translate-inline.css') ?>"/>
 
 <script id="translate-inline-icon" type="text/x-jQuery-tmpl">
@@ -52,7 +52,7 @@ require([
     "mage/edit-trigger",
     "mage/translate-inline"
 ], function($){
-        $('body').editTrigger({img: '<?php echo $block->getViewFileUrl('Magento_Core::fam_book_open.png') ?>', alwaysShown:true, singleElement:false});
+        $('body').editTrigger({img: '<?php echo $block->getViewFileUrl('Magento_Theme::fam_book_open.png') ?>', alwaysShown:true, singleElement:false});
         $('body').addClass('trnslate-inline-area');
 });
 </script>
diff --git a/app/code/Magento/Translation/view/frontend/templates/translate_inline.phtml b/app/code/Magento/Translation/view/frontend/templates/translate_inline.phtml
index a624247ed934e..4f2eb872f5142 100644
--- a/app/code/Magento/Translation/view/frontend/templates/translate_inline.phtml
+++ b/app/code/Magento/Translation/view/frontend/templates/translate_inline.phtml
@@ -9,7 +9,7 @@
 ?>
 
 <link rel="stylesheet" type="text/css" href="<?php echo $block->getViewFileUrl('prototype/windows/themes/default.css') ?>"/>
-<link rel="stylesheet" type="text/css" href="<?php echo $block->getViewFileUrl('Magento_Core::prototype/magento.css') ?>"/>
+<link rel="stylesheet" type="text/css" href="<?php echo $block->getViewFileUrl('Magento_Theme::prototype/magento.css') ?>"/>
 <link rel="stylesheet" type="text/css" href="<?php echo $block->getViewFileUrl('mage/translate-inline.css') ?>"/>
 
 <script id="translate-inline-icon" type="text/x-jQuery-tmpl">
@@ -52,7 +52,7 @@
         "mage/edit-trigger",
         "mage/translate-inline"
     ], function($){
-        $('body').editTrigger({img: '<?php echo $block->getViewFileUrl('Magento_Core::fam_book_open.png') ?>', alwaysShown:true, singleElement:false});
+        $('body').editTrigger({img: '<?php echo $block->getViewFileUrl('Magento_Theme::fam_book_open.png') ?>', alwaysShown:true, singleElement:false});
         $('body').addClass('trnslate-inline-area');
     });
 </script>
diff --git a/app/code/Magento/Core/view/frontend/web/translate_edit_icon.png b/app/code/Magento/Translation/view/frontend/web/translate_edit_icon.png
similarity index 100%
rename from app/code/Magento/Core/view/frontend/web/translate_edit_icon.png
rename to app/code/Magento/Translation/view/frontend/web/translate_edit_icon.png
diff --git a/app/code/Magento/Core/view/frontend/web/translate_edit_icon_hover.png b/app/code/Magento/Translation/view/frontend/web/translate_edit_icon_hover.png
similarity index 100%
rename from app/code/Magento/Core/view/frontend/web/translate_edit_icon_hover.png
rename to app/code/Magento/Translation/view/frontend/web/translate_edit_icon_hover.png
diff --git a/app/code/Magento/Ui/Component/Filter/Type/Date.php b/app/code/Magento/Ui/Component/Filter/Type/Date.php
index 30e269adc3d72..fa7a956403277 100644
--- a/app/code/Magento/Ui/Component/Filter/Type/Date.php
+++ b/app/code/Magento/Ui/Component/Filter/Type/Date.php
@@ -141,7 +141,7 @@ protected function convertDate($date, LocaleInterface $locale)
             $dateObj->setTimezone(
                 $this->scopeConfig->getValue(
                     $this->localeDate->getDefaultTimezonePath(),
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 )
             );
 
diff --git a/app/code/Magento/Ui/composer.json b/app/code/Magento/Ui/composer.json
index f239c77811814..7e8147c03b23c 100644
--- a/app/code/Magento/Ui/composer.json
+++ b/app/code/Magento/Ui/composer.json
@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
+        "magento/module-store": "0.42.0-beta7",
         "magento/module-backend": "0.42.0-beta7",
         "magento/framework": "0.42.0-beta7",
         "magento/module-eav": "0.42.0-beta7",
diff --git a/app/code/Magento/Ui/etc/adminhtml/routes.xml b/app/code/Magento/Ui/etc/adminhtml/routes.xml
index b8709c0996f4c..5bf72e1b3a1f6 100644
--- a/app/code/Magento/Ui/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Ui/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
     <router id="admin">
         <route id="mui" frontName="mui">
-            <module name="Magento_Ui" before="Magento_Adminhtml" />
+            <module name="Magento_Ui" before="Magento_Backend" />
         </route>
     </router>
 </config>
diff --git a/app/code/Magento/Ups/Block/Backend/System/CarrierConfig.php b/app/code/Magento/Ups/Block/Backend/System/CarrierConfig.php
index 3ec3e633a6884..ccdd22cf7b447 100644
--- a/app/code/Magento/Ups/Block/Backend/System/CarrierConfig.php
+++ b/app/code/Magento/Ups/Block/Backend/System/CarrierConfig.php
@@ -73,6 +73,6 @@ public function getWebsiteModel()
      */
     public function getConfig($path, $store = null)
     {
-        return $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store);
+        return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store);
     }
 }
diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index b256f0b19c2d7..e88b68ea433ca 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -250,7 +250,7 @@ public function setRequest(RateRequest $request)
         } else {
             $origCountry = $this->_scopeConfig->getValue(
                 \Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_COUNTRY_ID,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $request->getStoreId()
             );
         }
@@ -262,7 +262,7 @@ public function setRequest(RateRequest $request)
         } else {
             $origRegionCode = $this->_scopeConfig->getValue(
                 \Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_REGION_ID,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $request->getStoreId()
             );
         }
@@ -277,7 +277,7 @@ public function setRequest(RateRequest $request)
             $rowRequest->setOrigPostal(
                 $this->_scopeConfig->getValue(
                     \Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_ZIP,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                     $request->getStoreId()
                 )
             );
@@ -289,7 +289,7 @@ public function setRequest(RateRequest $request)
             $rowRequest->setOrigCity(
                 $this->_scopeConfig->getValue(
                     \Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_CITY,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                     $request->getStoreId()
                 )
             );
diff --git a/app/code/Magento/UrlRewrite/Controller/Router.php b/app/code/Magento/UrlRewrite/Controller/Router.php
index 64d646e9fd48f..ce2f31fc0d2a2 100644
--- a/app/code/Magento/UrlRewrite/Controller/Router.php
+++ b/app/code/Magento/UrlRewrite/Controller/Router.php
@@ -21,7 +21,7 @@ class Router implements \Magento\Framework\App\RouterInterface
     /** @var \Magento\Framework\UrlInterface */
     protected $url;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface */
+    /** @var \Magento\Store\Model\StoreManagerInterface */
     protected $storeManager;
 
     /** @var \Magento\Framework\App\ResponseInterface */
@@ -33,14 +33,14 @@ class Router implements \Magento\Framework\App\RouterInterface
     /**
      * @param \Magento\Framework\App\ActionFactory $actionFactory
      * @param \Magento\Framework\UrlInterface $url
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\ResponseInterface $response
      * @param UrlFinderInterface $urlFinder
      */
     public function __construct(
         \Magento\Framework\App\ActionFactory $actionFactory,
         \Magento\Framework\UrlInterface $url,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\ResponseInterface $response,
         UrlFinderInterface $urlFinder
     ) {
diff --git a/app/code/Magento/UrlRewrite/Model/Resource/UrlRewriteCollection.php b/app/code/Magento/UrlRewrite/Model/Resource/UrlRewriteCollection.php
index ee1c4b2a83987..aa9747a8ea73c 100644
--- a/app/code/Magento/UrlRewrite/Model/Resource/UrlRewriteCollection.php
+++ b/app/code/Magento/UrlRewrite/Model/Resource/UrlRewriteCollection.php
@@ -12,7 +12,7 @@ class UrlRewriteCollection extends \Magento\Framework\Model\Resource\Db\Collecti
     /**
      * Store Manager Model
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -21,7 +21,7 @@ class UrlRewriteCollection extends \Magento\Framework\Model\Resource\Db\Collecti
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param mixed $connection
      * @param \Magento\Framework\Model\Resource\Db\AbstractDb $resource
      */
@@ -30,7 +30,7 @@ public function __construct(
         \Psr\Log\LoggerInterface $logger,
         \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
         \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         $connection = null,
         \Magento\Framework\Model\Resource\Db\AbstractDb $resource = null
     ) {
diff --git a/app/code/Magento/UrlRewrite/etc/adminhtml/acl.xml b/app/code/Magento/UrlRewrite/etc/adminhtml/acl.xml
index 8ca263630f4e9..89c9f80c44cdd 100644
--- a/app/code/Magento/UrlRewrite/etc/adminhtml/acl.xml
+++ b/app/code/Magento/UrlRewrite/etc/adminhtml/acl.xml
@@ -8,9 +8,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::marketing">
-                    <resource id="Magento_Adminhtml::marketing_seo">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::marketing">
+                    <resource id="Magento_Backend::marketing_seo">
                         <resource id="Magento_UrlRewrite::urlrewrite" title="URL Rewrites" sortOrder="20" />
                     </resource>
                 </resource>
diff --git a/app/code/Magento/UrlRewrite/etc/adminhtml/routes.xml b/app/code/Magento/UrlRewrite/etc/adminhtml/routes.xml
index 87715c984cd7e..848ef0869d9e8 100644
--- a/app/code/Magento/UrlRewrite/etc/adminhtml/routes.xml
+++ b/app/code/Magento/UrlRewrite/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
     <router id="admin">
         <route id="adminhtml">
-            <module name="Magento_UrlRewrite" before="Magento_Adminhtml" />
+            <module name="Magento_UrlRewrite" before="Magento_Backend" />
         </route>
     </router>
 </config>
diff --git a/app/code/Magento/User/Model/User.php b/app/code/Magento/User/Model/User.php
index e6dc2de80badc..08bf907613175 100644
--- a/app/code/Magento/User/Model/User.php
+++ b/app/code/Magento/User/Model/User.php
@@ -120,7 +120,7 @@ class User extends AbstractModel implements StorageInterface
     protected $_transportBuilder;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -136,7 +136,7 @@ class User extends AbstractModel implements StorageInterface
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param \Magento\Framework\Model\Resource\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\Db $resourceCollection
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -151,7 +151,7 @@ public function __construct(
         \Magento\Framework\Mail\Template\TransportBuilder $transportBuilder,
         \Magento\Framework\Encryption\EncryptorInterface $encryptor,
         \Magento\Framework\Stdlib\DateTime $dateTime,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Model\Resource\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\Db $resourceCollection = null,
         array $data = []
@@ -214,7 +214,7 @@ public function __wakeup()
         $this->_roleFactory = $objectManager->get('Magento\Authorization\Model\RoleFactory');
         $this->_encryptor = $objectManager->get('Magento\Framework\Encryption\EncryptorInterface');
         $this->_transportBuilder = $objectManager->get('Magento\Framework\Mail\Template\TransportBuilder');
-        $this->_storeManager = $objectManager->get('Magento\Framework\Store\StoreManagerInterface');
+        $this->_storeManager = $objectManager->get('Magento\Store\Model\StoreManagerInterface');
     }
 
     /**
diff --git a/app/code/Magento/User/composer.json b/app/code/Magento/User/composer.json
index a01c8c5cd457f..7858879fc9c4f 100644
--- a/app/code/Magento/User/composer.json
+++ b/app/code/Magento/User/composer.json
@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
+        "magento/module-store": "0.42.0-beta7",
         "magento/module-authorization": "0.42.0-beta7",
         "magento/module-backend": "0.42.0-beta7",
         "magento/module-core": "0.42.0-beta7",
diff --git a/app/code/Magento/User/etc/acl.xml b/app/code/Magento/User/etc/acl.xml
index 2d30e0c2670ee..502b706e13856 100644
--- a/app/code/Magento/User/etc/acl.xml
+++ b/app/code/Magento/User/etc/acl.xml
@@ -8,8 +8,8 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::system">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::system">
                     <resource id="Magento_User::acl" title="Permissions" sortOrder="60">
                         <resource id="Magento_User::acl_users" title="All Users" sortOrder="10" />
                         <resource id="Magento_User::acl_roles" title="User Roles" sortOrder="30" />
diff --git a/app/code/Magento/Usps/Model/Carrier.php b/app/code/Magento/Usps/Model/Carrier.php
index adfb7e8a7586c..efccb26521a63 100644
--- a/app/code/Magento/Usps/Model/Carrier.php
+++ b/app/code/Magento/Usps/Model/Carrier.php
@@ -278,7 +278,7 @@ public function setRequest(\Magento\Quote\Model\Quote\Address\RateRequest $reque
             $r->setOrigPostal(
                 $this->_scopeConfig->getValue(
                     \Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_ZIP,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                     $request->getStoreId()
                 )
             );
@@ -290,7 +290,7 @@ public function setRequest(\Magento\Quote\Model\Quote\Address\RateRequest $reque
             $r->setOrigCountryId(
                 $this->_scopeConfig->getValue(
                     \Magento\Sales\Model\Order\Shipment::XML_PATH_STORE_COUNTRY_ID,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                     $request->getStoreId()
                 )
             );
diff --git a/app/code/Magento/Usps/composer.json b/app/code/Magento/Usps/composer.json
index 331d5e12c1061..5bd497072b8ac 100644
--- a/app/code/Magento/Usps/composer.json
+++ b/app/code/Magento/Usps/composer.json
@@ -3,6 +3,7 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
+        "magento/module-store": "0.42.0-beta7",
         "magento/module-shipping": "0.42.0-beta7",
         "magento/module-directory": "0.42.0-beta7",
         "magento/module-core": "0.42.0-beta7",
diff --git a/app/code/Magento/Webapi/Block/Adminhtml/Integration/Activate/Permissions/Tab/Webapi.php b/app/code/Magento/Webapi/Block/Adminhtml/Integration/Activate/Permissions/Tab/Webapi.php
index b6e3b1fe2913d..5c4d8056bc398 100644
--- a/app/code/Magento/Webapi/Block/Adminhtml/Integration/Activate/Permissions/Tab/Webapi.php
+++ b/app/code/Magento/Webapi/Block/Adminhtml/Integration/Activate/Permissions/Tab/Webapi.php
@@ -68,7 +68,7 @@ public function __construct(
 
     /**
      * Set the selected resources, which is an array of resource ids. If everything is allowed, the
-     * array will contain just the root resource id, which is "Magento_Adminhtml::all".
+     * array will contain just the root resource id, which is "Magento_Backend::all".
      *
      * @return void
      */
@@ -139,7 +139,7 @@ public function getResourcesTreeJson()
     /**
      * Return an array of selected resource ids. If everything is allowed then iterate through all
      * available resources to generate a comprehensive array of all resource ids, rather than just
-     * returning "Magento_Adminhtml::all".
+     * returning "Magento_Backend::all".
      *
      * @return string
      */
diff --git a/app/code/Magento/Webapi/Model/PathProcessor.php b/app/code/Magento/Webapi/Model/PathProcessor.php
index c52baf7ffa802..243e2940e8cf4 100644
--- a/app/code/Magento/Webapi/Model/PathProcessor.php
+++ b/app/code/Magento/Webapi/Model/PathProcessor.php
@@ -11,14 +11,14 @@
 class PathProcessor
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     private $storeManager;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
-    public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager)
+    public function __construct(\Magento\Store\Model\StoreManagerInterface $storeManager)
     {
         $this->storeManager = $storeManager;
     }
diff --git a/app/code/Magento/Webapi/Model/Soap/Server.php b/app/code/Magento/Webapi/Model/Soap/Server.php
index 7d8c5e01a46e0..af0160985783c 100644
--- a/app/code/Magento/Webapi/Model/Soap/Server.php
+++ b/app/code/Magento/Webapi/Model/Soap/Server.php
@@ -44,7 +44,7 @@ class Server
     protected $_request;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -70,7 +70,7 @@ class Server
      * @param \Magento\Framework\Config\ScopeInterface $configScope
      * @param \Magento\Webapi\Controller\Soap\Request $request
      * @param \Magento\Framework\DomDocument\Factory $domDocumentFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Webapi\Model\Soap\Server\Factory $soapServerFactory
      * @param \Magento\Framework\Reflection\TypeProcessor $typeProcessor
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -81,7 +81,7 @@ public function __construct(
         \Magento\Framework\Config\ScopeInterface $configScope,
         \Magento\Webapi\Controller\Soap\Request $request,
         \Magento\Framework\DomDocument\Factory $domDocumentFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Webapi\Model\Soap\Server\Factory $soapServerFactory,
         \Magento\Framework\Reflection\TypeProcessor $typeProcessor,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -104,7 +104,7 @@ public function __construct(
         /** Enable or disable SOAP extension WSDL cache depending on Magento configuration. */
         $wsdlCacheEnabled = $this->_scopeConfig->isSetFlag(
             self::CONFIG_PATH_WSDL_CACHE_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         if ($wsdlCacheEnabled) {
             ini_set('soap.wsdl_cache_enabled', '1');
@@ -136,7 +136,7 @@ public function getApiCharset()
     {
         $charset = $this->_scopeConfig->getValue(
             self::CONFIG_PATH_SOAP_CHARSET,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         return $charset ? $charset : self::SOAP_DEFAULT_ENCODING;
     }
diff --git a/app/code/Magento/Webapi/Model/Soap/Wsdl/Generator.php b/app/code/Magento/Webapi/Model/Soap/Wsdl/Generator.php
index 7ac161b8213b6..53788ac0df13f 100644
--- a/app/code/Magento/Webapi/Model/Soap/Wsdl/Generator.php
+++ b/app/code/Magento/Webapi/Model/Soap/Wsdl/Generator.php
@@ -44,7 +44,7 @@ class Generator
     protected $_registeredTypes = [];
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -55,14 +55,14 @@ class Generator
      * @param Factory $wsdlFactory
      * @param \Magento\Webapi\Model\Cache\Type $cache
      * @param \Magento\Framework\Reflection\TypeProcessor $typeProcessor
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Webapi\Model\Soap\Config $apiConfig,
         Factory $wsdlFactory,
         \Magento\Webapi\Model\Cache\Type $cache,
         \Magento\Framework\Reflection\TypeProcessor $typeProcessor,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->_apiConfig = $apiConfig;
         $this->_wsdlFactory = $wsdlFactory;
diff --git a/app/code/Magento/Weee/Helper/Data.php b/app/code/Magento/Weee/Helper/Data.php
index 60331dc441fc2..aa6ac7d19875f 100644
--- a/app/code/Magento/Weee/Helper/Data.php
+++ b/app/code/Magento/Weee/Helper/Data.php
@@ -64,13 +64,13 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     protected $_weeeConfig;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Weee\Model\Tax $weeeTax
      * @param \Magento\Weee\Model\Config $weeeConfig
      * @param \Magento\Tax\Helper\Data $taxData
@@ -78,7 +78,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Weee\Model\Tax $weeeTax,
         \Magento\Weee\Model\Config $weeeConfig,
         \Magento\Tax\Helper\Data $taxData,
diff --git a/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php b/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php
index 80f129ee53157..284593f0d3cfd 100644
--- a/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php
+++ b/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php
@@ -15,7 +15,7 @@ class Tax extends \Magento\Catalog\Model\Product\Attribute\Backend\Price
     protected $_attributeTax;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -26,7 +26,7 @@ class Tax extends \Magento\Catalog\Model\Product\Attribute\Backend\Price
 
     /**
      * @param \Magento\Directory\Model\CurrencyFactory $currencyFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Helper\Data $catalogData
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      * @param \Magento\Directory\Helper\Data $directoryHelper
@@ -34,7 +34,7 @@ class Tax extends \Magento\Catalog\Model\Product\Attribute\Backend\Price
      */
     public function __construct(
         \Magento\Directory\Model\CurrencyFactory $currencyFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Helper\Data $catalogData,
         \Magento\Framework\App\Config\ScopeConfigInterface $config,
         \Magento\Directory\Helper\Data $directoryHelper,
diff --git a/app/code/Magento/Weee/Model/Config.php b/app/code/Magento/Weee/Model/Config.php
index bb29336adea74..aebe98ed8d72f 100644
--- a/app/code/Magento/Weee/Model/Config.php
+++ b/app/code/Magento/Weee/Model/Config.php
@@ -60,7 +60,7 @@ public function getPriceDisplayType($store = null)
     {
         return $this->scopeConfig->getValue(
             self::XML_PATH_FPT_DISPLAY_PRODUCT_VIEW,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -75,7 +75,7 @@ public function getListPriceDisplayType($store = null)
     {
         return $this->scopeConfig->getValue(
             self::XML_PATH_FPT_DISPLAY_PRODUCT_LIST,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -90,7 +90,7 @@ public function getSalesPriceDisplayType($store = null)
     {
         return $this->scopeConfig->getValue(
             self::XML_PATH_FPT_DISPLAY_SALES,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -105,7 +105,7 @@ public function getEmailPriceDisplayType($store = null)
     {
         return $this->scopeConfig->getValue(
             self::XML_PATH_FPT_DISPLAY_EMAIL,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -120,7 +120,7 @@ public function includeInSubtotal($store = null)
     {
         return $this->scopeConfig->isSetFlag(
             self::XML_PATH_FPT_INCLUDE_IN_SUBTOTAL,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -135,7 +135,7 @@ public function isTaxable($store = null)
     {
         return $this->scopeConfig->isSetFlag(
             self::XML_PATH_FPT_TAXABLE,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
@@ -150,7 +150,7 @@ public function isEnabled($store = null)
     {
         return $this->scopeConfig->getValue(
             self::XML_PATH_FPT_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         );
     }
diff --git a/app/code/Magento/Weee/Model/Resource/Attribute/Backend/Weee/Tax.php b/app/code/Magento/Weee/Model/Resource/Attribute/Backend/Weee/Tax.php
index eeae9174af042..ee2d81eaa9ae6 100644
--- a/app/code/Magento/Weee/Model/Resource/Attribute/Backend/Weee/Tax.php
+++ b/app/code/Magento/Weee/Model/Resource/Attribute/Backend/Weee/Tax.php
@@ -13,17 +13,17 @@
 class Tax extends \Magento\Framework\Model\Resource\Db\AbstractDb
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
     /**
      * @param \Magento\Framework\App\Resource $resource
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      */
     public function __construct(
         \Magento\Framework\App\Resource $resource,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager
+        \Magento\Store\Model\StoreManagerInterface $storeManager
     ) {
         $this->_storeManager = $storeManager;
         parent::__construct($resource);
diff --git a/app/code/Magento/Weee/Model/Tax.php b/app/code/Magento/Weee/Model/Tax.php
index 0af28c3883985..7eab12df0722d 100644
--- a/app/code/Magento/Weee/Model/Tax.php
+++ b/app/code/Magento/Weee/Model/Tax.php
@@ -54,7 +54,7 @@ class Tax extends \Magento\Framework\Model\AbstractModel
     protected $_attributeFactory;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -89,7 +89,7 @@ class Tax extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Eav\Model\Entity\AttributeFactory $attributeFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Tax\Model\CalculationFactory $calculationFactory
      * @param \Magento\Customer\Model\Session $customerSession
      * @param AccountManagementInterface $accountManagement
@@ -105,7 +105,7 @@ public function __construct(
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\Registry $registry,
         \Magento\Eav\Model\Entity\AttributeFactory $attributeFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Tax\Model\CalculationFactory $calculationFactory,
         \Magento\Customer\Model\Session $customerSession,
         AccountManagementInterface $accountManagement,
diff --git a/app/code/Magento/Core/Model/Layout/Link.php b/app/code/Magento/Widget/Model/Layout/Link.php
similarity index 59%
rename from app/code/Magento/Core/Model/Layout/Link.php
rename to app/code/Magento/Widget/Model/Layout/Link.php
index a2b4251c1c9a4..7c93d913fa0a6 100644
--- a/app/code/Magento/Core/Model/Layout/Link.php
+++ b/app/code/Magento/Widget/Model/Layout/Link.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\Model\Layout;
+namespace Magento\Widget\Model\Layout;
 
 /**
  * Layout Link model class
@@ -11,9 +11,9 @@
  * @method int getStoreId()
  * @method int getThemeId()
  * @method int getLayoutUpdateId()
- * @method \Magento\Core\Model\Layout\Link setStoreId($id)
- * @method \Magento\Core\Model\Layout\Link setThemeId($id)
- * @method \Magento\Core\Model\Layout\Link setLayoutUpdateId($id)
+ * @method \Magento\Widget\Model\Layout\Link setStoreId($id)
+ * @method \Magento\Widget\Model\Layout\Link setThemeId($id)
+ * @method \Magento\Widget\Model\Layout\Link setLayoutUpdateId($id)
  */
 class Link extends \Magento\Framework\Model\AbstractModel
 {
@@ -24,6 +24,6 @@ class Link extends \Magento\Framework\Model\AbstractModel
      */
     protected function _construct()
     {
-        $this->_init('Magento\Core\Model\Resource\Layout\Link');
+        $this->_init('Magento\Widget\Model\Resource\Layout\Link');
     }
 }
diff --git a/app/code/Magento/Core/Model/Layout/Update.php b/app/code/Magento/Widget/Model/Layout/Update.php
similarity index 70%
rename from app/code/Magento/Core/Model/Layout/Update.php
rename to app/code/Magento/Widget/Model/Layout/Update.php
index 4ebe6bff17f6b..b8d6e965c2f8e 100644
--- a/app/code/Magento/Core/Model/Layout/Update.php
+++ b/app/code/Magento/Widget/Model/Layout/Update.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\Model\Layout;
+namespace Magento\Widget\Model\Layout;
 
 /**
  * Layout Update model class
@@ -12,13 +12,13 @@
  * @method int getLayoutLinkId() getLayoutLinkId()
  * @method string getUpdatedAt() getUpdatedAt()
  * @method string getXml() getXml()
- * @method \Magento\Core\Model\Layout\Update setIsTemporary() setIsTemporary(int $isTemporary)
- * @method \Magento\Core\Model\Layout\Update setHandle() setHandle(string $handle)
- * @method \Magento\Core\Model\Layout\Update setXml() setXml(string $xml)
- * @method \Magento\Core\Model\Layout\Update setStoreId() setStoreId(int $storeId)
- * @method \Magento\Core\Model\Layout\Update setThemeId() setThemeId(int $themeId)
- * @method \Magento\Core\Model\Layout\Update setUpdatedAt() setUpdatedAt(string $updateDateTime)
- * @method \Magento\Core\Model\Resource\Layout\Update\Collection getCollection()
+ * @method \Magento\Widget\Model\Layout\Update setIsTemporary() setIsTemporary(int $isTemporary)
+ * @method \Magento\Widget\Model\Layout\Update setHandle() setHandle(string $handle)
+ * @method \Magento\Widget\Model\Layout\Update setXml() setXml(string $xml)
+ * @method \Magento\Widget\Model\Layout\Update setStoreId() setStoreId(int $storeId)
+ * @method \Magento\Widget\Model\Layout\Update setThemeId() setThemeId(int $themeId)
+ * @method \Magento\Widget\Model\Layout\Update setUpdatedAt() setUpdatedAt(string $updateDateTime)
+ * @method \Magento\Widget\Model\Resource\Layout\Update\Collection getCollection()
  */
 class Update extends \Magento\Framework\Model\AbstractModel
 {
@@ -54,7 +54,7 @@ public function __construct(
      */
     protected function _construct()
     {
-        $this->_init('Magento\Core\Model\Resource\Layout\Update');
+        $this->_init('Magento\Widget\Model\Resource\Layout\Update');
     }
 
     /**
diff --git a/app/code/Magento/Core/Model/Resource/Layout/Link.php b/app/code/Magento/Widget/Model/Resource/Layout/Link.php
similarity index 75%
rename from app/code/Magento/Core/Model/Resource/Layout/Link.php
rename to app/code/Magento/Widget/Model/Resource/Layout/Link.php
index 3b42628a192ca..c8bd107d58d0f 100644
--- a/app/code/Magento/Core/Model/Resource/Layout/Link.php
+++ b/app/code/Magento/Widget/Model/Resource/Layout/Link.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\Model\Resource\Layout;
+namespace Magento\Widget\Model\Resource\Layout;
 
 /**
  * Layout Link resource model
@@ -17,6 +17,6 @@ class Link extends \Magento\Framework\Model\Resource\Db\AbstractDb
      */
     protected function _construct()
     {
-        $this->_init('core_layout_link', 'layout_link_id');
+        $this->_init('layout_link', 'layout_link_id');
     }
 }
diff --git a/app/code/Magento/Core/Model/Resource/Layout/Link/Collection.php b/app/code/Magento/Widget/Model/Resource/Layout/Link/Collection.php
similarity index 93%
rename from app/code/Magento/Core/Model/Resource/Layout/Link/Collection.php
rename to app/code/Magento/Widget/Model/Resource/Layout/Link/Collection.php
index 4498e969f1a8c..6da9307ea445b 100644
--- a/app/code/Magento/Core/Model/Resource/Layout/Link/Collection.php
+++ b/app/code/Magento/Widget/Model/Resource/Layout/Link/Collection.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\Model\Resource\Layout\Link;
+namespace Magento\Widget\Model\Resource\Layout\Link;
 
 /**
  * Layout update collection model
@@ -45,7 +45,7 @@ public function __construct(
     protected function _construct()
     {
         parent::_construct();
-        $this->_init('Magento\Core\Model\Layout\Link', 'Magento\Core\Model\Resource\Layout\Link');
+        $this->_init('Magento\Widget\Model\Layout\Link', 'Magento\Widget\Model\Resource\Layout\Link');
     }
 
     /**
@@ -71,7 +71,7 @@ protected function _joinWithUpdate($fields = [])
         $flagName = 'joined_with_update_table';
         if (!$this->getFlag($flagName)) {
             $this->getSelect()->join(
-                ['update' => $this->getTable('core_layout_update')],
+                ['update' => $this->getTable('layout_update')],
                 'update.layout_update_id = main_table.layout_update_id',
                 [$fields]
             );
diff --git a/app/code/Magento/Widget/Model/Resource/Layout/Plugin.php b/app/code/Magento/Widget/Model/Resource/Layout/Plugin.php
new file mode 100644
index 0000000000000..64595658c4146
--- /dev/null
+++ b/app/code/Magento/Widget/Model/Resource/Layout/Plugin.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Widget\Model\Resource\Layout;
+
+/**
+ * Class Plugin
+ *
+ * @package Magento\Widget\Model\Resource\Layout
+ */
+class Plugin
+{
+    /**
+     * @var \Magento\Widget\Model\Resource\Layout\Update
+     */
+    private $update;
+
+    /**
+     * @var \Magento\Framework\View\Design\ThemeInterface
+     */
+    private $theme;
+
+    /**
+     * @var \Magento\Framework\App\ScopeInterface
+     */
+    private $store;
+
+    /**
+     * @param \Magento\Widget\Model\Resource\Layout\Update $update
+     */
+    public function __construct(
+        \Magento\Widget\Model\Resource\Layout\Update $update
+    ) {
+        $this->update = $update;
+    }
+
+    /**
+     * Around getDbUpdateString
+     *
+     * @param \Magento\Framework\View\Model\Layout\Merge $subject
+     * @param callable $proceed
+     * @param string $handle
+     * @return string
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function aroundGetDbUpdateString(
+        \Magento\Framework\View\Model\Layout\Merge $subject,
+        \Closure $proceed,
+        $handle
+    ) {
+        return $this->update->fetchUpdatesByHandle($handle, $subject->getTheme(), $subject->getScope());
+    }
+} 
\ No newline at end of file
diff --git a/app/code/Magento/Core/Model/Resource/Layout/Update.php b/app/code/Magento/Widget/Model/Resource/Layout/Update.php
similarity index 88%
rename from app/code/Magento/Core/Model/Resource/Layout/Update.php
rename to app/code/Magento/Widget/Model/Resource/Layout/Update.php
index 00d3e0eff8281..5da0de6c0477a 100644
--- a/app/code/Magento/Core/Model/Resource/Layout/Update.php
+++ b/app/code/Magento/Widget/Model/Resource/Layout/Update.php
@@ -6,7 +6,7 @@
 
 // @codingStandardsIgnoreFile
 
-namespace Magento\Core\Model\Resource\Layout;
+namespace Magento\Widget\Model\Resource\Layout;
 
 /**
  * Layout update resource model
@@ -35,7 +35,7 @@ public function __construct(\Magento\Framework\App\Resource $resource, \Magento\
      */
     protected function _construct()
     {
-        $this->_init('core_layout_update', 'layout_update_id');
+        $this->_init('layout_update', 'layout_update_id');
     }
 
     /**
@@ -43,13 +43,13 @@ protected function _construct()
      *
      * @param string $handle
      * @param \Magento\Framework\View\Design\ThemeInterface $theme
-     * @param \Magento\Store\Model\Store $store
+     * @param \Magento\Framework\App\ScopeInterface $store
      * @return string
      */
     public function fetchUpdatesByHandle(
         $handle,
         \Magento\Framework\View\Design\ThemeInterface $theme,
-        \Magento\Store\Model\Store $store
+        \Magento\Framework\App\ScopeInterface $store
     ) {
         $bind = ['layout_update_handle' => $handle, 'theme_id' => $theme->getId(), 'store_id' => $store->getId()];
         $result = '';
@@ -77,7 +77,7 @@ protected function _getFetchUpdatesByHandleSelect($loadAllUpdates = false)
             ['layout_update' => $this->getMainTable()],
             ['xml']
         )->join(
-            ['link' => $this->getTable('core_layout_link')],
+            ['link' => $this->getTable('layout_link')],
             'link.layout_update_id=layout_update.layout_update_id',
             ''
         )->where(
@@ -100,7 +100,7 @@ protected function _getFetchUpdatesByHandleSelect($loadAllUpdates = false)
     /**
      * Update a "layout update link" if relevant data is provided
      *
-     * @param \Magento\Core\Model\Layout\Update|\Magento\Framework\Model\AbstractModel $object
+     * @param \Magento\Widget\Model\Layout\Update|\Magento\Framework\Model\AbstractModel $object
      * @return $this
      */
     protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
@@ -108,7 +108,7 @@ protected function _afterSave(\Magento\Framework\Model\AbstractModel $object)
         $data = $object->getData();
         if (isset($data['store_id']) && isset($data['theme_id'])) {
             $this->_getWriteAdapter()->insertOnDuplicate(
-                $this->getTable('core_layout_link'),
+                $this->getTable('layout_link'),
                 [
                     'store_id' => $data['store_id'],
                     'theme_id' => $data['theme_id'],
diff --git a/app/code/Magento/Core/Model/Resource/Layout/Update/Collection.php b/app/code/Magento/Widget/Model/Resource/Layout/Update/Collection.php
similarity index 92%
rename from app/code/Magento/Core/Model/Resource/Layout/Update/Collection.php
rename to app/code/Magento/Widget/Model/Resource/Layout/Update/Collection.php
index 1404d2e57826c..e918a9d2dec43 100644
--- a/app/code/Magento/Core/Model/Resource/Layout/Update/Collection.php
+++ b/app/code/Magento/Widget/Model/Resource/Layout/Update/Collection.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\Model\Resource\Layout\Update;
+namespace Magento\Widget\Model\Resource\Layout\Update;
 
 /**
  * Layout update collection model
@@ -59,7 +59,7 @@ public function __construct(
     protected function _construct()
     {
         parent::_construct();
-        $this->_init('Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Resource\Layout\Update');
+        $this->_init('Magento\Widget\Model\Layout\Update', 'Magento\Widget\Model\Resource\Layout\Update');
     }
 
     /**
@@ -100,7 +100,7 @@ protected function _joinWithLink()
         $flagName = 'joined_with_link_table';
         if (!$this->getFlag($flagName)) {
             $this->getSelect()->join(
-                ['link' => $this->getTable('core_layout_link')],
+                ['link' => $this->getTable('layout_link')],
                 'link.layout_update_id = main_table.layout_update_id',
                 ['store_id', 'theme_id']
             );
@@ -122,7 +122,7 @@ protected function _joinLeftWithLink($fields = [])
         $flagName = 'joined_left_with_link_table';
         if (!$this->getFlag($flagName)) {
             $this->getSelect()->joinLeft(
-                ['link' => $this->getTable('core_layout_link')],
+                ['link' => $this->getTable('layout_link')],
                 'link.layout_update_id = main_table.layout_update_id',
                 [$fields]
             );
@@ -176,7 +176,7 @@ public function addNoLinksFilter()
      */
     public function delete()
     {
-        /** @var $update \Magento\Core\Model\Layout\Update */
+        /** @var $update \Magento\Widget\Model\Layout\Update */
         foreach ($this->getItems() as $update) {
             $update->delete();
         }
diff --git a/app/code/Magento/Widget/Model/Resource/Widget/Instance.php b/app/code/Magento/Widget/Model/Resource/Widget/Instance.php
index b01f5eef1712f..d27659f3c83be 100644
--- a/app/code/Magento/Widget/Model/Resource/Widget/Instance.php
+++ b/app/code/Magento/Widget/Model/Resource/Widget/Instance.php
@@ -115,8 +115,8 @@ protected function _saveLayoutUpdates($widgetInstance, $pageGroupData)
         $writeAdapter = $this->_getWriteAdapter();
         $pageLayoutUpdateIds = [];
         $storeIds = $this->_prepareStoreIds($widgetInstance->getStoreIds());
-        $layoutUpdateTable = $this->getTable('core_layout_update');
-        $layoutUpdateLinkTable = $this->getTable('core_layout_link');
+        $layoutUpdateTable = $this->getTable('layout_update');
+        $layoutUpdateLinkTable = $this->getTable('layout_link');
 
         foreach ($pageGroupData['layout_handle_updates'] as $handle) {
             $xml = $widgetInstance->generateLayoutUpdateXml(
@@ -226,7 +226,7 @@ protected function _deleteLayoutUpdates($layoutUpdateIds)
         $writeAdapter = $this->_getWriteAdapter();
         if ($layoutUpdateIds) {
             $inCond = $writeAdapter->prepareSqlCondition('layout_update_id', ['in' => $layoutUpdateIds]);
-            $writeAdapter->delete($this->getTable('core_layout_update'), $inCond);
+            $writeAdapter->delete($this->getTable('layout_update'), $inCond);
         }
         return $this;
     }
diff --git a/app/code/Magento/Widget/Model/Template/Filter.php b/app/code/Magento/Widget/Model/Template/Filter.php
index 713868ac60bb4..7b5df0165051e 100755
--- a/app/code/Magento/Widget/Model/Template/Filter.php
+++ b/app/code/Magento/Widget/Model/Template/Filter.php
@@ -28,7 +28,7 @@ class Filter extends \Magento\Cms\Model\Template\Filter
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Core\Model\VariableFactory $coreVariableFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\View\LayoutInterface $layout
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
      * @param \Magento\Framework\App\State $appState
@@ -44,7 +44,7 @@ public function __construct(
         \Magento\Framework\View\Asset\Repository $assetRepo,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Core\Model\VariableFactory $coreVariableFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\View\LayoutInterface $layout,
         \Magento\Framework\View\LayoutFactory $layoutFactory,
         \Magento\Framework\App\State $appState,
diff --git a/app/code/Magento/Widget/data/widget_setup/data-install-2.0.0.php b/app/code/Magento/Widget/data/widget_setup/data-install-2.0.0.php
index cd8b76e54949b..7f6b89ef9846b 100644
--- a/app/code/Magento/Widget/data/widget_setup/data-install-2.0.0.php
+++ b/app/code/Magento/Widget/data/widget_setup/data-install-2.0.0.php
@@ -15,6 +15,15 @@
     \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_PLAIN,
     ['instance_id']
 );
+
+$installer->appendClassAliasReplace(
+    'layout_update',
+    'xml',
+    \Magento\Framework\Module\Setup\Migration::ENTITY_TYPE_BLOCK,
+    \Magento\Framework\Module\Setup\Migration::FIELD_CONTENT_TYPE_XML,
+    ['layout_update_id']
+);
+
 $installer->doUpdateClassAliases();
 
 $installer->endSetup();
diff --git a/app/code/Magento/Widget/etc/acl.xml b/app/code/Magento/Widget/etc/acl.xml
index 493c0633ad436..25ca84c0203c2 100644
--- a/app/code/Magento/Widget/etc/acl.xml
+++ b/app/code/Magento/Widget/etc/acl.xml
@@ -8,9 +8,9 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::content">
-                    <resource id="Magento_Adminhtml::content_elements">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::content">
+                    <resource id="Magento_Backend::content_elements">
                         <resource id="Magento_Widget::widget_instance" title="Frontend Apps" sortOrder="50" />
                     </resource>
                 </resource>
diff --git a/app/code/Magento/Widget/etc/adminhtml/routes.xml b/app/code/Magento/Widget/etc/adminhtml/routes.xml
index b250370038238..4c9134c080366 100644
--- a/app/code/Magento/Widget/etc/adminhtml/routes.xml
+++ b/app/code/Magento/Widget/etc/adminhtml/routes.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/App/etc/routes.xsd">
     <router id="admin">
         <route id="adminhtml">
-            <module name="Magento_Widget" before="Magento_Adminhtml" />
+            <module name="Magento_Widget" before="Magento_Backend" />
         </route>
     </router>
 </config>
diff --git a/app/code/Magento/Widget/etc/di.xml b/app/code/Magento/Widget/etc/di.xml
index 1efde5645dcb3..a6fa351baaba7 100644
--- a/app/code/Magento/Widget/etc/di.xml
+++ b/app/code/Magento/Widget/etc/di.xml
@@ -19,10 +19,19 @@
             <argument name="cacheId" xsi:type="string">widget_config</argument>
         </arguments>
     </type>
+    <type name="Magento\Widget\Model\Resource\Layout\Update">
+        <arguments>
+            <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Layout</argument>
+        </arguments>
+    </type>
     <type name="Magento\Cms\Model\Template\FilterProvider">
         <arguments>
             <argument name="pageFilter" xsi:type="string">Magento\Widget\Model\Template\Filter</argument>
             <argument name="blockFilter" xsi:type="string">Magento\Widget\Model\Template\Filter</argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\View\Model\Layout\Merge">
+        <plugin name="widget-layout-update-plugin"
+                type="Magento\Widget\Model\Resource\Layout\Plugin" sortOrder="10"/>
+    </type>
 </config>
diff --git a/app/code/Magento/Widget/sql/widget_setup/install-2.0.0.php b/app/code/Magento/Widget/sql/widget_setup/install-2.0.0.php
index 3f91b5008df1e..cb550f6dd990f 100644
--- a/app/code/Magento/Widget/sql/widget_setup/install-2.0.0.php
+++ b/app/code/Magento/Widget/sql/widget_setup/install-2.0.0.php
@@ -7,6 +7,9 @@
 /* @var $installer \Magento\Setup\Module\SetupModule */
 $installer = $this;
 
+/* @var $connection \Magento\Framework\DB\Adapter\AdapterInterface */
+$connection = $installer->getConnection();
+
 $installer->startSetup();
 
 /**
@@ -45,9 +48,9 @@
     )->setComment(
         'Preconfigured Widgets'
     );
-    $installer->getConnection()->createTable($table);
+    $connection->createTable($table);
 } else {
-    $installer->getConnection()->dropIndex($installer->getTable('widget'), 'IDX_CODE');
+    $connection->dropIndex($installer->getTable('widget'), 'IDX_CODE');
 
     $tables = [
         $installer->getTable(
@@ -72,9 +75,9 @@
         ],
     ];
 
-    $installer->getConnection()->modifyTables($tables);
+    $connection->modifyTables($tables);
 
-    $installer->getConnection()->changeColumn(
+    $connection->changeColumn(
         $installer->getTable('widget'),
         'code',
         'widget_code',
@@ -85,14 +88,14 @@
         ]
     );
 
-    $installer->getConnection()->changeColumn(
+    $connection->changeColumn(
         $installer->getTable('widget'),
         'type',
         'widget_type',
         ['type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT, 'length' => 255, 'comment' => 'Widget Type']
     );
 
-    $installer->getConnection()->addIndex(
+    $connection->addIndex(
         $installer->getTable('widget'),
         $installer->getIdxName('widget', ['widget_code']),
         ['widget_code']
@@ -102,7 +105,7 @@
 /**
  * Create table 'widget_instance'
  */
-$table = $installer->getConnection()->newTable(
+$table = $connection->newTable(
     $installer->getTable('widget_instance')
 )->addColumn(
     'instance_id',
@@ -156,12 +159,12 @@
 )->setComment(
     'Instances of Widget for Package Theme'
 );
-$installer->getConnection()->createTable($table);
+$connection->createTable($table);
 
 /**
  * Create table 'widget_instance_page'
  */
-$table = $installer->getConnection()->newTable(
+$table = $connection->newTable(
     $installer->getTable('widget_instance_page')
 )->addColumn(
     'page_id',
@@ -224,12 +227,12 @@
 )->setComment(
     'Instance of Widget on Page'
 );
-$installer->getConnection()->createTable($table);
+$connection->createTable($table);
 
 /**
  * Create table 'widget_instance_page_layout'
  */
-$table = $installer->getConnection()->newTable(
+$table = $connection->newTable(
     $installer->getTable('widget_instance_page_layout')
 )->addColumn(
     'page_id',
@@ -262,15 +265,129 @@
     \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
     \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
 )->addForeignKey(
-    $installer->getFkName('widget_instance_page_layout', 'layout_update_id', 'core_layout_update', 'layout_update_id'),
+    $installer->getFkName('widget_instance_page_layout', 'layout_update_id', 'layout_update', 'layout_update_id'),
     'layout_update_id',
-    $installer->getTable('core_layout_update'),
+    $installer->getTable('layout_update'),
     'layout_update_id',
     \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
     \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
 )->setComment(
     'Layout updates'
 );
-$installer->getConnection()->createTable($table);
+$connection->createTable($table);
+
+/**
+ * Create table 'layout_update'
+ */
+$table = $connection->newTable(
+    $installer->getTable('layout_update')
+)->addColumn(
+    'layout_update_id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+    null,
+    ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
+    'Layout Update Id'
+)->addColumn(
+    'handle',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    255,
+    [],
+    'Handle'
+)->addColumn(
+    'xml',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+    '64k',
+    [],
+    'Xml'
+)->addColumn(
+    'sort_order',
+    \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
+    null,
+    ['nullable' => false, 'default' => '0'],
+    'Sort Order'
+)->addColumn(
+    'updated_at',
+    \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
+    null,
+    ['nullable' => true],
+    'Last Update Timestamp'
+)->addIndex(
+    $installer->getIdxName('layout_update', ['handle']),
+    ['handle']
+)->setComment(
+    'Layout Updates'
+);
+$connection->createTable($table);
+
+/**
+ * Create table 'layout_link'
+ */
+$table = $connection->newTable(
+    $installer->getTable('layout_link')
+)->addColumn(
+    'layout_link_id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+    null,
+    ['identity' => true, 'unsigned' => true, 'nullable' => false, 'primary' => true],
+    'Link Id'
+)->addColumn(
+    'store_id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_SMALLINT,
+    null,
+    ['unsigned' => true, 'nullable' => false, 'default' => '0'],
+    'Store Id'
+)->addColumn(
+    'theme_id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+    null,
+    ['unsigned' => true, 'nullable' => false],
+    'Theme id'
+)->addColumn(
+    'layout_update_id',
+    \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+    null,
+    ['unsigned' => true, 'nullable' => false, 'default' => '0'],
+    'Layout Update Id'
+)->addColumn(
+    'is_temporary',
+    \Magento\Framework\DB\Ddl\Table::TYPE_BOOLEAN,
+    null,
+    ['nullable' => false, 'default' => '0'],
+    'Defines whether Layout Update is Temporary'
+)->addIndex(
+    $installer->getIdxName('layout_link', ['layout_update_id']),
+    ['layout_update_id']
+)->addForeignKey(
+    $installer->getFkName('layout_link', 'layout_update_id', 'layout_update', 'layout_update_id'),
+    'layout_update_id',
+    $installer->getTable('layout_update'),
+    'layout_update_id',
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+)->addIndex(
+    $installer->getIdxName(
+        'layout_link',
+        ['store_id', 'theme_id', 'layout_update_id', 'is_temporary'],
+        \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_UNIQUE
+    ),
+    ['store_id', 'theme_id', 'layout_update_id', 'is_temporary']
+)->addForeignKey(
+    $installer->getFkName('layout_link', 'store_id', 'store', 'store_id'),
+    'store_id',
+    $installer->getTable('store'),
+    'store_id',
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+)->addForeignKey(
+    $installer->getFkName('layout_link', 'theme_id', 'theme', 'theme_id'),
+    'theme_id',
+    $installer->getTable('theme'),
+    'theme_id',
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE,
+    \Magento\Framework\DB\Ddl\Table::ACTION_CASCADE
+)->setComment(
+    'Layout Link'
+);
+$connection->createTable($table);
 
 $installer->endSetup();
diff --git a/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_edit.xml b/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_edit.xml
index bea500d52e677..2763ef2c44096 100644
--- a/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_edit.xml
+++ b/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_edit.xml
@@ -9,7 +9,7 @@
     <head>
         <link src="prototype/window.js"/>
         <css src="prototype/windows/themes/default.css"/>
-        <css src="Magento_Core::prototype/magento.css"/>
+        <css src="Magento_Theme::prototype/magento.css"/>
     </head>
     <body>
         <referenceContainer name="content">
diff --git a/app/code/Magento/Wishlist/Block/Rss/Link.php b/app/code/Magento/Wishlist/Block/Rss/Link.php
index ef711ecfe392a..bc5ae6908cba8 100644
--- a/app/code/Magento/Wishlist/Block/Rss/Link.php
+++ b/app/code/Magento/Wishlist/Block/Rss/Link.php
@@ -64,7 +64,7 @@ public function isRssAllowed()
     {
         return $this->_scopeConfig->isSetFlag(
             'rss/wishlist/active',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
diff --git a/app/code/Magento/Wishlist/Controller/Index/Send.php b/app/code/Magento/Wishlist/Controller/Index/Send.php
index 3eea28afb56dc..c989d815bda47 100644
--- a/app/code/Magento/Wishlist/Controller/Index/Send.php
+++ b/app/code/Magento/Wishlist/Controller/Index/Send.php
@@ -155,12 +155,12 @@ public function execute()
 
             try {
                 $scopeConfig = $this->_objectManager->get('Magento\Framework\App\Config\ScopeConfigInterface');
-                $storeManager = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface');
+                $storeManager = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface');
                 foreach ($emails as $email) {
                     $transport = $this->_transportBuilder->setTemplateIdentifier(
                         $scopeConfig->getValue(
                             'wishlist/email/email_template',
-                            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                         )
                     )->setTemplateOptions(
                         [
@@ -181,7 +181,7 @@ public function execute()
                     )->setFrom(
                         $scopeConfig->getValue(
                             'wishlist/email/email_identity',
-                            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                         )
                     )->addTo(
                         $email
diff --git a/app/code/Magento/Wishlist/Helper/Data.php b/app/code/Magento/Wishlist/Helper/Data.php
index f135ede465297..d0216995de92a 100644
--- a/app/code/Magento/Wishlist/Helper/Data.php
+++ b/app/code/Magento/Wishlist/Helper/Data.php
@@ -78,7 +78,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     protected $_wishlistFactory;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -103,7 +103,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Wishlist\Model\WishlistFactory $wishlistFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Core\Helper\PostData $postDataHelper
      * @param \Magento\Customer\Helper\View $customerViewHelper
      * @param WishlistProviderInterface $wishlistProvider
@@ -114,7 +114,7 @@ public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Wishlist\Model\WishlistFactory $wishlistFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Core\Helper\PostData $postDataHelper,
         \Magento\Customer\Helper\View $customerViewHelper,
         WishlistProviderInterface $wishlistProvider
@@ -202,13 +202,13 @@ public function getItemCount()
         $storedDisplayType = $this->_customerSession->getWishlistDisplayType();
         $currentDisplayType = $this->_scopeConfig->getValue(
             self::XML_PATH_WISHLIST_LINK_USE_QTY,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
 
         $storedDisplayOutOfStockProducts = $this->_customerSession->getDisplayOutOfStockProducts();
         $currentDisplayOutOfStockProducts = $this->_scopeConfig->getValue(
             self::XML_PATH_CATALOGINVENTORY_SHOW_OUT_OF_STOCK,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         if (!$this->_customerSession->hasWishlistItemCount() ||
             $currentDisplayType != $storedDisplayType ||
@@ -430,7 +430,7 @@ public function isAllow()
     {
         if ($this->_moduleManager->isOutputEnabled($this->_getModuleName()) && $this->_scopeConfig->getValue(
             'wishlist/general/active',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )
         ) {
             return true;
@@ -513,7 +513,7 @@ public function calculate()
             $collection = $this->getWishlistItemCollection()->setInStockFilter(true);
             if ($this->_scopeConfig->getValue(
                 self::XML_PATH_WISHLIST_LINK_USE_QTY,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
             ) {
                 $count = $collection->getItemsQty();
@@ -523,13 +523,13 @@ public function calculate()
             $this->_customerSession->setWishlistDisplayType(
                 $this->_scopeConfig->getValue(
                     self::XML_PATH_WISHLIST_LINK_USE_QTY,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 )
             );
             $this->_customerSession->setDisplayOutOfStockProducts(
                 $this->_scopeConfig->getValue(
                     self::XML_PATH_CATALOGINVENTORY_SHOW_OUT_OF_STOCK,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 )
             );
         }
@@ -547,7 +547,7 @@ public function isDisplayQty()
     {
         return $this->_scopeConfig->getValue(
             self::XML_PATH_WISHLIST_LINK_USE_QTY,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 }
diff --git a/app/code/Magento/Wishlist/Helper/Rss.php b/app/code/Magento/Wishlist/Helper/Rss.php
index e627c7743dbd2..511e865aa5934 100644
--- a/app/code/Magento/Wishlist/Helper/Rss.php
+++ b/app/code/Magento/Wishlist/Helper/Rss.php
@@ -32,7 +32,7 @@ class Rss extends \Magento\Wishlist\Helper\Data
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Wishlist\Model\WishlistFactory $wishlistFactory
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Core\Helper\PostData $postDataHelper
      * @param \Magento\Customer\Helper\View $customerViewHelper
      * @param \Magento\Wishlist\Controller\WishlistProviderInterface $wishlistProvider
@@ -46,7 +46,7 @@ public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Wishlist\Model\WishlistFactory $wishlistFactory,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Core\Helper\PostData $postDataHelper,
         \Magento\Customer\Helper\View $customerViewHelper,
         \Magento\Wishlist\Controller\WishlistProviderInterface $wishlistProvider,
@@ -122,7 +122,7 @@ public function isRssAllow()
         return $this->_moduleManager->isEnabled('Magento_Rss')
             && $this->_scopeConfig->isSetFlag(
                 'rss/wishlist/active',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
     }
 }
diff --git a/app/code/Magento/Wishlist/Model/Config.php b/app/code/Magento/Wishlist/Model/Config.php
index a8789a30d62db..de0e315021c11 100644
--- a/app/code/Magento/Wishlist/Model/Config.php
+++ b/app/code/Magento/Wishlist/Model/Config.php
@@ -44,11 +44,11 @@ public function __construct(
     ) {
         $emailLimitInConfig = (int)$scopeConfig->getValue(
             self::XML_PATH_SHARING_EMAIL_LIMIT,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         $textLimitInConfig = (int)$scopeConfig->getValue(
             self::XML_PATH_SHARING_TEXT_LIMIT,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         $this->_sharingEmailLimit = $emailLimitInConfig ?: self::SHARING_EMAIL_LIMIT;
         $this->_sharignTextLimit = $textLimitInConfig ?: self::SHARING_TEXT_LIMIT;
diff --git a/app/code/Magento/Wishlist/Model/Item.php b/app/code/Magento/Wishlist/Model/Item.php
index 33fb1733c7c20..314afecc70465 100644
--- a/app/code/Magento/Wishlist/Model/Item.php
+++ b/app/code/Magento/Wishlist/Model/Item.php
@@ -89,7 +89,7 @@ class Item extends AbstractModel implements ItemInterface
     protected $_flagOptionsSaved = null;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -126,7 +126,7 @@ class Item extends AbstractModel implements ItemInterface
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
      * @param \Magento\Catalog\Model\Resource\Url $catalogUrl
      * @param OptionFactory $wishlistOptFactory
@@ -141,7 +141,7 @@ class Item extends AbstractModel implements ItemInterface
     public function __construct(
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\Registry $registry,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Stdlib\DateTime\DateTime $date,
         \Magento\Catalog\Model\Resource\Url $catalogUrl,
         OptionFactory $wishlistOptFactory,
diff --git a/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php b/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php
index fe98c8dbf5745..6552345f30f3d 100644
--- a/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php
+++ b/app/code/Magento/Wishlist/Model/Resource/Item/Collection.php
@@ -83,7 +83,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
     protected $stockConfiguration = null;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -139,7 +139,7 @@ class Collection extends \Magento\Framework\Model\Resource\Db\Collection\Abstrac
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
      * @param \Magento\Sales\Helper\Admin $adminhtmlSales
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
      * @param \Magento\Wishlist\Model\Config $wishlistConfig
      * @param \Magento\Catalog\Model\Product\Visibility $productVisibility
@@ -161,7 +161,7 @@ public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration,
         \Magento\Sales\Helper\Admin $adminhtmlSales,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Stdlib\DateTime\DateTime $date,
         \Magento\Wishlist\Model\Config $wishlistConfig,
         \Magento\Catalog\Model\Product\Visibility $productVisibility,
diff --git a/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php b/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php
index 41cf27e9b5bf1..45eff464866a6 100644
--- a/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php
+++ b/app/code/Magento/Wishlist/Model/Resource/Item/Collection/Grid.php
@@ -28,7 +28,7 @@ class Grid extends \Magento\Wishlist\Model\Resource\Item\Collection
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration
      * @param \Magento\Sales\Helper\Admin $adminhtmlSales
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
      * @param \Magento\Wishlist\Model\Config $wishlistConfig
      * @param \Magento\Catalog\Model\Product\Visibility $productVisibility
@@ -51,7 +51,7 @@ public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\CatalogInventory\Api\StockConfigurationInterface $stockConfiguration,
         \Magento\Sales\Helper\Admin $adminhtmlSales,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Stdlib\DateTime\DateTime $date,
         \Magento\Wishlist\Model\Config $wishlistConfig,
         \Magento\Catalog\Model\Product\Visibility $productVisibility,
diff --git a/app/code/Magento/Wishlist/Model/Rss/Wishlist.php b/app/code/Magento/Wishlist/Model/Rss/Wishlist.php
index a481a648414de..88f6ab4487f08 100644
--- a/app/code/Magento/Wishlist/Model/Rss/Wishlist.php
+++ b/app/code/Magento/Wishlist/Model/Rss/Wishlist.php
@@ -116,7 +116,7 @@ public function isAllowed()
     {
         return (bool)$this->scopeConfig->getValue(
             'rss/wishlist/active',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
diff --git a/app/code/Magento/Wishlist/Model/Wishlist.php b/app/code/Magento/Wishlist/Model/Wishlist.php
index 53f1365e38a8e..45933e31a1a7f 100644
--- a/app/code/Magento/Wishlist/Model/Wishlist.php
+++ b/app/code/Magento/Wishlist/Model/Wishlist.php
@@ -75,7 +75,7 @@ class Wishlist extends \Magento\Framework\Model\AbstractModel implements \Magent
     protected $_catalogProduct;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -126,7 +126,7 @@ class Wishlist extends \Magento\Framework\Model\AbstractModel implements \Magent
      * @param \Magento\Wishlist\Helper\Data $wishlistData
      * @param ResourceWishlist $resource
      * @param Collection $resourceCollection
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $date
      * @param ItemFactory $wishlistItemFactory
      * @param CollectionFactory $wishlistCollectionFactory
@@ -145,7 +145,7 @@ public function __construct(
         \Magento\Wishlist\Helper\Data $wishlistData,
         ResourceWishlist $resource,
         Collection $resourceCollection,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Stdlib\DateTime\DateTime $date,
         ItemFactory $wishlistItemFactory,
         CollectionFactory $wishlistCollectionFactory,
diff --git a/app/code/Magento/Wishlist/etc/acl.xml b/app/code/Magento/Wishlist/etc/acl.xml
index fa928acbe59ff..a3bf442d6da72 100644
--- a/app/code/Magento/Wishlist/etc/acl.xml
+++ b/app/code/Magento/Wishlist/etc/acl.xml
@@ -8,10 +8,10 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
-                <resource id="Magento_Adminhtml::stores">
-                    <resource id="Magento_Adminhtml::stores_settings">
-                        <resource id="Magento_Adminhtml::config">
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::stores">
+                    <resource id="Magento_Backend::stores_settings">
+                        <resource id="Magento_Backend::config">
                             <resource id="Magento_Wishlist::config_wishlist" title="Wish List Section" sortOrder="80" />
                         </resource>
                     </resource>
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml b/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml
index c9e46104eb566..bbad15a0bd022 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/layout/default.xml
@@ -16,7 +16,7 @@
         <css src="css/pages.css"/>
         <css src="css/styles-old.css"/>
         <css src="mui/utils.css"/>
-        <css src="Magento_Core::prototype/magento.css"/>
+        <css src="Magento_Theme::prototype/magento.css"/>
         <css src="mui/print.css" media="print"/>
     </head>
 
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/layout/styles.xml b/app/design/adminhtml/Magento/backend/Magento_Backend/layout/styles.xml
index 7fe3ce52af9f7..8d7bc28aa03f8 100644
--- a/app/design/adminhtml/Magento/backend/Magento_Backend/layout/styles.xml
+++ b/app/design/adminhtml/Magento/backend/Magento_Backend/layout/styles.xml
@@ -17,7 +17,7 @@
         <remove src="css/styles-old.css"/>
         <remove src="jquery/farbtastic/css/farbtastic.css"/>
         <remove src="mui/utils.css"/>
-        <remove src="Magento_Core::prototype/magento.css"/>
+        <remove src="Magento_Theme::prototype/magento.css"/>
         <remove src="mui/print.css"/>
 
         <css src="css/styles.css"/>
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_cart_index.xml b/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_cart_index.xml
index fe90d5af22934..427bca31bbc00 100644
--- a/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_cart_index.xml
+++ b/app/design/frontend/Magento/blank/Magento_Checkout/layout/checkout_cart_index.xml
@@ -10,7 +10,7 @@
         <referenceContainer name="checkout.cart.items">
             <container name="checkout.cart.container" htmlTag="div" htmlClass="cart-container" before="-">
                 <container name="cart.summary" label="Cart Summary Container" htmlTag="div" htmlClass="cart-summary" after="-">
-                    <block class="Magento\Framework\View\Element\Template" name="checkout.cart.summary.title" before="-" template="Magento_Core::text.phtml">
+                    <block class="Magento\Framework\View\Element\Template" name="checkout.cart.summary.title" before="-" template="Magento_Theme::text.phtml">
                         <arguments>
                             <argument translate="true" name="text" xsi:type="string">Summary</argument>
                             <argument name="tag" xsi:type="string">strong</argument>
diff --git a/app/etc/di.xml b/app/etc/di.xml
index af058c9dc4aaf..1b30490102602 100644
--- a/app/etc/di.xml
+++ b/app/etc/di.xml
@@ -13,14 +13,13 @@
     <preference for="Magento\Framework\Search\Request\Aggregation\StatusInterface" type="Magento\Framework\Search\Request\Aggregation\Status" />
     <preference for="Magento\Framework\App\RequestInterface" type="Magento\Framework\App\Request\Http" />
     <preference for="Magento\Framework\App\Http\RequestInterface" type="Magento\Framework\App\Request\Http" />
-    <preference for="Magento\Framework\App\Request\PathInfoProcessorInterface" type="Magento\Store\App\Request\PathInfoProcessor" />
     <preference for="Magento\Framework\App\ResponseInterface" type="Magento\Framework\App\Response\Http" />
     <preference for="Magento\Framework\App\RouterListInterface" type="Magento\Framework\App\RouterList" />
     <preference for="Magento\Framework\App\FrontControllerInterface" type="Magento\Framework\App\FrontController" />
     <preference for="Magento\Framework\App\CacheInterface" type="Magento\Framework\App\Cache\Proxy" />
     <preference for="Magento\Framework\App\Cache\StateInterface" type="Magento\Framework\App\Cache\State" />
     <preference for="Magento\Framework\App\Cache\TypeListInterface" type="Magento\Framework\App\Cache\TypeList" />
-    <preference for="Magento\Framework\Store\StoreManagerInterface" type="Magento\Store\Model\StoreManager" />
+    <preference for="Magento\Store\Model\StoreManagerInterface" type="Magento\Store\Model\StoreManager" />
     <preference for="Magento\Framework\View\DesignInterface" type="Magento\Theme\Model\View\Design\Proxy" />
     <preference for="Magento\Framework\View\Design\ThemeInterface" type="Magento\Theme\Model\Theme" />
     <preference for="Magento\Framework\View\Design\Theme\ResolverInterface" type="Magento\Theme\Model\Theme\Resolver" />
@@ -48,7 +47,7 @@
     <preference for="Magento\Framework\Interception\PluginListInterface" type="Magento\Framework\Interception\PluginList\PluginList" />
     <preference for="Magento\Framework\Event\ManagerInterface" type="Magento\Framework\Event\Manager\Proxy" />
     <preference for="Magento\Framework\View\LayoutInterface" type="Magento\Framework\View\Layout" />
-    <preference for="Magento\Framework\View\Layout\ProcessorInterface" type="Magento\Core\Model\Layout\Merge" />
+    <preference for="Magento\Framework\View\Layout\ProcessorInterface" type="Magento\Framework\View\Model\Layout\Merge" />
     <preference for="Magento\Framework\View\Url\ConfigInterface" type="Magento\Framework\View\Url\Config" />
     <preference for="Magento\Framework\App\Route\ConfigInterface" type="Magento\Framework\App\Route\Config" />
     <preference for="Magento\Framework\App\Resource\ConfigInterface" type="Magento\Framework\App\Resource\Config\Proxy" />
@@ -63,6 +62,7 @@
     <preference for="Magento\Framework\Interception\ChainInterface" type="Magento\Framework\Interception\Chain\Chain" />
     <preference for="Magento\Framework\Module\Output\ConfigInterface" type="Magento\Framework\Module\Output\Config" />
     <preference for="Magento\Framework\View\Design\Theme\CustomizationInterface" type="Magento\Framework\View\Design\Theme\Customization" />
+    <preference for="Magento\Framework\View\Asset\ConfigInterface" type="Magento\Framework\View\Asset\Config" />
     <preference for="Magento\Framework\Image\Adapter\ConfigInterface" type="Magento\Framework\Image\Adapter\Config" />
     <preference for="Magento\Framework\View\Design\Theme\Image\PathInterface" type="Magento\Theme\Model\Theme\Image\Path" />
     <preference for="Magento\Framework\Session\Config\ConfigInterface" type="Magento\Framework\Session\Config" />
@@ -87,6 +87,46 @@
     <preference for="Magento\Framework\DB\LoggerInterface" type="Magento\Framework\DB\Logger\Null"/>
     <preference for="Magento\Framework\App\Resource\ConnectionAdapterInterface" type="Magento\Framework\Model\Resource\Type\Db\Pdo\Mysql"/>
     <preference for="Magento\Framework\DB\QueryInterface" type="Magento\Framework\DB\Query"/>
+    <preference for="Magento\Framework\Acl\CacheInterface" type="Magento\Framework\Acl\Cache" />
+    <preference for="Magento\Framework\App\AreaInterface" type="Magento\Framework\App\Area" />
+    <preference for="Magento\Framework\Module\Updater\SetupInterface" type="Magento\Framework\Module\DataSetup" />
+    <preference for="Magento\Framework\Module\ResourceResolverInterface" type="Magento\Framework\Module\ResourceResolver" />
+    <preference for="Magento\Framework\AuthorizationInterface" type="Magento\Framework\Authorization" />
+    <preference for="Magento\Framework\Authorization\PolicyInterface" type="Magento\Framework\Authorization\Policy\DefaultPolicy" />
+    <preference for="Magento\Framework\Authorization\RoleLocatorInterface" type="Magento\Framework\Authorization\RoleLocator\DefaultRoleLocator" />
+    <preference for="Magento\Framework\Session\SessionManagerInterface" type="Magento\Framework\Session\Generic" />
+    <preference for="Magento\Framework\App\Config\ScopeConfigInterface" type="Magento\Framework\App\Config" />
+    <preference for="Magento\Framework\App\Config\ReinitableConfigInterface" type="Magento\Framework\App\ReinitableConfig" />
+    <preference for="Magento\Framework\App\Config\MutableScopeConfigInterface" type="Magento\Framework\App\MutableScopeConfig" />
+    <preference for="Magento\Framework\App\Config\Storage\WriterInterface" type="Magento\Framework\App\Config\Storage\Writer" />
+    <preference for="Magento\Framework\Config\ConverterInterface" type="Magento\Framework\Config\Converter\Dom"/>
+    <preference for="Magento\Framework\App\DefaultPathInterface" type="Magento\Framework\App\DefaultPath\DefaultPath" />
+    <preference for="Magento\Framework\Encryption\EncryptorInterface" type="Magento\Framework\Encryption\Encryptor" />
+    <preference for="Magento\Framework\Filter\Encrypt\AdapterInterface" type="Magento\Framework\Filter\Encrypt\Basic" />
+    <preference for="Magento\Framework\Cache\ConfigInterface" type="Magento\Framework\Cache\Config" />
+    <preference for="Magento\Framework\View\Asset\MergeStrategyInterface" type="Magento\Framework\View\Asset\MergeStrategy\Direct" />
+    <preference for="Magento\Framework\App\ViewInterface" type="Magento\Framework\App\View" />
+    <preference for="Magento\Framework\Data\Collection\EntityFactoryInterface" type="Magento\Framework\Data\Collection\EntityFactory" />
+    <preference for="Magento\Framework\Translate\InlineInterface" type="Magento\Framework\Translate\Inline" />
+    <preference for="Magento\Framework\Session\ValidatorInterface" type="Magento\Framework\Session\Validator" />
+    <preference for="Magento\Framework\Session\StorageInterface" type="Magento\Framework\Session\Storage" />
+    <preference for="Magento\Framework\Url\RouteParamsResolverInterface" type="Magento\Framework\Url\RouteParamsResolver" />
+    <preference for="Magento\Framework\Url\QueryParamsResolverInterface" type="Magento\Framework\Url\QueryParamsResolver" />
+    <preference for="Magento\Framework\Url\ScopeResolverInterface" type="Magento\Framework\Url\ScopeResolver" />
+    <preference for="Magento\Framework\Url\SecurityInfoInterface" type="Magento\Framework\Url\SecurityInfo\Proxy" />
+    <preference for="Magento\Framework\Css\PreProcessor\AdapterInterface" type="Magento\Framework\Css\PreProcessor\Adapter\Oyejorge" />
+    <preference for="Magento\Framework\LocaleInterface" type="Magento\Framework\Locale" />
+    <preference for="Magento\Framework\Locale\CurrencyInterface" type="Magento\Framework\Locale\Currency" />
+    <preference for="Magento\Framework\CurrencyInterface" type="Magento\Framework\Currency" />
+    <preference for="Magento\Framework\Locale\FormatInterface" type="Magento\Framework\Locale\Format" />
+    <preference for="Magento\Framework\Locale\ResolverInterface" type="Magento\Framework\Locale\Resolver" />
+    <preference for="Magento\Framework\Stdlib\DateTime\TimezoneInterface" type="Magento\Framework\Stdlib\DateTime\Timezone" />
+    <preference for="Magento\Framework\Stdlib\DateTime\DateInterface" type="Magento\Framework\Stdlib\DateTime\Date" />
+    <preference for="Magento\Framework\Less\PreProcessor\ErrorHandlerInterface" type="Magento\Framework\Less\PreProcessor\ErrorHandler" />
+    <preference for="Magento\Framework\Module\ResourceInterface" type="Magento\Framework\Module\Resource" />
+    <preference for="Magento\Framework\Pricing\Amount\AmountInterface" type="Magento\Framework\Pricing\Amount\Base" />
+    <preference for="Magento\Framework\Api\SearchResultsInterface" type="Magento\Framework\Api\SearchResults" />
+    <preference for="Magento\Framework\Api\AttributeInterface" type="Magento\Framework\Api\AttributeValue" />
     <type name="Magento\Framework\Logger\Handler\Base">
         <arguments>
             <argument name="filesystem" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
@@ -265,6 +305,7 @@
     <type name="Magento\Framework\Url">
         <arguments>
             <argument name="session" xsi:type="object">Magento\Framework\Session\Generic\Proxy</argument>
+            <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
         </arguments>
     </type>
     <virtualType name="layoutArgumentInterpreterInternal" type="Magento\Framework\Data\Argument\Interpreter\Composite">
@@ -280,7 +321,7 @@
                 <item name="string" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\String</item>
                 <item name="null" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\NullType</item>
             </argument>
-            <argument name="discriminator" xsi:type="const">Magento\Core\Model\Layout\Merge::TYPE_ATTRIBUTE</argument>
+            <argument name="discriminator" xsi:type="const">Magento\Framework\View\Model\Layout\Merge::TYPE_ATTRIBUTE</argument>
         </arguments>
     </virtualType>
     <virtualType name="layoutArgumentInterpreter" type="Magento\Framework\View\Layout\Argument\Interpreter\Decorator\Updater">
@@ -340,12 +381,12 @@
     <type name="Magento\Framework\View\Layout\Reader\Block">
         <arguments>
             <argument name="readerPool" xsi:type="object">blockRenderPool</argument>
-            <argument name="scopeType" xsi:type="const">Magento\Framework\Store\ScopeInterface::SCOPE_STORE</argument>
+            <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
         </arguments>
     </type>
     <type name="Magento\Framework\View\Layout\Reader\UiComponent">
         <arguments>
-            <argument name="scopeType" xsi:type="const">Magento\Framework\Store\ScopeInterface::SCOPE_STORE</argument>
+            <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
         </arguments>
     </type>
     <virtualType name="bodyRenderPool" type="Magento\Framework\View\Layout\ReaderPool">
@@ -556,9 +597,402 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\View\Model\Layout\Merge">
+        <arguments>
+            <argument name="fileSource" xsi:type="object">Magento\Framework\View\Layout\File\Collector\Aggregated\Proxy</argument>
+            <argument name="pageLayoutFileSource" xsi:type="object">pageLayoutFileCollectorAggregated</argument>
+            <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Layout</argument>
+        </arguments>
+    </type>
     <type name="CSSmin">
         <arguments>
             <argument name="raise_php_limits" xsi:type="boolean">false</argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\App\DefaultPath\DefaultPath">
+        <arguments>
+            <argument name="parts" xsi:type="array">
+                <item name="module" xsi:type="string">core</item>
+                <item name="controller" xsi:type="string">index</item>
+                <item name="action" xsi:type="string">index</item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Data\Collection\Db\FetchStrategy\Cache">
+        <arguments>
+            <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Collection</argument>
+            <argument name="cacheIdPrefix" xsi:type="string">collection_</argument>
+            <argument name="cacheLifetime" xsi:type="string">86400</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Event\Config\Data">
+        <arguments>
+            <argument name="reader" xsi:type="object">Magento\Framework\Event\Config\Reader\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\View\Asset\Collection" shared="false" />
+    <virtualType name="layoutFileSourceBase" type="Magento\Framework\View\File\Collector\Base">
+        <arguments>
+            <argument name="subDir" xsi:type="string">layout</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="layoutFileSourceBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
+        <arguments>
+            <argument name="subject" xsi:type="object">layoutFileSourceBase</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="layoutFileSourceBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
+        <arguments>
+            <argument name="subject" xsi:type="object">layoutFileSourceBaseFiltered</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="layoutFileSourceTheme" type="Magento\Framework\View\File\Collector\ThemeModular">
+        <arguments>
+            <argument name="subDir" xsi:type="string">layout</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="layoutFileSourceThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
+        <arguments>
+            <argument name="subject" xsi:type="object">layoutFileSourceTheme</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="layoutFileSourceThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
+        <arguments>
+            <argument name="subject" xsi:type="object">layoutFileSourceThemeFiltered</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="layoutFileSourceOverrideBase" type="Magento\Framework\View\File\Collector\Override\Base">
+        <arguments>
+            <argument name="subDir" xsi:type="string">layout/override/base</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="layoutFileSourceOverrideBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
+        <arguments>
+            <argument name="subject" xsi:type="object">layoutFileSourceOverrideBase</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="layoutFileSourceOverrideBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
+        <arguments>
+            <argument name="subject" xsi:type="object">layoutFileSourceOverrideBaseFiltered</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="layoutFileSourceOverrideTheme" type="Magento\Framework\View\File\Collector\Override\ThemeModular">
+        <arguments>
+            <argument name="subDir" xsi:type="string">layout/override/theme</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="layoutFileSourceOverrideThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
+        <arguments>
+            <argument name="subject" xsi:type="object">layoutFileSourceOverrideTheme</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="layoutFileSourceOverrideThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
+        <arguments>
+            <argument name="subject" xsi:type="object">layoutFileSourceOverrideThemeFiltered</argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Framework\View\Layout\File\Collector\Aggregated">
+        <arguments>
+            <argument name="baseFiles" xsi:type="object">layoutFileSourceBaseSorted</argument>
+            <argument name="themeFiles" xsi:type="object">layoutFileSourceThemeSorted</argument>
+            <argument name="overrideBaseFiles" xsi:type="object">layoutFileSourceOverrideBaseSorted</argument>
+            <argument name="overrideThemeFiles" xsi:type="object">layoutFileSourceOverrideThemeSorted</argument>
+        </arguments>
+    </type>
+    <virtualType name="pageLayoutFileSourceBase" type="Magento\Framework\View\File\Collector\Base">
+        <arguments>
+            <argument name="subDir" xsi:type="string">page_layout</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="pageLayoutFileSourceBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
+        <arguments>
+            <argument name="subject" xsi:type="object">pageLayoutFileSourceBase</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="pageLayoutFileSourceBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
+        <arguments>
+            <argument name="subject" xsi:type="object">pageLayoutFileSourceBaseFiltered</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="pageLayoutFileSourceTheme" type="Magento\Framework\View\File\Collector\ThemeModular">
+        <arguments>
+            <argument name="subDir" xsi:type="string">page_layout</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="pageLayoutFileSourceThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
+        <arguments>
+            <argument name="subject" xsi:type="object">pageLayoutFileSourceTheme</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="pageLayoutFileSourceThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
+        <arguments>
+            <argument name="subject" xsi:type="object">pageLayoutFileSourceThemeFiltered</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="pageLayoutFileSourceOverrideBase" type="Magento\Framework\View\File\Collector\Override\Base">
+        <arguments>
+            <argument name="subDir" xsi:type="string">page_layout/override/base</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="pageLayoutFileSourceOverrideBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
+        <arguments>
+            <argument name="subject" xsi:type="object">pageLayoutFileSourceOverrideBase</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="pageLayoutFileSourceOverrideBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
+        <arguments>
+            <argument name="subject" xsi:type="object">pageLayoutFileSourceOverrideBaseFiltered</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="pageLayoutFileSourceOverrideTheme" type="Magento\Framework\View\File\Collector\Override\ThemeModular">
+        <arguments>
+            <argument name="subDir" xsi:type="string">page_layout/override/theme</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="pageLayoutFileSourceOverrideThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
+        <arguments>
+            <argument name="subject" xsi:type="object">pageLayoutFileSourceOverrideTheme</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="pageLayoutFileSourceOverrideThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
+        <arguments>
+            <argument name="subject" xsi:type="object">pageLayoutFileSourceOverrideThemeFiltered</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="pageLayoutFileCollectorAggregated" type="Magento\Framework\View\Layout\File\Collector\Aggregated">
+        <arguments>
+            <argument name="baseFiles" xsi:type="object">pageLayoutFileSourceBaseSorted</argument>
+            <argument name="themeFiles" xsi:type="object">pageLayoutFileSourceThemeSorted</argument>
+            <argument name="overrideBaseFiles" xsi:type="object">pageLayoutFileSourceOverrideBaseSorted</argument>
+            <argument name="overrideThemeFiles" xsi:type="object">pageLayoutFileSourceOverrideThemeSorted</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="pageFileSourceBase" type="Magento\Framework\View\File\Collector\Base"/>
+    <virtualType name="pageFileSourceBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
+        <arguments>
+            <argument name="subject" xsi:type="object">pageFileSourceBase</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="pageFileSourceBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
+        <arguments>
+            <argument name="subject" xsi:type="object">pageFileSourceBaseFiltered</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="pageFileSourceTheme" type="Magento\Framework\View\File\Collector\ThemeModular"/>
+    <virtualType name="pageFileSourceThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
+        <arguments>
+            <argument name="subject" xsi:type="object">pageFileSourceTheme</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="pageFileSourceThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
+        <arguments>
+            <argument name="subject" xsi:type="object">pageFileSourceThemeFiltered</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="pageFileSourceOverrideBase" type="Magento\Framework\View\File\Collector\Override\Base">
+        <arguments>
+            <argument name="subDir" xsi:type="string">page/override</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="pageFileSourceOverrideBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
+        <arguments>
+            <argument name="subject" xsi:type="object">pageFileSourceOverrideBase</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="pageFileSourceOverrideBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
+        <arguments>
+            <argument name="subject" xsi:type="object">pageFileSourceOverrideBaseFiltered</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="pageFileSourceOverrideTheme" type="Magento\Framework\View\File\Collector\Override\ThemeModular">
+        <arguments>
+            <argument name="subDir" xsi:type="string">override/theme</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="pageFileSourceOverrideThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
+        <arguments>
+            <argument name="subject" xsi:type="object">pageFileSourceOverrideTheme</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="pageFileSourceOverrideThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
+        <arguments>
+            <argument name="subject" xsi:type="object">pageFileSourceOverrideThemeFiltered</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="pageLayoutRenderPool" type="Magento\Framework\View\Layout\ReaderPool">
+        <arguments>
+            <argument name="readers" xsi:type="array">
+                <item name="container" xsi:type="string">Magento\Framework\View\Layout\Reader\Container</item>
+                <item name="move" xsi:type="string">Magento\Framework\View\Layout\Reader\Move</item>
+                <item name="remove" xsi:type="string">Magento\Framework\View\Layout\Reader\Remove</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Framework\View\Page\Layout\Reader">
+        <arguments>
+            <argument name="pageLayoutFileSource" xsi:type="object">pageLayoutFileCollectorAggregated</argument>
+            <argument name="reader" xsi:type="object">pageLayoutRenderPool</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\View\PageLayout\File\Collector\Aggregated">
+        <arguments>
+            <argument name="baseFiles" xsi:type="object">pageFileSourceBaseSorted</argument>
+            <argument name="themeFiles" xsi:type="object">pageFileSourceThemeSorted</argument>
+            <argument name="overrideBaseFiles" xsi:type="object">pageFileSourceOverrideBaseSorted</argument>
+            <argument name="overrideThemeFiles" xsi:type="object">pageFileSourceOverrideThemeSorted</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\View\Design\Theme\Image">
+        <arguments>
+            <argument name="uploader" xsi:type="object">Magento\Framework\View\Design\Theme\Image\Uploader\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\App\Config\ScopePool">
+        <arguments>
+            <argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Config</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\App\Config\Initial">
+        <arguments>
+            <argument name="reader" xsi:type="object">Magento\Framework\App\Config\Initial\Reader\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\App\Config\Initial\Reader">
+        <arguments>
+            <argument name="converter" xsi:type="object">Magento\Framework\App\Config\Initial\Converter</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\App\Route\Config">
+        <arguments>
+            <argument name="reader" xsi:type="object">Magento\Framework\App\Route\Config\Reader\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Session\Validator">
+        <arguments>
+            <argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
+            <argument name="skippedUserAgentList" xsi:type="array">
+                <item name="flash" xsi:type="string">Shockwave Flash</item>
+                <item name="flash_mac" xsi:type="string"><![CDATA[Adobe Flash Player\s{1,}\w{1,10}]]></item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Object\Copy\Config\Reader">
+        <arguments>
+            <argument name="fileName" xsi:type="string">fieldset.xml</argument>
+            <argument name="schemaLocator" xsi:type="object">Magento\Framework\Object\Copy\Config\SchemaLocator</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Object\Copy\Config\SchemaLocator">
+        <arguments>
+            <argument name="schema" xsi:type="string">lib/internal/Magento/Framework/Object/etc/fieldset.xsd</argument>
+            <argument name="perFileSchema" xsi:type="string">lib/internal/Magento/Framework/Object/etc/fieldset_file.xsd</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Object\Copy\Config\Data">
+        <arguments>
+            <argument name="reader" xsi:type="object">Magento\Framework\Object\Copy\Config\Reader\Proxy</argument>
+            <argument name="cacheId" xsi:type="string">fieldset_config</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Image">
+        <arguments>
+            <argument name="adapter" xsi:type="object">Magento\Framework\Image\Adapter\Gd2</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\View\Layout\PageType\Config\Reader">
+        <arguments>
+            <argument name="fileName" xsi:type="string">page_types.xml</argument>
+            <argument name="converter" xsi:type="object">Magento\Framework\View\Layout\PageType\Config\Converter</argument>
+            <argument name="schemaLocator" xsi:type="object">Magento\Framework\View\Layout\PageType\Config\SchemaLocator</argument>
+            <argument name="defaultScope" xsi:type="string">frontend</argument>
+        </arguments>
+    </type>
+    <virtualType name="Magento\Framework\View\Layout\PageType\Config\Data" type="Magento\Framework\Config\Data">
+        <arguments>
+            <argument name="reader" xsi:type="object">Magento\Framework\View\Layout\PageType\Config\Reader</argument>
+            <argument name="cacheId" xsi:type="string">page_types_config</argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Framework\View\Layout\PageType\Config">
+        <arguments>
+            <argument name="dataStorage" xsi:type="object">Magento\Framework\View\Layout\PageType\Config\Data</argument>
+        </arguments>
+    </type>
+    <virtualType name="Magento\Framework\Message\Session\Storage" type="Magento\Framework\Session\Storage">
+        <arguments>
+            <argument name="namespace" xsi:type="string">message</argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Framework\Message\Session">
+        <arguments>
+            <argument name="storage" xsi:type="object">Magento\Framework\Message\Session\Storage</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Url\ScopeResolver">
+        <arguments>
+            <argument name="areaCode" xsi:type="string">frontend</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Less\PreProcessor\Instruction\MagentoImport">
+        <arguments>
+            <argument name="fileSource" xsi:type="object">Magento\Framework\Less\File\Collector\Aggregated</argument>
+        </arguments>
+    </type>
+    <virtualType name="lessFileSourceBase" type="Magento\Framework\View\File\Collector\Base">
+        <arguments>
+            <argument name="subDir" xsi:type="string">web</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="lessFileSourceBaseFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
+        <arguments>
+            <argument name="subject" xsi:type="object">lessFileSourceBase</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="lessFileSourceBaseSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
+        <arguments>
+            <argument name="subject" xsi:type="object">lessFileSourceBaseFiltered</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="lessFileOverriddenBase" type="Magento\Framework\View\File\Collector\Override\Base">
+        <arguments>
+            <argument name="subDir" xsi:type="string">web</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="lessFileSourceThemeFiltered" type="Magento\Framework\View\File\Collector\Decorator\ModuleOutput">
+        <arguments>
+            <argument name="subject" xsi:type="object">lessFileSourceTheme</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="lessFileSourceThemeSorted" type="Magento\Framework\View\File\Collector\Decorator\ModuleDependency">
+        <arguments>
+            <argument name="subject" xsi:type="object">lessFileSourceThemeFiltered</argument>
+        </arguments>
+    </virtualType>
+    <type name="Magento\Framework\Less\File\Collector\Aggregated">
+        <arguments>
+            <argument name="libraryFiles" xsi:type="object">Magento\Framework\Less\File\Collector\Library</argument>
+            <argument name="baseFiles" xsi:type="object">lessFileSourceBaseSorted</argument>
+            <argument name="overriddenBaseFiles" xsi:type="object">lessFileOverriddenBase</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\Module\Setup\MigrationData">
+        <arguments>
+            <argument name="data" xsi:type="array">
+                <item name="plain" xsi:type="string"><![CDATA[/^(?P<alias>[a-z]+[_a-z\d]*?\/[a-z]+[_a-z\d]*?)::.*?$/sui]]></item>
+                <item name="wiki" xsi:type="string"><![CDATA[/{{(block|widget).*?(class|type)=\"(?P<alias>[a-z]+[_a-z\d]*?\/[a-z]+[_a-z\d]*?)\".*?}}/sui]]></item>
+                <item name="xml" xsi:type="string"><![CDATA[/<block.*?class=\"(?P<alias>[a-z]+[_a-z\d]*?\/[a-z]+[_a-z\d]*?)\".*?>/sui]]></item>
+                <item name="serialized" xsi:type="string"><![CDATA[#(?P<string>s:\d+:"(?P<alias>[a-z]+[_a-z\d]*?/[a-z]+[_a-z\d]*?)")#sui]]></item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/dev/tests/api-functional/_files/Magento/TestModule1/etc/acl.xml b/dev/tests/api-functional/_files/Magento/TestModule1/etc/acl.xml
index 13a6a24cf6a50..848e3a8f36a28 100644
--- a/dev/tests/api-functional/_files/Magento/TestModule1/etc/acl.xml
+++ b/dev/tests/api-functional/_files/Magento/TestModule1/etc/acl.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
+            <resource id="Magento_Backend::admin">
                 <resource id="Magento_TestModule1::all" title="TestModule1" sortOrder="1">
                     <resource id="Magento_TestModule1::resource1" title="Resource1" sortOrder="20"/>
                     <resource id="Magento_TestModule1::resource2" title="Resource2" sortOrder="10"/>
diff --git a/dev/tests/api-functional/_files/Magento/TestModule2/etc/acl.xml b/dev/tests/api-functional/_files/Magento/TestModule2/etc/acl.xml
index 3903f959b007c..5b34b73575eb5 100644
--- a/dev/tests/api-functional/_files/Magento/TestModule2/etc/acl.xml
+++ b/dev/tests/api-functional/_files/Magento/TestModule2/etc/acl.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
+            <resource id="Magento_Backend::admin">
                 <resource id="Magento_TestModule2::all" title="TestModule2" sortOrder="1">
                     <resource id="Magento_TestModule2::resource1" title="Resource1" sortOrder="20"/>
                     <resource id="Magento_TestModule2::resource2" title="Resource2" sortOrder="10"/>
diff --git a/dev/tests/api-functional/_files/Magento/TestModule3/etc/acl.xml b/dev/tests/api-functional/_files/Magento/TestModule3/etc/acl.xml
index 214aef766e954..18b20140d5d66 100644
--- a/dev/tests/api-functional/_files/Magento/TestModule3/etc/acl.xml
+++ b/dev/tests/api-functional/_files/Magento/TestModule3/etc/acl.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
+            <resource id="Magento_Backend::admin">
                 <resource id="Magento_TestModule3::all" title="TestModule3" sortOrder="1">
                     <resource id="Magento_TestModule3::resource1" title="Resource1" sortOrder="20"/>
                 </resource>
diff --git a/dev/tests/api-functional/_files/Magento/TestModule4/etc/acl.xml b/dev/tests/api-functional/_files/Magento/TestModule4/etc/acl.xml
index c9ddd19a89bf1..a33f6a119464d 100644
--- a/dev/tests/api-functional/_files/Magento/TestModule4/etc/acl.xml
+++ b/dev/tests/api-functional/_files/Magento/TestModule4/etc/acl.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
+            <resource id="Magento_Backend::admin">
                 <resource id="Magento_TestModule4::all" title="TestModule4" sortOrder="1">
                     <resource id="Magento_TestModule4::resource1" title="Resource1" sortOrder="20"/>
                     <resource id="Magento_TestModule4::resource2" title="Resource2" sortOrder="10"/>
diff --git a/dev/tests/api-functional/_files/Magento/TestModule5/etc/acl.xml b/dev/tests/api-functional/_files/Magento/TestModule5/etc/acl.xml
index 55d512c6c148a..13985075d96f2 100644
--- a/dev/tests/api-functional/_files/Magento/TestModule5/etc/acl.xml
+++ b/dev/tests/api-functional/_files/Magento/TestModule5/etc/acl.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
+            <resource id="Magento_Backend::admin">
                 <resource id="Magento_TestModule5::all" title="TestModule5" sortOrder="1">
                     <resource id="Magento_TestModule5::resource1" title="Resource1" sortOrder="20"/>
                     <resource id="Magento_TestModule5::resource2" title="Resource2" sortOrder="10"/>
diff --git a/dev/tests/api-functional/_files/Magento/TestModuleMSC/etc/acl.xml b/dev/tests/api-functional/_files/Magento/TestModuleMSC/etc/acl.xml
index d78741690573d..556e568f1a61c 100644
--- a/dev/tests/api-functional/_files/Magento/TestModuleMSC/etc/acl.xml
+++ b/dev/tests/api-functional/_files/Magento/TestModuleMSC/etc/acl.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::admin">
+            <resource id="Magento_Backend::admin">
                 <resource id="Magento_TestModuleMSC::all" title="TestModuleMSC" sortOrder="1">
                     <resource id="Magento_TestModuleMSC::resource1" title="Resource1" sortOrder="20"/>
                     <resource id="Magento_TestModuleMSC::resource2" title="Resource2" sortOrder="10"/>
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/Authentication/Rest/OauthClient.php b/dev/tests/api-functional/framework/Magento/TestFramework/Authentication/Rest/OauthClient.php
index 4923269ead4cd..ae4604fd1c322 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/Authentication/Rest/OauthClient.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/Authentication/Rest/OauthClient.php
@@ -83,7 +83,7 @@ public function getAccessTokenEndpoint()
      */
     public function getTestApiEndpoint()
     {
-        $defaultStoreCode = Bootstrap::getObjectManager()->get('Magento\Framework\Store\StoreManagerInterface')
+        $defaultStoreCode = Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface')
             ->getStore()->getCode();
         return new Uri(TESTS_BASE_URL . '/rest/' . $defaultStoreCode . '/V1/testmodule1');
     }
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest.php
index d645edf62d111..7488f42ae0674 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Rest.php
@@ -53,7 +53,7 @@ public function __construct()
             'Magento\TestFramework\TestCase\Webapi\Adapter\Rest\DocumentationGenerator'
         );
         $this->defaultStoreCode = Bootstrap::getObjectManager()
-            ->get('Magento\Framework\Store\StoreManagerInterface')
+            ->get('Magento\Store\Model\StoreManagerInterface')
             ->getStore()
             ->getCode();
     }
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php
index c219a84439f0c..5936421cf67b9 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/Webapi/Adapter/Soap.php
@@ -127,11 +127,11 @@ public function generateWsdlUrl($services, $storeCode = null)
         /** Sort list of services to avoid having different WSDL URLs for the identical lists of services. */
         //TODO: This may change since same resource of multiple versions may be allowed after namespace changes
         ksort($services);
-        /** @var \Magento\Framework\Store\StoreManagerInterface $storeManager */
+        /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
         $storeCode = !is_null($storeCode)
             ? (string)$storeCode
             : Bootstrap::getObjectManager()
-                ->get('Magento\Framework\Store\StoreManagerInterface')
+                ->get('Magento\Store\Model\StoreManagerInterface')
                 ->getStore()
                 ->getCode();
 
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php
index f62e6944d5075..50cd00f7497f0 100644
--- a/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php
+++ b/dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php
@@ -490,7 +490,7 @@ protected function _updateAppConfig(
         if ($cleanAppCache) {
             if ($updateLocalConfig) {
                 $objectManager->get('Magento\Framework\App\Config\ReinitableConfigInterface')->reinit();
-                $objectManager->get('Magento\Framework\Store\StoreManagerInterface')->reinitStores();
+                $objectManager->get('Magento\Store\Model\StoreManagerInterface')->reinitStores();
             }
 
             if (!$this->_cleanAppConfigCache()) {
diff --git a/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php b/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php
index 611d08e922dc0..aedba2b6b9448 100644
--- a/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/Webapi/WsdlGenerationFromDataObjectTest.php
@@ -27,7 +27,7 @@ class WsdlGenerationFromDataObjectTest extends \Magento\TestFramework\TestCase\W
     protected function setUp()
     {
         $this->_markTestAsSoapOnly("WSDL generation tests are intended to be executed for SOAP adapter only.");
-        $this->_storeCode = Bootstrap::getObjectManager()->get('Magento\Framework\Store\StoreManagerInterface')
+        $this->_storeCode = Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface')
             ->getStore()->getCode();
         $this->_soapUrl = "{$this->_baseUrl}/soap/{$this->_storeCode}?services=testModule5AllSoapAndRestV1%2CtestModule5AllSoapAndRestV2";
         parent::setUp();
diff --git a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/Resource.php b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/Resource.php
index d9e1c4638eea0..89e81d3e7b73d 100644
--- a/dev/tests/functional/tests/app/Magento/User/Test/Fixture/Resource.php
+++ b/dev/tests/functional/tests/app/Magento/User/Test/Fixture/Resource.php
@@ -20,7 +20,7 @@ class Resource extends DataFixture
      * @var array
      */
     protected $resources = [
-        'Magento_Adminhtml::dashboard' => null,
+        'Magento_Backend::dashboard' => null,
         'Magento_Sales::sales' => null,
         'Magento_Sales::sales_operation' => 'Magento_Sales::sales',
         'Magento_Sales::sales_order' => 'Magento_Sales::sales_operation',
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php
index f64460972aaca..9854602a507fc 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Annotation/ConfigFixture.php
@@ -48,7 +48,7 @@ protected function _getConfigValue($configPath, $scopeCode = null)
             $scopeConfig = $objectManager->get('Magento\Framework\App\Config\ScopeConfigInterface');
             $result = $scopeConfig->getValue(
                 $configPath,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $scopeCode
             );
         }
@@ -82,7 +82,7 @@ protected function _setConfigValue($configPath, $value, $storeCode = false)
             )->setValue(
                 $configPath,
                 $value,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $storeCode
             );
         }
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Helper/Eav.php b/dev/tests/integration/framework/Magento/TestFramework/Helper/Eav.php
index 68171fa53f9db..6cb6d83f78dc9 100644
--- a/dev/tests/integration/framework/Magento/TestFramework/Helper/Eav.php
+++ b/dev/tests/integration/framework/Magento/TestFramework/Helper/Eav.php
@@ -18,7 +18,7 @@ class Eav
     public static function setIncrementIdPrefix($entityType, $prefix)
     {
         $website = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Framework\Store\StoreManagerInterface'
+            'Magento\Store\Model\StoreManagerInterface'
         )->getWebsite();
         $storeId = $website->getDefaultStore()->getId();
         $entityTypeModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
diff --git a/dev/tests/integration/testsuite/Magento/Authorization/Model/RulesTest.php b/dev/tests/integration/testsuite/Magento/Authorization/Model/RulesTest.php
index 53b69bf15c0f6..cc9f6456e586c 100644
--- a/dev/tests/integration/testsuite/Magento/Authorization/Model/RulesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Authorization/Model/RulesTest.php
@@ -29,7 +29,7 @@ public function testCRUD()
     {
         $this->_model
             ->setRoleType('G')
-            ->setResourceId('Magento_Adminhtml::all')
+            ->setResourceId('Magento_Backend::all')
             ->setPrivileges("")
             ->setAssertId(0)
             ->setRoleId(1)
@@ -44,7 +44,7 @@ public function testCRUD()
      */
     public function testInitialUserPermissions()
     {
-        $expectedDefaultPermissions = ['Magento_Adminhtml::all'];
+        $expectedDefaultPermissions = ['Magento_Backend::all'];
         $this->_checkExistingPermissions($expectedDefaultPermissions);
     }
 
@@ -54,9 +54,9 @@ public function testInitialUserPermissions()
      */
     public function testSetAllowForAllResources()
     {
-        $resources = ['Magento_Adminhtml::all'];
+        $resources = ['Magento_Backend::all'];
         $this->_model->setRoleId(1)->setResources($resources)->saveRel();
-        $expectedPermissions = ['Magento_Adminhtml::all'];
+        $expectedPermissions = ['Magento_Backend::all'];
         $this->_checkExistingPermissions($expectedPermissions);
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/Captcha/Model/ObserverTest.php
index 1fc192fff011d..7d57800fb1763 100644
--- a/dev/tests/integration/testsuite/Magento/Captcha/Model/ObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Captcha/Model/ObserverTest.php
@@ -46,7 +46,7 @@ public function testBackendLoginActionWithInvalidCaptchaReturnsError()
     public function testCaptchaIsRequiredAfterFailedLoginAttempts()
     {
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Framework\Store\StoreManagerInterface'
+            'Magento\Store\Model\StoreManagerInterface'
         )->setCurrentStore(
             0
         );
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/NewTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/NewTest.php
index d5a5a01937fcd..0801e8bccbcda 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/NewTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Block/Product/NewTest.php
@@ -54,7 +54,7 @@ public function testGetCacheKeyInfo()
         $this->assertSame(1, array_shift($keys));
         $this->assertEquals(
             \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                'Magento\Framework\Store\StoreManagerInterface'
+                'Magento\Store\Model\StoreManagerInterface'
             )->getStore()->getId(),
             $info[1]
         );
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Helper/DataTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Helper/DataTest.php
index 222e942923088..121f6b025393e 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Helper/DataTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Helper/DataTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Catalog\Helper;
 
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 use Magento\Tax\Model\ClassModel;
 use Magento\Tax\Model\Config;
 use Magento\Tax\Model\TaxRuleFixtureFactory;
@@ -204,7 +204,7 @@ public function testIsUsingStaticUrlsAllowed()
         $this->assertTrue($this->helper->isUsingStaticUrlsAllowed());
         $this->helper->setStoreId(
             \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                'Magento\Framework\Store\StoreManagerInterface'
+                'Magento\Store\Model\StoreManagerInterface'
             )->getStore()->getId()
         );
         $this->assertTrue($this->helper->isUsingStaticUrlsAllowed());
@@ -225,7 +225,7 @@ public function testIsUrlDirectivesParsingAllowed()
         $this->assertFalse($this->helper->isUrlDirectivesParsingAllowed());
         $this->helper->setStoreId(
             \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                'Magento\Framework\Store\StoreManagerInterface'
+                'Magento\Store\Model\StoreManagerInterface'
             )->getStore()->getId()
         );
         $this->assertFalse($this->helper->isUrlDirectivesParsingAllowed());
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Helper/ImageTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Helper/ImageTest.php
index b311d6d29cd22..8c73b9779c883 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Helper/ImageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Helper/ImageTest.php
@@ -47,7 +47,7 @@ public static function setUpBeforeClass()
         // watermark fixture
         mkdir(
             $fixtureMediaDir . '/watermark/stores/' . $objectManager->get(
-                'Magento\Framework\Store\StoreManagerInterface'
+                'Magento\Store\Model\StoreManagerInterface'
             )->getStore()->getId(),
             0777,
             true
@@ -55,7 +55,7 @@ public static function setUpBeforeClass()
         copy(
             "{$fixtureDir}/watermark.jpg",
             $fixtureMediaDir . '/watermark/stores/' . $objectManager->get(
-                'Magento\Framework\Store\StoreManagerInterface'
+                'Magento\Store\Model\StoreManagerInterface'
             )->getStore()->getId() . '/watermark.jpg'
         );
 
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/AbstractTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/AbstractTest.php
index 012c01e5233c5..b45e05df43559 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/AbstractTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/AbstractTest.php
@@ -137,7 +137,7 @@ public function testGetStore()
         $this->assertSame(
             $store,
             \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                'Magento\Framework\Store\StoreManagerInterface'
+                'Magento\Store\Model\StoreManagerInterface'
             )->getStore()
         );
     }
@@ -146,7 +146,7 @@ public function testGetWebsiteStoreIds()
     {
         $ids = $this->_model->getWebsiteStoreIds();
         $storeId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Framework\Store\StoreManagerInterface'
+            'Magento\Store\Model\StoreManagerInterface'
         )->getStore()->getId();
         $this->assertEquals([$storeId => $storeId], $ids);
     }
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest.php
index fce29e9ddddf6..c5fb702940342 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest.php
@@ -29,12 +29,12 @@ class CategoryImageTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->_oldLogActive = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Framework\Store\StoreManagerInterface'
+            'Magento\Store\Model\StoreManagerInterface'
         )->getStore()->getConfig(
             'dev/log/active'
         );
         $this->_oldExceptionFile = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Framework\Store\StoreManagerInterface'
+            'Magento\Store\Model\StoreManagerInterface'
         )->getStore()->getConfig(
             'dev/log/exception_file'
         );
@@ -47,7 +47,7 @@ protected function tearDown()
         )->setValue(
             'dev/log/active',
             $this->_oldLogActive,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
 
         $this->_oldLogActive = null;
@@ -57,7 +57,7 @@ protected function tearDown()
         )->setValue(
             'dev/log/exception_file',
             $this->_oldExceptionFile,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
 
         $this->_oldExceptionFile = null;
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest/StubZendLogWriterStream.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest/StubZendLogWriterStream.php
index 6780850add530..667241e2d64f0 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest/StubZendLogWriterStream.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Category/CategoryImageTest/StubZendLogWriterStream.php
@@ -10,7 +10,7 @@
 )->setValue(
     'dev/log/active',
     1,
-    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
 );
 
 \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
@@ -18,7 +18,7 @@
 )->setValue(
     'dev/log/exception_file',
     'save_category_without_image.log',
-    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
 );
 class StubZendLogWriterStream extends \Zend_Log_Writer_Stream
 {
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php
index 42f25fa8110aa..72a723413d214 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTest.php
@@ -27,8 +27,8 @@ class CategoryTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        /** @var $storeManager \Magento\Framework\Store\StoreManagerInterface */
-        $storeManager = $objectManager->get('Magento\Framework\Store\StoreManagerInterface');
+        /** @var $storeManager \Magento\Store\Model\StoreManagerInterface */
+        $storeManager = $objectManager->get('Magento\Store\Model\StoreManagerInterface');
         $this->_store = $storeManager->getStore();
         $this->_model = $objectManager->create('Magento\Catalog\Model\Category');
     }
@@ -96,7 +96,7 @@ public function testGetStoreIds()
         /* id from fixture */
         $this->assertContains(
             \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                'Magento\Framework\Store\StoreManagerInterface'
+                'Magento\Store\Model\StoreManagerInterface'
             )->getStore()->getId(),
             $this->_model->getStoreIds()
         );
@@ -106,7 +106,7 @@ public function testSetGetStoreId()
     {
         $this->assertEquals(
             \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                'Magento\Framework\Store\StoreManagerInterface'
+                'Magento\Store\Model\StoreManagerInterface'
             )->getStore()->getId(),
             $this->_model->getStoreId()
         );
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/CategoryTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/CategoryTest.php
index 0f06fae7c13e7..e9fed1bf4d723 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/CategoryTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Layer/CategoryTest.php
@@ -150,7 +150,7 @@ public function testGetCurrentStore()
     {
         $this->assertSame(
             \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                'Magento\Framework\Store\StoreManagerInterface'
+                'Magento\Store\Model\StoreManagerInterface'
             )->getStore(),
             $this->_model->getCurrentStore()
         );
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/PriceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/PriceTest.php
index 20cb539091c77..7b46196b1238b 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/PriceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/PriceTest.php
@@ -79,7 +79,7 @@ public function testAfterSave()
                 $product->getId(),
                 $this->_model->getAttribute()->getId(),
                 \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                    'Magento\Framework\Store\StoreManagerInterface'
+                    'Magento\Store\Model\StoreManagerInterface'
                 )->getStore()->getId()
             )
         );
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php
index 026dd9dac902e..231b6fc7c3cf9 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/TierpriceTest.php
@@ -141,10 +141,10 @@ public function testAfterSave()
     public function testAfterSaveEmpty()
     {
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Framework\Store\StoreManagerInterface'
+            'Magento\Store\Model\StoreManagerInterface'
         )->setCurrentStore(
             \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                'Magento\Framework\Store\StoreManagerInterface'
+                'Magento\Store\Model\StoreManagerInterface'
             )->getStore(
                 \Magento\Store\Model\Store::DEFAULT_STORE_ID
             )
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductExternalTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductExternalTest.php
index 29b25636b3107..197d9efa5595f 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductExternalTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductExternalTest.php
@@ -31,7 +31,7 @@ public function testGetStoreId()
     {
         $this->assertEquals(
             \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                'Magento\Framework\Store\StoreManagerInterface'
+                'Magento\Store\Model\StoreManagerInterface'
             )->getStore()->getId(),
             $this->_model->getStoreId()
         );
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
index 62e2ae63f8cba..db9cfaa872bda 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
@@ -202,7 +202,7 @@ public function testDuplicateSkuGeneration()
     protected function _undo($duplicate)
     {
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Framework\Store\StoreManagerInterface'
+            'Magento\Store\Model\StoreManagerInterface'
         )->getStore()->setId(
             \Magento\Store\Model\Store::DEFAULT_STORE_ID
         );
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/products.php b/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/products.php
index 60d88b22736c9..ab28f1432590a 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/products.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/controllers/_files/products.php
@@ -28,7 +28,7 @@
 )->setAttributeSetId(
     4
 )->setWebsiteIds(
-    [$obectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getWebsiteId()]
+    [$obectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getWebsiteId()]
 )->setSku(
     'simple_product_1'
 )->setName(
@@ -69,7 +69,7 @@
 )->setAttributeSetId(
     4
 )->setWebsiteIds(
-    [$obectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getWebsiteId()]
+    [$obectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getWebsiteId()]
 )->setSku(
     'simple_product_2'
 )->setName(
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
index daab88995bb84..6c0af79022f84 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
@@ -809,7 +809,7 @@ public function testProductsWithMultipleStores()
         $product->load($id);
         $this->assertEquals('1', $product->getHasOptions());
 
-        $objectManager->get('Magento\Framework\Store\StoreManagerInterface')->setCurrentStore('fixturestore');
+        $objectManager->get('Magento\Store\Model\StoreManagerInterface')->setCurrentStore('fixturestore');
 
         /** @var \Magento\Catalog\Model\Product $simpleProduct */
         $simpleProduct = $objectManager->create('Magento\Catalog\Model\Product');
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/_files/discount_10percent.php b/dev/tests/integration/testsuite/Magento/Checkout/_files/discount_10percent.php
index aec9d9c02d152..cd139fa8b271c 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/_files/discount_10percent.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/_files/discount_10percent.php
@@ -14,7 +14,7 @@
     'is_active' => true,
     'website_ids' => [
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Framework\Store\StoreManagerInterface'
+            'Magento\Store\Model\StoreManagerInterface'
         )->getStore()->getWebsiteId()
     ],
     'customer_group_ids' => [\Magento\Customer\Model\GroupManagement::NOT_LOGGED_IN_ID],
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Controller/RouterTest.php b/dev/tests/integration/testsuite/Magento/Cms/Controller/RouterTest.php
index 687923eb5a46a..69e7ee649b9a3 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/Controller/RouterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Controller/RouterTest.php
@@ -29,10 +29,10 @@ protected function setUp()
             \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\UrlInterface'),
             \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Cms\Model\PageFactory'),
             \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                'Magento\Framework\Store\StoreManagerInterface'
+                'Magento\Store\Model\StoreManagerInterface'
             ),
             \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                'Magento\Framework\Store\StoreManagerInterface'
+                'Magento\Store\Model\StoreManagerInterface'
             )
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/Cms/_files/block.php b/dev/tests/integration/testsuite/Magento/Cms/_files/block.php
index b5a791a7bd740..bd641ff387ff8 100644
--- a/dev/tests/integration/testsuite/Magento/Cms/_files/block.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/_files/block.php
@@ -21,7 +21,7 @@
 )->setStores(
     [
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Framework\Store\StoreManagerInterface'
+            'Magento\Store\Model\StoreManagerInterface'
         )->getStore()->getId()
     ]
 )->save();
diff --git a/dev/tests/integration/testsuite/Magento/Core/_files/second_third_store.php b/dev/tests/integration/testsuite/Magento/Core/_files/second_third_store.php
index 385f755a67e2f..c8702a0756932 100644
--- a/dev/tests/integration/testsuite/Magento/Core/_files/second_third_store.php
+++ b/dev/tests/integration/testsuite/Magento/Core/_files/second_third_store.php
@@ -30,5 +30,5 @@
 
 /* Refresh stores memory cache */
 \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-    'Magento\Framework\Store\StoreManagerInterface'
+    'Magento\Store\Model\StoreManagerInterface'
 )->reinitStores();
diff --git a/dev/tests/integration/testsuite/Magento/Core/_files/store.php b/dev/tests/integration/testsuite/Magento/Core/_files/store.php
index eb7df4f2fdaa2..dcb4f52e6722d 100644
--- a/dev/tests/integration/testsuite/Magento/Core/_files/store.php
+++ b/dev/tests/integration/testsuite/Magento/Core/_files/store.php
@@ -8,10 +8,10 @@
 $storeCode = 'fixturestore';
 if (!$store->load($storeCode)->getId()) {
     $websiteId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-        'Magento\Framework\Store\StoreManagerInterface'
+        'Magento\Store\Model\StoreManagerInterface'
     )->getWebsite()->getId();
     $groupId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-        'Magento\Framework\Store\StoreManagerInterface'
+        'Magento\Store\Model\StoreManagerInterface'
     )->getWebsite()->getDefaultGroupId();
     $store->setCode(
         $storeCode
@@ -30,6 +30,6 @@
 
     /* Refresh stores memory cache */
     \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-        'Magento\Framework\Store\StoreManagerInterface'
+        'Magento\Store\Model\StoreManagerInterface'
     )->reinitStores();
 }
diff --git a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Model/System/CurrencysymbolTest.php b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Model/System/CurrencysymbolTest.php
index eb6b0856d4ad0..f4bbd8d197d07 100644
--- a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Model/System/CurrencysymbolTest.php
+++ b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Model/System/CurrencysymbolTest.php
@@ -31,7 +31,7 @@ protected function tearDown()
     {
         $this->currencySymbolModel = null;
         Bootstrap::getObjectManager()->get('Magento\Framework\App\Config\ReinitableConfigInterface')->reinit();
-        Bootstrap::getObjectManager()->create('Magento\Framework\Store\StoreManagerInterface')->reinitStores();
+        Bootstrap::getObjectManager()->create('Magento\Store\Model\StoreManagerInterface')->reinitStores();
     }
 
     public function testGetCurrencySymbolsData()
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/CartTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/CartTest.php
index 425bee97ddaa6..f7160adb6c3af 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/CartTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/CartTest.php
@@ -22,7 +22,7 @@ class CartTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Framework\Registry */
     private $_coreRegistry;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface */
+    /** @var \Magento\Store\Model\StoreManagerInterface */
     private $_storeManager;
 
     /** @var Cart */
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php
index 937c36c5101ba..d43e59c6c79b3 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfoTest.php
@@ -31,7 +31,7 @@ class PersonalInfoTest extends \PHPUnit_Framework_TestCase
     /** @var  \Magento\Customer\Api\GroupRepositoryInterface */
     private $_groupRepository;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface */
+    /** @var \Magento\Store\Model\StoreManagerInterface */
     private $_storeManager;
 
     /** @var \Magento\Framework\ObjectManagerInterface */
@@ -52,7 +52,7 @@ public function setUp()
     {
         $this->_objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
-        $this->_storeManager = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface');
+        $this->_storeManager = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface');
         $this->_context = $this->_objectManager->get(
             'Magento\Backend\Block\Template\Context',
             ['storeManager' => $this->_storeManager]
@@ -162,7 +162,7 @@ public function testGetStoreCreateDateTimezone()
             ->getDefaultTimezonePath();
         $timezone = $this->_context->getScopeConfig()->getValue(
             $defaultTimeZonePath,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->_loadCustomer()->getStoreId()
         );
         $this->assertEquals($timezone, $this->_block->getStoreCreateDateTimezone());
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/ViewTest.php b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/ViewTest.php
index 6fd17aa638fc6..6a4c5c9127877 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/ViewTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Block/Adminhtml/Edit/Tab/ViewTest.php
@@ -29,7 +29,7 @@ class ViewTest extends \PHPUnit_Framework_TestCase
     /** @var  CustomerRepositoryInterface */
     private $_customerRepository;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface */
+    /** @var \Magento\Store\Model\StoreManagerInterface */
     private $_storeManager;
 
     /** @var \Magento\Framework\ObjectManagerInterface */
diff --git a/dev/tests/integration/testsuite/Magento/Customer/Model/GroupManagementTest.php b/dev/tests/integration/testsuite/Magento/Customer/Model/GroupManagementTest.php
index 0f8d9fe72cedd..92b884b1d254d 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/Model/GroupManagementTest.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/Model/GroupManagementTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Customer\Model;
 
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
@@ -45,8 +45,8 @@ public function testGetDefaultGroupWithStoreId($testGroup, $storeId)
      * @magentoDataFixture Magento/Core/_files/second_third_store.php
      */
     public function testGetDefaultGroupWithNonDefaultStoreId()
-    {        /** @var \Magento\Framework\Store\StoreManagerInterface  $storeManager */
-        $storeManager = Bootstrap::getObjectManager()->get('Magento\Framework\Store\StoreManagerInterface');
+    {        /** @var \Magento\Store\Model\StoreManagerInterface  $storeManager */
+        $storeManager = Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface');
         $nonDefaultStore = $storeManager->getStore('secondstore');
         $nonDefaultStoreId = $nonDefaultStore->getId();
         /** @var \Magento\Framework\App\MutableScopeConfig $scopeConfig */
@@ -54,7 +54,7 @@ public function testGetDefaultGroupWithNonDefaultStoreId()
         $scopeConfig->setValue(
             \Magento\Customer\Model\GroupManagement::XML_PATH_DEFAULT_ID,
             2,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             'secondstore'
         );
         $testGroup = ['id' => 2, 'code' => 'Wholesale', 'tax_class_id' => 3, 'tax_class_name' => 'Retail Customer'];
@@ -111,8 +111,8 @@ public function testGetAllGroup()
      */
     public function getDefaultGroupDataProvider()
     {
-        /** @var \Magento\Framework\Store\StoreManagerInterface  $storeManager */
-        $storeManager = Bootstrap::getObjectManager()->get('Magento\Framework\Store\StoreManagerInterface');
+        /** @var \Magento\Store\Model\StoreManagerInterface  $storeManager */
+        $storeManager = Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface');
         $defaultStoreId = $storeManager->getStore()->getId();
         return [
             'no store id' => [
diff --git a/dev/tests/integration/testsuite/Magento/Customer/_files/quote.php b/dev/tests/integration/testsuite/Magento/Customer/_files/quote.php
index 7175a2f5c599c..d40823b6573ef 100644
--- a/dev/tests/integration/testsuite/Magento/Customer/_files/quote.php
+++ b/dev/tests/integration/testsuite/Magento/Customer/_files/quote.php
@@ -39,7 +39,7 @@
     1
 )->setStoreId(
     \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-        'Magento\Framework\Store\StoreManagerInterface'
+        'Magento\Store\Model\StoreManagerInterface'
     )->getStore()->getId()
 )->setReservedOrderId(
     'test01'
diff --git a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/AddressTest.php b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/AddressTest.php
index baf260103a378..73012c62e5cfd 100644
--- a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/AddressTest.php
+++ b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/AddressTest.php
@@ -36,7 +36,7 @@ protected function setUp()
         );
 
         $websites = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Framework\Store\StoreManagerInterface'
+            'Magento\Store\Model\StoreManagerInterface'
         )->getWebsites(
             true
         );
diff --git a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/CustomerTest.php b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/CustomerTest.php
index 88da061d8948e..9dac322d762f6 100644
--- a/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/CustomerTest.php
+++ b/dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Export/CustomerTest.php
@@ -182,7 +182,7 @@ public function testFilterEntityCollection()
                 'email' => 'example.com',
                 'created_at' => [$createdAtDate, ''],
                 'store_id' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                    'Magento\Framework\Store\StoreManagerInterface'
+                    'Magento\Store\Model\StoreManagerInterface'
                 )->getStore()->getId()
             ]
         ];
diff --git a/dev/tests/integration/testsuite/Magento/Directory/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/Directory/Model/ObserverTest.php
index 3601d7b0fac0d..018c8b1c71e89 100644
--- a/dev/tests/integration/testsuite/Magento/Directory/Model/ObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Directory/Model/ObserverTest.php
@@ -9,7 +9,7 @@
 namespace Magento\Directory\Model;
 
 use Magento\Framework\ObjectManagerInterface;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
@@ -43,23 +43,15 @@ public function setUp()
         $this->objectManager = Bootstrap::getObjectManager();
 
         $this->scopeConfig = $this->objectManager->create('Magento\Framework\App\MutableScopeConfig');
-        $this->scopeConfig->setValue(Observer::IMPORT_ENABLE, 1, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
-        $this->scopeConfig->setValue(
-            Observer::CRON_STRING_PATH,
-            'cron-string-path',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
-        );
-        $this->scopeConfig->setValue(
-            Observer::IMPORT_SERVICE,
-            'webservicex',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
-        );
+        $this->scopeConfig->setValue(Observer::IMPORT_ENABLE, 1, ScopeInterface::SCOPE_STORE);
+        $this->scopeConfig->setValue(Observer::CRON_STRING_PATH, 'cron-string-path', ScopeInterface::SCOPE_STORE);
+        $this->scopeConfig->setValue(Observer::IMPORT_SERVICE, 'webservicex', ScopeInterface::SCOPE_STORE);
 
         $this->configResource = $this->objectManager->get('Magento\Core\Model\Resource\Config');
         $this->configResource->saveConfig(
             $this->baseCurrencyPath,
             $this->baseCurrency,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             0
         );
 
@@ -82,7 +74,7 @@ public function testScheduledUpdateCurrencyRates()
         $this->configResource->saveConfig(
             $this->allowedCurrenciesPath,
             $allowedCurrencies,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            ScopeInterface::SCOPE_STORE,
             0
         );
         $this->observer->scheduledUpdateCurrencyRates(null);
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
index 81529277542fd..eeea37be4c282 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php
@@ -139,7 +139,7 @@ public function testLayoutDirective($area, $directiveParams, $expectedOutput)
         )->setValue(
             \Magento\Framework\View\DesignInterface::XML_PATH_THEME_ID,
             $themeId,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
 
         /** @var $layout \Magento\Framework\View\LayoutInterface */
diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
index ea2d858bd2224..5ffaed0005fad 100644
--- a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php
@@ -65,7 +65,7 @@ public function testSetGetTemplateFilter()
         $this->assertSame($filter, $this->_model->getTemplateFilter());
         $this->assertEquals(
             \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                'Magento\Framework\Store\StoreManagerInterface'
+                'Magento\Store\Model\StoreManagerInterface'
             )->getStore()->getId(),
             $filter->getStoreId()
         );
@@ -106,7 +106,7 @@ public function testGetProcessedTemplate()
             [
                 'area' => 'frontend',
                 'store' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                    'Magento\Framework\Store\StoreManagerInterface'
+                    'Magento\Store\Model\StoreManagerInterface'
                 )->getStore(
                     'fixturestore'
                 )->getId()
@@ -130,7 +130,7 @@ protected function _setNotDefaultThemeForFixtureStore()
         )->setValue(
             \Magento\Framework\View\DesignInterface::XML_PATH_THEME_ID,
             $theme->getId(),
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             'fixturestore'
         );
     }
@@ -154,7 +154,7 @@ public function testGetProcessedTemplateSubject()
             [
                 'area' => 'frontend',
                 'store' => \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                    'Magento\Framework\Store\StoreManagerInterface'
+                    'Magento\Store\Model\StoreManagerInterface'
                 )->getStore(
                     'fixturestore'
                 )->getId()
@@ -194,7 +194,7 @@ public function testSetDesignConfigException($config)
     public function setDesignConfigExceptionDataProvider()
     {
         $storeId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getId();
+            ->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getId();
         return [
             [[]],
             [['area' => 'frontend']],
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php b/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php
index e3a45563f3b8b..14f9874a7378c 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Session/SidResolverTest.php
@@ -93,7 +93,7 @@ public function testGetSid($sid, $useFrontedSid, $isOwnOriginUrl, $testSid)
             'getValue'
         )->with(
             \Magento\Framework\Session\SidResolver::XML_PATH_USE_FRONTEND_SID,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )->will(
             $this->returnValue($useFrontedSid)
         );
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Translate/InlineTest.php b/dev/tests/integration/testsuite/Magento/Framework/Translate/InlineTest.php
index 063f55ebb7a76..ae0d6cc07a199 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Translate/InlineTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Translate/InlineTest.php
@@ -43,7 +43,7 @@ protected function setUp()
         );
         /* Called getConfig as workaround for setConfig bug */
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Framework\Store\StoreManagerInterface'
+            'Magento\Store\Model\StoreManagerInterface'
         )->getStore(
             $this->_storeId
         )->getConfig(
@@ -54,7 +54,7 @@ protected function setUp()
         )->setValue(
             'dev/translate_inline/active',
             true,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->_storeId
         );
     }
@@ -66,7 +66,7 @@ public function testIsAllowed()
         $this->assertTrue(
             $this->_model->isAllowed(
                 \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                    'Magento\Framework\Store\StoreManagerInterface'
+                    'Magento\Store\Model\StoreManagerInterface'
                 )->getStore(
                     $this->_storeId
                 )
@@ -78,7 +78,7 @@ public function testIsAllowed()
         $this->assertFalse(
             $this->_model->isAllowed(
                 \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                    'Magento\Framework\Store\StoreManagerInterface'
+                    'Magento\Store\Model\StoreManagerInterface'
                 )->getStore(
                     $this->_storeId
                 )
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Translate/_files/_inline_page_expected.html b/dev/tests/integration/testsuite/Magento/Framework/Translate/_files/_inline_page_expected.html
index 494c89457156d..605506449099a 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Translate/_files/_inline_page_expected.html
+++ b/dev/tests/integration/testsuite/Magento/Framework/Translate/_files/_inline_page_expected.html
@@ -16,7 +16,7 @@
     </div>
 <script type="text/javascript" src="http://localhost/pub/static/frontend/Magento/luma/en_US/prototype/window.js"></script>
 <link rel="stylesheet" type="text/css" href="http://localhost/pub/static/frontend/Magento/luma/en_US/prototype/windows/themes/default.css"/>
-<link rel="stylesheet" type="text/css" href="http://localhost/pub/media/theme/static/frontend/{{design_package}}/default/en_US/Magento_Core/prototype/magento.css"/>
+<link rel="stylesheet" type="text/css" href="http://localhost/pub/media/theme/static/frontend/{{design_package}}/default/en_US/Magento_Theme/prototype/magento.css"/>
 <script type="text/javascript" src="http://localhost/pub/static/frontend/Magento/luma/en_US/mage/edit-trigger.js"></script>
 <script type="text/javascript" src="http://localhost/pub/static/frontend/Magento/luma/en_US/mage/translate-inline.js"></script>
 <link rel="stylesheet" type="text/css" href="http://localhost/pub/static/frontend/Magento/luma/en_US/mage/translate-inline.css"/>
@@ -27,7 +27,7 @@
             $(this).translateInline({
                 ajaxUrl: 'http://localhost/index.php/translation/ajax/index/',
                 area: 'frontend',
-                editTrigger: {img: 'http://localhost/pub/media/theme/static/frontend/{{design_package}}/default/en_US/Magento_Core/fam_book_open.png'}
+                editTrigger: {img: 'http://localhost/pub/media/theme/static/frontend/{{design_package}}/default/en_US/Magento_Theme/fam_book_open.png'}
             });
         });
     })(jQuery);
diff --git a/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php b/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php
index 43f836a844397..44d7f7ab3c101 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/TranslateTest.php
@@ -52,7 +52,7 @@ protected function setUp()
             'Magento\Theme\Model\View\Design',
             ['getDesignTheme'],
             [
-                $objectManager->get('Magento\Framework\Store\StoreManagerInterface'),
+                $objectManager->get('Magento\Store\Model\StoreManagerInterface'),
                 $objectManager->get('Magento\Framework\View\Design\Theme\FlyweightFactory'),
                 $objectManager->get('Magento\Framework\App\Config\ScopeConfigInterface'),
                 $objectManager->get('Magento\Theme\Model\ThemeFactory'),
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTest.php
index 689068525611c..14abd695c7adb 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/LayoutTest.php
@@ -9,7 +9,7 @@
  *
  * Note that some methods are not covered here, see the \Magento\Framework\View\LayoutDirectivesTest
  *
- * @see \Magento\Core\Model\LayoutDirectivesTest
+ * @see \Magento\Framework\View\LayoutDirectivesTest
  */
 namespace Magento\Framework\View;
 
@@ -91,7 +91,7 @@ public function testGenerateXml()
      * A smoke test for generating elements
      *
      * See sophisticated tests at \Magento\Framework\View\LayoutDirectivesTest
-     * @see \Magento\Core\Model\LayoutDirectivesTest
+     * @see \Magento\Framework\View\LayoutDirectivesTest
      * @magentoAppIsolation enabled
      */
     public function testGenerateGetAllBlocks()
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Model/Layout/MergeTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/Model/Layout/MergeTest.php
new file mode 100644
index 0000000000000..758e4b4de28d3
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Framework/View/Model/Layout/MergeTest.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\View\Model\Layout;
+
+class MergeTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Fixture XML instruction(s) to be used in tests
+     */
+    const FIXTURE_LAYOUT_XML = '<block class="Magento\Framework\View\Element\Template" template="fixture.phtml"/>';
+
+    /**
+     * @var \Magento\Framework\View\Model\Layout\Merge
+     */
+    protected $model;
+
+    protected function setUp()
+    {
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        /** @var $theme \Magento\Framework\View\Design\ThemeInterface */
+        $theme = $objectManager->create('Magento\Framework\View\Design\ThemeInterface');
+        $theme->load(1);
+
+        /** @var $layoutUpdate1 \Magento\Widget\Model\Layout\Update */
+        $layoutUpdate1 = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            'Magento\Widget\Model\Layout\Update'
+        );
+        $layoutUpdate1->setHandle('fixture_handle_one');
+        $layoutUpdate1->setXml('
+            <body>
+                <block class="Magento\Framework\View\Element\Template" template="fixture_template_one.phtml"/>
+            </body>
+        ');
+        $layoutUpdate1->setHasDataChanges(true);
+        $layoutUpdate1->save();
+        $link1 = $objectManager->create('Magento\Widget\Model\Layout\Link');
+        $link1->setThemeId($theme->getId());
+        $link1->setLayoutUpdateId($layoutUpdate1->getId());
+        $link1->save();
+
+        /** @var $layoutUpdate2 \Magento\Widget\Model\Layout\Update */
+        $layoutUpdate2 = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            'Magento\Widget\Model\Layout\Update'
+        );
+        $layoutUpdate2->setHandle('fixture_handle_two');
+        $layoutUpdate2->setXml('
+            <body>
+                <block class="Magento\Framework\View\Element\Template" template="fixture_template_two.phtml"/>
+            </body>
+        ');
+        $layoutUpdate2->setHasDataChanges(true);
+        $layoutUpdate2->save($layoutUpdate2);
+        $link2 = $objectManager->create('Magento\Widget\Model\Layout\Link');
+        $link2->setThemeId($theme->getId());
+        $link2->setLayoutUpdateId($layoutUpdate2->getId());
+        $link2->save();
+
+        $this->model = $objectManager->create('Magento\Framework\View\Model\Layout\Merge',
+            [
+                'theme' => $theme
+            ]);
+    }
+
+    public function testLoadDbApp()
+    {
+        $this->assertEmpty($this->model->getHandles());
+        $this->assertEmpty($this->model->asString());
+        $handles = ['fixture_handle_one', 'fixture_handle_two'];
+        $this->model->load($handles);
+        $expectedResult = '
+            <root>
+                <body>
+                    <block class="Magento\Framework\View\Element\Template" template="fixture_template_one.phtml"/>
+                </body>
+                <body>
+                    <block class="Magento\Framework\View\Element\Template" template="fixture_template_two.phtml"/>
+                </body>
+            </root>
+        ';
+        $actualResult = '<root>' . $this->model->asString() . '</root>';
+        $this->assertXmlStringEqualsXmlString($expectedResult, $actualResult);
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/fixture_handle_one.xml b/dev/tests/integration/testsuite/Magento/Framework/View/Model/Layout/_files/layout/fixture_handle_one.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/fixture_handle_one.xml
rename to dev/tests/integration/testsuite/Magento/Framework/View/Model/Layout/_files/layout/fixture_handle_one.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/fixture_handle_two.xml b/dev/tests/integration/testsuite/Magento/Framework/View/Model/Layout/_files/layout/fixture_handle_two.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/fixture_handle_two.xml
rename to dev/tests/integration/testsuite/Magento/Framework/View/Model/Layout/_files/layout/fixture_handle_two.xml
diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/AbstractStubEntity.php b/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/AbstractStubEntity.php
index 031d37ec7a649..8cfb1a015e9cb 100644
--- a/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/AbstractStubEntity.php
+++ b/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/AbstractStubEntity.php
@@ -13,7 +13,7 @@ abstract class AbstractStubEntity extends \Magento\ImportExport\Model\Export\Abs
 {
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\ImportExport\Model\Export\Factory $collectionFactory,
         \Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory,
         array $data = []
diff --git a/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/EntityAbstractTest.php b/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/EntityAbstractTest.php
index 8166c915ae479..3c445575a6fda 100644
--- a/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/EntityAbstractTest.php
+++ b/dev/tests/integration/testsuite/Magento/ImportExport/Model/Export/EntityAbstractTest.php
@@ -109,7 +109,7 @@ abstract class Stub_Magento_ImportExport_Model_Export_AbstractEntity
 {
     public function __construct(
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\ImportExport\Model\Export\Factory $collectionFactory,
         \Magento\ImportExport\Model\Resource\CollectionByPagesIteratorFactory $resourceColFactory,
         array $data = []
diff --git a/dev/tests/integration/testsuite/Magento/Integration/Service/V1/AuthorizationServiceTest.php b/dev/tests/integration/testsuite/Magento/Integration/Service/V1/AuthorizationServiceTest.php
index 9553a4a858d2d..5f801e0110921 100644
--- a/dev/tests/integration/testsuite/Magento/Integration/Service/V1/AuthorizationServiceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Integration/Service/V1/AuthorizationServiceTest.php
@@ -56,7 +56,7 @@ protected function setUp()
     public function testGrantPermissions()
     {
         $integrationId = rand(1, 1000);
-        $resources = ['Magento_Sales::create', 'Magento_Cms::page', 'Magento_Adminhtml::dashboard'];
+        $resources = ['Magento_Sales::create', 'Magento_Cms::page', 'Magento_Backend::dashboard'];
         /** Preconditions check */
         $this->_ensurePermissionsAreNotGranted($integrationId, $resources);
 
@@ -92,7 +92,7 @@ public function changePermissionsProvider()
         return [
             'integration' => [
                 'integrationId' => rand(1, 1000),
-                'initialResources' => ['Magento_Cms::page', 'Magento_Adminhtml::dashboard'],
+                'initialResources' => ['Magento_Cms::page', 'Magento_Backend::dashboard'],
                 'newResources' => ['Magento_Sales::cancel', 'Magento_Cms::page_delete'],
             ],
             'integration clear permissions' => [
@@ -110,7 +110,7 @@ public function testGrantAllPermissions()
     {
         $integrationId = rand(1, 1000);
         $this->_service->grantAllPermissions($integrationId);
-        $this->_ensurePermissionsAreGranted($integrationId, ['Magento_Adminhtml::all']);
+        $this->_ensurePermissionsAreGranted($integrationId, ['Magento_Backend::all']);
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/_files/queue.php b/dev/tests/integration/testsuite/Magento/Newsletter/_files/queue.php
index db3b3ba683ee8..58529e1a56500 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/_files/queue.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/_files/queue.php
@@ -14,8 +14,8 @@
 $template->load('fixture_tpl', 'template_code');
 $templateId = $template->getId();
 
-$currentStore = $objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getId();
-$otherStore = $objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore('fixturestore')->getId();
+$currentStore = $objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getId();
+$otherStore = $objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore('fixturestore')->getId();
 
 /** @var $queue \Magento\Newsletter\Model\Queue */
 $queue = $objectManager->create('Magento\Newsletter\Model\Queue');
diff --git a/dev/tests/integration/testsuite/Magento/Newsletter/_files/subscribers.php b/dev/tests/integration/testsuite/Magento/Newsletter/_files/subscribers.php
index 3a5b36d59e16b..fe3cc067ec3e1 100644
--- a/dev/tests/integration/testsuite/Magento/Newsletter/_files/subscribers.php
+++ b/dev/tests/integration/testsuite/Magento/Newsletter/_files/subscribers.php
@@ -8,10 +8,10 @@
 require __DIR__ . '/../../../Magento/Customer/_files/customer.php';
 
 $currentStore = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-    'Magento\Framework\Store\StoreManagerInterface'
+    'Magento\Store\Model\StoreManagerInterface'
 )->getStore()->getId();
 $otherStore = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-    'Magento\Framework\Store\StoreManagerInterface'
+    'Magento\Store\Model\StoreManagerInterface'
 )->getStore(
     'fixturestore'
 )->getId();
diff --git a/dev/tests/integration/testsuite/Magento/Payment/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/Payment/Model/ObserverTest.php
index 1f44e5c0481d4..94ea3cb8e6e50 100644
--- a/dev/tests/integration/testsuite/Magento/Payment/Model/ObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Payment/Model/ObserverTest.php
@@ -60,7 +60,7 @@ public function testUpdateOrderStatusForPaymentMethodsEvent()
         $scopeConfig = $this->_objectManager->get('Magento\Framework\App\Config\ScopeConfigInterface');
         $defaultStatus = (string)$scopeConfig->getValue(
             'payment/checkmo/order_status',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
 
         /** @var \Magento\Core\Model\Resource\Config $config */
@@ -76,7 +76,7 @@ public function testUpdateOrderStatusForPaymentMethodsEvent()
 
         $newStatus = (string)$scopeConfig->getValue(
             'payment/checkmo/order_status',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
 
         $status->unassignState(\Magento\Sales\Model\Order::STATE_NEW);
@@ -85,7 +85,7 @@ public function testUpdateOrderStatusForPaymentMethodsEvent()
 
         $unassignedStatus = $scopeConfig->getValue(
             'payment/checkmo/order_status',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
 
         $this->assertEquals('pending', $defaultStatus);
@@ -116,7 +116,7 @@ public function testUpdateOrderStatusForPaymentMethods()
         $scopeConfig = $this->_objectManager->get('Magento\Framework\App\Config\ScopeConfigInterface');
         $unassignedStatus = (string)$scopeConfig->getValue(
             'payment/checkmo/order_status',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         $this->assertEquals('pending', $unassignedStatus);
     }
@@ -140,6 +140,6 @@ protected function _createEventObserver()
     protected function _resetConfig()
     {
         $this->_objectManager->get('Magento\Framework\App\Config\ReinitableConfigInterface')->reinit();
-        $this->_objectManager->create('Magento\Framework\Store\StoreManagerInterface')->reinitStores();
+        $this->_objectManager->create('Magento\Store\Model\StoreManagerInterface')->reinitStores();
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Review/_files/customer_review.php b/dev/tests/integration/testsuite/Magento/Review/_files/customer_review.php
index 19ece27a66e1a..547516ebfcbf7 100644
--- a/dev/tests/integration/testsuite/Magento/Review/_files/customer_review.php
+++ b/dev/tests/integration/testsuite/Magento/Review/_files/customer_review.php
@@ -26,19 +26,13 @@
     ->setEntityPkValue($product->getId())
     ->setStatusId(\Magento\Review\Model\Review::STATUS_PENDING)
     ->setStoreId(
-        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->get('Magento\Framework\Store\StoreManagerInterface')
-            ->getStore()
-            ->getId()
-    )
-    ->setStores(
-        [
-            \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-                ->get('Magento\Framework\Store\StoreManagerInterface')
-                ->getStore()
-                ->getId()
-        ]
+        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface')
+            ->getStore()->getId()
     )
+    ->setStores([
+        \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface')
+            ->getStore()->getId()
+    ])
     ->save();
 
 \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Framework\Registry')->register(
diff --git a/dev/tests/integration/testsuite/Magento/Review/_files/different_reviews.php b/dev/tests/integration/testsuite/Magento/Review/_files/different_reviews.php
index e92f3c6183c21..a5e5fa9104b6d 100644
--- a/dev/tests/integration/testsuite/Magento/Review/_files/different_reviews.php
+++ b/dev/tests/integration/testsuite/Magento/Review/_files/different_reviews.php
@@ -18,12 +18,12 @@
     \Magento\Review\Model\Review::STATUS_PENDING
 )->setStoreId(
     \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-        'Magento\Framework\Store\StoreManagerInterface'
+        'Magento\Store\Model\StoreManagerInterface'
     )->getStore()->getId()
 )->setStores(
     [
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Framework\Store\StoreManagerInterface'
+            'Magento\Store\Model\StoreManagerInterface'
         )->getStore()->getId()
     ]
 )->save();
@@ -40,12 +40,12 @@
     \Magento\Review\Model\Review::STATUS_APPROVED
 )->setStoreId(
     \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-        'Magento\Framework\Store\StoreManagerInterface'
+        'Magento\Store\Model\StoreManagerInterface'
     )->getStore()->getId()
 )->setStores(
     [
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Framework\Store\StoreManagerInterface'
+            'Magento\Store\Model\StoreManagerInterface'
         )->getStore()->getId()
     ]
 )->save();
@@ -62,12 +62,12 @@
     \Magento\Review\Model\Review::STATUS_APPROVED
 )->setStoreId(
     \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-        'Magento\Framework\Store\StoreManagerInterface'
+        'Magento\Store\Model\StoreManagerInterface'
     )->getStore()->getId()
 )->setStores(
     [
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Framework\Store\StoreManagerInterface'
+            'Magento\Store\Model\StoreManagerInterface'
         )->getStore()->getId()
     ]
 )->save();
diff --git a/dev/tests/integration/testsuite/Magento/Review/_files/review_xss.php b/dev/tests/integration/testsuite/Magento/Review/_files/review_xss.php
index e7497306d0f59..76976691452fc 100644
--- a/dev/tests/integration/testsuite/Magento/Review/_files/review_xss.php
+++ b/dev/tests/integration/testsuite/Magento/Review/_files/review_xss.php
@@ -15,12 +15,12 @@
     \Magento\Review\Model\Review::STATUS_PENDING
 )->setStoreId(
     \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-        'Magento\Framework\Store\StoreManagerInterface'
+        'Magento\Store\Model\StoreManagerInterface'
     )->getStore()->getId()
 )->setStores(
     [
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Framework\Store\StoreManagerInterface'
+            'Magento\Store\Model\StoreManagerInterface'
         )->getStore()->getId()
     ]
 )->setNickname(
diff --git a/dev/tests/integration/testsuite/Magento/Review/_files/reviews.php b/dev/tests/integration/testsuite/Magento/Review/_files/reviews.php
index 8f8c6acdfcb6a..7f8202978fc97 100644
--- a/dev/tests/integration/testsuite/Magento/Review/_files/reviews.php
+++ b/dev/tests/integration/testsuite/Magento/Review/_files/reviews.php
@@ -18,12 +18,12 @@
     \Magento\Review\Model\Review::STATUS_PENDING
 )->setStoreId(
     \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-        'Magento\Framework\Store\StoreManagerInterface'
+        'Magento\Store\Model\StoreManagerInterface'
     )->getStore()->getId()
 )->setStores(
     [
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Framework\Store\StoreManagerInterface'
+            'Magento\Store\Model\StoreManagerInterface'
         )->getStore()->getId()
     ]
 )->save();
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php
index 21a3ab71070cc..890462879d0be 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/Model/Resource/OrderTest.php
@@ -93,7 +93,7 @@ public function testSaveOrder()
             ->setShippingAddress($shippingAddress)
             ->setStoreId(
                 $this->objectManager
-                    ->get('Magento\Framework\Store\StoreManagerInterface')
+                    ->get('Magento\Store\Model\StoreManagerInterface')
                     ->getStore()
                     ->getId()
             )
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
index 6d9497bc2c372..dfd4511b37c4b 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order.php
@@ -51,7 +51,7 @@
 )->setShippingAddress(
     $shippingAddress
 )->setStoreId(
-    $objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getId()
+    $objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getId()
 )->addItem(
     $orderItem
 )->setPayment(
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_fixture_store.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_fixture_store.php
index 1f0759c65b3f8..6bbd0430c0bfc 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_fixture_store.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_fixture_store.php
@@ -47,7 +47,7 @@
 )->setShippingAddress(
     $shippingAddress
 )->setStoreId(
-    $objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore('fixturestore')->getId()
+    $objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore('fixturestore')->getId()
 )->addItem(
     $orderItem
 )->setPayment(
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_info.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_info.php
index 9cf0caca1f276..1862adfcee81f 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_info.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_info.php
@@ -45,7 +45,7 @@
     true
 )->setStoreId(
     \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-        'Magento\Framework\Store\StoreManagerInterface'
+        'Magento\Store\Model\StoreManagerInterface'
     )->getStore()->getId()
 )->setReservedOrderId(
     'test01'
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/order_paid_with_payflowpro.php b/dev/tests/integration/testsuite/Magento/Sales/_files/order_paid_with_payflowpro.php
index 356ca3a729887..130ace4811f7e 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/order_paid_with_payflowpro.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/order_paid_with_payflowpro.php
@@ -35,7 +35,7 @@
     $shippingAddress
 )->setStoreId(
     \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-        'Magento\Framework\Store\StoreManagerInterface'
+        'Magento\Store\Model\StoreManagerInterface'
     )->getStore()->getId()
 )->setPayment(
     $payment
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/quote.php b/dev/tests/integration/testsuite/Magento/Sales/_files/quote.php
index b4d418c387eec..8bdafe16f41aa 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/quote.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/quote.php
@@ -50,7 +50,7 @@
     true
 )->setStoreId(
     \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-        'Magento\Framework\Store\StoreManagerInterface'
+        'Magento\Store\Model\StoreManagerInterface'
     )->getStore()->getId()
 )->setReservedOrderId(
     'test01'
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_40_percent_off.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_40_percent_off.php
index 4c7173aa92459..c9a49409c7e8e 100644
--- a/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_40_percent_off.php
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_40_percent_off.php
@@ -25,7 +25,7 @@
         'stop_rules_processing' => 1,
         'website_ids' => [
             \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                'Magento\Framework\Store\StoreManagerInterface'
+                'Magento\Store\Model\StoreManagerInterface'
             )->getWebsite()->getId()
         ]
     ]
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_50_percent_off.php b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_50_percent_off.php
index 2c6f6460c8462..3aa0026f5a48b 100644
--- a/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_50_percent_off.php
+++ b/dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_50_percent_off.php
@@ -25,7 +25,7 @@
         'stop_rules_processing' => 1,
         'website_ids' => [
             \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                'Magento\Framework\Store\StoreManagerInterface'
+                'Magento\Store\Model\StoreManagerInterface'
             )->getWebsite()->getId()
         ]
     ]
diff --git a/dev/tests/integration/testsuite/Magento/Store/Model/GroupTest.php b/dev/tests/integration/testsuite/Magento/Store/Model/GroupTest.php
index 5310ecab43bc0..33faa758e8e30 100644
--- a/dev/tests/integration/testsuite/Magento/Store/Model/GroupTest.php
+++ b/dev/tests/integration/testsuite/Magento/Store/Model/GroupTest.php
@@ -22,7 +22,7 @@ protected function setUp()
     public function testSetGetWebsite()
     {
         $this->assertFalse($this->_model->getWebsite());
-        $website = Bootstrap::getObjectManager()->get('Magento\Framework\Store\StoreManagerInterface')->getWebsite();
+        $website = Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface')->getWebsite();
         $this->_model->setWebsite($website);
         $actualResult = $this->_model->getWebsite();
         $this->assertSame($website, $actualResult);
@@ -34,7 +34,7 @@ public function testSetGetWebsite()
     public function testGetWebsiteDefault()
     {
         $this->assertFalse($this->_model->getWebsite());
-        $website = Bootstrap::getObjectManager()->get('Magento\Framework\Store\StoreManagerInterface')->getWebsite();
+        $website = Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface')->getWebsite();
         $this->_model->setWebsite($website);
         // Empty string should get treated like no parameter
         $actualResult = $this->_model->getWebsite('');
diff --git a/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php b/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
index 961873bc56359..af24b2b206fb1 100644
--- a/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
+++ b/dev/tests/integration/testsuite/Magento/Store/Model/StoreTest.php
@@ -120,7 +120,7 @@ public function testSetGetWebsite()
     {
         $this->assertFalse($this->model->getWebsite());
         $website = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Framework\Store\StoreManagerInterface'
+            'Magento\Store\Model\StoreManagerInterface'
         )->getWebsite();
         $this->model->setWebsite($website);
         $actualResult = $this->model->getWebsite();
@@ -157,14 +157,14 @@ public function testGetBaseUrl($type, $useRewrites, $useStoreCode, $expected)
         )->setValue(
             \Magento\Store\Model\Store::XML_PATH_USE_REWRITES,
             $useRewrites,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
             'Magento\Framework\App\Config\MutableScopeConfigInterface'
         )->setValue(
             \Magento\Store\Model\Store::XML_PATH_STORE_IN_URL,
             $useStoreCode,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
 
         $actual = $this->model->getBaseUrl($type);
@@ -244,14 +244,14 @@ public function testGetBaseUrlForCustomEntryPoint($type, $useCustomEntryPoint, $
         )->setValue(
             \Magento\Store\Model\Store::XML_PATH_USE_REWRITES,
             false,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
             'Magento\Framework\App\Config\MutableScopeConfigInterface'
         )->setValue(
             \Magento\Store\Model\Store::XML_PATH_STORE_IN_URL,
             $useStoreCode,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
 
         // emulate custom entry point
diff --git a/dev/tests/integration/testsuite/Magento/Store/_files/second_store.php b/dev/tests/integration/testsuite/Magento/Store/_files/second_store.php
index a8ee609555451..ac1a841589326 100644
--- a/dev/tests/integration/testsuite/Magento/Store/_files/second_store.php
+++ b/dev/tests/integration/testsuite/Magento/Store/_files/second_store.php
@@ -6,10 +6,10 @@
 
 $store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Store\Model\Store');
 $websiteId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-    'Magento\Framework\Store\StoreManagerInterface'
+    'Magento\Store\Model\StoreManagerInterface'
 )->getWebsite()->getId();
 $groupId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-    'Magento\Framework\Store\StoreManagerInterface'
+    'Magento\Store\Model\StoreManagerInterface'
 )->getWebsite()->getDefaultGroupId();
 $store->setCode(
     'fixture_second_store'
@@ -28,5 +28,5 @@
 
 /* Refresh stores memory cache */
 \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-    'Magento\Framework\Store\StoreManagerInterface'
+    'Magento\Store\Model\StoreManagerInterface'
 )->reinitStores();
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/LayoutTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/LayoutTest.php
index 3b8ab45122e45..b64ede3b82863 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/LayoutTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/LayoutTest.php
@@ -138,7 +138,7 @@ public function testPageTypesDeclaration()
             function (\Magento\Framework\View\File $layout) {
                 $content = simplexml_load_file($layout->getFilename());
                 $this->assertEmpty(
-                    $content->xpath(\Magento\Core\Model\Layout\Merge::XPATH_HANDLE_DECLARATION),
+                    $content->xpath(\Magento\Framework\View\Model\Layout\Merge::XPATH_HANDLE_DECLARATION),
                     "Theme layout update '" . $layout->getFilename() . "' contains page type declaration(s)"
                 );
             },
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/Magento/Payment/MethodsTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/Magento/Payment/MethodsTest.php
index 83e7bf3ed7951..4a578a6020c64 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/Magento/Payment/MethodsTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/Magento/Payment/MethodsTest.php
@@ -25,7 +25,7 @@ public function testPaymentMethod($code, $methodClass)
             'Magento\Framework\View\Element\BlockFactory'
         );
         $storeId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Framework\Store\StoreManagerInterface'
+            'Magento\Store\Model\StoreManagerInterface'
         )->getStore()->getId();
         /** @var $model \Magento\Payment\Model\MethodInterface */
         if (empty($methodClass)) {
@@ -60,20 +60,20 @@ public function testPaymentMethod($code, $methodClass)
             if ($model->canUseInternal()) {
                 try {
                     \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                        'Magento\Framework\Store\StoreManagerInterface'
+                        'Magento\Store\Model\StoreManagerInterface'
                     )->getStore()->setId(
                         \Magento\Store\Model\Store::DEFAULT_STORE_ID
                     );
                     $block->setArea('adminhtml');
                     $this->assertFileExists($block->getTemplateFile(), $message);
                     \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                        'Magento\Framework\Store\StoreManagerInterface'
+                        'Magento\Store\Model\StoreManagerInterface'
                     )->getStore()->setId(
                         $storeId
                     );
                 } catch (\Exception $e) {
                     \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                        'Magento\Framework\Store\StoreManagerInterface'
+                        'Magento\Store\Model\StoreManagerInterface'
                     )->getStore()->setId(
                         $storeId
                     );
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/BlockInstantiationTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/BlockInstantiationTest.php
index 520ca3b468242..5f9ec25ebbcf2 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/BlockInstantiationTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/BlockInstantiationTest.php
@@ -57,7 +57,7 @@ public function allBlocksDataProvider()
         try {
             /** @var $website \Magento\Store\Model\Website */
             \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                'Magento\Framework\Store\StoreManagerInterface'
+                'Magento\Store\Model\StoreManagerInterface'
             )->getStore()->setWebsiteId(
                 0
             );
@@ -111,7 +111,7 @@ protected function _getBlocksToSkip()
     private function _addBlock($module, $blockClass, $class, $templateBlocks)
     {
         $area = 'frontend';
-        if ($module == 'Magento_Adminhtml' || strpos(
+        if ($module == 'Magento_Backend' || strpos(
             $blockClass,
             '\\Adminhtml\\'
         ) || strpos(
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php
index e86d024abf5ad..2f6b5f00e500d 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/LayoutFilesTest.php
@@ -84,7 +84,7 @@ protected function isSkippedArgument(array $argumentData)
         unset($argumentData['updater']);
 
         // Arguments, evaluation of which causes a run-time error, because of unsafe assumptions to the environment
-        $typeAttr = \Magento\Core\Model\Layout\Merge::TYPE_ATTRIBUTE;
+        $typeAttr = \Magento\Framework\View\Model\Layout\Merge::TYPE_ATTRIBUTE;
         $ignoredArguments = [
             [
                 $typeAttr => 'object',
diff --git a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/TemplateFilesTest.php b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/TemplateFilesTest.php
index b5551a59d44eb..80d126976c80b 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/TemplateFilesTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Integrity/Modular/TemplateFilesTest.php
@@ -51,7 +51,7 @@ public function allTemplatesDataProvider()
         try {
             /** @var $website \Magento\Store\Model\Website */
             \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                'Magento\Framework\Store\StoreManagerInterface'
+                'Magento\Store\Model\StoreManagerInterface'
             )->getStore()->setWebsiteId(
                 0
             );
@@ -68,7 +68,7 @@ public function allTemplatesDataProvider()
                 }
 
                 $area = 'frontend';
-                if ($module == 'Magento_Adminhtml' || strpos(
+                if ($module == 'Magento_Backend' || strpos(
                     $blockClass,
                     '\\Adminhtml\\'
                 ) || strpos(
diff --git a/dev/tests/integration/testsuite/Magento/Theme/Block/Html/FooterTest.php b/dev/tests/integration/testsuite/Magento/Theme/Block/Html/FooterTest.php
index b9353ea075ea7..c4d4c5bb6b32c 100644
--- a/dev/tests/integration/testsuite/Magento/Theme/Block/Html/FooterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/Block/Html/FooterTest.php
@@ -31,7 +31,7 @@ public function testGetCacheKeyInfo()
         $context->setValue(Context::CONTEXT_AUTH, false, false);
         $block = $objectManager->get('Magento\Framework\View\LayoutInterface')
             ->createBlock('Magento\Theme\Block\Html\Footer');
-        $storeId = $objectManager->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getId();
+        $storeId = $objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getId();
         $this->assertEquals(
             ['PAGE_FOOTER', $storeId, 0, $this->_theme->getId(), null],
             $block->getCacheKeyInfo()
diff --git a/dev/tests/integration/testsuite/Magento/Theme/Model/DesignTest.php b/dev/tests/integration/testsuite/Magento/Theme/Model/DesignTest.php
index 24b8a4e7b3dc9..22673156c8353 100644
--- a/dev/tests/integration/testsuite/Magento/Theme/Model/DesignTest.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/DesignTest.php
@@ -36,7 +36,7 @@ public function testChangeDesign()
             'Magento\Framework\View\DesignInterface'
         );
         $storeId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Framework\Store\StoreManagerInterface'
+            'Magento\Store\Model\StoreManagerInterface'
         )->getDefaultStoreView()->getId();
         // fixture design_change
         $designChange = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
@@ -103,7 +103,7 @@ public function testLoadChangeCache()
             ->create('Magento\Framework\Stdlib\DateTime');
         $date = $dateTime->now(true);
         $storeId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Framework\Store\StoreManagerInterface'
+            'Magento\Store\Model\StoreManagerInterface'
         )->getDefaultStoreView()->getId();
         // fixture design_change
 
@@ -166,7 +166,7 @@ public function testLoadChangeTimezone($storeCode, $storeTimezone, $storeUtcOffs
         }
 
         $store = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Framework\Store\StoreManagerInterface'
+            'Magento\Store\Model\StoreManagerInterface'
         )->getStore(
             $storeCode
         );
diff --git a/dev/tests/integration/testsuite/Magento/Theme/Model/View/DesignTest.php b/dev/tests/integration/testsuite/Magento/Theme/Model/View/DesignTest.php
index 44dae02dfb119..2fe398ded09e7 100644
--- a/dev/tests/integration/testsuite/Magento/Theme/Model/View/DesignTest.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/Model/View/DesignTest.php
@@ -131,7 +131,7 @@ public function testGetConfigurationDesignThemeDefaults()
     public function testGetConfigurationDesignThemeStore()
     {
         $storeId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Framework\Store\StoreManagerInterface'
+            'Magento\Store\Model\StoreManagerInterface'
         )->getStore()->getId();
         $this->assertEquals('one', $this->_model->getConfigurationDesignTheme());
         $this->assertEquals('one', $this->_model->getConfigurationDesignTheme(null, ['store' => $storeId]));
diff --git a/dev/tests/integration/testsuite/Magento/Theme/_files/design_change.php b/dev/tests/integration/testsuite/Magento/Theme/_files/design_change.php
index bce3e85d2b19e..6a3f64a7d928f 100644
--- a/dev/tests/integration/testsuite/Magento/Theme/_files/design_change.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/_files/design_change.php
@@ -5,7 +5,7 @@
  */
 
 $storeId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-    'Magento\Framework\Store\StoreManagerInterface'
+    'Magento\Store\Model\StoreManagerInterface'
 )->getDefaultStoreView()->getId();
 /** @var $change \Magento\Theme\Model\Design */
 $change = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Theme\Model\Design');
diff --git a/dev/tests/integration/testsuite/Magento/Theme/_files/design_change_timezone.php b/dev/tests/integration/testsuite/Magento/Theme/_files/design_change_timezone.php
index c9de375655863..9426331a7c705 100644
--- a/dev/tests/integration/testsuite/Magento/Theme/_files/design_change_timezone.php
+++ b/dev/tests/integration/testsuite/Magento/Theme/_files/design_change_timezone.php
@@ -14,7 +14,7 @@
 ];
 foreach ($designChanges as $designChangeData) {
     $storeId = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-        'Magento\Framework\Store\StoreManagerInterface'
+        'Magento\Store\Model\StoreManagerInterface'
     )->getStore(
         $designChangeData['store']
     )->getId();
diff --git a/dev/tests/integration/testsuite/Magento/Translation/Model/InlineParserTest.php b/dev/tests/integration/testsuite/Magento/Translation/Model/InlineParserTest.php
index 34e234cde3f9d..da9e72ff09906 100644
--- a/dev/tests/integration/testsuite/Magento/Translation/Model/InlineParserTest.php
+++ b/dev/tests/integration/testsuite/Magento/Translation/Model/InlineParserTest.php
@@ -26,7 +26,7 @@ protected function setUp()
         );
         /* Called getConfig as workaround for setConfig bug */
         \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Framework\Store\StoreManagerInterface'
+            'Magento\Store\Model\StoreManagerInterface'
         )->getStore(
             $this->_storeId
         )->getConfig(
@@ -37,7 +37,7 @@ protected function setUp()
         )->setValue(
             'dev/translate_inline/active',
             true,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->_storeId
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Edit/FormTest.php b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Edit/FormTest.php
index 2cbcdf0cec9f7..18382c4b69f1e 100644
--- a/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Edit/FormTest.php
+++ b/dev/tests/integration/testsuite/Magento/UrlRewrite/Block/Edit/FormTest.php
@@ -105,7 +105,7 @@ public function testStoreElementSingleStore()
 
         // Check that store value set correctly
         $defaultStore = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            'Magento\Framework\Store\StoreManagerInterface'
+            'Magento\Store\Model\StoreManagerInterface'
         )->getStore(
             true
         )->getId();
diff --git a/dev/tests/integration/testsuite/Magento/User/Block/Role/Tab/EditTest.php b/dev/tests/integration/testsuite/Magento/User/Block/Role/Tab/EditTest.php
index 718225e6c1cdc..45d3cd2244034 100644
--- a/dev/tests/integration/testsuite/Magento/User/Block/Role/Tab/EditTest.php
+++ b/dev/tests/integration/testsuite/Magento/User/Block/Role/Tab/EditTest.php
@@ -35,7 +35,7 @@ protected function setUp()
     public function testConstructor()
     {
         $this->assertNotEmpty($this->_block->getSelectedResources());
-        $this->assertContains('Magento_Adminhtml::all', $this->_block->getSelectedResources());
+        $this->assertContains('Magento_Backend::all', $this->_block->getSelectedResources());
     }
 
     public function testGetTree()
diff --git a/dev/tests/integration/testsuite/Magento/User/_files/user_with_role.php b/dev/tests/integration/testsuite/Magento/User/_files/user_with_role.php
index 591ee5153ba50..e5668373aa5f0 100644
--- a/dev/tests/integration/testsuite/Magento/User/_files/user_with_role.php
+++ b/dev/tests/integration/testsuite/Magento/User/_files/user_with_role.php
@@ -16,7 +16,7 @@
     ->setPassword(\Magento\TestFramework\Bootstrap::ADMIN_PASSWORD)
     ->setEmail('adminUser@example.com')
     ->setRoleType('G')
-    ->setResourceId('Magento_Adminhtml::all')
+    ->setResourceId('Magento_Backend::all')
     ->setPrivileges("")
     ->setAssertId(0)
     ->setRoleId(1)
diff --git a/dev/tests/integration/testsuite/Magento/Webapi/Model/PathProcessorTest.php b/dev/tests/integration/testsuite/Magento/Webapi/Model/PathProcessorTest.php
index eeae74762e0f1..23031143f514c 100644
--- a/dev/tests/integration/testsuite/Magento/Webapi/Model/PathProcessorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Webapi/Model/PathProcessorTest.php
@@ -9,7 +9,7 @@
 class PathProcessorTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -21,7 +21,7 @@ class PathProcessorTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        $this->storeManager = $objectManager->get('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManager = $objectManager->get('Magento\Store\Model\StoreManagerInterface');
         $this->pathProcessor = $objectManager->get('Magento\Webapi\Model\PathProcessor');
     }
 
diff --git a/dev/tests/integration/testsuite/Magento/Webapi/Model/Soap/ServerTest.php b/dev/tests/integration/testsuite/Magento/Webapi/Model/Soap/ServerTest.php
index 76adf00063361..5d8bf16ecb1cc 100644
--- a/dev/tests/integration/testsuite/Magento/Webapi/Model/Soap/ServerTest.php
+++ b/dev/tests/integration/testsuite/Magento/Webapi/Model/Soap/ServerTest.php
@@ -28,7 +28,7 @@ class ServerTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Store\Model\Store */
     protected $_storeMock;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface */
+    /** @var \Magento\Store\Model\StoreManagerInterface */
     protected $_storeManagerMock;
 
     /** @var \Magento\Webapi\Model\Soap\Server\Factory */
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Layout/UpdateTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Layout/UpdateTest.php
similarity index 75%
rename from dev/tests/integration/testsuite/Magento/Core/Model/Layout/UpdateTest.php
rename to dev/tests/integration/testsuite/Magento/Widget/Model/Layout/UpdateTest.php
index 8ab18f1a86d33..c422c8a6ed262 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Layout/UpdateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Layout/UpdateTest.php
@@ -3,28 +3,28 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\Model\Layout;
+namespace Magento\Widget\Model\Layout;
 
 class UpdateTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Core\Model\Layout\Update
+     * @var \Magento\Widget\Model\Layout\Update
      */
     protected $_model;
 
     protected function setUp()
     {
         $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Core\Model\Layout\Update'
+            'Magento\Widget\Model\Layout\Update'
         );
     }
 
     public function testConstructor()
     {
         $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Core\Model\Layout\Update'
+            'Magento\Widget\Model\Layout\Update'
         );
-        $this->assertInstanceOf('Magento\Core\Model\Resource\Layout\Update', $this->_model->getResource());
+        $this->assertInstanceOf('Magento\Widget\Model\Resource\Layout\Update', $this->_model->getResource());
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Layout/UpdateTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Resource/Layout/UpdateTest.php
similarity index 81%
rename from dev/tests/integration/testsuite/Magento/Core/Model/Resource/Layout/UpdateTest.php
rename to dev/tests/integration/testsuite/Magento/Widget/Model/Resource/Layout/UpdateTest.php
index 487a1dd895b05..258dd874ce606 100644
--- a/dev/tests/integration/testsuite/Magento/Core/Model/Resource/Layout/UpdateTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Resource/Layout/UpdateTest.php
@@ -3,24 +3,24 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\Model\Resource\Layout;
+namespace Magento\Widget\Model\Resource\Layout;
 
 class UpdateTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Core\Model\Resource\Layout\Update
+     * @var \Magento\Widget\Model\Resource\Layout\Update
      */
     protected $_resourceModel;
 
     protected function setUp()
     {
         $this->_resourceModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Core\Model\Resource\Layout\Update'
+            'Magento\Widget\Model\Resource\Layout\Update'
         );
     }
 
     /**
-     * @magentoDataFixture Magento/Core/_files/layout_update.php
+     * @magentoDataFixture Magento/Widget/_files/layout_update.php
      */
     public function testFetchUpdatesByHandle()
     {
@@ -33,7 +33,7 @@ public function testFetchUpdatesByHandle()
             'test_handle',
             $theme,
             \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-                'Magento\Framework\Store\StoreManagerInterface'
+                'Magento\Store\Model\StoreManagerInterface'
             )->getStore()
         );
         $this->assertEquals('not_temporary', $result);
@@ -41,7 +41,7 @@ public function testFetchUpdatesByHandle()
 
     /**
      * @magentoDataFixture Magento/Backend/controllers/_files/cache/application_cache.php
-     * @magentoDataFixture Magento/Core/_files/layout_cache.php
+     * @magentoDataFixture Magento/Widget/_files/layout_cache.php
      */
     public function testSaveAfterClearCache()
     {
@@ -55,9 +55,9 @@ public function testSaveAfterClearCache()
         $this->assertNotEmpty($appCache->load('APPLICATION_FIXTURE'));
         $this->assertNotEmpty($layoutCache->load('LAYOUT_CACHE_FIXTURE'));
 
-        /** @var $layoutUpdate \Magento\Core\Model\Layout\Update */
+        /** @var $layoutUpdate \Magento\Widget\Model\Layout\Update */
         $layoutUpdate = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            'Magento\Core\Model\Layout\Update'
+            'Magento\Widget\Model\Layout\Update'
         );
         $layoutUpdate->setHasDataChanges(true);
         $this->_resourceModel->save($layoutUpdate);
diff --git a/dev/tests/integration/testsuite/Magento/Core/_files/layout_cache.php b/dev/tests/integration/testsuite/Magento/Widget/_files/layout_cache.php
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/Core/_files/layout_cache.php
rename to dev/tests/integration/testsuite/Magento/Widget/_files/layout_cache.php
diff --git a/dev/tests/integration/testsuite/Magento/Core/_files/layout_update.php b/dev/tests/integration/testsuite/Magento/Widget/_files/layout_update.php
similarity index 78%
rename from dev/tests/integration/testsuite/Magento/Core/_files/layout_update.php
rename to dev/tests/integration/testsuite/Magento/Widget/_files/layout_update.php
index 123dad3d52a08..425b1697659a4 100644
--- a/dev/tests/integration/testsuite/Magento/Core/_files/layout_update.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/_files/layout_update.php
@@ -21,8 +21,8 @@
     \Magento\Framework\View\Design\ThemeInterface::TYPE_VIRTUAL
 )->save();
 
-/** @var $updateNotTemporary \Magento\Core\Model\Layout\Update */
-$updateNotTemporary = $objectManager->create('Magento\Core\Model\Layout\Update');
+/** @var $updateNotTemporary \Magento\Widget\Model\Layout\Update */
+$updateNotTemporary = $objectManager->create('Magento\Widget\Model\Layout\Update');
 $updateNotTemporary->setHandle(
     'test_handle'
 )->setXml(
@@ -33,8 +33,8 @@
     $theme->getId()
 )->save();
 
-/** @var $updateTemporary \Magento\Core\Model\Layout\Update */
-$updateTemporary = $objectManager->create('Magento\Core\Model\Layout\Update');
+/** @var $updateTemporary \Magento\Widget\Model\Layout\Update */
+$updateTemporary = $objectManager->create('Magento\Widget\Model\Layout\Update');
 $updateTemporary->setHandle(
     'test_handle'
 )->setIsTemporary(
diff --git a/dev/tests/performance/testsuite/fixtures/catalog_200_categories_80k_products.php b/dev/tests/performance/testsuite/fixtures/catalog_200_categories_80k_products.php
index f467c451e6689..84427ea9f19ca 100644
--- a/dev/tests/performance/testsuite/fixtures/catalog_200_categories_80k_products.php
+++ b/dev/tests/performance/testsuite/fixtures/catalog_200_categories_80k_products.php
@@ -15,7 +15,7 @@
 
 $nestingLevel = 1;
 $parentCategoryId = $defaultParentCategoryId = $this->getObjectManager()->get(
-    'Magento\Framework\Store\StoreManagerInterface'
+    'Magento\Store\Model\StoreManagerInterface'
 )->getStore()->getRootCategoryId();
 $nestingPath = "1/{$parentCategoryId}";
 $categoryPath = '';
diff --git a/dev/tests/performance/testsuite/fixtures/sales_100k_orders.php b/dev/tests/performance/testsuite/fixtures/sales_100k_orders.php
index fc48c71952496..e5a666c78a2ca 100644
--- a/dev/tests/performance/testsuite/fixtures/sales_100k_orders.php
+++ b/dev/tests/performance/testsuite/fixtures/sales_100k_orders.php
@@ -43,7 +43,7 @@
     \Magento\Sales\Model\Order::STATE_NEW,
     true
 )->setStoreId(
-    $this->getObjectManager()->get('Magento\Framework\Store\StoreManagerInterface')->getStore()->getId()
+    $this->getObjectManager()->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getId()
 );
 
 for ($i = 1; $i <= 100000; $i++) {
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Library/_files/blacklist.txt b/dev/tests/static/testsuite/Magento/Test/Integrity/Library/_files/blacklist.txt
index 53770b9f92ec4..6a8dcbc9a4e79 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Library/_files/blacklist.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Library/_files/blacklist.txt
@@ -78,3 +78,4 @@ lib/internal/Magento/Framework/Url/ScopeResolver.php
 lib/internal/Magento/Framework/Url/SecurityInfo.php
 lib/internal/Magento/Framework/Url/RouteParamsResolver.php
 lib/internal/Magento/Framework/View/Url/Config.php
+lib/internal/Magento/Framework/View/Asset/Config.php
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/_files/blacklist/ce.txt b/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/_files/blacklist/ce.txt
index 07c64e4180cf1..366964138a05f 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/_files/blacklist/ce.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/_files/blacklist/ce.txt
@@ -32,7 +32,6 @@ lib/internal/Magento/Framework/RequireJs
 lib/internal/Magento/Framework/Search
 lib/internal/Magento/Framework/Serialization
 lib/internal/Magento/Framework/Simplexml
-lib/internal/Magento/Framework/Store
 lib/internal/Magento/Framework/System
 lib/internal/Magento/Framework/Test
 lib/internal/Magento/Framework/Url
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php
index 07767f5c8d8cd..ce5a5fc429bc4 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/dependency_test/tables_ce.php
@@ -4,10 +4,10 @@
  * See COPYING.txt for license details.
  */
 return [
-    'admin_assert' => 'Magento_Adminhtml',
+    'admin_assert' => 'Magento_Backend',
     'authorization_role' => 'Magento_Authorization',
     'authorization_rule' => 'Magento_Authorization',
-    'admin_user' => 'Magento_Adminhtml',
+    'admin_user' => 'Magento_Backend',
     'adminnotification_inbox' => 'Magento_AdminNotification',
     'catalog_category_entity_datetime' => 'Magento_Catalog',
     'catalog_category_entity_decimal' => 'Magento_Catalog',
@@ -115,8 +115,6 @@
     'core_email_template' => 'Magento_Core',
     'core_file_storage' => 'Magento_Core',
     'core_flag' => 'Magento_Core',
-    'core_layout_link' => 'Magento_Core',
-    'core_layout_update' => 'Magento_Core',
     'core_resource' => 'Magento_Core',
     'core_variable' => 'Magento_Core',
     'core_variable_value' => 'Magento_Core',
@@ -189,6 +187,8 @@
     'googleshopping_types' => 'Magento_GoogleShopping',
     'importexport_importdata' => 'Magento_ImportExport',
     'integration' => 'Magento_Integration',
+    'layout_link' => 'Magento_Widget',
+    'layout_update' => 'Magento_Widget',
     'log_customer' => 'Magento_Log',
     'log_quote' => 'Magento_Log',
     'log_summary' => 'Magento_Log',
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
index 6a4f0deb2e3e3..8b0bdbd20c159 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
@@ -823,13 +823,13 @@
     ['Mage_Core_Model_Session_Abstract_Varien'],
     ['Mage_Core_Model_Session_Abstract_Zend'],
     ['Magento\Core\Model\Source\Email\Variables', 'Magento\Email\Model\Source\Variables'],
-    ['Magento\Core\Model\Store\ListInterface', 'Magento\Framework\Store\StoreManagerInterface'],
-    ['Magento\Core\Model\Store\StorageInterface', 'Magento\Framework\Store\StoreManagerInterface'],
+    ['Magento\Core\Model\Store\ListInterface', 'Magento\Store\Model\StoreManagerInterface'],
+    ['Magento\Core\Model\Store\StorageInterface', 'Magento\Store\Model\StoreManagerInterface'],
     ['Mage_Core_Model_Store_Group_Limitation'],
     ['Mage_Core_Model_Store_Limitation'],
     ['Magento\Core\Model\Variable\Observer'],
     ['Mage_Core_Model_Website_Limitation'],
-    ['Mage_Core_Model_Layout_Data', 'Magento\Core\Model\Layout\Update'],
+    ['Mage_Core_Model_Layout_Data', 'Magento\Widget\Model\Layout\Update'],
     ['Mage_Core_Model_Theme_Customization_Link'],
     ['Mage_Customer_Block_Account'],
     ['Mage_Customer_Block_Account_Navigation'],
@@ -1594,7 +1594,6 @@
     ['Magento\Core\Model\View\Url\Config', 'Magento\Framework\View\Url\Config'],
     ['Magento\Core\Model\View\Config', 'Magento\Framework\View\Config'],
     ['Magento\Core\Model\Image\Factory', 'Magento\Framework\Image\Factory'],
-    ['Magento\Store\Model\StoreManagerInterface', 'Magento\Framework\Store\StoreManagerInterface'],
     ['Magento\Core\Model\Theme\Image', 'Magento\Framework\View\Design\Theme\Image'],
     ['Magento\Core\Model\Theme\FlyweightFactory', 'Magento\Framework\View\Design\Theme\FlyweightFactory'],
     ['Magento\Core\Model\Image\AdapterFactory', 'Magento\Framework\Image\AdapterFactory'],
@@ -2227,8 +2226,7 @@
     ['Magento\Core\Model\Resource\Website', 'Magento\Store\Model\Resource\Website'],
     ['Magento\Core\Model\Resource\Website\Collection', 'Magento\Store\Model\Resource\Website\Collection'],
     ['Magento\Core\Model\Resource\Website\Grid\Collection', 'Magento\Store\Model\Resource\Website\Grid\Collection'],
-    ['Magento\Core\Model\ScopeInterface', 'Magento\Framework\Store\ScopeInterface'],
-    ['Magento\Store\Model\ScopeInterface', 'Magento\Framework\Store\ScopeInterface'],
+    ['Magento\Core\Model\ScopeInterface', 'Magento\Store\Model\ScopeInterface'],
     ['Magento\Core\Model\Store', 'Magento\Store\Model\Store'],
     ['Magento\Store\Model\Exception', 'Magento\Framework\Model\Exception, Magento\Framework\App\InitException'],
     ['Magento\Core\Model\Store\Group', 'Magento\Store\Model\Group'],
@@ -2244,7 +2242,9 @@
     ['Magento\BaseScopeInterface', 'Magento\Framework\App\ScopeInterface'],
     ['Magento\BaseScopeResolverInterface', 'Magento\Framework\App\ScopeResolverInterface'],
     ['Magento\Framework\Locale\ScopeConfigInterface'],
-    ['Magento\Framework\StoreManagerInterface', 'Magento\Framework\Store\StoreManagerInterface'],
+    ['Magento\Framework\StoreManagerInterface', 'Magento\Store\Model\StoreManagerInterface'],
+    ['Magento\Framework\Store\StoreManagerInterface', 'Magento\Store\Model\StoreManagerInterface'],
+    ['Magento\Framework\Store\ScopeInterface', 'Magento\Store\Model\ScopeInterface'],
     ['Magento\Core\Model\Module\Output\Config', 'Magento\Framework\Module\Output\Config'],
     ['Magento\Core\Model\Resource\Setup\Context', 'Magento\Framework\Module\Setup\Context'],
     ['Magento\Core\Model\Resource\Setup\Migration', 'Magento\Framework\Module\Setup\Migration'],
@@ -2917,4 +2917,15 @@
     ['Magento\Core\Block\RequireCookie', 'Magento\Cookie\Block\RequireCookie'],
     ['Magento\Core\Controller\Index\NoCookies', 'Magento\Cookie\Controller\Index\NoCookies'],
     ['Magento\Core\Model\Asset\Config', 'Magento\Framework\View\Asset\Config'],
+    ['Magento\Core\Model\Layout\Merge', 'Magento\Framework\View\Model\Layout\Merge'],
+    ['Magento\Core\Model\Layout\Translator', 'Magento\Framework\View\Model\Layout\Translator'],
+    ['Magento\Core\Model\Layout\Update\Validator', 'Magento\Framework\View\Model\Layout\Update\Validator'],
+    ['Magento\Core\Model\PageLayout\Config\Builder', 'Magento\Theme\Model\PageLayout\Config\Builder'],
+    ['Magento\Core\Model\Layout\DepersonalizePlugin', 'Magento\PageCache\Model\Layout\DepersonalizePlugin'],
+    ['Magento\Core\Model\Layout\Link', 'Magento\Widget\Model\Layout\Link'],
+    ['Magento\Core\Model\Layout\Update', 'Magento\Widget\Model\Layout\Update'],
+    ['Magento\Core\Model\Resource\Layout\Link', 'Magento\Widget\Model\Resource\Layout\Link'],
+    ['Magento\Core\Model\Resource\Layout\Link\Collection', 'Magento\Widget\Model\Resource\Layout\Link\Collection'],
+    ['Magento\Core\Model\Resource\Layout\Update', 'Magento\Widget\Model\Resource\Layout\Update'],
+    ['Magento\Core\Model\Resource\Layout\Update\Collection', 'Magento\Widget\Model\Resource\Layout\Update\Collection'],
 ];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
index bcffdfd411409..a648097786fb8 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_constants.php
@@ -115,12 +115,12 @@
     ['RULE_PERM_ALLOW', '\Magento\Framework\Math\Random'],
     ['RULE_PERM_DENY', '\Magento\Framework\Math\Random'],
     ['RULE_PERM_INHERIT', '\Magento\Framework\Math\Random'],
-    ['SCOPE_TYPE_GROUP', 'Magento\Core\Model\App', 'Magento\Framework\Store\ScopeInterface::SCOPE_GROUP'],
-    ['SCOPE_TYPE_STORE', 'Magento\Core\Model\App', 'Magento\Framework\Store\ScopeInterface::SCOPE_STORE'],
+    ['SCOPE_TYPE_GROUP', 'Magento\Core\Model\App', 'Magento\Store\Model\ScopeInterface::SCOPE_GROUP'],
+    ['SCOPE_TYPE_STORE', 'Magento\Core\Model\App', 'Magento\Store\Model\ScopeInterface::SCOPE_STORE'],
     [
         'SCOPE_TYPE_WEBSITE',
         'Magento\Core\Model\App',
-        'Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE'
+        'Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE'
     ],
     ['SEESION_MAX_COOKIE_LIFETIME'],
     ['TYPE_BINARY', null, 'Magento_DB_Ddl_Table::TYPE_BLOB'],
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
index 55f56e8ced3f9..07b606d3e7878 100755
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
@@ -216,7 +216,7 @@
     ['addCustomerData', 'Magento\Catalog\Model\Product\Item', 'setCustomerId'],
     ['addCustomersToAlertQueueAction'],
     ['addCustomerToSegments'],
-    ['addHandle', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
+    ['addHandle', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
     ['addItemPriceBlockType'],
     ['addItemRender', 'Magento\Sales\Block\Adminhtml\Items\AbstractItems'],
     ['addItemRender', 'Magento\Checkout\Block\Cart\AbstractCart'],
@@ -229,7 +229,7 @@
     ['addModule', 'Magento\Core\App\Router\Base'],
     ['addRouter', 'Magento\Framework\App\FrontController'],
     ['addOptionRenderer', 'Magento\Catalog\Block\Product\View\Options'],
-    ['addPageHandles', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
+    ['addPageHandles', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
     ['addPagerLimit', 'Magento\Catalog\Block\Product\ProductList\Toolbar'],
     ['addRegisterLink', 'Magento\Customer\Block\Account\Link'],
     ['addRenderer', 'Magento\Bundle\Block\Catalog\Product\View\Type\Bundle'],
@@ -241,7 +241,7 @@
     ['addToAlersAction'],
     ['addToChildGroup'],
     ['addToParentGroup', '\Magento\Core\Block\AbstractBlock'],
-    ['addUpdate', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
+    ['addUpdate', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
     ['addVisibleFilterToCollection', 'Magento\Catalog\Model\Product\Status'],
     [
         'addVisibleInCatalogFilterToCollection',
@@ -268,9 +268,9 @@
     ['applyAllDataUpdates', 'Magento\Core\Model\Resource\Setup'],
     ['applyAllUpdates', 'Magento\Core\Model\Resource\Setup'],
     ['applyDesign', 'Magento\Catalog\Model\Design'],
-    ['asArray', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
-    ['asSimplexml', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
-    ['asString', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
+    ['asArray', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
+    ['asSimplexml', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
+    ['asString', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
     ['authAdmin'],
     ['authFailed', '', '\Magento\Framework\HTTP\Authentication::setAuthenticationFailed'],
     ['authFrontend'],
@@ -346,7 +346,7 @@
     ['exportOrderedExcelAction'],
     ['fetchItemsCount', 'Magento\Wishlist\Model\Resource\Wishlist'],
     ['fetchRuleRatesForCustomerTaxClass'],
-    ['fetchUpdatesByHandle', 'Magento\Core\Model\Resource\Layout', 'Magento\Core\Model\Resource\Layout\Update'],
+    ['fetchUpdatesByHandle', 'Magento\Core\Model\Resource\Layout', 'Magento\Widget\Model\Resource\Layout\Update'],
     ['flush', 'Magento\Framework\App\Cache', 'Magento_Cache_FrontendInterface::clean()'],
     ['flush', 'Magento\Framework\App\Cache\Proxy', 'Magento_Cache_FrontendInterface::clean()'],
     ['flush', 'Magento\Framework\App\CacheInterface', 'Magento_Cache_FrontendInterface::clean()'],
@@ -407,7 +407,7 @@
     ['getConfigData', 'Magento\Cms\Model\Wysiwyg\Images\Storage'],
     ['getConfigDataModel', 'Magento\Core\Model\Config'],
     ['getConnectionTypeInstance', 'Magento\Framework\App\Resource'],
-    ['getContainers', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
+    ['getContainers', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
     ['getCurrentUrl', 'Magento\Core\Helper\Url', 'Magento\Framework\Url'],
     ['getCustomerData', 'Magento\Sales\Block\Adminhtml\Order\Create\Form\Account'],
     ['getDataForSave', 'Magento\Wishlist\Model\Item'],
@@ -439,11 +439,11 @@
     ['getExtensionsForCheck'],
     ['getFacets'],
     ['getFallbackTheme'],
-    ['getFileLayoutUpdatesXml', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
+    ['getFileLayoutUpdatesXml', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
     ['getFormated', '', "getFormated(true) -> format('html'), getFormated() -> format('text')"],
     ['getFormObject', 'Magento\Backend\Block\Widget\Form'],
     ['getGiftmessageHtml', 'Magento\Sales\Block\Adminhtml\Order\View\Tab\Info'],
-    ['getHandles', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
+    ['getHandles', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
     ['getHeaderCssClass', 'Magento_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option_Search'],
     ['getHeaderText', 'Magento_Bundle_Block_Adminhtml_Catalog_Product_Edit_Tab_Bundle_Option_Search'],
     ['getHelperClassName', 'Magento\Core\Model\Config'],
@@ -512,9 +512,9 @@
     ['getOriginalRequest', 'Magento\Framework\App\Request\Http'],
     ['getPackage', 'Magento\Widget\Model\Widget\Instance'],
     ['getPackageTheme', 'Magento\Widget\Model\Widget\Instance', 'getThemeId'],
-    ['getPageHandleLabel', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
-    ['getPageHandles', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
-    ['getPageHandleType', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
+    ['getPageHandleLabel', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
+    ['getPageHandles', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
+    ['getPageHandleType', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
     ['getPageTemplateProcessor', 'Magento\Cms\Helper\Data'],
     ['getBlockTemplateProcessor', 'Magento\Cms\Helper\Data'],
     ['getPathAsArray', '', 'direct explode by /'],
@@ -709,7 +709,7 @@
     ['isVerbose', 'Magento\Framework\Shell'],
     ['isWindowsOs', 'Magento\TestFramework\Helper\Memory'],
     ['joinTaxClass', 'Magento\Tax\Helper\Data'],
-    ['load', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
+    ['load', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
     ['loadBaseContents', 'Magento\Email\Model\Template'],
     ['loadBase', 'Magento\Core\Model\Config'],
     ['loadByCustomer', 'Magento\Newsletter\Model\Resource\Subscriber', 'loadByCustomerData'],
@@ -746,7 +746,7 @@
     ['order_success_page_view', 'Magento\GoogleAnalytics\Model\Observer'],
     ['orderedAction', 'Magento\Backend\Controller\Report\Product'],
     ['output', 'Magento\Framework\Shell'],
-    ['pageHandleExists', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
+    ['pageHandleExists', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
     ['parseDateTime', 'Magento\Framework\Stdlib\DateTime\DateTime'],
     ['postDispatchMyAccountSave'],
     ['postDispatchSystemImportExportRun'],
@@ -771,7 +771,7 @@
     ['removeAuthLink', 'Magento\Customer\Block\Account\Link'],
     ['removeItem', 'Magento\Theme\Block\Html\Head'],
     ['removeCustomerFromSegments'],
-    ['removeHandle', 'Magento\Core\Model\Layout\Update', 'Magento\Core\Model\Layout\Merge'],
+    ['removeHandle', 'Magento\Core\Model\Layout\Update', 'Magento\Framework\View\Model\Layout\Merge'],
     ['removeParentCartLink', 'Magento\Checkout\Block\Links'],
     ['removeRegisterLink', 'Magento\Customer\Block\Account\Link'],
     ['renderView', '', 'Magento_Core_Block_Template::_toHtml()'],
@@ -1625,9 +1625,9 @@
         'getRatingSummary',
         'Magento\Catalog\Model\Product'
     ],
-    ['getCurrentStore', 'Magento\Framework\Store\StoreManagerInterface'],
-    ['getAnyStoreView', 'Magento\Framework\Store\StoreManagerInterface'],
-    ['throwStoreException', 'Magento\Framework\Store\StoreManagerInterface'],
+    ['getCurrentStore', 'Magento\Store\Model\StoreManagerInterface'],
+    ['getAnyStoreView', 'Magento\Store\Model\StoreManagerInterface'],
+    ['throwStoreException', 'Magento\Store\Model\StoreManagerInterface'],
     ['getCustomer', 'Magento\ProductAlert\Helper\Data'],
     ['addCustomerFilter', 'Magento\ProductAlert\Model\Resource\Stock\Collection'],
     ['addCustomerFilter', 'Magento\ProductAlert\Model\Resource\Price\Collection'],
diff --git a/dev/tests/unit/testsuite/Magento/AdminNotification/Model/System/Message/BaseurlTest.php b/dev/tests/unit/testsuite/Magento/AdminNotification/Model/System/Message/BaseurlTest.php
index d2271e2cdcd9e..290d926e37e6c 100644
--- a/dev/tests/unit/testsuite/Magento/AdminNotification/Model/System/Message/BaseurlTest.php
+++ b/dev/tests/unit/testsuite/Magento/AdminNotification/Model/System/Message/BaseurlTest.php
@@ -48,7 +48,7 @@ protected function setUp()
         $this->_configMock = $this->getMock('Magento\Framework\App\Config', [], [], '', false);
         $this->_urlBuilderMock = $this->getMock('Magento\Framework\UrlInterface');
 
-        $this->_storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->_storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $configFactoryMock = $this->getMock(
             'Magento\Framework\App\Config\ValueFactory',
             ['create'],
diff --git a/dev/tests/unit/testsuite/Magento/Authorization/Model/Acl/AclRetrieverTest.php b/dev/tests/unit/testsuite/Magento/Authorization/Model/Acl/AclRetrieverTest.php
index 12514a57463d9..f9687b8ef551f 100644
--- a/dev/tests/unit/testsuite/Magento/Authorization/Model/Acl/AclRetrieverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Authorization/Model/Acl/AclRetrieverTest.php
@@ -66,7 +66,7 @@ public function testGetAllowedResourcesByUserRoleNotFound()
     public function testGetAllowedResourcesByUser()
     {
         $this->roleMock->expects($this->any())->method('getId')->will($this->returnValue(1));
-        $expectedResources = ['Magento_Adminhtml::dashboard', 'Magento_Cms::page'];
+        $expectedResources = ['Magento_Backend::dashboard', 'Magento_Cms::page'];
         $this->assertEquals(
             $expectedResources,
             $this->aclRetriever->getAllowedResourcesByUser(UserContextInterface::USER_TYPE_INTEGRATION, 1)
@@ -115,7 +115,7 @@ protected function createAclRetriever()
             false
         );
         $rulesMock1->expects($this->any())->method('getResourceId')->will(
-            $this->returnValue('Magento_Adminhtml::dashboard')
+            $this->returnValue('Magento_Backend::dashboard')
         );
         /** @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Authorization\Model\Rules $rulesMock1 */
         $rulesMock2 = $this->getMock(
diff --git a/dev/tests/unit/testsuite/Magento/Authorization/Model/Acl/Loader/RuleTest.php b/dev/tests/unit/testsuite/Magento/Authorization/Model/Acl/Loader/RuleTest.php
index 2f2d9d64db6c3..ad2ea32befc80 100644
--- a/dev/tests/unit/testsuite/Magento/Authorization/Model/Acl/Loader/RuleTest.php
+++ b/dev/tests/unit/testsuite/Magento/Authorization/Model/Acl/Loader/RuleTest.php
@@ -25,7 +25,7 @@ class RuleTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->_resourceMock = $this->getMock('Magento\Framework\App\Resource', [], [], '', false, false);
-        $this->_rootResourceMock = new \Magento\Framework\Acl\RootResource('Magento_Adminhtml::all');
+        $this->_rootResourceMock = new \Magento\Framework\Acl\RootResource('Magento_Backend::all');
         $this->_model = new \Magento\Authorization\Model\Acl\Loader\Rule(
             $this->_rootResourceMock,
             $this->_resourceMock
@@ -48,7 +48,7 @@ public function testPopulateAcl()
         )->will(
             $this->returnValue(
                 [
-                    ['role_id' => 1, 'resource_id' => 'Magento_Adminhtml::all', 'permission' => 'allow'],
+                    ['role_id' => 1, 'resource_id' => 'Magento_Backend::all', 'permission' => 'allow'],
                     ['role_id' => 2, 'resource_id' => 1, 'permission' => 'allow'],
                     ['role_id' => 3, 'resource_id' => 1, 'permission' => 'deny'],
                 ]
@@ -60,7 +60,7 @@ public function testPopulateAcl()
         $aclMock = $this->getMock('Magento\Framework\Acl');
         $aclMock->expects($this->any())->method('has')->will($this->returnValue(true));
         $aclMock->expects($this->at(1))->method('allow')->with('1', null, null);
-        $aclMock->expects($this->at(2))->method('allow')->with('1', 'Magento_Adminhtml::all', null);
+        $aclMock->expects($this->at(2))->method('allow')->with('1', 'Magento_Backend::all', null);
         $aclMock->expects($this->at(4))->method('allow')->with('2', 1, null);
         $aclMock->expects($this->at(6))->method('deny')->with('3', 1, null);
 
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/Column/Renderer/CurrencyTest.php b/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/Column/Renderer/CurrencyTest.php
index 3606e9ba1afbb..46bbce1b13e90 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/Column/Renderer/CurrencyTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Block/Widget/Grid/Column/Renderer/CurrencyTest.php
@@ -49,7 +49,7 @@ class CurrencyTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->_storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->_storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->_localeMock = $this->getMock('Magento\Framework\Locale\CurrencyInterface');
         $this->_requestMock = $this->getMock('Magento\Framework\App\RequestInterface');
 
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/ScopeDefinerTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/ScopeDefinerTest.php
index 498149ba64b1a..4b6a50dcf2fd4 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/ScopeDefinerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/ScopeDefinerTest.php
@@ -37,7 +37,7 @@ public function testGetScopeReturnsStoreScopeIfStoreIsSpecified()
         )->will(
             $this->returnValueMap([['website', null, 'someWebsite'], ['store', null, 'someStore']])
         );
-        $this->assertEquals(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $this->_model->getScope());
+        $this->assertEquals(\Magento\Store\Model\ScopeInterface::SCOPE_STORE, $this->_model->getScope());
     }
 
     public function testGetScopeReturnsWebsiteScopeIfWebsiteIsSpecified()
@@ -49,6 +49,6 @@ public function testGetScopeReturnsWebsiteScopeIfWebsiteIsSpecified()
         )->will(
             $this->returnValueMap([['website', null, 'someWebsite'], ['store', null, null]])
         );
-        $this->assertEquals(\Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE, $this->_model->getScope());
+        $this->assertEquals(\Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE, $this->_model->getScope());
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/AbstractElementTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/AbstractElementTest.php
index cd4b3cacf534e..f41efd6524af4 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/AbstractElementTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/AbstractElementTest.php
@@ -125,11 +125,11 @@ public function isVisibleReturnsTrueForProperScopesDataProvider()
             ],
             [
                 ['showInDefault' => 0, 'showInStore' => 1, 'showInWebsite' => 0],
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             ],
             [
                 ['showInDefault' => 0, 'showInStore' => 0, 'showInWebsite' => 1],
-                \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE
+                \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE
             ]
         ];
     }
@@ -154,11 +154,11 @@ public function isVisibleReturnsFalseForNonProperScopesDataProvider()
             ],
             [
                 ['showInDefault' => 1, 'showInStore' => 0, 'showInWebsite' => 1],
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             ],
             [
                 ['showInDefault' => 1, 'showInStore' => 1, 'showInWebsite' => 0],
-                \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE
+                \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE
             ]
         ];
     }
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/Element/Dependency/MapperTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/Element/Dependency/MapperTest.php
index 942caa54c5dd0..13366a5d68c3f 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/Element/Dependency/MapperTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/Element/Dependency/MapperTest.php
@@ -136,7 +136,7 @@ public function testGetDependenciesWhenDependentIsInvisible($isValueSatisfy)
                 'getValue'
             )->with(
                 $dependentPath,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 self::STORE_CODE
             )->will(
                 $this->returnValue(self::VALUE_IN_STORE)
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/Element/SectionTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/Element/SectionTest.php
index dfb1f51660154..a8973f0050b66 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/Element/SectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Config/Structure/Element/SectionTest.php
@@ -85,7 +85,7 @@ public function testIsVisibleProceedsWithVisibilityCheckIfSectionIsAllowed()
     {
         $this->_authorizationMock->expects($this->any())->method('isAllowed')->will($this->returnValue(true));
         $this->_storeManagerMock->expects($this->once())->method('isSingleStoreMode')->will($this->returnValue(true));
-        $this->_model->setData(['resource' => 'Magento_Adminhtml::all'], 'scope');
+        $this->_model->setData(['resource' => 'Magento_Backend::all'], 'scope');
         $this->_model->isVisible();
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/ConfigTest.php
index 305790efadf79..cf4017fb0e782 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/ConfigTest.php
@@ -48,7 +48,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
     protected $_dataFactoryMock;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -112,7 +112,7 @@ protected function setUp()
             false
         );
 
-        $this->_storeManager = $this->getMockForAbstractClass('Magento\Framework\Store\StoreManagerInterface');
+        $this->_storeManager = $this->getMockForAbstractClass('Magento\Store\Model\StoreManagerInterface');
 
         $this->_model = new \Magento\Backend\Model\Config(
             $this->_appConfigMock,
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Session/AdminConfigTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Session/AdminConfigTest.php
index 660a720d13ff3..e419e13a938ee 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Session/AdminConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Session/AdminConfigTest.php
@@ -29,7 +29,7 @@ class AdminConfigTest extends \PHPUnit_Framework_TestCase
     private $objectManager;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface | \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface | \PHPUnit_Framework_MockObject_MockObject
      */
     private $storeManagerMock;
 
@@ -61,7 +61,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $storeMock->expects($this->once())->method('getBaseUrl')->will($this->returnValue('/'));
-        $this->storeManagerMock = $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface');
         $this->storeManagerMock->expects($this->once())->method('getStore')->will($this->returnValue($storeMock));
 
         $this->filesystemMock = $this->getMock('\Magento\Framework\Filesystem', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Session/QuoteTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Session/QuoteTest.php
index 5fa83e855b285..ac801cd35c338 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/Session/QuoteTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Session/QuoteTest.php
@@ -12,7 +12,7 @@
 class QuoteTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManagerMock;
 
@@ -183,7 +183,7 @@ protected function setUp()
             false
         );
         $this->storeManagerMock = $this->getMockForAbstractClass(
-            'Magento\Framework\Store\StoreManagerInterface',
+            'Magento\Store\Model\StoreManagerInterface',
             [],
             '',
             false
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/UrlTest.php b/dev/tests/unit/testsuite/Magento/Backend/Model/UrlTest.php
index 0108acedf986a..d0383a4eda34e 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/UrlTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/UrlTest.php
@@ -102,7 +102,7 @@ protected function setUp()
         )->method(
             'getId'
         )->will(
-            $this->returnValue('Magento_Adminhtml::system_acl_roles')
+            $this->returnValue('Magento_Backend::system_acl_roles')
         );
         $mockItem->expects($this->any())->method('getAction')->will($this->returnValue('adminhtml/user_role'));
 
@@ -111,7 +111,7 @@ protected function setUp()
         )->method(
             'get'
         )->with(
-            $this->equalTo('Magento_Adminhtml::system_acl_roles')
+            $this->equalTo('Magento_Backend::system_acl_roles')
         )->will(
             $this->returnValue($mockItem)
         );
@@ -132,7 +132,7 @@ protected function setUp()
         )->with(
             \Magento\Backend\Model\Url::XML_PATH_STARTUP_MENU_ITEM
         )->will(
-            $this->returnValue('Magento_Adminhtml::system_acl_roles')
+            $this->returnValue('Magento_Backend::system_acl_roles')
         );
 
         $this->_coreDataMock = $this->getMock('Magento\Core\Helper\Data', ['getHash'], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/_files/acl.xml b/dev/tests/unit/testsuite/Magento/Backend/Model/_files/acl.xml
index f89c58f0dffdd..d5f11c7fb1a4c 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Model/_files/acl.xml
+++ b/dev/tests/unit/testsuite/Magento/Backend/Model/_files/acl.xml
@@ -8,11 +8,11 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../lib/internal/Magento/Framework/Acl/etc/acl.xsd">
     <acl>
         <resources>
-            <resource id="Magento_Adminhtml::all" title="Allow everything" />
-            <resource id="Magento_Adminhtml::admin" title="Magento Admin">
-                <resource id="Magento_Adminhtml::dashboard" title="Dashboard" sortOrder="0" />
-                <resource id="Magento_Adminhtml::system" title="System" sortOrder="90">
-                    <resource id="Magento_Adminhtml::store" title="Manage Stores" />
+            <resource id="Magento_Backend::all" title="Allow everything" />
+            <resource id="Magento_Backend::admin" title="Magento Admin">
+                <resource id="Magento_Backend::dashboard" title="Dashboard" sortOrder="0" />
+                <resource id="Magento_Backend::system" title="System" sortOrder="90">
+                    <resource id="Magento_Backend::store" title="Manage Stores" />
                 </resource>
             </resource>
         </resources>
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Model/LinkManagementTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Model/LinkManagementTest.php
index 9d1f3e7b650ec..723814408cadc 100644
--- a/dev/tests/unit/testsuite/Magento/Bundle/Model/LinkManagementTest.php
+++ b/dev/tests/unit/testsuite/Magento/Bundle/Model/LinkManagementTest.php
@@ -69,7 +69,7 @@ class LinkManagementTest extends \PHPUnit_Framework_TestCase
     protected $optionCollectionFactoryMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Store\StoreManagerInterface
+     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManagerMock;
 
@@ -141,7 +141,7 @@ protected function setUp()
         $this->optionCollectionFactoryMock = $this->getMock(
             '\Magento\Bundle\Model\Resource\Option\CollectionFactory', ['create'], [], '', false
         );
-        $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
+        $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface', [], [], '', false);
 
         $this->model = $helper->getObject(
             '\Magento\Bundle\Model\LinkManagement',
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Model/OptionRepositoryTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Model/OptionRepositoryTest.php
index 093571a535ee5..7bff3de04713e 100644
--- a/dev/tests/unit/testsuite/Magento/Bundle/Model/OptionRepositoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Bundle/Model/OptionRepositoryTest.php
@@ -84,7 +84,7 @@ protected function setUp()
             '',
             false
         );
-        $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
         $this->linkManagementMock = $this->getMock('\Magento\Bundle\Api\ProductLinkManagementInterface');
         $this->optionListMock = $this->getMock('\Magento\Bundle\Model\Product\OptionList', [], [], '', false);
         $this->linkListMock = $this->getMock('\Magento\Bundle\Model\Product\LinksList', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/CatalogPriceTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/CatalogPriceTest.php
index c82c12bb55c90..96b005e33439e 100644
--- a/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/CatalogPriceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/CatalogPriceTest.php
@@ -39,7 +39,7 @@ class CatalogPriceTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->commonPriceMock = $this->getMock(
             'Magento\Catalog\Model\Product\CatalogPrice',
             [],
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/PriceTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/PriceTest.php
index 01b99cd72d0a7..656aafc5baf03 100644
--- a/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/PriceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/PriceTest.php
@@ -66,7 +66,7 @@ protected function setUp()
             '',
             false
         );
-        $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
         $this->localeDateMock = $this->getMock('\Magento\Framework\Stdlib\DateTime\TimezoneInterface');
         $this->customerSessionMock = $this->getMock('\Magento\Customer\Model\Session', [], [], '', false);
         $this->eventManagerMock = $this->getMock('\Magento\Framework\Event\ManagerInterface');
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/TypeTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/TypeTest.php
index c915ace0f5c2e..11bcf428e513e 100644
--- a/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/TypeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/TypeTest.php
@@ -32,7 +32,7 @@ class TypeTest extends \PHPUnit_Framework_TestCase
     protected $catalogData;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManager;
 
@@ -70,7 +70,7 @@ protected function setUp()
         $this->catalogData = $this->getMockBuilder('Magento\Catalog\Helper\Data')
             ->disableOriginalConstructor()
             ->getMock();
-        $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+        $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->disableOriginalConstructor()
             ->getMock();
         $this->bundleOptionFactory = $this->getMockBuilder('Magento\Bundle\Model\OptionFactory')
diff --git a/dev/tests/unit/testsuite/Magento/Captcha/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Captcha/Helper/DataTest.php
index 4662e60bb7ab2..0e4c592978aa5 100644
--- a/dev/tests/unit/testsuite/Magento/Captcha/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Captcha/Helper/DataTest.php
@@ -84,7 +84,7 @@ public function testGetConfigNode()
             'getValue'
         )->with(
             'customer/captcha/enable',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )->will(
             $this->returnValue('1')
         );
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Category/AbstractCategoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Category/AbstractCategoryTest.php
index c5071cc170d54..067a798dec8dc 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Category/AbstractCategoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Category/AbstractCategoryTest.php
@@ -69,7 +69,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->storeManagerMock = $this->getMockBuilder('\Magento\Framework\Store\StoreManagerInterface')
+        $this->storeManagerMock = $this->getMockBuilder('\Magento\Store\Model\StoreManagerInterface')
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/AlertsTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/AlertsTest.php
index d2a0f1b8747f7..e2a0f4918ffb9 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/AlertsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/AlertsTest.php
@@ -40,13 +40,13 @@ public function testCanShowTab($priceAllow, $stockAllow, $canShowTab)
         $valueMap = [
             [
                 'catalog/productalert/allow_price',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 null,
                 $priceAllow,
             ],
             [
                 'catalog/productalert/allow_stock',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 null,
                 $stockAllow
             ],
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/InventoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/InventoryTest.php
index bef24530adc90..800477edfff34 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/InventoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/InventoryTest.php
@@ -46,7 +46,7 @@ class InventoryTest extends \PHPUnit_Framework_TestCase
     protected $contextMock;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManagerMock;
 
@@ -112,7 +112,7 @@ protected function setUp()
             false
         );
         $this->storeManagerMock = $this->getMockForAbstractClass(
-            'Magento\Framework\Store\StoreManagerInterface',
+            'Magento\Store\Model\StoreManagerInterface',
             [],
             '',
             false
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Category/Rss/LinkTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Category/Rss/LinkTest.php
index 36f76a7b3c41f..9058281e07d07 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Category/Rss/LinkTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Category/Rss/LinkTest.php
@@ -34,7 +34,7 @@ class LinkTest extends \PHPUnit_Framework_TestCase
     protected $scopeConfigInterface;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManagerInterface;
 
@@ -47,7 +47,7 @@ protected function setUp()
     {
         $this->urlBuilderInterface = $this->getMock('Magento\Framework\App\Rss\UrlBuilderInterface');
         $this->scopeConfigInterface = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
-        $this->storeManagerInterface = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerInterface = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->registry = $this->getMock('Magento\Framework\Registry');
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/CategoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/CategoryTest.php
index 1bfe887439116..6032a4afbffab 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/CategoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/CategoryTest.php
@@ -54,7 +54,7 @@ class CategoryTest extends \PHPUnit_Framework_TestCase
     protected $customerSession;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManager;
 
@@ -105,7 +105,7 @@ protected function setUp()
         $this->imageHelper = $this->getMock('Magento\Catalog\Helper\Image', [], [], '', false);
         $this->customerSession = $this->getMock('Magento\Customer\Model\Session', ['getId'], [], '', false);
         $this->customerSession->expects($this->any())->method('getId')->will($this->returnValue(1));
-        $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $store = $this->getMockBuilder('\Magento\Store\Model\Store')
             ->setMethods(['getId', '__wakeup'])->disableOriginalConstructor()->getMock();
         $store->expects($this->any())->method('getId')->will($this->returnValue(1));
@@ -194,7 +194,7 @@ public function testGetCacheLifetime()
     public function testIsAllowed()
     {
         $this->scopeConfig->expects($this->once())->method('isSetFlag')
-            ->with('rss/catalog/category', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+            ->with('rss/catalog/category', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
             ->will($this->returnValue(true));
         $this->assertEquals(true, $this->block->isAllowed());
     }
@@ -202,7 +202,7 @@ public function testIsAllowed()
     public function testGetFeeds()
     {
         $this->scopeConfig->expects($this->once())->method('isSetFlag')
-            ->with('rss/catalog/category', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+            ->with('rss/catalog/category', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
             ->will($this->returnValue(true));
 
         $category = $this->getMockBuilder('\Magento\Catalog\Model\Category')
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/Product/NewProductsTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/Product/NewProductsTest.php
index 23ddf2db094e1..5ab728554a13e 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/Product/NewProductsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/Product/NewProductsTest.php
@@ -44,7 +44,7 @@ class NewProductsTest extends \PHPUnit_Framework_TestCase
     protected $rssUrlBuilder;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManager;
 
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/Product/SpecialTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/Product/SpecialTest.php
index b497f057e72ca..49707aaca9b33 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/Product/SpecialTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Rss/Product/SpecialTest.php
@@ -54,7 +54,7 @@ class SpecialTest extends \PHPUnit_Framework_TestCase
     protected $rssUrlBuilder;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManager;
 
@@ -95,7 +95,7 @@ protected function setUp()
         $this->rssModel = $this->getMock('Magento\Catalog\Model\Rss\Product\Special', [], [], '', false);
         $this->rssUrlBuilder = $this->getMock('Magento\Framework\App\Rss\UrlBuilderInterface');
 
-        $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $store = $this->getMockBuilder('\Magento\Store\Model\Store')
             ->setMethods(['getId', 'getFrontendName', '__wakeup'])->disableOriginalConstructor()->getMock();
         $store->expects($this->any())->method('getId')->will($this->returnValue(1));
@@ -209,7 +209,7 @@ protected function getItemMock()
     public function testIsAllowed()
     {
         $this->scopeConfig->expects($this->once())->method('isSetFlag')
-            ->with('rss/catalog/special', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+            ->with('rss/catalog/special', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
             ->will($this->returnValue(true));
         $this->assertEquals(true, $this->block->isAllowed());
     }
@@ -222,7 +222,7 @@ public function testGetCacheLifetime()
     public function testGetFeeds()
     {
         $this->scopeConfig->expects($this->once())->method('isSetFlag')
-            ->with('rss/catalog/special', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+            ->with('rss/catalog/special', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
             ->will($this->returnValue(true));
         $this->rssUrlBuilder->expects($this->once())->method('getUrl')
             ->with(['type' => 'special_products'])
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Block/Widget/LinkTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Block/Widget/LinkTest.php
index 6cf427a930bf0..3028f4a437b9d 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Block/Widget/LinkTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Block/Widget/LinkTest.php
@@ -12,7 +12,7 @@
 class LinkTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Store\StoreManagerInterface
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManager;
 
@@ -33,7 +33,7 @@ class LinkTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->urlFinder = $this->getMock('Magento\UrlRewrite\Model\UrlFinderInterface');
 
         $context = $this->getMock('Magento\Framework\View\Element\Template\Context', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/SaveTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/SaveTest.php
index 473b20cc9f0a5..9e484f562bb08 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/SaveTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/SaveTest.php
@@ -328,11 +328,11 @@ public function testExecute($categoryId, $storeId, $activeTabId, $parentId)
             false
         );
         /**
-         * @var \Magento\Framework\Store\StoreManagerInterface
+         * @var \Magento\Store\Model\StoreManagerInterface
          * |\PHPUnit_Framework_MockObject_MockObject $storeManagerMock
          */
         $storeManagerMock = $this->getMockForAbstractClass(
-            'Magento\Framework\Store\StoreManagerInterface',
+            'Magento\Store\Model\StoreManagerInterface',
             [],
             '',
             false,
@@ -408,7 +408,7 @@ public function testExecute($categoryId, $storeId, $activeTabId, $parentId)
                         ['Magento\Backend\Model\Auth\Session', $sessionMock],
                         ['Magento\Framework\Registry', $registryMock],
                         ['Magento\Cms\Model\Wysiwyg\Config', $wysiwygConfigMock],
-                        ['Magento\Framework\Store\StoreManagerInterface', $storeManagerMock],
+                        ['Magento\Store\Model\StoreManagerInterface', $storeManagerMock],
                     ]
                 )
             );
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Widget/CategoriesJsonTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Widget/CategoriesJsonTest.php
index 13653fcab211b..3278dbc452c72 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Widget/CategoriesJsonTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Widget/CategoriesJsonTest.php
@@ -42,7 +42,7 @@ class CategoriesJsonTest extends \PHPUnit_Framework_TestCase
     protected $chooserBlockMock;
 
     /**
-     * @var \Magento\Core\Model\Layout|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\View\Layout|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $layoutMock;
 
@@ -95,7 +95,7 @@ public function setUp()
             ->method('create')
             ->willReturn($this->resultJson);
 
-        $this->layoutMock = $this->getMock('Magento\Core\Model\Layout', ['createBlock'], [], '', false);
+        $this->layoutMock = $this->getMock('Magento\Framework\View\Layout', ['createBlock'], [], '', false);
 
         $layoutFactory = $this->getMockBuilder('Magento\Framework\View\LayoutFactory')
             ->disableOriginalConstructor()
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Widget/ChooserTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Widget/ChooserTest.php
index e8fbd0e489845..513ea409282e6 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Widget/ChooserTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Widget/ChooserTest.php
@@ -37,7 +37,7 @@ class ChooserTest extends \PHPUnit_Framework_TestCase
     protected $chooserBlockMock;
 
     /**
-     * @var \Magento\Core\Model\Layout|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\View\Layout|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $layoutMock;
 
@@ -90,7 +90,7 @@ public function setUp()
             ->method('create')
             ->willReturn($this->resultRaw);
 
-        $this->layoutMock = $this->getMock('Magento\Core\Model\Layout', ['createBlock'], [], '', false);
+        $this->layoutMock = $this->getMock('Magento\Framework\View\Layout', ['createBlock'], [], '', false);
         $layoutFactory = $this->getMockBuilder('Magento\Framework\View\LayoutFactory')
             ->disableOriginalConstructor()
             ->setMethods(['create'])
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Initialization/HelperTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Initialization/HelperTest.php
index 8d0497c352128..0eb89b9f1735d 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Initialization/HelperTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Initialization/HelperTest.php
@@ -63,7 +63,7 @@ protected function setUp()
         $this->jsHelperMock = $this->getMock('Magento\Backend\Helper\Js', [], [], '', false);
         $this->storeMock = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
         $this->websiteMock = $this->getMock('Magento\Store\Model\Website', [], [], '', false);
-        $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
 
         $this->stockFilterMock = $this->getMock(
             'Magento\Catalog\Controller\Adminhtml\Product\Initialization\StockDataFilter',
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Category/ViewTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Category/ViewTest.php
index d5872fa7459dc..5cedb13bbfb0b 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Category/ViewTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Category/ViewTest.php
@@ -75,7 +75,7 @@ class ViewTest extends \PHPUnit_Framework_TestCase
     protected $store;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManager;
 
@@ -156,7 +156,7 @@ public function setUp()
         $this->categoryRepository = $this->getMock('Magento\Catalog\Api\CategoryRepositoryInterface');
 
         $this->store = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
-        $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->storeManager->expects($this->any())->method('getStore')->will($this->returnValue($this->store));
 
         $this->catalogDesign = $this->getMock('Magento\Catalog\Model\Design', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Product/Compare/IndexTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Product/Compare/IndexTest.php
index 3152e59ba5134..4fbc2520073e6 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Controller/Product/Compare/IndexTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Controller/Product/Compare/IndexTest.php
@@ -41,7 +41,7 @@ class IndexTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Catalog\Model\Session|\PHPUnit_Framework_MockObject_MockObject */
     protected $catalogSession;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $storeManagerMock;
 
     /** @var \Magento\Core\App\Action\FormKeyValidator|\PHPUnit_Framework_MockObject_MockObject */
@@ -94,7 +94,7 @@ protected function setUp()
         $this->visitorMock = $this->getMock('Magento\Customer\Model\Visitor', [], [], '', false);
         $this->listCompareMock = $this->getMock('Magento\Catalog\Model\Product\Compare\ListCompare', [], [], '', false);
         $this->catalogSession = $this->getMock('Magento\Catalog\Model\Session', ['setBeforeCompareUrl'], [], '', false);
-        $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->formKeyValidatorMock = $this->getMock('Magento\Core\App\Action\FormKeyValidator', [], [], '', false);
         $this->redirectFactoryMock = $this->getMock(
             'Magento\Framework\Controller\Result\RedirectFactory',
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Helper/Product/Edit/Action/AttributeTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Helper/Product/Edit/Action/AttributeTest.php
index 35d41e0f46b2b..97cf8bd59a454 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Helper/Product/Edit/Action/AttributeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Helper/Product/Edit/Action/AttributeTest.php
@@ -11,7 +11,7 @@
 class AttributeTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManagerMock;
 
@@ -30,7 +30,7 @@ protected function setUp()
         $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
 
         $this->storeManagerMock = $this->getMockForAbstractClass(
-            'Magento\Framework\Store\StoreManagerInterface',
+            'Magento\Store\Model\StoreManagerInterface',
             [],
             '',
             false
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Helper/Product/Flat/IndexerTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Helper/Product/Flat/IndexerTest.php
index 4cb9c96a4d73a..853094b5a1940 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Helper/Product/Flat/IndexerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Helper/Product/Flat/IndexerTest.php
@@ -18,7 +18,7 @@ class IndexerTest extends \PHPUnit_Framework_TestCase
     protected $_model;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $_storeManagerMock;
 
@@ -73,7 +73,7 @@ public function setUp()
 
         $eavFactoryMock = $this->getMock('Magento\Eav\Model\Entity\AttributeFactory', [], [], '', false);
 
-        $this->_storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->_storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
 
         $this->_connectionMock = $this->getMock(
             'Magento\Framework\DB\Adapter\Pdo\Mysql',
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Attribute/Backend/CustomlayoutupdateTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Attribute/Backend/CustomlayoutupdateTest.php
index d81f994ac6511..40a76c01be564 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Attribute/Backend/CustomlayoutupdateTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Attribute/Backend/CustomlayoutupdateTest.php
@@ -67,11 +67,11 @@ protected function setUp()
     }
 
     /**
-     * @return \Magento\Core\Model\Layout\Update\ValidatorFactory
+     * @return \Magento\Framework\View\Model\Layout\Update\ValidatorFactory
      */
     private function getMockedLayoutUpdateValidatorFactory()
     {
-        $mockBuilder = $this->getMockBuilder('\Magento\Core\Model\Layout\Update\ValidatorFactory');
+        $mockBuilder = $this->getMockBuilder('\Magento\Framework\View\Model\Layout\Update\ValidatorFactory');
         $mockBuilder->disableOriginalConstructor();
         $mockBuilder->setMethods(['create']);
         $mock = $mockBuilder->getMock();
@@ -84,11 +84,11 @@ private function getMockedLayoutUpdateValidatorFactory()
     }
 
     /**
-     * @return \Magento\Core\Model\Layout\Update\Validator
+     * @return \Magento\Framework\View\Model\Layout\Update\Validator
      */
     private function getMockedValidator()
     {
-        $mockBuilder = $this->getMockBuilder('\Magento\Core\Model\Layout\Update\Validator');
+        $mockBuilder = $this->getMockBuilder('\Magento\Framework\View\Model\Layout\Update\Validator');
         $mockBuilder->disableOriginalConstructor();
         $mock = $mockBuilder->getMock();
 
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/Attribute/Source/LayoutTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/Attribute/Source/LayoutTest.php
index ead7edbde897f..8965116af3ff8 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/Attribute/Source/LayoutTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/Attribute/Source/LayoutTest.php
@@ -34,7 +34,7 @@ protected function setUp()
     }
 
     /**
-     * @return \Magento\Core\Model\PageLayout\Config\Builder
+     * @return \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface
      */
     private function getMockedPageLayoutBuilder()
     {
@@ -45,9 +45,9 @@ private function getMockedPageLayoutBuilder()
             ->method('toOptionArray')
             ->will($this->returnValue($this->testArray));
 
-        $mockPageLayoutBuilder = $this->getMockBuilder('Magento\Core\Model\PageLayout\Config\Builder')
-            ->disableOriginalConstructor()
-            ->getMock();
+        $mockPageLayoutBuilder = $this->getMockBuilder(
+            'Magento\Framework\View\Model\PageLayout\Config\BuilderInterface'
+        )->disableOriginalConstructor()->getMock();
         $mockPageLayoutBuilder->expects($this->once())
             ->method('getPageLayoutsConfig')
             ->will($this->returnValue($mockPageLayoutConfig));
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/TreeTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/TreeTest.php
index 07dbf1a28ec7e..8b38af7d56cf1 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/TreeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Category/TreeTest.php
@@ -16,7 +16,7 @@ class TreeTest extends \PHPUnit_Framework_TestCase
     protected $categoryTreeMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Store\StoreManagerInterface
+     * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManagerMock;
 
@@ -60,7 +60,7 @@ public function setUp()
             ->getMock();
 
         $this->storeManagerMock = $this->getMockBuilder(
-                '\Magento\Framework\Store\StoreManagerInterface'
+                '\Magento\Store\Model\StoreManagerInterface'
             )->disableOriginalConstructor()
             ->getMock();
 
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php
index 615c06b20bb09..f6f9d8fa22d6a 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryRepositoryTest.php
@@ -49,7 +49,7 @@ protected function setUp()
             false
         );
         $this->categoryResourceMock = $this->getMock('\Magento\Catalog\Model\Resource\Category', [], [], '', false);
-        $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
 
         $this->model = new \Magento\Catalog\Model\CategoryRepository(
             $this->categoryFactoryMock,
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryTest.php
index 5bb59398af219..5967ad9f59abd 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/CategoryTest.php
@@ -29,7 +29,7 @@ class CategoryTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Framework\Registry|\PHPUnit_Framework_MockObject_MockObject */
     protected $registry;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $storeManager;
 
     /** @var \Magento\Catalog\Model\Resource\Category\Tree|\PHPUnit_Framework_MockObject_MockObject */
@@ -95,7 +95,7 @@ protected function setUp()
             ->will($this->returnValue($this->cacheManager));
 
         $this->registry = $this->getMock('Magento\Framework\Registry');
-        $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->categoryTreeResource = $this->getMock('Magento\Catalog\Model\Resource\Category\Tree', [], [], '', false);
         $this->categoryTreeFactory = $this->getMock(
             'Magento\Catalog\Model\Resource\Category\TreeFactory',
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/ConfigTest.php
index 00b5c4639d7c5..a18df7aeb95fa 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/ConfigTest.php
@@ -222,7 +222,7 @@ protected function prepareConfigModelForAttributes()
         $attribute->expects($this->any())->method('getStoreLabel')->will($this->returnValue($storeLabel));
         $attribute->expects($this->any())->method('getAttributeCode')->will($this->returnValue($attributeCode));
 
-        $storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+        $storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
         $store = $this->getMock('\Magento\Store\Model\Store', [], [], '', false);
         $storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
         $store->expects($this->any())->method('getId')->will($this->returnValue($storeId));
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/EraserTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/EraserTest.php
index 8cc520a832084..c666bd8fe562a 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/EraserTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/EraserTest.php
@@ -47,7 +47,7 @@ protected function setUp()
             [2, 'store_2_flat'],
         ]));
 
-        $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->model = new \Magento\Catalog\Model\Indexer\Product\Flat\Action\Eraser(
             $resource,
             $this->indexerHelper,
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php
index c61db945fa33c..7014626764887 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php
@@ -66,7 +66,7 @@ public function setUp()
         $this->resource->expects($this->any())->method('getConnection')
             ->with('default')
             ->will($this->returnValue($this->connection));
-        $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->store = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
         $this->store->expects($this->any())->method('getId')->will($this->returnValue('store_id_1'));
         $this->storeManager->expects($this->any())->method('getStores')->will($this->returnValue([$this->store]));
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowsTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowsTest.php
index 8ac88371f39e6..0789115e20184 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowsTest.php
@@ -66,7 +66,7 @@ public function setUp()
         $this->_resource->expects($this->any())->method('getConnection')
             ->with('default')
             ->will($this->returnValue($this->_connection));
-        $this->_storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->_storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->_store = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
         $this->_store->expects($this->any())->method('getId')->will($this->returnValue('store_id_1'));
         $this->_storeManager->expects($this->any())->method('getStores')->will(
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/ObserverTest.php
index 0615e954a4e09..1373adaf475bb 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/ObserverTest.php
@@ -18,7 +18,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
     protected $_model;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $_storeManagerMock;
 
@@ -52,7 +52,7 @@ protected function setUp()
         $this->_objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
 
         $this->_storeManagerMock = $this->getMock(
-            'Magento\Framework\Store\StoreManagerInterface',
+            'Magento\Store\Model\StoreManagerInterface',
             [],
             [],
             '',
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/System/Config/PriceScopeTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/System/Config/PriceScopeTest.php
index d775de563f864..e3418ae001718 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/System/Config/PriceScopeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Indexer/Product/Price/System/Config/PriceScopeTest.php
@@ -42,7 +42,7 @@ public function setUp()
 
         $contextMock = $this->getMock('Magento\Framework\Model\Context', [], [], '', false);
         $registryMock = $this->getMock('Magento\Framework\Registry', [], [], '', false);
-        $storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
+        $storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false);
         $configMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
 
 
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/FilterableAttributeListTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/FilterableAttributeListTest.php
index 893d39009226f..dae378983bc93 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/FilterableAttributeListTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/FilterableAttributeListTest.php
@@ -21,7 +21,7 @@ class FilterableAttributeListTest extends \PHPUnit_Framework_TestCase
     protected $collectionFactoryMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Store\StoreManagerInterface
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManagerMock;
 
@@ -36,7 +36,7 @@ protected function setUp()
             '\Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory', ['create'], [], '', false);
 
         $this->storeManagerMock = $this->getMock(
-            '\Magento\Framework\Store\StoreManagerInterface', [], [], '', false
+            '\Magento\Store\Model\StoreManagerInterface', [], [], '', false
         );
 
         $this->layerMock = $this->getMock(
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/StateKeyTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/StateKeyTest.php
index b57c96109df04..4dc836c0be5bb 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/StateKeyTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Category/StateKeyTest.php
@@ -25,7 +25,7 @@ class StateKeyTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
         $this->customerSessionMock = $this->getMock('\Magento\Customer\Model\Session', [], [], '', false);
         $this->model = new StateKey($this->storeManagerMock, $this->customerSessionMock);
     }
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/AttributeTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/AttributeTest.php
index dd7cc714be674..74725687834c1 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/AttributeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/AttributeTest.php
@@ -40,7 +40,7 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
     /** @var  \Magento\Catalog\Model\Layer\Filter\ItemFactory|MockObject */
     private $filterItemFactory;
 
-    /** @var  \Magento\Framework\Store\StoreManagerInterface|MockObject */
+    /** @var  \Magento\Store\Model\StoreManagerInterface|MockObject */
     private $storeManager;
 
     /** @var  \Magento\Catalog\Model\Layer|MockObject */
@@ -60,8 +60,8 @@ protected function setUp()
             ->setMethods(['create'])
             ->getMock();
 
-        /** @var \Magento\Framework\Store\StoreManagerInterface $storeManager */
-        $this->storeManager = $this->getMockBuilder('\Magento\Framework\Store\StoreManagerInterface')
+        /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
+        $this->storeManager = $this->getMockBuilder('\Magento\Store\Model\StoreManagerInterface')
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMockForAbstractClass();
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/DataProvider/PriceTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/DataProvider/PriceTest.php
index 27a78d73f12ef..500dd8dd04151 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/DataProvider/PriceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Filter/DataProvider/PriceTest.php
@@ -199,23 +199,23 @@ private function getValueMap()
     {
         return [
             Price::XML_PATH_RANGE_CALCULATION => [
-                'scope' => \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                'scope' => \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 'value' => 111,
             ],
             Price::XML_PATH_RANGE_STEP => [
-                'scope' => \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                'scope' => \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 'value' => 222,
             ],
             Price::XML_PATH_ONE_PRICE_INTERVAL => [
-                'scope' => \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                'scope' => \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 'value' => 333,
             ],
             Price::XML_PATH_INTERVAL_DIVISION_LIMIT => [
-                'scope' => \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                'scope' => \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 'value' => 444,
             ],
             Price::XML_PATH_RANGE_MAX_INTERVALS => [
-                'scope' => \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                'scope' => \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 'value' => 555,
             ],
         ];
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/CollectionFilterTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/CollectionFilterTest.php
index 4c1cba95e7409..8b527c450c529 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/CollectionFilterTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/CollectionFilterTest.php
@@ -36,7 +36,7 @@ protected function setUp()
         $this->visibilityMock = $this->getMock('Magento\Catalog\Model\Product\Visibility', [], [], '', false);
         $this->catalogConfigMock = $this->getMock('\Magento\Catalog\Model\Config', [], [], '', false);
 
-        $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
 
         $this->model = $objectManager->getObject(
             'Magento\Catalog\Model\Layer\Search\CollectionFilter',
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/FilterableAttributeListTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/FilterableAttributeListTest.php
index f1cbd1b6e995c..2afb8894af13f 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/FilterableAttributeListTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/FilterableAttributeListTest.php
@@ -21,7 +21,7 @@ class FilterableAttributeListTest extends \PHPUnit_Framework_TestCase
     protected $collectionFactoryMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Store\StoreManagerInterface
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManagerMock;
 
@@ -36,7 +36,7 @@ protected function setUp()
             '\Magento\Catalog\Model\Resource\Product\Attribute\CollectionFactory', ['create'], [], '', false);
 
         $this->storeManagerMock = $this->getMock(
-            '\Magento\Framework\Store\StoreManagerInterface', [], [], '', false
+            '\Magento\Store\Model\StoreManagerInterface', [], [], '', false
         );
 
         $this->layerMock = $this->getMock(
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/StateKeyTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/StateKeyTest.php
index 2c2cfc3367298..fec85625a7bdf 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/StateKeyTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Layer/Search/StateKeyTest.php
@@ -32,7 +32,7 @@ class StateKeyTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
         $this->customerSessionMock = $this->getMock('\Magento\Customer\Model\Session', [], [], '', false);
         $this->queryFactoryMock = $this->getMock(
             '\Magento\Search\Model\QueryFactory',
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/LayerTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/LayerTest.php
index ed1218a621e26..10a9fad9e9994 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/LayerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/LayerTest.php
@@ -30,7 +30,7 @@ class LayerTest extends \PHPUnit_Framework_TestCase
     private $registry;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     private $storeManager;
 
@@ -113,7 +113,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
 
-        $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+        $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->setMethods(['getStore'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/ObserverTest.php
index ec274d371280d..5228841640a91 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/ObserverTest.php
@@ -36,7 +36,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
     protected $_categoryFlatState;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -58,7 +58,7 @@ public function setUp()
             false
         );
 
-        $this->_storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+        $this->_storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php
index 74ad52b9b7c10..67f5e0b62d3e4 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractTest.php
@@ -25,7 +25,7 @@ protected function setUp()
         $this->_helper->expects($this->any())->method('isPriceGlobal')->will($this->returnValue(true));
 
         $currencyFactoryMock = $this->getMock('Magento\Directory\Model\CurrencyFactory', [], [], '', false);
-        $storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
+        $storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false);
         $productTypeMock = $this->getMock('Magento\Catalog\Model\Product\Type', [], [], '', false);
         $configMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
         $groupManagement = $this->getMock('Magento\Customer\Api\GroupManagementInterface', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Frontend/ImageTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Frontend/ImageTest.php
index a05773d718f39..e63adaac73997 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Frontend/ImageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Frontend/ImageTest.php
@@ -50,13 +50,13 @@ private function getMockedProduct()
     }
 
     /**
-     * @return \Magento\Framework\Store\StoreManagerInterface
+     * @return \Magento\Store\Model\StoreManagerInterface
      */
     private function getMockedStoreManager()
     {
         $mockedStore = $this->getMockedStore();
 
-        $mockBuilder = $this->getMockBuilder('\Magento\Framework\Store\StoreManagerInterface');
+        $mockBuilder = $this->getMockBuilder('\Magento\Store\Model\StoreManagerInterface');
         $mock = $mockBuilder->setMethods(['getStore'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Source/CountryofmanufactureTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Source/CountryofmanufactureTest.php
index 0439a06ca072f..fd6081a924b9b 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Source/CountryofmanufactureTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Source/CountryofmanufactureTest.php
@@ -8,7 +8,7 @@
 class CountryofmanufactureTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManagerMock;
 
@@ -29,7 +29,7 @@ class CountryofmanufactureTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
         $this->storeMock = $this->getMock('\Magento\Store\Model\Store', [], [], '', false);
         $this->cacheConfig = $this->getMock('\Magento\Framework\App\Cache\Type\Config', [], [], '', false);
         $this->objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Source/LayoutTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Source/LayoutTest.php
index 3295f59e5ea5d..fdcc3ba53d9cc 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Source/LayoutTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Attribute/Source/LayoutTest.php
@@ -16,14 +16,15 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
     /** @var ObjectManagerHelper */
     protected $objectManagerHelper;
 
-    /** @var \Magento\Core\Model\PageLayout\Config\Builder|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface
+     * |\PHPUnit_Framework_MockObject_MockObject */
     protected $pageLayoutBuilder;
 
     protected function setUp()
     {
-        $this->pageLayoutBuilder = $this->getMockBuilder('Magento\Core\Model\PageLayout\Config\Builder')
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->pageLayoutBuilder = $this->getMockBuilder(
+            'Magento\Framework\View\Model\PageLayout\Config\BuilderInterface'
+        )->disableOriginalConstructor()->getMock();
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);
         $this->layoutModel = $this->objectManagerHelper->getObject(
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Gallery/GalleryManagementTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Gallery/GalleryManagementTest.php
index 3a37b1a9e63f3..7acab9fb41df6 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Gallery/GalleryManagementTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Gallery/GalleryManagementTest.php
@@ -65,7 +65,7 @@ class GalleryManagementTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
         $this->productRepositoryMock = $this->getMock('\Magento\Catalog\Api\ProductRepositoryInterface');
         $this->attributeRepositoryMock = $this->getMock('\Magento\Catalog\Api\ProductAttributeRepositoryInterface');
         $this->mediaConfigMock = $this->getMock('\Magento\Catalog\Model\Product\Media\Config', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/GroupPriceManagementTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/GroupPriceManagementTest.php
index 85843f457590b..7969e5c4096ad 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/GroupPriceManagementTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/GroupPriceManagementTest.php
@@ -70,7 +70,7 @@ protected function setUp()
             '',
             false
         );
-        $this->storeManagerMock = $this->getMockBuilder('\Magento\Framework\Store\StoreManagerInterface')
+        $this->storeManagerMock = $this->getMockBuilder('\Magento\Store\Model\StoreManagerInterface')
             ->setMethods(['getWebsite'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
@@ -92,7 +92,7 @@ protected function setUp()
         $this->productRepositoryMock->expects($this->any())->method('get')->with('product_sku')
             ->will($this->returnValue($this->productMock));
         $this->configMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
-        $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->groupPriceManagement = new GroupPriceManagement(
             $this->productRepositoryMock,
             $this->priceBuilderMock,
@@ -121,7 +121,7 @@ public function testGetList($configValue, $groupData, $expected)
         $this->configMock
             ->expects($this->once())
             ->method('getValue')
-            ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
+            ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
             ->will($this->returnValue($configValue));
         $this->priceBuilderMock
             ->expects($this->once())
@@ -160,7 +160,7 @@ public function testSuccessRemoveGroupPrice()
         $this->configMock
             ->expects($this->once())
             ->method('getValue')
-            ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
+            ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
             ->will($this->returnValue(0));
         $this->priceModifierMock->expects($this->once())->method('removeGroupPrice')->with($this->productMock, 4, 0);
 
@@ -192,7 +192,7 @@ public function testSuccessRemoveGroupPriceFromWebsiteLevel()
         $this->configMock
             ->expects($this->once())
             ->method('getValue')
-            ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
+            ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
             ->will($this->returnValue(1));
         $this->priceModifierMock->expects($this->once())->method('removeGroupPrice')->with($this->productMock, 4, 1);
 
@@ -212,7 +212,7 @@ public function testSetNewPriceWithGlobalPriceScope()
         $this->configMock
             ->expects($this->once())
             ->method('getValue')
-            ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
+            ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
             ->will($this->returnValue(1));
 
         $this->productMock->expects($this->once())->method('setData')->with(
@@ -244,7 +244,7 @@ public function testSetUpdatedPriceWithGlobalPriceScope()
         $this->configMock
             ->expects($this->once())
             ->method('getValue')
-            ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
+            ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
             ->will($this->returnValue(0));
 
         $this->productMock->expects($this->once())->method('setData')->with(
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/ImageTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/ImageTest.php
index d2ac450321d55..b2f78dd741fee 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/ImageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/ImageTest.php
@@ -31,7 +31,7 @@ class ImageTest extends \PHPUnit_Framework_TestCase
     protected $registry;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManager;
 
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Media/AttributeManagementTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Media/AttributeManagementTest.php
index d31a79c6fa0c9..c188c4997faa0 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Media/AttributeManagementTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/Media/AttributeManagementTest.php
@@ -39,7 +39,7 @@ protected function setUp()
             false
         );
         $this->storeId = 1;
-        $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
         $storeMock = $this->getMock('\Magento\Store\Model\Store', [], [], '', false);
         $storeMock->expects($this->any())
             ->method('getId')
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/TierPriceManagementTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/TierPriceManagementTest.php
index 3867bafcf987f..42e114740a7ac 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/TierPriceManagementTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/TierPriceManagementTest.php
@@ -79,7 +79,7 @@ protected function setUp()
             '',
             false
         );
-        $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
         $this->websiteMock =
             $this->getMock('Magento\Store\Model\Website', ['getId', '__wakeup'], [], '', false);
         $this->productMock = $this->getMock(
@@ -129,7 +129,7 @@ public function testGetList($configValue, $customerGroupId, $groupData, $expecte
         $this->configMock
             ->expects($this->once())
             ->method('getValue')
-            ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
+            ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
             ->will($this->returnValue($configValue));
         if ($expected) {
             $this->priceBuilderMock
@@ -182,7 +182,7 @@ public function testSuccessDeleteTierPrice()
         $this->configMock
             ->expects($this->once())
             ->method('getValue')
-            ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
+            ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
             ->will($this->returnValue(0));
         $this->priceModifierMock->expects($this->once())->method('removeTierPrice')->with($this->productMock, 4, 5, 0);
 
@@ -214,7 +214,7 @@ public function testSuccessDeleteTierPriceFromWebsiteLevel()
         $this->configMock
             ->expects($this->once())
             ->method('getValue')
-            ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
+            ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
             ->will($this->returnValue(1));
         $this->priceModifierMock->expects($this->once())->method('removeTierPrice')->with($this->productMock, 4, 5, 1);
 
@@ -243,7 +243,7 @@ public function testSetNewPriceWithGlobalPriceScopeAll()
         $this->configMock
             ->expects($this->once())
             ->method('getValue')
-            ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
+            ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
             ->will($this->returnValue(1));
 
         $this->productMock->expects($this->once())->method('setData')->with(
@@ -289,7 +289,7 @@ public function testSetNewPriceWithGlobalPriceScope()
         $this->configMock
             ->expects($this->once())
             ->method('getValue')
-            ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
+            ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
             ->will($this->returnValue(0));
 
         $this->productMock->expects($this->once())->method('setData')->with(
@@ -317,7 +317,7 @@ public function testSetUpdatedPriceWithGlobalPriceScope()
         $this->configMock
             ->expects($this->once())
             ->method('getValue')
-            ->with('catalog/price/scope', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE)
+            ->with('catalog/price/scope', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE)
             ->will($this->returnValue(0));
 
         $this->productMock->expects($this->once())->method('setData')->with(
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/UrlTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/UrlTest.php
index 32ea31a22a5f2..d6adddac76b3f 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/UrlTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Product/UrlTest.php
@@ -65,7 +65,7 @@ protected function setUp()
 
         $store = $this->getMock('Magento\Store\Model\Store', ['getId', '__wakeup'], [], '', false);
         $store->expects($this->any())->method('getId')->will($this->returnValue(1));
-        $storeManager = $this->getMockForAbstractClass('Magento\Framework\Store\StoreManagerInterface');
+        $storeManager = $this->getMockForAbstractClass('Magento\Store\Model\StoreManagerInterface');
         $storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
 
         $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductTest.php
index 6a5c305ee7559..ded753edb1def 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/ProductTest.php
@@ -211,7 +211,7 @@ public function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+        $storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $storeManager->expects($this->any())
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/AbstractTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/AbstractTest.php
index c1f9815215697..0a8c04067abc7 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/AbstractTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/AbstractTest.php
@@ -88,7 +88,7 @@ public function testWalkAttributes()
                 $this->getMock('Magento\Framework\Locale\FormatInterface'),
                 $this->getMock('Magento\Eav\Model\Resource\Helper', [], [], '', false, false),
                 $this->getMock('Magento\Framework\Validator\UniversalFactory', [], [], '', false, false),
-                $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false),
+                $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false),
                 $this->getMock('Magento\Catalog\Model\Factory', [], [], '', false),
                 []
             ]
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Category/TreeTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Category/TreeTest.php
index 81b93bac76a08..a9421ac5ce0cc 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Category/TreeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Category/TreeTest.php
@@ -179,7 +179,7 @@ public function testAddCollectionData()
         $store = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
         $store->expects($this->any())->method('getId')->will($this->returnValue(1));
 
-        $storeManager = $this->getMockForAbstractClass('Magento\Framework\Store\StoreManagerInterface');
+        $storeManager = $this->getMockForAbstractClass('Magento\Store\Model\StoreManagerInterface');
         $storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
 
         $model = $objectHelper->getObject(
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/FlatTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/FlatTest.php
index dcc7de50a43c6..1f17b422ce1bc 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/FlatTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/FlatTest.php
@@ -18,7 +18,7 @@ class FlatTest extends \PHPUnit_Framework_TestCase
     protected $_store;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManagerInterface;
 
@@ -26,7 +26,7 @@ public function setUp()
     {
         $this->_store = $this->getMock('\Magento\Store\Model\Store', [], [], '', false);
 
-        $this->_storeManagerInterface = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+        $this->_storeManagerInterface = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
 
         $this->_storeManagerInterface->expects(
             $this->any()
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Link/Product/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Link/Product/CollectionTest.php
index 5aac658f62f1b..e433ed52fea44 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Link/Product/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Link/Product/CollectionTest.php
@@ -47,7 +47,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Validator\UniversalFactory|\PHPUnit_Framework_MockObject_MockObject */
     protected $universalFactoryMock;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $storeManagerMock;
 
     /** @var \Magento\Catalog\Helper\Data|\PHPUnit_Framework_MockObject_MockObject */
@@ -90,7 +90,7 @@ protected function setUp()
         $entity->expects($this->any())->method('getDefaultAttributes')->will($this->returnValue([]));
         $this->universalFactoryMock = $this->getMock('Magento\Framework\Validator\UniversalFactory', [], [], '', false);
         $this->universalFactoryMock->expects($this->any())->method('create')->will($this->returnValue($entity));
-        $this->storeManagerMock = $this->getMockForAbstractClass('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMockForAbstractClass('Magento\Store\Model\StoreManagerInterface');
         $this->storeManagerMock
             ->expects($this->any())
             ->method('getStore')
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/CollectionTest.php
index 6a8fa9447c617..f1d5c9a562af5 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Resource/Product/Option/CollectionTest.php
@@ -41,7 +41,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
     protected $optionsFactoryMock;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManagerMock;
 
diff --git a/dev/tests/unit/testsuite/Magento/Catalog/Model/Rss/Product/SpecialTest.php b/dev/tests/unit/testsuite/Magento/Catalog/Model/Rss/Product/SpecialTest.php
index a660645a399b8..90ef1470e5404 100644
--- a/dev/tests/unit/testsuite/Magento/Catalog/Model/Rss/Product/SpecialTest.php
+++ b/dev/tests/unit/testsuite/Magento/Catalog/Model/Rss/Product/SpecialTest.php
@@ -34,7 +34,7 @@ class SpecialTest extends \PHPUnit_Framework_TestCase
     protected $product;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManager;
 
diff --git a/dev/tests/unit/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/OptionTest.php b/dev/tests/unit/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/OptionTest.php
index 85282bf88352e..3f01380ce3679 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/OptionTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogImportExport/Model/Import/Product/Type/OptionTest.php
@@ -227,7 +227,7 @@ protected function setUp()
             $this->getMock('Magento\ImportExport\Model\Resource\Import\Data', [], [], '', false),
             $this->getMock('Magento\Framework\App\Resource', [], [], '', false),
             $this->getMock('Magento\ImportExport\Model\Resource\Helper', [], [], '', false),
-            $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false),
+            $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false),
             $this->getMock('Magento\Catalog\Model\ProductFactory', [], [], '', false),
             $this->getMock(
                 'Magento\Catalog\Model\Resource\Product\Option\CollectionFactory',
diff --git a/dev/tests/unit/testsuite/Magento/CatalogInventory/Api/StockConfigurationTest.php b/dev/tests/unit/testsuite/Magento/CatalogInventory/Api/StockConfigurationTest.php
index b9f12e0da9093..f17c621f516cc 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogInventory/Api/StockConfigurationTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogInventory/Api/StockConfigurationTest.php
@@ -91,7 +91,7 @@ public function testIsShowOutOfStock()
             ->method('isSetFlag')
             ->with(
                 \Magento\CatalogInventory\Model\Configuration::XML_PATH_SHOW_OUT_OF_STOCK,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $store
             )
             ->will($this->returnValue(true));
@@ -105,7 +105,7 @@ public function testIsAutoReturnEnabled()
             ->method('isSetFlag')
             ->with(
                 \Magento\CatalogInventory\Model\Configuration::XML_PATH_ITEM_AUTO_RETURN,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $store
             )
             ->will($this->returnValue(true));
@@ -119,7 +119,7 @@ public function testIsDisplayProductStockStatus()
             ->method('isSetFlag')
             ->with(
                 \Magento\CatalogInventory\Model\Configuration::XML_PATH_DISPLAY_PRODUCT_STOCK_STATUS,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $store
             )
             ->will($this->returnValue(true));
diff --git a/dev/tests/unit/testsuite/Magento/CatalogInventory/Helper/MinsaleqtyTest.php b/dev/tests/unit/testsuite/Magento/CatalogInventory/Helper/MinsaleqtyTest.php
index 18a631ac3c7da..7f58b91dd74c4 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogInventory/Helper/MinsaleqtyTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogInventory/Helper/MinsaleqtyTest.php
@@ -74,7 +74,7 @@ public function testGetConfigValue($customerGroupId, $store, $minSaleQty, $resul
             ->method('getValue')
             ->with(
                 $this->equalTo(\Magento\CatalogInventory\Model\Configuration::XML_PATH_MIN_SALE_QTY),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($store)
             )
             ->will($this->returnValue($minSaleQty));
diff --git a/dev/tests/unit/testsuite/Magento/CatalogInventory/Helper/StockTest.php b/dev/tests/unit/testsuite/Magento/CatalogInventory/Helper/StockTest.php
index 5bde5faa49a2f..c604ab66bfb48 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogInventory/Helper/StockTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogInventory/Helper/StockTest.php
@@ -47,7 +47,7 @@ protected function setUp()
         )
             ->disableOriginalConstructor()
             ->getMock();
-        $this->storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+        $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->disableOriginalConstructor()
             ->getMock();
         $this->scopeConfigMock = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')
diff --git a/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/ConfigurationTest.php b/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/ConfigurationTest.php
index 38c2c55877b0f..3228670da3763 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/ConfigurationTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/ConfigurationTest.php
@@ -46,7 +46,7 @@ protected function setUp()
         $this->minSaleQtyHelperMock = $this->getMockBuilder('Magento\CatalogInventory\Helper\Minsaleqty')
             ->disableOriginalConstructor()
             ->getMock();
-        $this->storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+        $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->disableOriginalConstructor()
             ->getMock();
         $this->model = new Configuration(
@@ -99,7 +99,7 @@ public function testCanSubtractQty()
     {
         $this->scopeConfigMock->expects($this->once())
             ->method('isSetFlag')
-            ->with(Configuration::XML_PATH_CAN_SUBTRACT, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, 1)
+            ->with(Configuration::XML_PATH_CAN_SUBTRACT, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, 1)
             ->willReturn(true);
         $this->assertTrue($this->model->canSubtractQty(1));
     }
@@ -109,7 +109,7 @@ public function testGetMinQty()
         $qty = 1;
         $this->scopeConfigMock->expects($this->once())
             ->method('getValue')
-            ->with(Configuration::XML_PATH_MIN_QTY, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, 1)
+            ->with(Configuration::XML_PATH_MIN_QTY, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, 1)
             ->willReturn($qty);
         $this->assertEquals($qty, $this->model->getMinQty(1));
     }
@@ -132,7 +132,7 @@ public function testGetMaxSaleQty()
         $store = 1;
         $this->scopeConfigMock->expects($this->once())
             ->method('getValue')
-            ->with(Configuration::XML_PATH_MAX_SALE_QTY, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store)
+            ->with(Configuration::XML_PATH_MAX_SALE_QTY, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)
             ->willReturn(1);
         $this->assertEquals(1, $this->model->getMaxSaleQty($store));
     }
@@ -143,11 +143,7 @@ public function testGetNotifyStockQty()
 
         $this->scopeConfigMock->expects($this->once())
             ->method('getValue')
-            ->with(
-                Configuration::XML_PATH_NOTIFY_STOCK_QTY,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
-                $store
-            )
+            ->with(Configuration::XML_PATH_NOTIFY_STOCK_QTY, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)
             ->willReturn(1);
         $this->assertEquals(1, $this->model->getNotifyStockQty($store));
     }
@@ -160,7 +156,7 @@ public function testGetEnableQtyIncrements()
             ->method('getValue')
             ->with(
                 Configuration::XML_PATH_ENABLE_QTY_INCREMENTS,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $store
             )->willReturn(1);
         $this->assertEquals(1, $this->model->getEnableQtyIncrements($store));
@@ -172,7 +168,7 @@ public function testGetQtyIncrements()
 
         $this->scopeConfigMock->expects($this->once())
             ->method('getValue')
-            ->with(Configuration::XML_PATH_QTY_INCREMENTS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store)
+            ->with(Configuration::XML_PATH_QTY_INCREMENTS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)
             ->willReturn(1);
         $this->assertEquals(1, $this->model->getQtyIncrements($store));
     }
@@ -182,7 +178,7 @@ public function testGetBackorders()
         $store = 1;
         $this->scopeConfigMock->expects($this->once())
             ->method('getValue')
-            ->with(Configuration::XML_PATH_BACKORDERS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store)
+            ->with(Configuration::XML_PATH_BACKORDERS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)
             ->willReturn(1);
         $this->model->getBackorders($store);
     }
@@ -192,11 +188,7 @@ public function testGetCanBackInStock()
         $store = 1;
         $this->scopeConfigMock->expects($this->once())
             ->method('isSetFlag')
-            ->with(
-                Configuration::XML_PATH_CAN_BACK_IN_STOCK,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
-                $store
-            )
+            ->with(Configuration::XML_PATH_CAN_BACK_IN_STOCK, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)
             ->willReturn(1);
         $this->assertEquals(1, $this->model->getCanBackInStock($store));
     }
@@ -206,11 +198,7 @@ public function testIsShowOutOfStock()
         $store = 1;
         $this->scopeConfigMock->expects($this->once())
             ->method('isSetFlag')
-            ->with(
-                Configuration::XML_PATH_SHOW_OUT_OF_STOCK,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
-                $store
-            )
+            ->with(Configuration::XML_PATH_SHOW_OUT_OF_STOCK, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)
             ->willReturn(1);
         $this->assertEquals(1, $this->model->isShowOutOfStock($store));
     }
@@ -220,11 +208,7 @@ public function testIsAutoReturnEnabled()
         $store = 1;
         $this->scopeConfigMock->expects($this->once())
             ->method('isSetFlag')
-            ->with(
-                Configuration::XML_PATH_ITEM_AUTO_RETURN,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
-                $store
-            )
+            ->with(Configuration::XML_PATH_ITEM_AUTO_RETURN, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)
             ->willReturn(1);
         $this->assertEquals(1, $this->model->isAutoReturnEnabled($store));
     }
@@ -236,7 +220,7 @@ public function testIsDisplayProductStockStatus()
             ->method('isSetFlag')
             ->with(
                 Configuration::XML_PATH_DISPLAY_PRODUCT_STOCK_STATUS,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $store
             )
             ->willReturn(1);
@@ -252,7 +236,7 @@ public function testGetDefaultConfigValue()
             ->method('getValue')
             ->with(
                 Configuration::XML_PATH_ITEM . $field,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $store
             )
             ->willReturn(1);
diff --git a/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/Stock/ItemTest.php b/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/Stock/ItemTest.php
index 0d0ba7eac63f7..64225ea390a28 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/Stock/ItemTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogInventory/Model/Stock/ItemTest.php
@@ -43,7 +43,7 @@ class ItemTest extends \PHPUnit_Framework_TestCase
     protected $customerSession;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManager;
 
@@ -94,10 +94,7 @@ protected function setUp()
 
         $store = $this->getMock('Magento\Store\Model\Store', ['getId', '__wakeup'], [], '', false);
         $store->expects($this->any())->method('getId')->willReturn($this->storeId);
-        $this->storeManager = $this->getMockForAbstractClass(
-            'Magento\Framework\Store\StoreManagerInterface',
-            ['getStore']
-        );
+        $this->storeManager = $this->getMockForAbstractClass('Magento\Store\Model\StoreManagerInterface', ['getStore']);
         $this->storeManager->expects($this->any())->method('getStore')->willReturn($store);
 
         $this->stockConfiguration = $this->getMock(
diff --git a/dev/tests/unit/testsuite/Magento/CatalogRule/Model/RuleTest.php b/dev/tests/unit/testsuite/Magento/CatalogRule/Model/RuleTest.php
index 6e7b8187a7f1f..61941e3f63dfe 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogRule/Model/RuleTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogRule/Model/RuleTest.php
@@ -16,7 +16,7 @@ class RuleTest extends \PHPUnit_Framework_TestCase
     /** @var ObjectManagerHelper */
     protected $objectManagerHelper;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $storeManager;
 
     /** @var \PHPUnit_Framework_MockObject_MockObject */
@@ -33,7 +33,7 @@ class RuleTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->storeModel = $this->getMock('Magento\Store\Model\Store', ['__wakeup', 'getId'], [], '', false);
         $this->combineFactory = $this->getMock(
             'Magento\CatalogRule\Model\Rule\Condition\CombineFactory',
diff --git a/dev/tests/unit/testsuite/Magento/CatalogSearch/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/CatalogSearch/Helper/DataTest.php
index dd36f3bbd302a..5a10ccecd87ef 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogSearch/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogSearch/Helper/DataTest.php
@@ -46,7 +46,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
     protected $_filterManagerMock;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $_storeManagerMock;
 
@@ -58,7 +58,7 @@ public function setUp()
         $this->_scopeConfigMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
         $this->_escaperMock = $this->getMock('Magento\Framework\Escaper');
         $this->_filterManagerMock = $this->getMock('Magento\Framework\Filter\FilterManager', [], [], '', false);
-        $this->_storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->_storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
 
         $this->_model = new \Magento\CatalogSearch\Helper\Data(
             $this->_contextMock,
@@ -88,7 +88,7 @@ public function testGetMinQueryLength()
             ->method('getValue')
             ->with(
                 \Magento\Search\Model\Query::XML_PATH_MIN_QUERY_LENGTH,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 null
             )
             ->will($this->returnValue($return));
@@ -102,7 +102,7 @@ public function testGetMaxQueryLength()
             ->method('getValue')
             ->with(
                 \Magento\Search\Model\Query::XML_PATH_MAX_QUERY_LENGTH,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 null
             )
             ->will($this->returnValue($return));
diff --git a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php
index a8f70211a849e..92e61845b9e34 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php
@@ -10,7 +10,7 @@ class FullTest extends \PHPUnit_Framework_TestCase
 {
     /** @var \Magento\Framework\Search\Request\Config|\PHPUnit_Framework_MockObject_MockObject */
     protected $searchRequestConfig;
-    /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $storeManager;
     /** @var \Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full */
     protected $object;
@@ -45,7 +45,7 @@ public function setUp()
         $scopeConfig = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')
             ->disableOriginalConstructor()
             ->getMock();
-        $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+        $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->disableOriginalConstructor()
             ->getMock();
         $dateTime = $this->getMockBuilder('Magento\Framework\Stdlib\DateTime')
diff --git a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Layer/Filter/AttributeTest.php b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Layer/Filter/AttributeTest.php
index 74025239397a8..32ee450a8f41c 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Layer/Filter/AttributeTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Layer/Filter/AttributeTest.php
@@ -40,7 +40,7 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
     /** @var  \Magento\Catalog\Model\Layer\Filter\ItemFactory|MockObject */
     private $filterItemFactory;
 
-    /** @var  \Magento\Framework\Store\StoreManagerInterface|MockObject */
+    /** @var  \Magento\Store\Model\StoreManagerInterface|MockObject */
     private $storeManager;
 
     /** @var  \Magento\Catalog\Model\Layer|MockObject */
@@ -57,8 +57,8 @@ protected function setUp()
             ->setMethods(['create'])
             ->getMock();
 
-        /** @var \Magento\Framework\Store\StoreManagerInterface $storeManager */
-        $this->storeManager = $this->getMockBuilder('\Magento\Framework\Store\StoreManagerInterface')
+        /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
+        $this->storeManager = $this->getMockBuilder('\Magento\Store\Model\StoreManagerInterface')
             ->disableOriginalConstructor()
             ->setMethods([])
             ->getMockForAbstractClass();
diff --git a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/AdvancedTest.php b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/AdvancedTest.php
index 99c9dda315bd0..dd4284e6a4a58 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/AdvancedTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/AdvancedTest.php
@@ -74,7 +74,7 @@ protected function getStoreManager()
             ->method('getId')
             ->willReturn(1);
 
-        $storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+        $storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->setMethods(['getStore'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
diff --git a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/Fulltext/CollectionTest.php b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/Fulltext/CollectionTest.php
index 002ce5621efcd..86ec8ae378200 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/Fulltext/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Resource/Fulltext/CollectionTest.php
@@ -61,7 +61,7 @@ protected function getStoreManager()
             ->method('getId')
             ->willReturn(1);
 
-        $storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+        $storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->setMethods(['getStore'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
diff --git a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Search/IndexBuilderTest.php b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Search/IndexBuilderTest.php
index e99d676fbecb3..42883d442a961 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Search/IndexBuilderTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogSearch/Model/Search/IndexBuilderTest.php
@@ -23,7 +23,7 @@ class IndexBuilderTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Framework\App\Config\ScopeConfigInterface|MockObject */
     private $config;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface|MockObject */
+    /** @var \Magento\Store\Model\StoreManagerInterface|MockObject */
     private $storeManager;
 
     /** @var \Magento\Framework\Search\RequestInterface|MockObject */
@@ -71,7 +71,7 @@ protected function setUp()
             ->setMethods(['isSetFlag'])
             ->getMockForAbstractClass();
 
-        $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')->getMock();
+        $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')->getMock();
 
         $objectManagerHelper = new ObjectManagerHelper($this);
         $this->target = $objectManagerHelper->getObject(
diff --git a/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGeneratorTest.php b/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGeneratorTest.php
index 72b2c124c6499..894f7e1c6cf46 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGeneratorTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlPathGeneratorTest.php
@@ -6,7 +6,7 @@
 namespace Magento\CatalogUrlRewrite\Model;
 
 use Magento\Catalog\Model\Category;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 use Magento\TestFramework\Helper\ObjectManager;
 
 class CategoryUrlPathGeneratorTest extends \PHPUnit_Framework_TestCase
@@ -14,7 +14,7 @@ class CategoryUrlPathGeneratorTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator */
     protected $categoryUrlPathGenerator;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $storeManager;
 
     /** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
@@ -42,7 +42,7 @@ protected function setUp()
             'isObjectNew'
         ];
         $this->category = $this->getMock('Magento\Catalog\Model\Category', $categoryMethods, [], '', false);
-        $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
         $this->categoryRepository = $this->getMock('Magento\Catalog\Api\CategoryRepositoryInterface');
 
@@ -185,11 +185,7 @@ public function testGetUrlPathWithSuffixAndStore($urlPath, $storeId, $categorySt
 
         $passedStoreId = $storeId ? $storeId : $categoryStoreId;
         $this->scopeConfig->expects($this->once())->method('getValue')
-            ->with(
-                CategoryUrlPathGenerator::XML_PATH_CATEGORY_URL_SUFFIX,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
-                $passedStoreId
-            )
+            ->with(CategoryUrlPathGenerator::XML_PATH_CATEGORY_URL_SUFFIX, ScopeInterface::SCOPE_STORE, $passedStoreId)
             ->will($this->returnValue($suffix));
 
         $this->assertEquals(
@@ -216,11 +212,7 @@ public function testGetUrlPathWithSuffixWithoutStore()
         $store->expects($this->once())->method('getId')->will($this->returnValue($currentStoreId));
         $this->storeManager->expects($this->once())->method('getStore')->will($this->returnValue($store));
         $this->scopeConfig->expects($this->once())->method('getValue')
-            ->with(
-                CategoryUrlPathGenerator::XML_PATH_CATEGORY_URL_SUFFIX,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
-                $currentStoreId
-            )
+            ->with(CategoryUrlPathGenerator::XML_PATH_CATEGORY_URL_SUFFIX, ScopeInterface::SCOPE_STORE, $currentStoreId)
             ->will($this->returnValue($suffix));
 
         $this->assertEquals(
diff --git a/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlPathGeneratorTest.php b/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlPathGeneratorTest.php
index e9e01c85e5e45..57648b02f0471 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlPathGeneratorTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlPathGeneratorTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\CatalogUrlRewrite\Model;
 
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 use Magento\TestFramework\Helper\ObjectManager;
 
 class ProductUrlPathGeneratorTest extends \PHPUnit_Framework_TestCase
@@ -13,7 +13,7 @@ class ProductUrlPathGeneratorTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator */
     protected $productUrlPathGenerator;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $storeManager;
 
     /** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
@@ -33,7 +33,7 @@ protected function setUp()
         $this->category = $this->getMock('Magento\Catalog\Model\Category', [], [], '', false);
         $productMethods = ['__wakeup', 'getData', 'getUrlKey', 'getName', 'formatUrlKey', 'getId'];
         $this->product = $this->getMock('Magento\Catalog\Model\Product', $productMethods, [], '', false);
-        $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
         $this->categoryUrlPathGenerator = $this->getMock(
             'Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator',
@@ -131,11 +131,7 @@ public function testGetUrlPathWithSuffixAndCategoryAnsStore()
             ->will($this->returnValue('category-url-path'));
         $this->storeManager->expects($this->never())->method('getStore');
         $this->scopeConfig->expects($this->once())->method('getValue')
-            ->with(
-                ProductUrlPathGenerator::XML_PATH_PRODUCT_URL_SUFFIX,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
-                $storeId
-            )
+            ->with(ProductUrlPathGenerator::XML_PATH_PRODUCT_URL_SUFFIX, ScopeInterface::SCOPE_STORE, $storeId)
             ->will($this->returnValue('.html'));
 
         $this->assertEquals(
diff --git a/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGeneratorTest.php b/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGeneratorTest.php
index 446f743b26da7..06f44a1e65f3f 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGeneratorTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGeneratorTest.php
@@ -31,7 +31,7 @@ class ProductUrlRewriteGeneratorTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\CatalogUrlRewrite\Model\ObjectRegistryFactory|\PHPUnit_Framework_MockObject_MockObject */
     protected $objectRegistryFactory;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $storeManager;
 
     /** @var \Magento\Catalog\Model\Resource\Category\Collection|\PHPUnit_Framework_MockObject_MockObject */
@@ -44,7 +44,7 @@ protected function setUp()
             ->disableOriginalConstructor()->getMock();
         $this->product->expects($this->any())->method('getCategoryCollection')
             ->will($this->returnValue($this->categoriesCollection));
-        $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+        $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->disableOriginalConstructor()->getMock();
         $this->categoriesCollection->expects($this->exactly(2))->method('addAttributeToSelect')
             ->will($this->returnSelf());
diff --git a/dev/tests/unit/testsuite/Magento/CatalogWidget/Block/Product/ProductsListTest.php b/dev/tests/unit/testsuite/Magento/CatalogWidget/Block/Product/ProductsListTest.php
index 5a16e6709d4c8..2a2886db769f8 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogWidget/Block/Product/ProductsListTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogWidget/Block/Product/ProductsListTest.php
@@ -51,7 +51,7 @@ class ProductsListTest extends \PHPUnit_Framework_TestCase
     protected $widgetConditionsHelper;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManager;
 
@@ -83,7 +83,7 @@ protected function setUp()
         $this->builder = $this->getMock('Magento\Rule\Model\Condition\Sql\Builder', [], [], '', false);
         $this->rule = $this->getMock('Magento\CatalogWidget\Model\Rule', [], [], '', false);
         $this->widgetConditionsHelper = $this->getMock('Magento\Widget\Helper\Conditions');
-        $this->storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
         $this->design = $this->getMock('\Magento\Framework\View\DesignInterface');
 
         $objectManagerHelper = new ObjectManagerHelper($this);
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Controller/CartTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Controller/CartTest.php
index 47e0a0ef701b3..aa6eaad579e31 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Controller/CartTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Controller/CartTest.php
@@ -18,7 +18,7 @@ public function testControllerImplementsProductViewInterface()
     public function testGoBack()
     {
         $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
-        $storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
 
         $responseMock = $this->getMock('Magento\Framework\App\Response\Http', [], [], '', false);
         $responseMock->headersSentThrowsException = false;
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveBillingTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveBillingTest.php
index e2eaa99645d40..d0a0ad3d1285a 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveBillingTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveBillingTest.php
@@ -231,7 +231,7 @@ public function testValidateMinimumAmount()
             ->method('toHtml')
             ->willReturn('some_html');
 
-        $update = $this->getMock('Magento\Core\Model\Layout\Merge', ['load'], [], '', false);
+        $update = $this->getMock('Magento\Framework\View\Model\Layout\Merge', ['load'], [], '', false);
         $layout->expects($this->any())
             ->method('getUpdate')
             ->willReturn($update);
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveShippingTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveShippingTest.php
index b1068f2f43d1f..f8a35fa0d335f 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveShippingTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveShippingTest.php
@@ -230,7 +230,7 @@ public function testValidateMinimumAmount()
             ->method('toHtml')
             ->willReturn('some_html');
 
-        $update = $this->getMock('Magento\Core\Model\Layout\Merge', [], [], '', false);
+        $update = $this->getMock('Magento\Framework\View\Model\Layout\Merge', [], [], '', false);
         $layout->expects($this->any())
             ->method('getUpdate')
             ->willReturn($update);
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Helper/CartTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Helper/CartTest.php
index c5ecb1d1dd72f..c01449d988414 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Helper/CartTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Helper/CartTest.php
@@ -80,7 +80,7 @@ protected function setUp()
         $contextMock->expects($this->any())->method('getUrlBuilder')->will($this->returnValue($this->urlBuilderMock));
         $contextMock->expects($this->any())->method('getRequest')->will($this->returnValue($this->requestMock));
         $contextMock->expects($this->any())->method('getUrlEncoder')->will($this->returnValue($this->urlEncoder));
-        $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
         $this->coreHelperMock = $this->getMock('\Magento\Core\Helper\Data', [], [], '', false);
         $this->scopeConfigMock = $this->getMock('\Magento\Framework\App\Config\ScopeConfigInterface');
         $this->cartMock = $this->getMock('\Magento\Checkout\Model\Cart', [], [], '', false);
@@ -162,7 +162,7 @@ public function testGetShouldRedirectToCart()
     {
         $storeId = 1;
         $this->scopeConfigMock->expects($this->once())->method('isSetFlag')
-            ->with(Cart::XML_PATH_REDIRECT_TO_CART, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId)
+            ->with(Cart::XML_PATH_REDIRECT_TO_CART, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $storeId)
             ->will($this->returnValue(true));
         $this->assertTrue($this->helper->getShouldRedirectToCart($storeId));
     }
@@ -208,7 +208,7 @@ public function testGetAddUrl()
      */
     public function testGetDeletePostJson($id, $url, $isAjax, $expectedPostData)
     {
-        $storeManager = $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface');
+        $storeManager = $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface');
         $coreData = $this->getMock('\Magento\Core\Helper\Data', [], [], '', false);
         $scopeConfig = $this->getMockForAbstractClass('\Magento\Framework\App\Config\ScopeConfigInterface');
         $checkoutCart = $this->getMock('\Magento\Checkout\Model\Cart', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Helper/DataTest.php
index 321ddd9406e61..9e88e7178acf6 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Helper/DataTest.php
@@ -9,7 +9,7 @@
 namespace Magento\Checkout\Helper;
 
 use Magento\TestFramework\Helper\ObjectManager;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 class DataTest extends \PHPUnit_Framework_TestCase
 {
@@ -81,49 +81,49 @@ protected function setUp()
                     [
                         [
                             'checkout/payment_failed/template',
-                            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                             8,
                             'fixture_email_template_payment_failed'
                         ],
                         [
                             'checkout/payment_failed/receiver',
-                            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                             8,
                             'sysadmin'
                         ],
                         [
                             'trans_email/ident_sysadmin/email',
-                            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                             8,
                             'sysadmin@example.com'
                         ],
                         [
                             'trans_email/ident_sysadmin/name',
-                            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                             8,
                             'System Administrator'
                         ],
                         [
                             'checkout/payment_failed/identity',
-                            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                             8,
                             'noreply@example.com'
                         ],
                         [
                             'carriers/ground/title',
-                            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                             null,
                             'Ground Shipping'
                         ],
                         [
                             'payment/fixture-payment-method/title',
-                            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                             null,
                             'Check Money Order'
                         ],
                         [
                             'checkout/options/onepage_checkout_enabled',
-                            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                             null,
                             'One Page Checkout'
                         ]
@@ -131,7 +131,7 @@ protected function setUp()
                 )
             );
 
-        $this->_storeManager = $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface');
+        $this->_storeManager = $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface');
 
         $this->_checkoutSession = $this->getMock('\Magento\Checkout\Model\Session', [], [], '', false);
 
@@ -342,7 +342,7 @@ public function testIsCustomerMustBeLogged()
     {
         $this->_scopeConfig->expects($this->once())->method('isSetFlag')->with(
             'checkout/options/customer_must_be_logged',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )->will($this->returnValue(true));
         $this->assertTrue($this->_helper->isCustomerMustBeLogged());
     }
@@ -362,7 +362,7 @@ public function testGetPriceInclTaxWithoutTax()
         $rowTotal = 15;
         $roundPrice = 17;
         $expected = 17;
-        $storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
+        $storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface', [], [], '', false);
         $objectManagerHelper = new ObjectManager($this);
         $helper = $objectManagerHelper->getObject(
             '\Magento\Checkout\Helper\Data',
@@ -421,7 +421,7 @@ public function testGetSubtotalInclTaxNegative()
 
     public function testGetBasePriceInclTaxWithoutQty()
     {
-        $storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
+        $storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface', [], [], '', false);
         $objectManagerHelper = new ObjectManager($this);
         $helper = $objectManagerHelper->getObject(
             '\Magento\Checkout\Helper\Data',
@@ -438,7 +438,7 @@ public function testGetBasePriceInclTaxWithoutQty()
 
     public function testGetBasePriceInclTax()
     {
-        $storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
+        $storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface', [], [], '', false);
         $objectManagerHelper = new ObjectManager($this);
         $helper = $objectManagerHelper->getObject(
             '\Magento\Checkout\Helper\Data',
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Model/CartTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Model/CartTest.php
index 8f948deeb2aec..60df3067b5e9f 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Model/CartTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Model/CartTest.php
@@ -234,7 +234,7 @@ public function testGetSummaryQty($useQty)
         $this->customerSessionMock->expects($this->any())->method('isLoggedIn')->will($this->returnValue(true));
 
         $this->scopeConfigMock->expects($this->once())->method('getValue')
-            ->with('checkout/cart_link/use_qty', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+            ->with('checkout/cart_link/use_qty', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
             ->will($this->returnValue($useQty));
 
         $qtyMethodName = ($useQty) ? 'getItemsQty' : 'getItemsCount';
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Model/SessionTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Model/SessionTest.php
index 887bac6e9af6c..4151d9b246801 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Model/SessionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Model/SessionTest.php
@@ -167,7 +167,7 @@ public function testRestoreQuote($hasOrderId, $hasQuoteId)
         );
         $storage = $this->getMock('Magento\Framework\Session\Storage', null);
         $store = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
-        $storeManager = $this->getMockForAbstractClass('Magento\Framework\Store\StoreManagerInterface');
+        $storeManager = $this->getMockForAbstractClass('Magento\Store\Model\StoreManagerInterface');
         $storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
         $eventManager = $this->getMockForAbstractClass('Magento\Framework\Event\ManagerInterface');
 
@@ -286,7 +286,7 @@ public function testReplaceQuote()
             ->method('getWebsiteId')
             ->will($this->returnValue($websiteId));
 
-        $storeManager = $this->getMockForAbstractClass('Magento\Framework\Store\StoreManagerInterface');
+        $storeManager = $this->getMockForAbstractClass('Magento\Store\Model\StoreManagerInterface');
         $storeManager->expects($this->any())
             ->method('getStore')
             ->will($this->returnValue($store));
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php
index 3d8bab9affbaf..e6300c92b29fd 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php
@@ -40,7 +40,7 @@ class OnepageTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Customer\Model\Session|\PHPUnit_Framework_MockObject_MockObject */
     protected $customerSessionMock;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $storeManagerMock;
 
     /** @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */
@@ -131,7 +131,7 @@ protected function setUp()
             '',
             false
         );
-        $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->requestMock = $this->getMock(
             'Magento\Framework\App\RequestInterface',
             ['isAjax', 'getModuleName', 'setModuleName', 'getActionName', 'setActionName', 'getParam', 'getCookie']
diff --git a/dev/tests/unit/testsuite/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepositoryTest.php b/dev/tests/unit/testsuite/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepositoryTest.php
index b5ff93a8d7210..24541f489f6e3 100644
--- a/dev/tests/unit/testsuite/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepositoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/CheckoutAgreements/Model/CheckoutAgreementsRepositoryTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\CheckoutAgreements\Model;
 
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 use Magento\TestFramework\Helper\ObjectManager;
 
 class CheckoutAgreementsRepositoryTest extends \PHPUnit_Framework_TestCase
@@ -46,7 +46,7 @@ protected function setUp()
             '',
             false
         );
-        $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->scopeConfigMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
         $this->model = new CheckoutAgreementsRepository(
             $this->factoryMock,
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php b/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php
index b53938a303da0..73cd48691b01d 100644
--- a/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php
@@ -62,7 +62,7 @@ protected function setUp()
         $valueMap = [
             [
                 'Magento\Framework\App\Config\ScopeConfigInterface',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $scopeConfigMock,
             ],
             ['Magento\Cms\Helper\Page', $this->_cmsHelperMock],
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Helper/PageTest.php b/dev/tests/unit/testsuite/Magento/Cms/Helper/PageTest.php
index e8591bb94fb80..e8b54125d1933 100755
--- a/dev/tests/unit/testsuite/Magento/Cms/Helper/PageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cms/Helper/PageTest.php
@@ -34,7 +34,7 @@ class PageTest extends \PHPUnit_Framework_TestCase
     protected $pageMock;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManagerMock;
 
@@ -141,7 +141,7 @@ protected function setUp()
                 ]
             )
             ->getMock();
-        $this->storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+        $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->getMockForAbstractClass();
         $this->localeDateMock = $this->getMockBuilder('Magento\Framework\Stdlib\DateTime\TimezoneInterface')
             ->getMockForAbstractClass();
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Model/Resource/Page/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Cms/Model/Resource/Page/CollectionTest.php
index f857bdfbe581d..6c6ac15177ba4 100644
--- a/dev/tests/unit/testsuite/Magento/Cms/Model/Resource/Page/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cms/Model/Resource/Page/CollectionTest.php
@@ -11,7 +11,7 @@
 class CollectionTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManagerMock;
 
@@ -107,7 +107,7 @@ protected function setUp()
             ->withAnyParameters()
             ->willReturn($this->searchResultProcessorMock);
         $this->storeManagerMock = $this->getMockForAbstractClass(
-            'Magento\Framework\Store\StoreManagerInterface',
+            'Magento\Store\Model\StoreManagerInterface',
             [],
             '',
             false,
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Model/Template/FilterTest.php b/dev/tests/unit/testsuite/Magento/Cms/Model/Template/FilterTest.php
index fded796ee9b77..b8e32ba2f1a74 100644
--- a/dev/tests/unit/testsuite/Magento/Cms/Model/Template/FilterTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cms/Model/Template/FilterTest.php
@@ -11,7 +11,7 @@
 class FilterTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManagerMock;
 
@@ -27,7 +27,7 @@ class FilterTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+        $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->disableOriginalConstructor()
             ->getMock();
         $this->storeMock = $this->getMockBuilder('Magento\Store\Model\Store')
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Model/Wysiwyg/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Cms/Model/Wysiwyg/ConfigTest.php
index a9d3696dc7b29..b2e5d8fb32b61 100644
--- a/dev/tests/unit/testsuite/Magento/Cms/Model/Wysiwyg/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cms/Model/Wysiwyg/ConfigTest.php
@@ -46,7 +46,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase
     protected $scopeConfigMock;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManagerMock;
 
@@ -85,7 +85,7 @@ protected function setUp()
         $this->scopeConfigMock = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')
             ->disableOriginalConstructor()
             ->getMock();
-        $this->storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+        $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->disableOriginalConstructor()
             ->getMock();
         $this->storeMock = $this->getMockBuilder('Magento\Store\Model\Store')
diff --git a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/AttributeTest.php b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/AttributeTest.php
index f0ebded1855a6..a0e3bdc23a2da 100644
--- a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/AttributeTest.php
+++ b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Model/Resource/Product/Type/Configurable/AttributeTest.php
@@ -18,7 +18,7 @@ class AttributeTest extends \PHPUnit_Framework_TestCase
     protected $catalogData;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManager;
 
@@ -36,7 +36,7 @@ public function setUp()
             ->setMethods(['isPriceGlobal'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+        $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Pricing/Price/AttributePriceTest.php b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Pricing/Price/AttributePriceTest.php
index dea736872b6c6..5d88d7b9e3158 100644
--- a/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Pricing/Price/AttributePriceTest.php
+++ b/dev/tests/unit/testsuite/Magento/ConfigurableProduct/Pricing/Price/AttributePriceTest.php
@@ -47,7 +47,7 @@ class AttributePriceTest extends \PHPUnit_Framework_TestCase
     protected $regularPriceMock;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManagerMock;
 
diff --git a/dev/tests/unit/testsuite/Magento/Contact/Controller/Index/IndexTest.php b/dev/tests/unit/testsuite/Magento/Contact/Controller/Index/IndexTest.php
index 0569cfade91f0..77f1a5a81b5d8 100644
--- a/dev/tests/unit/testsuite/Magento/Contact/Controller/Index/IndexTest.php
+++ b/dev/tests/unit/testsuite/Magento/Contact/Controller/Index/IndexTest.php
@@ -79,7 +79,7 @@ public function setUp()
             $this->getMock('\Magento\Framework\Mail\Template\TransportBuilder', [], [], '', false),
             $this->getMockForAbstractClass('\Magento\Framework\Translate\Inline\StateInterface', [], '', false),
             $this->_scopeConfig,
-            $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface', [], '', false)
+            $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface', [], '', false)
         );
     }
 
diff --git a/dev/tests/unit/testsuite/Magento/Contact/Controller/Index/PostTest.php b/dev/tests/unit/testsuite/Magento/Contact/Controller/Index/PostTest.php
index 4f9e857f11091..d26a9f6206941 100644
--- a/dev/tests/unit/testsuite/Magento/Contact/Controller/Index/PostTest.php
+++ b/dev/tests/unit/testsuite/Magento/Contact/Controller/Index/PostTest.php
@@ -54,7 +54,7 @@ class PostTest extends \PHPUnit_Framework_TestCase
     protected $_messageManager;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $_storeManager;
 
@@ -78,7 +78,7 @@ public function setUp()
         $this->_request = $this->getMock('\Magento\Framework\App\Request\Http', ['getPost'], [], '', false);
         $this->_redirect = $this->getMock('\Magento\Framework\App\Response\RedirectInterface', [], [], '', false);
         $this->_view = $this->getMock('\Magento\Framework\App\ViewInterface', [], [], '', false);
-        $this->_storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
+        $this->_storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface', [], [], '', false);
         $this->_transportBuilder = $this->getMock(
             '\Magento\Framework\Mail\Template\TransportBuilder',
             [],
diff --git a/dev/tests/unit/testsuite/Magento/Contact/Controller/IndexTest.php b/dev/tests/unit/testsuite/Magento/Contact/Controller/IndexTest.php
index 170308652dbe3..26e655449859b 100644
--- a/dev/tests/unit/testsuite/Magento/Contact/Controller/IndexTest.php
+++ b/dev/tests/unit/testsuite/Magento/Contact/Controller/IndexTest.php
@@ -56,7 +56,7 @@ public function setUp()
             $this->getMock('\Magento\Framework\Mail\Template\TransportBuilder', [], [], '', false),
             $this->getMockForAbstractClass('\Magento\Framework\Translate\Inline\StateInterface', [], '', false),
             $this->_scopeConfig,
-            $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface', [], '', false)
+            $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface', [], '', false)
         );
     }
 
@@ -71,7 +71,7 @@ public function testDispatch()
             'isSetFlag'
         )->with(
             \Magento\Contact\Controller\Index::XML_PATH_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )->will(
             $this->returnValue(false)
         );
diff --git a/dev/tests/unit/testsuite/Magento/Core/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Core/Helper/DataTest.php
index 679108ffc1674..94808003006c0 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Helper/DataTest.php
@@ -138,7 +138,7 @@ public function testIsDevAllowed($allowedIps, $expected, $callNum = 1)
             ->method('getValue')
             ->with(
                 Data::XML_PATH_DEV_ALLOW_IPS,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $storeId
             )->will($this->returnValue($allowedIps));
 
@@ -269,7 +269,7 @@ public function testGetDefaultCountry()
             ->method('getValue')
             ->with(
                 Data::XML_PATH_DEFAULT_COUNTRY,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $storeId
             )->will($this->returnValue($country));
 
diff --git a/dev/tests/unit/testsuite/Magento/Core/Helper/UrlTest.php b/dev/tests/unit/testsuite/Magento/Core/Helper/UrlTest.php
index 4805b2bdc54bb..40e0dc69eef74 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Helper/UrlTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Helper/UrlTest.php
@@ -19,7 +19,7 @@ public function setUp()
 
     public function testGetCurrentBase64Url()
     {
-        $storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+        $storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
         ->disableOriginalConstructor()
         ->getMock();
         $urlBuilderMock = $this->getMockBuilder('Magento\Framework\UrlInterface')
@@ -55,7 +55,7 @@ public function testGetCurrentBase64Url()
      */
     public function testGetEncodedUrl($url, $callNum)
     {
-        $storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+        $storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->disableOriginalConstructor()
             ->getMock();
         $urlBuilderMock = $this->getMockBuilder('Magento\Framework\UrlInterface')
@@ -96,7 +96,7 @@ public function getEncodedUrlDataProvider()
 
     public function testGetHomeUrl()
     {
-        $storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+        $storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->disableOriginalConstructor()
             ->getMock();
         $storeMock = $this->getMockBuilder('Magento\Store\Model\Store')
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/ConfirmTest.php b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/ConfirmTest.php
index 400db11a3f0db..d56513e1afae5 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/ConfirmTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/ConfirmTest.php
@@ -10,7 +10,7 @@
 
 use Magento\Customer\Helper\Address;
 use Magento\Customer\Model\Url;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/CreatePostTest.php b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/CreatePostTest.php
index c0630ada0897f..52f5f4714ac10 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/CreatePostTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/CreatePostTest.php
@@ -12,7 +12,7 @@
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\Customer\Helper\Address;
 use Magento\Customer\Model\Url;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * @SuppressWarnings(PHPMD.TooManyFields)
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Helper/AddressTest.php b/dev/tests/unit/testsuite/Magento/Customer/Helper/AddressTest.php
index ad9936c78ebdf..667fdb0779ddd 100755
--- a/dev/tests/unit/testsuite/Magento/Customer/Helper/AddressTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Helper/AddressTest.php
@@ -20,7 +20,7 @@ class AddressTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Framework\View\Element\BlockFactory|\PHPUnit_Framework_MockObject_MockObject */
     protected $blockFactory;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $storeManager;
 
     /** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
@@ -44,7 +44,7 @@ protected function setUp()
             'Magento\Framework\View\Element\BlockFactory'
         )->disableOriginalConstructor()->getMock();
         $this->storeManager = $this->getMockBuilder(
-            'Magento\Framework\Store\StoreManagerInterface'
+            'Magento\Store\Model\StoreManagerInterface'
         )->disableOriginalConstructor()->getMock();
         $this->scopeConfig = $this->getMockBuilder(
             'Magento\Framework\App\Config\ScopeConfigInterface'
@@ -155,7 +155,7 @@ public function testGetConfigCanShowConfig()
             ->will($this->returnValue('1'));
         $this->scopeConfig->expects($this->once())//test method cache
             ->method('getValue')
-            ->with('customer/address', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $store)
+            ->with('customer/address', \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $store)
             ->will($this->returnValue($result));
         $this->storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
         $this->assertNull($this->helper->getConfig('unavailable_key'));
@@ -231,7 +231,7 @@ public function testIsVatValidationEnabled($store, $result)
             ->method('getValue')
             ->with(
                 \Magento\Customer\Helper\Address::XML_PATH_VAT_VALIDATION_ENABLED,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $store
             )
             ->will($this->returnValue($result));
@@ -261,7 +261,7 @@ public function testHasValidateOnEachTransaction($store, $result)
             ->method('getValue')
             ->with(
                 \Magento\Customer\Helper\Address::XML_PATH_VIV_ON_EACH_TRANSACTION,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $store
             )
             ->will($this->returnValue($result));
@@ -291,7 +291,7 @@ public function testGetTaxCalculationAddressType($store, $result)
             ->method('getValue')
             ->with(
                 \Magento\Customer\Helper\Address::XML_PATH_VIV_TAX_CALCULATION_ADDRESS_TYPE,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $store
             )
             ->will($this->returnValue($result));
@@ -316,7 +316,7 @@ public function testIsDisableAutoGroupAssignDefaultValue()
             ->method('getValue')
             ->with(
                 \Magento\Customer\Helper\Address::XML_PATH_VIV_DISABLE_AUTO_ASSIGN_DEFAULT,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
             ->will($this->returnValue(true));
         $this->assertTrue($this->helper->isDisableAutoGroupAssignDefaultValue());
@@ -328,7 +328,7 @@ public function testIsVatAttributeVisible()
             ->method('getValue')
             ->with(
                 \Magento\Customer\Helper\Address::XML_PATH_VAT_FRONTEND_VISIBILITY,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
             ->will($this->returnValue(true));
         $this->assertTrue($this->helper->isVatAttributeVisible());
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/StoreTest.php b/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/StoreTest.php
index 003b676169497..db0879fb5fc65 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/StoreTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/StoreTest.php
@@ -14,15 +14,15 @@ class StoreTest extends \PHPUnit_Framework_TestCase
     protected $testable;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManager;
 
     public function setUp()
     {
-        $storeManager = $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+        $storeManager = $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->getMock();
-        /** @var \Magento\Framework\Store\StoreManagerInterface $storeManager */
+        /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
         $this->testable = new Store($storeManager);
     }
 
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/WebsiteTest.php b/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/WebsiteTest.php
index f328441dc5714..3d99d9375f764 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/WebsiteTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Model/Customer/Attribute/Backend/WebsiteTest.php
@@ -14,15 +14,15 @@ class WebsiteTest extends \PHPUnit_Framework_TestCase
     protected $testable;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManager;
 
     public function setUp()
     {
-        $storeManager = $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+        $storeManager = $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->getMock();
-        /** @var \Magento\Framework\Store\StoreManagerInterface $storeManager */
+        /** @var \Magento\Store\Model\StoreManagerInterface $storeManager */
         $this->testable = new Website($storeManager);
     }
 
diff --git a/dev/tests/unit/testsuite/Magento/DesignEditor/Model/StateTest.php b/dev/tests/unit/testsuite/Magento/DesignEditor/Model/StateTest.php
index 2b38c3849543a..6059ff2f89d4a 100644
--- a/dev/tests/unit/testsuite/Magento/DesignEditor/Model/StateTest.php
+++ b/dev/tests/unit/testsuite/Magento/DesignEditor/Model/StateTest.php
@@ -20,7 +20,7 @@ class StateTest extends \PHPUnit_Framework_TestCase
     /**#@+
      * Layout update resource models
      */
-    const LAYOUT_UPDATE_RESOURCE_MODEL_CORE_CLASS_NAME = 'Magento\Core\Model\Resource\Layout\Update';
+    const LAYOUT_UPDATE_RESOURCE_MODEL_CORE_CLASS_NAME = 'Magento\Widget\Model\Resource\Layout\Update';
 
     const LAYOUT_UPDATE_RESOURCE_MODEL_VDE_CLASS_NAME = 'Magento\DesignEditor\Model\Resource\Layout\Update';
 
@@ -149,7 +149,7 @@ protected function setUp()
         )->with(
             $this->equalTo(\Magento\Framework\View\DesignInterface::XML_PATH_THEME_ID),
             $this->equalTo(self::THEME_ID),
-            $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+            $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE)
         )->will(
             $this->returnSelf()
         );
diff --git a/dev/tests/unit/testsuite/Magento/Developer/Model/TemplateEngine/Plugin/DebugHintsTest.php b/dev/tests/unit/testsuite/Magento/Developer/Model/TemplateEngine/Plugin/DebugHintsTest.php
index 6b292fb6e5658..9e576c4d8e069 100644
--- a/dev/tests/unit/testsuite/Magento/Developer/Model/TemplateEngine/Plugin/DebugHintsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Developer/Model/TemplateEngine/Plugin/DebugHintsTest.php
@@ -115,13 +115,13 @@ protected function _setupConfigFixture($showTemplateHints, $showBlockHints)
                 [
                     [
                         DebugHints::XML_PATH_DEBUG_TEMPLATE_HINTS,
-                        \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                         null,
                         $showTemplateHints,
                     ],
                     [
                         DebugHints::XML_PATH_DEBUG_TEMPLATE_HINTS_BLOCKS,
-                        \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                         null,
                         $showBlockHints
                     ],
diff --git a/dev/tests/unit/testsuite/Magento/Directory/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Directory/Helper/DataTest.php
index 62708a4d0332d..e5c2914f36513 100644
--- a/dev/tests/unit/testsuite/Magento/Directory/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Directory/Helper/DataTest.php
@@ -77,7 +77,7 @@ public function setUp()
         $this->_coreHelper = $this->getMock('Magento\Core\Helper\Data', [], [], '', false);
 
         $this->_store = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
-        $storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
+        $storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false);
         $storeManager->expects($this->any())->method('getStore')->will($this->returnValue($this->_store));
 
         $currencyFactory = $this->getMock('Magento\Directory\Model\CurrencyFactory', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Directory/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Directory/Model/ObserverTest.php
index 8b31ca2c35059..cf7afd8f96ffb 100644
--- a/dev/tests/unit/testsuite/Magento/Directory/Model/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Directory/Model/ObserverTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Directory\Model;
 
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 use Magento\TestFramework\Helper\ObjectManager;
 
 class ObserverTest extends \PHPUnit_Framework_TestCase
@@ -26,7 +26,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Framework\Mail\Template\TransportBuilder|\PHPUnit_Framework_MockObject_MockObject */
     protected $transportBuilder;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $storeManager;
 
     /** @var \Magento\Directory\Model\CurrencyFactory|\PHPUnit_Framework_MockObject_MockObject */
@@ -79,7 +79,7 @@ public function testScheduledUpdateCurrencyRates()
         $this->scopeConfig
             ->expects($this->at(0))
             ->method('getValue')
-            ->with(Observer::IMPORT_ENABLE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+            ->with(Observer::IMPORT_ENABLE, ScopeInterface::SCOPE_STORE)
             ->will($this->returnValue(1));
         $this->scopeConfig
             ->expects($this->at(1))
@@ -89,7 +89,7 @@ public function testScheduledUpdateCurrencyRates()
         $this->scopeConfig
             ->expects($this->at(2))
             ->method('getValue')
-            ->with(Observer::IMPORT_SERVICE, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+            ->with(Observer::IMPORT_SERVICE, ScopeInterface::SCOPE_STORE)
             ->will($this->returnValue('import-service'));
         $importInterfaceMock = $this->getMockBuilder('Magento\Directory\Model\Currency\Import\Webservicex')
             ->disableOriginalConstructor()
diff --git a/dev/tests/unit/testsuite/Magento/Directory/Model/PriceCurrencyTest.php b/dev/tests/unit/testsuite/Magento/Directory/Model/PriceCurrencyTest.php
index 67b21e1aeccb5..522c50d4ce45d 100644
--- a/dev/tests/unit/testsuite/Magento/Directory/Model/PriceCurrencyTest.php
+++ b/dev/tests/unit/testsuite/Magento/Directory/Model/PriceCurrencyTest.php
@@ -14,7 +14,7 @@ class PriceCurrencyTest extends \PHPUnit_Framework_TestCase
     protected $priceCurrency;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManager;
 
diff --git a/dev/tests/unit/testsuite/Magento/Downloadable/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Downloadable/Model/ObserverTest.php
index 727661e6d3b1f..eafee58aba500 100644
--- a/dev/tests/unit/testsuite/Magento/Downloadable/Model/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Downloadable/Model/ObserverTest.php
@@ -10,7 +10,7 @@
 use Magento\Downloadable\Model\Product\Type as DownloadableProductType;
 use Magento\Downloadable\Model\Resource\Link\Purchased\Item\Collection as LinkItemCollection;
 use Magento\Downloadable\Model\Resource\Link\Purchased\Item\CollectionFactory;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper;
 
 class ObserverTest extends \PHPUnit_Framework_TestCase
@@ -223,11 +223,7 @@ public function testIsAllowedGuestCheckoutConfigSetToTrue($productType, $isAllow
 
         $this->scopeConfig->expects($this->once())
             ->method('isSetFlag')
-            ->with(
-                Observer::XML_PATH_DISABLE_GUEST_CHECKOUT,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
-                $this->storeMock
-            )
+            ->with(Observer::XML_PATH_DISABLE_GUEST_CHECKOUT, ScopeInterface::SCOPE_STORE, $this->storeMock)
             ->willReturn(true);
 
         $this->observerMock->expects($this->exactly(3))
@@ -270,11 +266,7 @@ public function testIsAllowedGuestCheckoutConfigSetToFalse()
 
         $this->scopeConfig->expects($this->once())
             ->method('isSetFlag')
-            ->with(
-                Observer::XML_PATH_DISABLE_GUEST_CHECKOUT,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
-                $this->storeMock
-            )
+            ->with(Observer::XML_PATH_DISABLE_GUEST_CHECKOUT, ScopeInterface::SCOPE_STORE, $this->storeMock)
             ->willReturn(false);
 
         $this->observerMock->expects($this->exactly(2))
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Attribute/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Attribute/CollectionTest.php
index 27ab79c97be4b..f14a99bfc6aaf 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Attribute/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Attribute/CollectionTest.php
@@ -46,7 +46,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
     protected $entityTypeMock;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManagerMock;
 
@@ -79,7 +79,7 @@ protected function setUp()
             ->method('getEntityType')
             ->will($this->returnValue($this->entityTypeMock));
 
-        $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->storeManagerMock->expects($this->any())
             ->method('getStore')
             ->will($this->returnSelf());
diff --git a/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Entity/Attribute/Option/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Entity/Attribute/Option/CollectionTest.php
index cf7d5d61967df..b3e15125f0632 100644
--- a/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Entity/Attribute/Option/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Eav/Model/Resource/Entity/Attribute/Option/CollectionTest.php
@@ -38,7 +38,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
     protected $coreResourceMock;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManagerMock;
 
@@ -83,7 +83,7 @@ protected function setUp()
             false
         );
         $this->storeManagerMock = $this->getMock(
-            'Magento\Framework\Store\StoreManagerInterface',
+            'Magento\Store\Model\StoreManagerInterface',
             [],
             [],
             '',
diff --git a/dev/tests/unit/testsuite/Magento/Email/Block/Adminhtml/Template/PreviewTest.php b/dev/tests/unit/testsuite/Magento/Email/Block/Adminhtml/Template/PreviewTest.php
index 4f0f2f650124d..fe240f2422bde 100644
--- a/dev/tests/unit/testsuite/Magento/Email/Block/Adminhtml/Template/PreviewTest.php
+++ b/dev/tests/unit/testsuite/Magento/Email/Block/Adminhtml/Template/PreviewTest.php
@@ -54,7 +54,7 @@ public function testToHtml($requestParamMap)
         $design = $this->getMock('Magento\Framework\View\DesignInterface');
         $store = $this->getMock('Magento\Store\Model\Store', ['getId', '__wakeup'], [], '', false);
         $store->expects($this->any())->method('getId')->will($this->returnValue(1));
-        $storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+        $storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
         $storeManager->expects($this->any())->method('getDefaultStoreView')->will($this->returnValue(null));
         $storeManager->expects($this->any())->method('getStores')->will($this->returnValue([$store]));
 
@@ -140,7 +140,7 @@ public function testToHtmlWithException()
         $eventManage = $this->getMock('Magento\Framework\Event\ManagerInterface');
         $scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
         $design = $this->getMock('Magento\Framework\View\DesignInterface');
-        $storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+        $storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
         $storeManager->expects($this->any())->method('getDefaultStoreView')->will($this->returnValue(null));
         $storeManager->expects($this->any())->method('getStores')->will($this->returnValue([]));
 
diff --git a/dev/tests/unit/testsuite/Magento/Fedex/Model/CarrierTest.php b/dev/tests/unit/testsuite/Magento/Fedex/Model/CarrierTest.php
index 7054c045d028f..a9c8534c2f270 100644
--- a/dev/tests/unit/testsuite/Magento/Fedex/Model/CarrierTest.php
+++ b/dev/tests/unit/testsuite/Magento/Fedex/Model/CarrierTest.php
@@ -48,7 +48,7 @@ public function setUp()
         $rateFactory->expects($this->any())->method('create')->will($this->returnValue($rate));
 
         $store = $this->getMock('Magento\Store\Model\Store', ['getBaseCurrencyCode', '__wakeup'], [], '', false);
-        $storeManager = $this->getMockForAbstractClass('Magento\Framework\Store\StoreManagerInterface');
+        $storeManager = $this->getMockForAbstractClass('Magento\Store\Model\StoreManagerInterface');
         $storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
         $priceCurrency = $this->getMockBuilder('Magento\Framework\Pricing\PriceCurrencyInterface')->getMock();
         $priceCurrency->expects($this->once())
diff --git a/dev/tests/unit/testsuite/Magento/Framework/App/ViewTest.php b/dev/tests/unit/testsuite/Magento/Framework/App/ViewTest.php
index 2201b46fe20e2..4502bfbfc8c28 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/App/ViewTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/App/ViewTest.php
@@ -58,7 +58,7 @@ protected function setUp()
         $this->_layoutMock = $this->getMock('Magento\Framework\View\Layout', [], [], '', false);
         $this->_requestMock = $this->getMock('Magento\Framework\App\Request\Http', [], [], '', false);
         $this->_configScopeMock = $this->getMock('Magento\Framework\Config\ScopeInterface');
-        $this->_layoutProcessor = $this->getMock('Magento\Core\Model\Layout\Merge', [], [], '', false);
+        $this->_layoutProcessor = $this->getMock('Magento\Framework\View\Model\Layout\Merge', [], [], '', false);
         $this->_layoutMock->expects($this->any())->method('getUpdate')
             ->will($this->returnValue($this->_layoutProcessor));
         $this->_actionFlagMock = $this->getMock('Magento\Framework\App\ActionFlag', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Code/Model/File/Validator/NotProtectedExtensionTest.php b/dev/tests/unit/testsuite/Magento/Framework/Code/Model/File/Validator/NotProtectedExtensionTest.php
index 970377a81108b..05f63c59fc8cc 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Code/Model/File/Validator/NotProtectedExtensionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Code/Model/File/Validator/NotProtectedExtensionTest.php
@@ -33,7 +33,7 @@ protected function setUp()
             $this->equalTo(
                 \Magento\Core\Model\File\Validator\NotProtectedExtension::XML_PATH_PROTECTED_FILE_EXTENSIONS
             ),
-            $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+            $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
             $this->equalTo(null)
         )->will(
             $this->returnValue($this->_protectedList)
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Pricing/Render/RendererPoolTest.php b/dev/tests/unit/testsuite/Magento/Framework/Pricing/Render/RendererPoolTest.php
index 1a5ed42fd59be..2179bb5b7df5f 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Pricing/Render/RendererPoolTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Pricing/Render/RendererPoolTest.php
@@ -16,7 +16,7 @@ class RendererPoolTest extends \PHPUnit_Framework_TestCase
     protected $object;
 
     /**
-     * @var \Magento\Core\Model\Layout | \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\View\Layout | \PHPUnit_Framework_MockObject_MockObject
      */
     protected $layoutMock;
 
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Session/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Framework/Session/ConfigTest.php
index 67a8190b83e7a..e51b345024e43 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Session/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Session/ConfigTest.php
@@ -465,7 +465,7 @@ protected function getModel($validator)
             [
                 'scopeConfig' => $this->configMock,
                 'validatorFactory' => $this->validatorFactoryMock,
-                'scopeType' => \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                'scopeType' => \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 'cacheLimiter' => \Magento\Framework\Session\SaveHandlerInterface::DEFAULT_HANDLER,
                 'lifetimePath' => 'test_web/test_cookie/test_cookie_lifetime',
                 'request' => $this->requestMock,
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Url/ScopeResolverTest.php b/dev/tests/unit/testsuite/Magento/Framework/Url/ScopeResolverTest.php
index 3e55494ff5809..38aaa5d1fb6d6 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Url/ScopeResolverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Url/ScopeResolverTest.php
@@ -10,7 +10,7 @@ class ScopeResolverTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_storeManagerMock;
+    protected $scopeResolverMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
@@ -20,10 +20,10 @@ class ScopeResolverTest extends \PHPUnit_Framework_TestCase
     public function setUp()
     {
         $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
-        $this->_storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')->getMock();
+        $this->scopeResolverMock = $this->getMockBuilder('Magento\Framework\App\ScopeResolverInterface')->getMock();
         $this->_object = $objectManager->getObject(
             'Magento\Framework\Url\ScopeResolver',
-            ['storeManager' => $this->_storeManagerMock]
+            ['scopeResolver' => $this->scopeResolverMock]
         );
     }
 
@@ -33,11 +33,11 @@ public function setUp()
      */
     public function testGetScope($scopeId)
     {
-        $scopeMock = $this->getMockBuilder('\Magento\Framework\Url\ScopeInterface')->getMock();
-        $this->_storeManagerMock->expects(
+        $scopeMock = $this->getMockBuilder('Magento\Framework\Url\ScopeInterface')->getMock();
+        $this->scopeResolverMock->expects(
             $this->at(0)
         )->method(
-            'getStore'
+            'getScope'
         )->with(
             $scopeId
         )->will(
@@ -65,7 +65,7 @@ public function getScopeDataProvider()
 
     public function testGetScopes()
     {
-        $this->_storeManagerMock->expects($this->once())->method('getStores');
+        $this->scopeResolverMock->expects($this->once())->method('getScopes');
         $this->_object->getScopes();
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Framework/Url/SecurityInfoTest.php b/dev/tests/unit/testsuite/Magento/Framework/Url/SecurityInfoTest.php
index ba44579221dc9..ca3263b8eb9e7 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Url/SecurityInfoTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Url/SecurityInfoTest.php
@@ -19,14 +19,7 @@ class SecurityInfoTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->_scopeConfigMock = $this->getMock('\Magento\Framework\App\Config\ScopeConfigInterface');
-        $this->_model = new \Magento\Framework\Url\SecurityInfo($this->_scopeConfigMock, ['/account', '/cart']);
-    }
-
-    public function testIsSecureReturnsFalseIfDisabledInConfig()
-    {
-        $this->_scopeConfigMock->expects($this->once())->method('getValue')->will($this->returnValue(false));
-        $this->assertFalse($this->_model->isSecure('http://example.com/account'));
+        $this->_model = new \Magento\Framework\Url\SecurityInfo(['/account', '/cart']);
     }
 
     /**
@@ -36,7 +29,6 @@ public function testIsSecureReturnsFalseIfDisabledInConfig()
      */
     public function testIsSecureChecksIfUrlIsInSecureList($url, $expected)
     {
-        $this->_scopeConfigMock->expects($this->once())->method('getValue')->will($this->returnValue(true));
         $this->assertEquals($expected, $this->_model->isSecure($url));
     }
 
diff --git a/dev/tests/unit/testsuite/Magento/Framework/UrlTest.php b/dev/tests/unit/testsuite/Magento/Framework/UrlTest.php
index 62606668601aa..84dccffe3d6e5 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/UrlTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/UrlTest.php
@@ -106,7 +106,7 @@ protected function getRequestMock($mockMethods = [])
      */
     protected function getUrlModel($arguments = [])
     {
-        $arguments = array_merge($arguments, ['scopeType' => Store\ScopeInterface::SCOPE_STORE]);
+        $arguments = array_merge($arguments, ['scopeType' => \Magento\Store\Model\ScopeInterface::SCOPE_STORE]);
         $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
         return $objectManager->getObject('Magento\Framework\Url', $arguments);
     }
@@ -499,7 +499,7 @@ public function testGetConfigData($urlType, $configPath, $isSecure, $isSecureCal
 
         $this->scopeConfig->expects($this->any())
             ->method('getValue')
-            ->with($this->equalTo($configPath), Store\ScopeInterface::SCOPE_STORE, $this->scopeMock)
+            ->with($this->equalTo($configPath), \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $this->scopeMock)
             ->will($this->returnValue('http://localhost/'));
         $this->routeParamsResolverMock->expects($this->at(0))->method('hasData')->with('secure_is_forced')
             ->will($this->returnValue(false));
@@ -546,7 +546,7 @@ public function testGetConfigDataWithSecureIsForcedParam()
             ->method('getValue')
             ->with(
                 'web/secure/base_url_secure_forced',
-                Store\ScopeInterface::SCOPE_STORE, $this->scopeMock
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $this->scopeMock
             )
             ->will($this->returnValue('http://localhost/'));
         $this->routeParamsResolverMock->expects($this->once())->method('hasData')->with('secure_is_forced')
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Asset/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Asset/ConfigTest.php
index cf83ec7fdbb62..f4eb83ceae526 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Asset/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Asset/ConfigTest.php
@@ -38,7 +38,7 @@ public function testIsMergeCssFiles($booleanData)
     {
         $this->scopeConfigMock->expects($this->once())
             ->method('isSetFlag')
-            ->with(Config::XML_PATH_MERGE_CSS_FILES, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+            ->with(Config::XML_PATH_MERGE_CSS_FILES, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
             ->willReturn($booleanData);
         $this->assertSame($booleanData, $this->model->isMergeCssFiles());
     }
@@ -50,7 +50,7 @@ public function testIsMergeJsFiles($booleanData)
     {
         $this->scopeConfigMock->expects($this->once())
             ->method('isSetFlag')
-            ->with(Config::XML_PATH_MERGE_JS_FILES, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+            ->with(Config::XML_PATH_MERGE_JS_FILES, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
             ->willReturn($booleanData);
         $this->assertSame($booleanData, $this->model->isMergeJsFiles());
     }
@@ -62,7 +62,7 @@ public function testIsAssetMinification()
             ->method('isSetFlag')
             ->with(
                 sprintf(Config::XML_PATH_MINIFICATION_ENABLED, $contentType),
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )->willReturn(true);
         $this->assertTrue($this->model->isAssetMinification($contentType));
     }
@@ -75,7 +75,7 @@ public function testGetAssetMinificationAdapter()
             ->method('getValue')
             ->with(
                 sprintf(Config::XML_PATH_MINIFICATION_ADAPTER, $contentType),
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )->willReturn($adapter);
         $this->assertSame($adapter, $this->model->getAssetMinificationAdapter($contentType));
     }
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/LayoutTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/LayoutTest.php
index 07792d1add264..7327807f51ebc 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/LayoutTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/LayoutTest.php
@@ -36,7 +36,7 @@ class LayoutTest extends \PHPUnit_Framework_TestCase
     protected $themeResolverMock;
 
     /**
-     * @var \Magento\Core\Model\Layout\Merge|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\View\Model\Layout\Merge|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $processorMock;
 
@@ -76,7 +76,7 @@ protected function setUp()
         $this->themeResolverMock = $this->getMockForAbstractClass(
             'Magento\Framework\View\Design\Theme\ResolverInterface'
         );
-        $this->processorMock = $this->getMock('Magento\Core\Model\Layout\Merge', [], [], '', false);
+        $this->processorMock = $this->getMock('Magento\Framework\View\Model\Layout\Merge', [], [], '', false);
         $this->schStructureMock = $this->getMock('Magento\Framework\View\Layout\ScheduledStructure', [], [], '', false);
         $this->eventManagerMock = $this->getMock('Magento\Framework\Event\ManagerInterface');
         $this->generatorBlockMock = $this->getMockBuilder('Magento\Framework\View\Layout\Generator\Block')
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/MergeTest.php
similarity index 92%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/MergeTest.php
index a34d242149d9d..1a319c9856ef8 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/MergeTest.php
@@ -3,17 +3,17 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\Model\Layout;
+namespace Magento\Framework\View\Model\Layout;
 
 class MergeTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * Fixture XML instruction(s) to be used in tests
      */
-    const FIXTURE_LAYOUT_XML = '<block class="Magento\Framework\View\Element\Template" template="fixture.phtml"/>';
+    const FIXTURE_LAYOUT_XML = '<block class="Magento\Framework\View\Element\Template" template="fixture_template_one.phtml"/>';
 
     /**
-     * @var \Magento\Core\Model\Layout\Merge
+     * @var \Magento\Framework\View\Model\Layout\Merge
      */
     protected $_model;
 
@@ -40,7 +40,7 @@ class MergeTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $_store;
+    protected $scope;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
@@ -61,7 +61,7 @@ protected function setUp()
     {
         $files = [];
         foreach (glob(__DIR__ . '/_files/layout/*.xml') as $filename) {
-            $files[] = new \Magento\Framework\View\File($filename, 'Magento_Core');
+            $files[] = new \Magento\Framework\View\File($filename, 'Magento_Widget');
         }
         $fileSource = $this->getMockForAbstractClass('Magento\Framework\View\File\CollectorInterface');
         $fileSource->expects($this->any())->method('getFiles')->will($this->returnValue($files));
@@ -71,19 +71,19 @@ protected function setUp()
 
         $design = $this->getMockForAbstractClass('Magento\Framework\View\DesignInterface');
 
-        $this->_store = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
-        $this->_store->expects($this->any())->method('getId')->will($this->returnValue(20));
-        $storeManager = $this->getMockForAbstractClass('Magento\Framework\Store\StoreManagerInterface');
-        $storeManager->expects($this->once())->method('getStore')->with(null)->will($this->returnValue($this->_store));
+        $this->scope = $this->getMock('Magento\Framework\Url\ScopeInterface', [], [], '', false);
+        $this->scope->expects($this->any())->method('getId')->will($this->returnValue(20));
+        $scopeResolver = $this->getMockForAbstractClass('Magento\Framework\Url\ScopeResolverInterface');
+        $scopeResolver->expects($this->once())->method('getScope')->with(null)->will($this->returnValue($this->scope));
 
-        $this->_resource = $this->getMock('Magento\Core\Model\Resource\Layout\Update', [], [], '', false);
+        $this->_resource = $this->getMock('Magento\Widget\Model\Resource\Layout\Update', [], [], '', false);
 
         $this->_appState = $this->getMock('Magento\Framework\App\State', [], [], '', false);
 
         $this->_logger = $this->getMock('Psr\Log\LoggerInterface');
 
         $this->_layoutValidator = $this->getMock(
-            'Magento\Core\Model\Layout\Update\Validator',
+            'Magento\Framework\View\Model\Layout\Update\Validator',
             [],
             [],
             '',
@@ -118,10 +118,10 @@ function ($filename) use ($fileDriver) {
             ->getMock();
 
         $this->_model = $objectHelper->getObject(
-            'Magento\Core\Model\Layout\Merge',
+            'Magento\Framework\View\Model\Layout\Merge',
             [
                 'design' => $design,
-                'storeManager' => $storeManager,
+                'scopeResolver' => $scopeResolver,
                 'fileSource' => $fileSource,
                 'pageLayoutFileSource' => $pageLayoutFileSource,
                 'resource' => $this->_resource,
@@ -274,22 +274,22 @@ public function testLoadCache()
     public function testLoadDbApp()
     {
         $this->_resource->expects(
-            $this->once()
+            $this->any()
         )->method(
             'fetchUpdatesByHandle'
         )->with(
             'fixture_handle',
             $this->_theme,
-            $this->_store
+            $this->scope
         )->will(
             $this->returnValue(self::FIXTURE_LAYOUT_XML)
         );
         $this->assertEmpty($this->_model->getHandles());
         $this->assertEmpty($this->_model->asString());
-        $handles = ['fixture_handle'];
+        $handles = ['fixture_handle_one'];
         $this->_model->load($handles);
         $this->assertEquals($handles, $this->_model->getHandles());
-        $this->assertXmlStringEqualsXmlString(self::FIXTURE_LAYOUT_XML, $this->_model->asString());
+        $this->assertXmlStringEqualsXmlString('<body>' . self::FIXTURE_LAYOUT_XML . '</body>', $this->_model->asString());
     }
 
     public function testGetFileLayoutUpdatesXml()
@@ -399,7 +399,7 @@ public function testLoadWithInvalidLayout()
         $this->_layoutValidator->expects($this->any())->method('isValid')->will($this->returnValue(false));
 
         $suffix = md5(implode('|', $this->_model->getHandles()));
-        $cacheId = "LAYOUT_{$this->_theme->getArea()}_STORE{$this->_store->getId()}_{$this->_theme->getId()}{$suffix}";
+        $cacheId = "LAYOUT_{$this->_theme->getArea()}_STORE{$this->scope->getId()}_{$this->_theme->getId()}{$suffix}";
         $messages = $this->_layoutValidator->getMessages();
 
         // Testing error message is logged with logger
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/TranslatorTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/TranslatorTest.php
similarity index 80%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/TranslatorTest.php
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/TranslatorTest.php
index 81b1f45c1ceb4..3ca1601dfa45a 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/TranslatorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/TranslatorTest.php
@@ -3,12 +3,12 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\Model\Layout;
+namespace Magento\Framework\View\Model\Layout;
 
 class TranslatorTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Core\Model\Layout\Translator
+     * @var \Magento\Framework\View\Model\Layout\Translator
      */
     protected $_object;
 
@@ -45,11 +45,11 @@ protected function setUp()
 
         $this->_xmlDocument = simplexml_load_string($string, 'Magento\Framework\Simplexml\Element');
 
-        $this->_object = new \Magento\Core\Model\Layout\Translator();
+        $this->_object = new \Magento\Framework\View\Model\Layout\Translator();
     }
 
     /**
-     * @covers \Magento\Core\Model\Layout\Translator::translateActionParameters
+     * @covers \Magento\Framework\View\Model\Layout\Translator::translateActionParameters
      */
     public function testTranslateActionParametersWithNonTranslatedArgument()
     {
@@ -60,7 +60,7 @@ public function testTranslateActionParametersWithNonTranslatedArgument()
     }
 
     /**
-     * @covers \Magento\Core\Model\Layout\Translator::translateActionParameters
+     * @covers \Magento\Framework\View\Model\Layout\Translator::translateActionParameters
      */
     public function testTranslateActionParametersWithTranslatedArgument()
     {
@@ -72,7 +72,7 @@ public function testTranslateActionParametersWithTranslatedArgument()
     }
 
     /**
-     * @covers \Magento\Core\Model\Layout\Translator::translateActionParameters
+     * @covers \Magento\Framework\View\Model\Layout\Translator::translateActionParameters
      */
     public function testTranslateActionParametersWithHierarchyTranslatedArgumentAndNonStringParam()
     {
@@ -84,7 +84,7 @@ public function testTranslateActionParametersWithHierarchyTranslatedArgumentAndN
     }
 
     /**
-     * @covers \Magento\Core\Model\Layout\Translator::translateActionParameters
+     * @covers \Magento\Framework\View\Model\Layout\Translator::translateActionParameters
      */
     public function testTranslateActionParametersWithoutModule()
     {
@@ -96,7 +96,7 @@ public function testTranslateActionParametersWithoutModule()
     }
 
     /**
-     * @covers \Magento\Core\Model\Layout\Translator::translateArgument
+     * @covers \Magento\Framework\View\Model\Layout\Translator::translateArgument
      */
     public function testTranslateArgumentWithDefaultModuleAndSelfTranslatedMode()
     {
@@ -105,7 +105,7 @@ public function testTranslateArgumentWithDefaultModuleAndSelfTranslatedMode()
     }
 
     /**
-     * @covers \Magento\Core\Model\Layout\Translator::translateArgument
+     * @covers \Magento\Framework\View\Model\Layout\Translator::translateArgument
      */
     public function testTranslateArgumentWithoutModuleAndNoSelfTranslatedMode()
     {
@@ -114,7 +114,7 @@ public function testTranslateArgumentWithoutModuleAndNoSelfTranslatedMode()
     }
 
     /**
-     * @covers \Magento\Core\Model\Layout\Translator::translateArgument
+     * @covers \Magento\Framework\View\Model\Layout\Translator::translateArgument
      */
     public function testTranslateArgumentViaParentNodeWithParentModule()
     {
@@ -123,7 +123,7 @@ public function testTranslateArgumentViaParentNodeWithParentModule()
     }
 
     /**
-     * @covers \Magento\Core\Model\Layout\Translator::translateArgument
+     * @covers \Magento\Framework\View\Model\Layout\Translator::translateArgument
      */
     public function testTranslateArgumentViaParentNodeWithOwnModule()
     {
@@ -132,7 +132,7 @@ public function testTranslateArgumentViaParentNodeWithOwnModule()
     }
 
     /**
-     * @covers \Magento\Core\Model\Layout\Translator::translateArgument
+     * @covers \Magento\Framework\View\Model\Layout\Translator::translateArgument
      */
     public function testTranslateArgumentViaParentWithNodeThatIsNotInTranslateList()
     {
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/Update/ValidatorTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/Update/ValidatorTest.php
similarity index 96%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/Update/ValidatorTest.php
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/Update/ValidatorTest.php
index cc4950fa16edc..8c16998fe6aed 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/Update/ValidatorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/Update/ValidatorTest.php
@@ -3,9 +3,9 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\Model\Layout\Update;
+namespace Magento\Framework\View\Model\Layout\Update;
 
-use Magento\Core\Model\Layout\Update\Validator;
+use Magento\Framework\View\Model\Layout\Update\Validator;
 
 class ValidatorTest extends \PHPUnit_Framework_TestCase
 {
@@ -62,7 +62,7 @@ protected function _createValidator($layoutUpdate, $isSchemaValid = true)
         );
 
         $model = $this->_objectHelper->getObject(
-            'Magento\Core\Model\Layout\Update\Validator',
+            'Magento\Framework\View\Model\Layout\Update\Validator',
             ['dirList' => $dirList, 'domConfigFactory' => $domConfigFactory]
         );
 
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_category_default.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/catalog_category_default.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_category_default.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/catalog_category_default.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_category_layered.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/catalog_category_layered.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_category_layered.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/catalog_category_layered.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_product_view.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/catalog_product_view.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_product_view.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/catalog_product_view.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_product_view_type_configurable.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/catalog_product_view_type_configurable.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_product_view_type_configurable.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/catalog_product_view_type_configurable.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_product_view_type_simple.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/catalog_product_view_type_simple.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/catalog_product_view_type_simple.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/catalog_product_view_type_simple.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/checkout_onepage_index.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/checkout_onepage_index.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/checkout_onepage_index.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/checkout_onepage_index.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/customer_account.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/customer_account.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/customer_account.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/customer_account.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/default.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/default.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/default.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/default.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/file_wrong.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/file_wrong.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/file_wrong.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/file_wrong.xml
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/fixture_handle_one.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/fixture_handle_one.xml
new file mode 100644
index 0000000000000..c259187703f18
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/fixture_handle_one.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page>
+    <body>
+        <block class="Magento\Framework\View\Element\Template" template="fixture_template_one.phtml"/>
+    </body>
+</page>
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/fixture_handle_page_layout.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/fixture_handle_page_layout.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/fixture_handle_page_layout.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/fixture_handle_page_layout.xml
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/fixture_handle_two.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/fixture_handle_two.xml
new file mode 100644
index 0000000000000..9e3196c69b294
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/fixture_handle_two.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page>
+    <body>
+        <block class="Magento\Framework\View\Element\Template" template="fixture_template_two.phtml"/>
+    </body>
+</page>
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/fixture_handle_with_page_layout.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/fixture_handle_with_page_layout.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/fixture_handle_with_page_layout.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/fixture_handle_with_page_layout.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/not_a_page_type.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/not_a_page_type.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/not_a_page_type.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/not_a_page_type.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/page_empty.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/page_empty.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/page_empty.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/page_empty.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/print.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/print.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/print.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/print.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/sales_guest_print.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/sales_guest_print.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/sales_guest_print.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/sales_guest_print.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/sales_order_print.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/sales_order_print.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/layout/sales_order_print.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/layout/sales_order_print.xml
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/merged.xml b/dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/merged.xml
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/_files/merged.xml
rename to dev/tests/unit/testsuite/Magento/Framework/View/Model/Layout/_files/merged.xml
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Page/TitleTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Page/TitleTest.php
index 526a8a3f3aa41..cf259b68d3b07 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Page/TitleTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Page/TitleTest.php
@@ -9,7 +9,7 @@
  */
 namespace Magento\Framework\View\Page;
 
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 class TitleTest extends \PHPUnit_Framework_TestCase
 {
diff --git a/dev/tests/unit/testsuite/Magento/Framework/View/Result/PageTest.php b/dev/tests/unit/testsuite/Magento/Framework/View/Result/PageTest.php
index 84d9b346355be..be6f534564ed7 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/View/Result/PageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/View/Result/PageTest.php
@@ -33,7 +33,7 @@ class PageTest extends \PHPUnit_Framework_TestCase
     protected $layout;
 
     /**
-     * @var \Magento\Core\Model\Layout\Merge|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\View\Model\Layout\Merge|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $layoutMerge;
 
@@ -73,7 +73,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->layoutFactory->expects($this->any())->method('create')->will($this->returnValue($this->layout));
-        $this->layoutMerge = $this->getMockBuilder('Magento\Core\Model\Layout\Merge')
+        $this->layoutMerge = $this->getMockBuilder('Magento\Framework\View\Model\Layout\Merge')
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/dev/tests/unit/testsuite/Magento/GiftMessage/Model/CartRepositoryTest.php b/dev/tests/unit/testsuite/Magento/GiftMessage/Model/CartRepositoryTest.php
index 6055ad43c5fd4..c2712492bba77 100644
--- a/dev/tests/unit/testsuite/Magento/GiftMessage/Model/CartRepositoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/GiftMessage/Model/CartRepositoryTest.php
@@ -101,7 +101,7 @@ protected function setUp()
             '',
             false
         );
-        $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->giftMessageManagerMock =
             $this->getMock('Magento\GiftMessage\Model\GiftMessageManager', [], [], '', false);
         $this->helperMock = $this->getMock('Magento\GiftMessage\Helper\Message', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/GiftMessage/Model/ItemRepositoryTest.php b/dev/tests/unit/testsuite/Magento/GiftMessage/Model/ItemRepositoryTest.php
index a90156cb497ff..18fb89322ce34 100644
--- a/dev/tests/unit/testsuite/Magento/GiftMessage/Model/ItemRepositoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/GiftMessage/Model/ItemRepositoryTest.php
@@ -100,7 +100,7 @@ protected function setUp()
             '',
             false
         );
-        $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->giftMessageManagerMock =
             $this->getMock('Magento\GiftMessage\Model\GiftMessageManager', [], [], '', false);
         $this->helperMock = $this->getMock('Magento\GiftMessage\Helper\Message', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/GoogleOptimizer/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/GoogleOptimizer/Helper/DataTest.php
index 40f5bd7112898..bc2c747e6d2ef 100644
--- a/dev/tests/unit/testsuite/Magento/GoogleOptimizer/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/GoogleOptimizer/Helper/DataTest.php
@@ -63,7 +63,7 @@ public function testGoogleExperimentIsEnabled($isExperimentsEnabled)
             'isSetFlag'
         )->with(
             \Magento\GoogleOptimizer\Helper\Data::XML_PATH_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         )->will(
             $this->returnValue($isExperimentsEnabled)
@@ -95,7 +95,7 @@ public function testGoogleExperimentIsActive($isExperimentsEnabled, $isAnalytics
             'isSetFlag'
         )->with(
             \Magento\GoogleOptimizer\Helper\Data::XML_PATH_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $store
         )->will(
             $this->returnValue($isExperimentsEnabled)
diff --git a/dev/tests/unit/testsuite/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/MassAddTest.php b/dev/tests/unit/testsuite/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/MassAddTest.php
index bf809208479cd..db475eaf54019 100644
--- a/dev/tests/unit/testsuite/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/MassAddTest.php
+++ b/dev/tests/unit/testsuite/Magento/GoogleShopping/Controller/Adminhtml/Googleshopping/Items/MassAddTest.php
@@ -53,14 +53,14 @@ protected function setUp()
                 ->setMethods(['getId', '__sleep', '__wakeup'])->getMock();
         $store->expects($this->exactly(2))->method('getId')->will($this->returnValue(1));
 
-        $storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $storeManager->expects($this->once())->method('getStore')->will($this->returnValue($store));
 
         $this->controllerArguments['context']->getObjectManager()
             ->expects($this->at(0))->method('get')->with('Magento\GoogleShopping\Model\Flag')
             ->will($this->returnValue($this->flag));
         $this->controllerArguments['context']->getObjectManager()
-            ->expects($this->at(1))->method('get')->with('Magento\Framework\Store\StoreManagerInterface')
+            ->expects($this->at(1))->method('get')->with('Magento\Store\Model\StoreManagerInterface')
             ->will($this->returnValue($storeManager));
 
         $this->controller = $this->objectManagerHelper->getObject(
diff --git a/dev/tests/unit/testsuite/Magento/GoogleShopping/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/GoogleShopping/Helper/DataTest.php
index e48388469be44..f005bf9c10912 100644
--- a/dev/tests/unit/testsuite/Magento/GoogleShopping/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/GoogleShopping/Helper/DataTest.php
@@ -22,7 +22,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Framework\Stdlib\String|\PHPUnit_Framework_MockObject_MockObject */
     protected $string;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $storeManagerInterface;
 
     protected function setUp()
diff --git a/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/ConfigTest.php
index d87417d789c6f..2a4e858daf9cf 100644
--- a/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/ConfigTest.php
@@ -47,7 +47,7 @@ public function testGetAccountPassword()
             ->method('getValue')
             ->with(
                 'google/googleshopping/' . $configPasswordKey,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $storeId
             )->will($this->returnValue($password));
         $this->assertEquals($password, $this->model->getAccountPassword($storeId));
diff --git a/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/MassOperationsTest.php b/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/MassOperationsTest.php
index d14ae8351bba8..fd30bf370848c 100644
--- a/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/MassOperationsTest.php
+++ b/dev/tests/unit/testsuite/Magento/GoogleShopping/Model/MassOperationsTest.php
@@ -28,7 +28,7 @@ class MassOperationsTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Framework\Notification\NotifierInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $notificationInterface;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $storeManagerInterface;
 
     /** @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject */
@@ -58,7 +58,7 @@ protected function setUp()
             false
         );
         $this->notificationInterface = $this->getMock('Magento\Framework\Notification\NotifierInterface');
-        $this->storeManagerInterface = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerInterface = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->logger = $this->getMock('Psr\Log\LoggerInterface');
         $this->googleShoppingHelper = $this->getMock('Magento\GoogleShopping\Helper\Data', [], [], '', false);
         $this->googleShoppingCategoryHelper = $this->getMock('Magento\GoogleShopping\Helper\Category');
diff --git a/dev/tests/unit/testsuite/Magento/GroupedProduct/Block/Adminhtml/Product/Composite/Fieldset/GroupedTest.php b/dev/tests/unit/testsuite/Magento/GroupedProduct/Block/Adminhtml/Product/Composite/Fieldset/GroupedTest.php
index e5d7cc1140325..796207b675067 100644
--- a/dev/tests/unit/testsuite/Magento/GroupedProduct/Block/Adminhtml/Product/Composite/Fieldset/GroupedTest.php
+++ b/dev/tests/unit/testsuite/Magento/GroupedProduct/Block/Adminhtml/Product/Composite/Fieldset/GroupedTest.php
@@ -38,7 +38,7 @@ protected function setUp()
         $this->productMock = $this->getMock('\Magento\Catalog\Model\Product', [], [], '', false);
         $this->coreHelperMock = $this->getMock('\Magento\Core\Helper\Data', [], [], '', false);
         $this->storeManagerMock = $this->getMock(
-            '\Magento\Framework\Store\StoreManagerInterface',
+            '\Magento\Store\Model\StoreManagerInterface',
             [],
             [],
             '',
diff --git a/dev/tests/unit/testsuite/Magento/GroupedProduct/Model/Product/CatalogPriceTest.php b/dev/tests/unit/testsuite/Magento/GroupedProduct/Model/Product/CatalogPriceTest.php
index f22bcbcb95dc8..d469332820303 100644
--- a/dev/tests/unit/testsuite/Magento/GroupedProduct/Model/Product/CatalogPriceTest.php
+++ b/dev/tests/unit/testsuite/Magento/GroupedProduct/Model/Product/CatalogPriceTest.php
@@ -44,7 +44,7 @@ class CatalogPriceTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->commonPriceMock = $this->getMock(
             'Magento\Catalog\Model\Product\CatalogPrice',
             [],
diff --git a/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/EavAbstractTest.php b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/EavAbstractTest.php
index 1a23367cd5298..288782ca318d4 100644
--- a/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/EavAbstractTest.php
+++ b/dev/tests/unit/testsuite/Magento/ImportExport/Model/Import/Entity/EavAbstractTest.php
@@ -49,7 +49,7 @@ class EavAbstractTest extends \PHPUnit_Framework_TestCase
     protected $_resourceHelper;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
diff --git a/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php b/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php
index a9a2c2fff6880..681c9593b5283 100644
--- a/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Integration/Controller/Adminhtml/IntegrationTest.php
@@ -70,7 +70,7 @@ abstract class IntegrationTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Framework\App\ViewInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $_viewMock;
 
-    /** @var \Magento\Core\Model\Layout\Merge|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Framework\View\Model\Layout\Merge|\PHPUnit_Framework_MockObject_MockObject */
     protected $_layoutMergeMock;
 
     /** @var \Magento\Framework\View\LayoutInterface|\PHPUnit_Framework_MockObject_MockObject */
@@ -174,7 +174,7 @@ protected function _createIntegrationController($actionName)
             ->getMock();
         $this->_layoutMock = $this->getMock('Magento\Framework\View\LayoutInterface');
         $this->_layoutMergeMock = $this->getMockBuilder(
-            'Magento\Core\Model\Layout\Merge'
+            'Magento\Framework\View\Model\Layout\Merge'
         )->disableOriginalConstructor()->getMock();
         $this->_layoutMock->expects(
             $this->any()
@@ -263,7 +263,7 @@ protected function _verifyLoadAndRenderLayout()
     {
         $map = [
             ['Magento\Framework\App\Config\ScopeConfigInterface', $this->_configMock],
-            ['Magento\Core\Model\Layout\Filter\Acl', $this->_layoutFilterMock],
+            ['Magento\Backend\Model\Layout\Filter\Acl', $this->_layoutFilterMock],
             ['Magento\Backend\Model\Session', $this->_backendSessionMock],
             ['Magento\Framework\TranslateInterface', $this->_translateModelMock],
             ['Magento\Framework\Config\ScopeInterface', $this->_configScopeMock],
diff --git a/dev/tests/unit/testsuite/Magento/Integration/Helper/Oauth/ConsumerTest.php b/dev/tests/unit/testsuite/Magento/Integration/Helper/Oauth/ConsumerTest.php
index 3a4eb3e10c040..6374b23bec308 100644
--- a/dev/tests/unit/testsuite/Magento/Integration/Helper/Oauth/ConsumerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Integration/Helper/Oauth/ConsumerTest.php
@@ -7,7 +7,7 @@
 
 class ConsumerTest extends \PHPUnit_Framework_TestCase
 {
-    /** @var \Magento\Framework\Store\StoreManagerInterface */
+    /** @var \Magento\Store\Model\StoreManagerInterface */
     protected $_storeManagerMock;
 
     /** @var \Magento\Integration\Model\Oauth\Consumer\Factory */
@@ -62,7 +62,7 @@ protected function setUp()
         $this->_tokenFactory->expects($this->any())->method('create')->will($this->returnValue($this->_tokenMock));
 
         $this->_storeManagerMock = $this->getMockBuilder(
-            'Magento\Framework\Store\StoreManagerInterface'
+            'Magento\Store\Model\StoreManagerInterface'
         )->disableOriginalConstructor()->getMockForAbstractClass();
         $this->_storeMock = $this->getMockBuilder(
             'Magento\Store\Model\Store'
diff --git a/dev/tests/unit/testsuite/Magento/Integration/Service/V1/OauthTest.php b/dev/tests/unit/testsuite/Magento/Integration/Service/V1/OauthTest.php
index 2c9abbacc23bd..b86c45b3bb617 100644
--- a/dev/tests/unit/testsuite/Magento/Integration/Service/V1/OauthTest.php
+++ b/dev/tests/unit/testsuite/Magento/Integration/Service/V1/OauthTest.php
@@ -91,7 +91,7 @@ protected function setUp()
         );
 
         $this->_service = new \Magento\Integration\Service\V1\Oauth(
-            $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false),
+            $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false),
             $this->_consumerFactory,
             $this->_tokenFactoryMock,
             $this->getMock('Magento\Integration\Helper\Oauth\Data', [], [], '', false),
diff --git a/dev/tests/unit/testsuite/Magento/Log/Model/LogTest.php b/dev/tests/unit/testsuite/Magento/Log/Model/LogTest.php
index 49e48d08d29a5..d6442da9d999d 100644
--- a/dev/tests/unit/testsuite/Magento/Log/Model/LogTest.php
+++ b/dev/tests/unit/testsuite/Magento/Log/Model/LogTest.php
@@ -61,7 +61,7 @@ protected function setUp()
     public function testGetLogCleanTime()
     {
         $this->scopeConfig->expects($this->once())->method('getValue')
-            ->with(Log::XML_LOG_CLEAN_DAYS, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+            ->with(Log::XML_LOG_CLEAN_DAYS, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
             ->will($this->returnValue(30));
         $this->assertEquals(2592000, $this->log->getLogCleanTime());
     }
@@ -76,7 +76,7 @@ public function testGetOnlineMinutesInterval()
         $this->scopeConfig->expects($this->once())->method('getValue')
             ->with(
                 'customer/online_customers/online_minutes_interval',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )->will($this->returnValue(10));
 
         $this->assertEquals(10, $this->log->getOnlineMinutesInterval());
diff --git a/dev/tests/unit/testsuite/Magento/Log/Model/Shell/Command/CleanTest.php b/dev/tests/unit/testsuite/Magento/Log/Model/Shell/Command/CleanTest.php
index fe1b7ebb70bde..ab7d9737d3a02 100644
--- a/dev/tests/unit/testsuite/Magento/Log/Model/Shell/Command/CleanTest.php
+++ b/dev/tests/unit/testsuite/Magento/Log/Model/Shell/Command/CleanTest.php
@@ -46,7 +46,7 @@ public function testExecuteWithDaysOffset()
             ->with(
                 \Magento\Log\Model\Log::XML_LOG_CLEAN_DAYS,
                 10,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
 
         $this->_logMock->expects($this->once())->method('clean');
diff --git a/dev/tests/unit/testsuite/Magento/Log/Model/VisitorTest.php b/dev/tests/unit/testsuite/Magento/Log/Model/VisitorTest.php
index b8e542f9844a6..c67c65d2876dd 100644
--- a/dev/tests/unit/testsuite/Magento/Log/Model/VisitorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Log/Model/VisitorTest.php
@@ -26,7 +26,7 @@ class VisitorTest extends \PHPUnit_Framework_TestCase
     protected $sessionManagerInterface;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManagerInterface;
 
@@ -59,7 +59,7 @@ public function setUp()
     {
         $this->registry = $this->getMock('Magento\Framework\Registry');
         $this->sessionManagerInterface = $this->getMock('Magento\Framework\Session\SessionManagerInterface');
-        $this->storeManagerInterface = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerInterface = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->header = $this->getMock('Magento\Framework\HTTP\Header', [], [], '', false);
         $this->remoteAddress = $this->getMock('Magento\Framework\HTTP\PhpEnvironment\RemoteAddress', [], [], '', false);
         $this->serverAddress = $this->getMock('Magento\Framework\HTTP\PhpEnvironment\ServerAddress', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/ShippingTest.php b/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/ShippingTest.php
index b1726bfa8f1f9..931c92190cb8d 100644
--- a/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/ShippingTest.php
+++ b/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/ShippingTest.php
@@ -101,7 +101,7 @@ public function testGetCarrierName()
         $carrierCode = 'some carrier code';
         $name = 'some name';
         $this->scopeConfigMock->expects($this->once())->method('getValue')->with('carriers/' . $carrierCode . '/title',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)->will($this->returnValue($name));
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE)->will($this->returnValue($name));
 
         $this->assertEquals($name, $this->model->getCarrierName($carrierCode));
     }
@@ -110,7 +110,7 @@ public function testGetCarrierNameWithEmptyName()
     {
         $carrierCode = 'some carrier code';
         $this->scopeConfigMock->expects($this->once())->method('getValue')->with('carriers/' . $carrierCode . '/title',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)->will($this->returnValue(null));
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE)->will($this->returnValue(null));
 
         $this->assertEquals($carrierCode, $this->model->getCarrierName($carrierCode));
     }
diff --git a/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/SuccessTest.php b/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/SuccessTest.php
index a594804f3974c..411eaaa51d40a 100644
--- a/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/SuccessTest.php
+++ b/dev/tests/unit/testsuite/Magento/Multishipping/Block/Checkout/SuccessTest.php
@@ -45,7 +45,7 @@ protected function setUp()
             false
         );
         $this->contextMock = $this->getMock('Magento\Framework\View\Element\Template\Context', [], [], '', false);
-        $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
+        $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false);
 
         $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
         $this->contextMock->expects($this->once())->method('getSession')->will($this->returnValue($this->sessionMock));
diff --git a/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php b/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php
index 46064a69ed282..09434687725e9 100644
--- a/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php
+++ b/dev/tests/unit/testsuite/Magento/OfflineShipping/Block/Adminhtml/Carrier/Tablerate/GridTest.php
@@ -13,7 +13,7 @@ class GridTest extends \PHPUnit_Framework_TestCase
     protected $model;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManagerMock;
 
@@ -41,7 +41,7 @@ protected function setUp()
     {
         $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
 
-        $this->storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+        $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->disableOriginalConstructor()
             ->getMock();
 
diff --git a/dev/tests/unit/testsuite/Magento/PageCache/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/PageCache/Model/ConfigTest.php
index 880214f645ec9..e73c4b377411c 100644
--- a/dev/tests/unit/testsuite/Magento/PageCache/Model/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/PageCache/Model/ConfigTest.php
@@ -66,25 +66,25 @@ public function setUp()
                 [
                     [
                         \Magento\PageCache\Model\Config::XML_VARNISH_PAGECACHE_BACKEND_HOST,
-                        \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                         null,
                         'example.com',
                     ],
                     [
                         \Magento\PageCache\Model\Config::XML_VARNISH_PAGECACHE_BACKEND_PORT,
-                        \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                         null,
                         '8080'
                     ],
                     [
                         \Magento\PageCache\Model\Config::XML_VARNISH_PAGECACHE_ACCESS_LIST,
-                        \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                         null,
                         '127.0.0.1, 192.168.0.1,127.0.0.2'
                     ],
                     [
                         \Magento\PageCache\Model\Config::XML_VARNISH_PAGECACHE_DESIGN_THEME_REGEX,
-                        \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                         null,
                         serialize([['regexp' => '(?i)pattern', 'value' => 'value_for_pattern']])
                     ],
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/DepersonalizePluginTest.php b/dev/tests/unit/testsuite/Magento/PageCache/Model/Layout/DepersonalizePluginTest.php
similarity index 97%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/DepersonalizePluginTest.php
rename to dev/tests/unit/testsuite/Magento/PageCache/Model/Layout/DepersonalizePluginTest.php
index 9f9fa70be441e..c3630097d53cd 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/DepersonalizePluginTest.php
+++ b/dev/tests/unit/testsuite/Magento/PageCache/Model/Layout/DepersonalizePluginTest.php
@@ -6,7 +6,7 @@
 
 // @codingStandardsIgnoreFile
 
-namespace Magento\Core\Model\Layout;
+namespace Magento\PageCache\Model\Layout;
 
 /**
  * Class DepersonalizePluginTest
@@ -14,7 +14,7 @@
 class DepersonalizePluginTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Core\Model\Layout\DepersonalizePluginTest
+     * @var \Magento\PageCache\Model\Layout\DepersonalizePlugin
      */
     protected $plugin;
 
diff --git a/dev/tests/unit/testsuite/Magento/Payment/Block/Info/SubstitutionTest.php b/dev/tests/unit/testsuite/Magento/Payment/Block/Info/SubstitutionTest.php
index 601e8ba418f9a..82ad3a3460298 100644
--- a/dev/tests/unit/testsuite/Magento/Payment/Block/Info/SubstitutionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Payment/Block/Info/SubstitutionTest.php
@@ -54,7 +54,7 @@ public function setUp()
             $this->stringContains(
                 'advanced/modules_disable_output/'
             ),
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )->will(
             $this->returnValue(
                 false
diff --git a/dev/tests/unit/testsuite/Magento/Payment/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Payment/Model/ConfigTest.php
index 6c30760a3c22d..d62c4c2b960f6 100644
--- a/dev/tests/unit/testsuite/Magento/Payment/Model/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Payment/Model/ConfigTest.php
@@ -8,7 +8,7 @@
 
 namespace Magento\Payment\Model;
 
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 use Magento\TestFramework\Helper\ObjectManager as ObjectManagerHelper;
 
 class ConfigTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php b/dev/tests/unit/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php
index 978b902b4ad1d..41518982f168d 100644
--- a/dev/tests/unit/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php
+++ b/dev/tests/unit/testsuite/Magento/Persistent/Block/Header/AdditionalTest.php
@@ -268,7 +268,7 @@ public function testToHtml($customerId)
             ->method('getValue')
             ->with(
                 'advanced/modules_disable_output/Magento_Persistent',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )->willReturn(false);
 
         // get cache
diff --git a/dev/tests/unit/testsuite/Magento/Quote/Model/Cart/ShippingMethodConverterTest.php b/dev/tests/unit/testsuite/Magento/Quote/Model/Cart/ShippingMethodConverterTest.php
index 187fda56b30fa..6bd008cd8e640 100644
--- a/dev/tests/unit/testsuite/Magento/Quote/Model/Cart/ShippingMethodConverterTest.php
+++ b/dev/tests/unit/testsuite/Magento/Quote/Model/Cart/ShippingMethodConverterTest.php
@@ -56,7 +56,7 @@ protected function setUp()
             '',
             false
         );
-        $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
         $this->currencyMock = $this->getMock('\Magento\Directory\Model\Currency', [], [], '', false);
         $this->shippingMethodMock =
             $this->getMock('\Magento\Quote\Api\Data\ShippingMethodInterface');
diff --git a/dev/tests/unit/testsuite/Magento/Quote/Model/Observer/Backend/CustomerQuoteTest.php b/dev/tests/unit/testsuite/Magento/Quote/Model/Observer/Backend/CustomerQuoteTest.php
index 214f03f25d0cf..c1e59dbfd91ce 100644
--- a/dev/tests/unit/testsuite/Magento/Quote/Model/Observer/Backend/CustomerQuoteTest.php
+++ b/dev/tests/unit/testsuite/Magento/Quote/Model/Observer/Backend/CustomerQuoteTest.php
@@ -16,7 +16,7 @@ class CustomerQuoteTest extends \PHPUnit_Framework_TestCase
     protected $customerQuote;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Store\StoreManagerInterface
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManagerMock;
 
@@ -42,7 +42,7 @@ class CustomerQuoteTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+        $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->disableOriginalConstructor()
             ->getMock();
         $this->configMock = $this->getMockBuilder('Magento\Customer\Model\Config\Share')
diff --git a/dev/tests/unit/testsuite/Magento/Quote/Model/Quote/AddressTest.php b/dev/tests/unit/testsuite/Magento/Quote/Model/Quote/AddressTest.php
index 9a3678812e037..6d45948f758f9 100644
--- a/dev/tests/unit/testsuite/Magento/Quote/Model/Quote/AddressTest.php
+++ b/dev/tests/unit/testsuite/Magento/Quote/Model/Quote/AddressTest.php
@@ -8,7 +8,7 @@
 
 namespace Magento\Quote\Model\Quote;
 
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Test class for \Magento\Sales\Model\Order
diff --git a/dev/tests/unit/testsuite/Magento/Quote/Model/Quote/Item/ProcessorTest.php b/dev/tests/unit/testsuite/Magento/Quote/Model/Quote/Item/ProcessorTest.php
index c41d81debcb83..940dd0f57106e 100644
--- a/dev/tests/unit/testsuite/Magento/Quote/Model/Quote/Item/ProcessorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Quote/Model/Quote/Item/ProcessorTest.php
@@ -8,7 +8,7 @@
 use \Magento\Catalog\Model\Product;
 use Magento\Quote\Model\Quote\ItemFactory;
 use Magento\Quote\Model\Quote\Item;
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Model\Store;
 use Magento\Framework\App\State;
 use Magento\Framework\Object;
@@ -29,7 +29,7 @@ class ProcessorTest extends \PHPUnit_Framework_TestCase
     protected $quoteItemFactoryMock;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface |\PHPUnit_Framework_MockObject_MockObject
+     * @var StoreManagerInterface |\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManagerMock;
 
diff --git a/dev/tests/unit/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php b/dev/tests/unit/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php
index 4b772d50afc65..451d2281e4964 100644
--- a/dev/tests/unit/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Quote/Model/QuoteRepositoryTest.php
@@ -51,7 +51,7 @@ protected function setUp()
         $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
 
         $this->quoteFactoryMock = $this->getMock('\Magento\Quote\Model\QuoteFactory', ['create'], [], '', false);
-        $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
         $this->quoteMock = $this->getMock(
             '\Magento\Quote\Model\Quote',
             ['load', 'loadByCustomer', 'getIsActive', 'getId', '__wakeup', 'setSharedStoreIds', 'save', 'delete',
diff --git a/dev/tests/unit/testsuite/Magento/Quote/Model/QuoteTest.php b/dev/tests/unit/testsuite/Magento/Quote/Model/QuoteTest.php
index 50c471073b7fc..d9e89ae07e385 100644
--- a/dev/tests/unit/testsuite/Magento/Quote/Model/QuoteTest.php
+++ b/dev/tests/unit/testsuite/Magento/Quote/Model/QuoteTest.php
@@ -9,7 +9,7 @@
 namespace Magento\Quote\Model;
 
 use Magento\Quote\Model\Quote\Address;
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 use Magento\TestFramework\Helper\ObjectManager;
 
 /**
@@ -887,10 +887,10 @@ public function testValidateMiniumumAmount()
         $this->quote->setStoreId($storeId);
 
         $valueMap = [
-            ['sales/minimum_order/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId, true],
-            ['sales/minimum_order/multi_address', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId, true],
+            ['sales/minimum_order/active', ScopeInterface::SCOPE_STORE, $storeId, true],
+            ['sales/minimum_order/multi_address', ScopeInterface::SCOPE_STORE, $storeId, true],
             ['sales/minimum_order/amount', ScopeInterface::SCOPE_STORE, $storeId, 20],
-            ['sales/minimum_order/tax_including', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId, true],
+            ['sales/minimum_order/tax_including', ScopeInterface::SCOPE_STORE, $storeId, true],
         ];
         $this->scopeConfig->expects($this->any())
             ->method('isSetFlag')
@@ -913,10 +913,10 @@ public function testValidateMiniumumAmountNegative()
         $this->quote->setStoreId($storeId);
 
         $valueMap = [
-            ['sales/minimum_order/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId, true],
-            ['sales/minimum_order/multi_address', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId, true],
-            ['sales/minimum_order/amount', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId, 20],
-            ['sales/minimum_order/tax_including', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, $storeId, true],
+            ['sales/minimum_order/active', ScopeInterface::SCOPE_STORE, $storeId, true],
+            ['sales/minimum_order/multi_address', ScopeInterface::SCOPE_STORE, $storeId, true],
+            ['sales/minimum_order/amount', ScopeInterface::SCOPE_STORE, $storeId, 20],
+            ['sales/minimum_order/tax_including', ScopeInterface::SCOPE_STORE, $storeId, true],
         ];
         $this->scopeConfig->expects($this->any())
             ->method('isSetFlag')
diff --git a/dev/tests/unit/testsuite/Magento/Reports/Model/Event/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Reports/Model/Event/ObserverTest.php
index 276b1c0daffac..8ab0afa7100c4 100644
--- a/dev/tests/unit/testsuite/Magento/Reports/Model/Event/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Reports/Model/Event/ObserverTest.php
@@ -76,7 +76,7 @@ public function setUp()
             ->willReturn($this->reportEventMock);
 
         /** @var \Magento\Store\Model\StoreManagerInterfac|\PHPUnit_Framework_MockObject_MockObject $storeManager */
-        $storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
 
         $this->storeMock = $this->getMockBuilder('\Magento\Store\Model\Store')
             ->disableOriginalConstructor()->getMock();
diff --git a/dev/tests/unit/testsuite/Magento/Review/Block/Adminhtml/RssTest.php b/dev/tests/unit/testsuite/Magento/Review/Block/Adminhtml/RssTest.php
index 396c0c691006d..123a4cfa8af60 100644
--- a/dev/tests/unit/testsuite/Magento/Review/Block/Adminhtml/RssTest.php
+++ b/dev/tests/unit/testsuite/Magento/Review/Block/Adminhtml/RssTest.php
@@ -21,7 +21,7 @@ class RssTest extends \PHPUnit_Framework_TestCase
     protected $objectManagerHelper;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManagerInterface;
 
@@ -37,7 +37,7 @@ class RssTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->storeManagerInterface = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerInterface = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->rss = $this->getMock('Magento\Review\Model\Rss', ['__wakeUp', 'getProductCollection'], [], '', false);
         $this->urlBuilder = $this->getMock('Magento\Framework\UrlInterface');
         $this->objectManagerHelper = new ObjectManagerHelper($this);
diff --git a/dev/tests/unit/testsuite/Magento/Review/Block/Customer/RecentTest.php b/dev/tests/unit/testsuite/Magento/Review/Block/Customer/RecentTest.php
index 6ac10c1809514..ec6ff0e55f3e7 100644
--- a/dev/tests/unit/testsuite/Magento/Review/Block/Customer/RecentTest.php
+++ b/dev/tests/unit/testsuite/Magento/Review/Block/Customer/RecentTest.php
@@ -27,12 +27,12 @@ class RecentTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Customer\Helper\Session\CurrentCustomer|\PHPUnit_Framework_MockObject_MockObject */
     protected $currentCustomer;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $storeManager;
 
     protected function setUp()
     {
-        $this->storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
         $this->context = $this->getMock('Magento\Framework\View\Element\Template\Context', [], [], '', false);
         $this->context->expects(
             $this->any()
diff --git a/dev/tests/unit/testsuite/Magento/Review/Controller/Adminhtml/Product/PostTest.php b/dev/tests/unit/testsuite/Magento/Review/Controller/Adminhtml/Product/PostTest.php
index 097f6abc1b94c..1dd384080fc18 100644
--- a/dev/tests/unit/testsuite/Magento/Review/Controller/Adminhtml/Product/PostTest.php
+++ b/dev/tests/unit/testsuite/Magento/Review/Controller/Adminhtml/Product/PostTest.php
@@ -135,9 +135,7 @@ protected function _prepareMockObjects()
         );
         $this->_objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface');
         $this->_messageManagerMock = $this->getMock('\Magento\Framework\Message\Manager', [], [], '', false);
-        $this->_storeManagerInterfaceMock = $this->getMockForAbstractClass(
-            'Magento\Framework\Store\StoreManagerInterface'
-        );
+        $this->_storeManagerInterfaceMock = $this->getMockForAbstractClass('Magento\Store\Model\StoreManagerInterface');
         $this->_storeModelMock = $this->getMock(
             'Magento\Store\Model\Store', ['__wakeup', 'getId'], [], '', false
         );
@@ -187,7 +185,7 @@ public function testPostAction()
         $this->_requestMock->expects($this->once())->method('getPost')
             ->will($this->returnValue(['status_id' => 1]));
         $this->_objectManagerMock->expects($this->at(0))->method('get')
-            ->with('Magento\Framework\Store\StoreManagerInterface')
+            ->with('Magento\Store\Model\StoreManagerInterface')
             ->will($this->returnValue($this->_storeManagerInterfaceMock));
         $this->_reviewFactoryMock->expects($this->once())->method('create')
             ->will($this->returnValue($this->_reviewModelMock));
diff --git a/dev/tests/unit/testsuite/Magento/Review/Controller/Product/PostTest.php b/dev/tests/unit/testsuite/Magento/Review/Controller/Product/PostTest.php
index 4102ac0034883..4644157c0f9ee 100644
--- a/dev/tests/unit/testsuite/Magento/Review/Controller/Product/PostTest.php
+++ b/dev/tests/unit/testsuite/Magento/Review/Controller/Product/PostTest.php
@@ -148,7 +148,7 @@ public function setUp()
         $this->messageManager = $this->getMock('\Magento\Framework\Message\ManagerInterface');
 
         $this->store = $this->getMock('\Magento\Store\Model\Store', ['getId'], [], '', false);
-        $storeManager = $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface');
+        $storeManager = $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface');
         $storeManager->expects($this->any())->method('getStore')->will($this->returnValue($this->store));
         $this->model = (new \Magento\TestFramework\Helper\ObjectManager($this))
             ->getObject(
diff --git a/dev/tests/unit/testsuite/Magento/Review/Model/Resource/Review/Product/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Review/Model/Resource/Review/Product/CollectionTest.php
index 0f33ada38c0b4..ce455c7886c99 100644
--- a/dev/tests/unit/testsuite/Magento/Review/Model/Resource/Review/Product/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Review/Model/Resource/Review/Product/CollectionTest.php
@@ -55,7 +55,7 @@ public function setUp()
         $universalFactory->expects($this->any())->method('create')->will($this->returnValue($entity));
         $store = $this->getMock('\Magento\Store\Model\Store', ['getId'], [], '', false);
         $store->expects($this->any())->method('getId')->will($this->returnValue(1));
-        $storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+        $storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
         $storeManager->expects($this->any())->method('getStore')->will($this->returnValue($store));
         $fetchStrategy = $this->getMock(
             '\Magento\Framework\Data\Collection\Db\FetchStrategy\Query',
diff --git a/dev/tests/unit/testsuite/Magento/Review/Model/ReviewTest.php b/dev/tests/unit/testsuite/Magento/Review/Model/ReviewTest.php
index 785eee86bd48a..20a385e193ae5 100644
--- a/dev/tests/unit/testsuite/Magento/Review/Model/ReviewTest.php
+++ b/dev/tests/unit/testsuite/Magento/Review/Model/ReviewTest.php
@@ -37,7 +37,7 @@ class ReviewTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Review\Model\Review\Summary|\PHPUnit_Framework_MockObject_MockObject */
     protected $summaryMock;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $storeManagerMock;
 
     /** @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
@@ -82,7 +82,7 @@ protected function setUp()
             false
         );
         $this->summaryMock = $this->getMock('Magento\Review\Model\Review\Summary', [], [], '', false);
-        $this->storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->urlInterfaceMock = $this->getMock('Magento\Framework\UrlInterface');
         $this->resource = $this->getMock('Magento\Review\Model\Resource\Review', [], [], '', false);
 
diff --git a/dev/tests/unit/testsuite/Magento/Rss/Model/UrlBuilderTest.php b/dev/tests/unit/testsuite/Magento/Rss/Model/UrlBuilderTest.php
index 119f682b59af1..d4f72b1f046ff 100644
--- a/dev/tests/unit/testsuite/Magento/Rss/Model/UrlBuilderTest.php
+++ b/dev/tests/unit/testsuite/Magento/Rss/Model/UrlBuilderTest.php
@@ -49,7 +49,7 @@ protected function setUp()
     public function testGetUrlEmpty()
     {
         $this->scopeConfigInterface->expects($this->once())->method('getValue')
-            ->with('rss/config/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+            ->with('rss/config/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
             ->will($this->returnValue(false));
         $this->assertEquals('', $this->urlBuilder->getUrl());
     }
@@ -57,7 +57,7 @@ public function testGetUrlEmpty()
     public function testGetUrl()
     {
         $this->scopeConfigInterface->expects($this->once())->method('getValue')
-            ->with('rss/config/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+            ->with('rss/config/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
             ->will($this->returnValue(true));
         $this->urlInterface->expects($this->once())->method('getUrl')
             ->with('rss/feed/index', ['type' => 'rss_feed'])
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Block/Order/Info/Buttons/RssTest.php b/dev/tests/unit/testsuite/Magento/Sales/Block/Order/Info/Buttons/RssTest.php
index 7d7432fe5a587..d8e94b601068d 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Block/Order/Info/Buttons/RssTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Block/Order/Info/Buttons/RssTest.php
@@ -95,7 +95,7 @@ public function testGetLabel()
     public function testIsRssAllowed()
     {
         $this->scopeConfigInterface->expects($this->once())->method('isSetFlag')
-            ->with('rss/order/status', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+            ->with('rss/order/status', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
             ->will($this->returnValue(true));
         $this->assertTrue($this->rss->isRssAllowed());
     }
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Block/Order/RecentTest.php b/dev/tests/unit/testsuite/Magento/Sales/Block/Order/RecentTest.php
index 33946edd7a3c9..6afae0681a8f7 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Block/Order/RecentTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Block/Order/RecentTest.php
@@ -66,7 +66,7 @@ public function testConstructMethod()
         $data = [];
         $attribute = ['customer_id', 'status'];
         $customerId = 25;
-        $layout = $this->getMock('Magento\Core\Model\Layout', ['getBlock'], [], '', false, false);
+        $layout = $this->getMock('Magento\Framework\View\Layout', ['getBlock'], [], '', false, false);
         $this->context->expects($this->once())
             ->method('getLayout')
             ->will($this->returnValue($layout));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Helper/AdminTest.php b/dev/tests/unit/testsuite/Magento/Sales/Helper/AdminTest.php
index 383078880447a..2f4573684267d 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Helper/AdminTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Helper/AdminTest.php
@@ -15,7 +15,7 @@ class AdminTest extends \PHPUnit_Framework_TestCase
     protected $contextMock;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManagerMock;
 
@@ -49,7 +49,7 @@ protected function setUp()
         $this->contextMock = $this->getMockBuilder('Magento\Framework\App\Helper\Context')
             ->disableOriginalConstructor()
             ->getMock();
-        $this->storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+        $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->disableOriginalConstructor()
             ->getMock();
         $this->salesConfigMock = $this->getMockBuilder('Magento\Sales\Model\Config')
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Sales/Helper/DataTest.php
index 542ef36e9e602..7cf3a0bb02814 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Helper/DataTest.php
@@ -37,7 +37,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+        $storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -198,7 +198,7 @@ protected function setupScopeConfigIsSetFlag($flagName, $returnValue)
             ->method('isSetFlag')
             ->with(
                 $flagName,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $this->storeMock
             )
             ->will($this->returnValue($returnValue));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Helper/GuestTest.php b/dev/tests/unit/testsuite/Magento/Sales/Helper/GuestTest.php
index 9ec31888e2df3..87c343c1d6e17 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Helper/GuestTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Helper/GuestTest.php
@@ -26,7 +26,7 @@ class GuestTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $scopeConfigInterfaceMock;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $storeManagerInterfaceMock;
 
     /** @var \Magento\Framework\App\State|\PHPUnit_Framework_MockObject_MockObject */
@@ -57,7 +57,7 @@ protected function setUp()
     {
         $this->appContextHelperMock = $this->getMock('Magento\Framework\App\Helper\Context', [], [], '', false);
         $this->scopeConfigInterfaceMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
-        $this->storeManagerInterfaceMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerInterfaceMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->stateMock = $this->getMock('Magento\Framework\App\State', [], [], '', false);
         $this->registryMock = $this->getMock('Magento\Framework\Registry');
         $this->sessionMock = $this->getMock('Magento\Customer\Model\Session', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Helper/ReorderTest.php b/dev/tests/unit/testsuite/Magento/Sales/Helper/ReorderTest.php
index 5f23a54fc1a30..e79ed2fb06a6e 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Helper/ReorderTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Helper/ReorderTest.php
@@ -47,7 +47,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+        $storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -129,7 +129,7 @@ protected function setupScopeConfigMock($returnValue)
             ->method('getValue')
             ->with(
                 Reorder::XML_PATH_SALES_REORDER_ALLOW,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 $this->storeParam
             )
             ->will($this->returnValue($returnValue));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/CreditmemoTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/CreditmemoTest.php
index c49c6b7caa185..7e9d43e006f81 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/CreditmemoTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/CreditmemoTest.php
@@ -59,7 +59,7 @@ public function setUp()
             'orderFactory' => $this->orderFactory,
             'cmItemCollectionFactory' => $this->cmItemCollectionFactoryMock,
             'calculatorFactory' => $this->getMock('Magento\Framework\Math\CalculatorFactory', [], [], '', false),
-            'storeManager' => $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false),
+            'storeManager' => $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false),
             'commentFactory' => $this->getMock(
                     'Magento\Sales\Model\Order\Creditmemo\CommentFactory',
                     [],
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentityTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentityTest.php
index 5b48505ed9bf4..5288da8be24f9 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentityTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/CreditmemoCommentIdentityTest.php
@@ -64,7 +64,7 @@ public function testIsEnabledTrue()
             ->method('isSetFlag')
             ->with(
                 $this->equalTo(CreditmemoCommentIdentity::XML_PATH_EMAIL_ENABLED),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue(true));
@@ -79,7 +79,7 @@ public function testGetEmailCopyTo()
             ->method('getValue')
             ->with(
                 $this->equalTo(CreditmemoCommentIdentity::XML_PATH_EMAIL_COPY_TO),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('test_value,test_value2'));
@@ -94,7 +94,7 @@ public function testGetEmailCopyToEmptyResult()
             ->method('getValue')
             ->with(
                 $this->equalTo(CreditmemoCommentIdentity::XML_PATH_EMAIL_COPY_TO),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue(null));
@@ -109,7 +109,7 @@ public function testCopyMethod()
             ->method('getValue')
             ->with(
                 $this->equalTo(CreditmemoCommentIdentity::XML_PATH_EMAIL_COPY_METHOD),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('copy_method'));
@@ -125,7 +125,7 @@ public function testGuestTemplateId()
             ->method('getValue')
             ->with(
                 $this->equalTo(CreditmemoCommentIdentity::XML_PATH_EMAIL_GUEST_TEMPLATE),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('template_id'));
@@ -141,7 +141,7 @@ public function testTemplateId()
             ->method('getValue')
             ->with(
                 $this->equalTo(CreditmemoCommentIdentity::XML_PATH_EMAIL_TEMPLATE),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('template_id'));
@@ -188,7 +188,7 @@ public function testGetEmailIdentity()
             ->method('getValue')
             ->with(
                 $this->equalTo(CreditmemoCommentIdentity::XML_PATH_EMAIL_IDENTITY),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue($emailIdentity));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentityTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentityTest.php
index ffc42b708bc79..b09bdecb12547 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentityTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/CreditmemoIdentityTest.php
@@ -64,7 +64,7 @@ public function testIsEnabledTrue()
             ->method('isSetFlag')
             ->with(
                 $this->equalTo(CreditmemoIdentity::XML_PATH_EMAIL_ENABLED),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue(true));
@@ -79,7 +79,7 @@ public function testGetEmailCopyTo()
             ->method('getValue')
             ->with(
                 $this->equalTo(CreditmemoIdentity::XML_PATH_EMAIL_COPY_TO),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('test_value,test_value2'));
@@ -94,7 +94,7 @@ public function testGetEmailCopyToEmptyResult()
             ->method('getValue')
             ->with(
                 $this->equalTo(CreditmemoIdentity::XML_PATH_EMAIL_COPY_TO),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue(null));
@@ -109,7 +109,7 @@ public function testCopyMethod()
             ->method('getValue')
             ->with(
                 $this->equalTo(CreditmemoIdentity::XML_PATH_EMAIL_COPY_METHOD),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('copy_method'));
@@ -125,7 +125,7 @@ public function testGuestTemplateId()
             ->method('getValue')
             ->with(
                 $this->equalTo(CreditmemoIdentity::XML_PATH_EMAIL_GUEST_TEMPLATE),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('template_id'));
@@ -141,7 +141,7 @@ public function testTemplateId()
             ->method('getValue')
             ->with(
                 $this->equalTo(CreditmemoIdentity::XML_PATH_EMAIL_TEMPLATE),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('template_id'));
@@ -188,7 +188,7 @@ public function testGetEmailIdentity()
             ->method('getValue')
             ->with(
                 $this->equalTo(CreditmemoIdentity::XML_PATH_EMAIL_IDENTITY),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue($emailIdentity));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentityTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentityTest.php
index 8c5bde878b000..97aaaf4a4294a 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentityTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/InvoiceCommentIdentityTest.php
@@ -64,7 +64,7 @@ public function testIsEnabledTrue()
             ->method('isSetFlag')
             ->with(
                 $this->equalTo(InvoiceCommentIdentity::XML_PATH_EMAIL_ENABLED),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue(true));
@@ -79,7 +79,7 @@ public function testGetEmailCopyTo()
             ->method('getValue')
             ->with(
                 $this->equalTo(InvoiceCommentIdentity::XML_PATH_EMAIL_COPY_TO),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('test_value,test_value2'));
@@ -94,7 +94,7 @@ public function testGetEmailCopyToEmptyResult()
             ->method('getValue')
             ->with(
                 $this->equalTo(InvoiceCommentIdentity::XML_PATH_EMAIL_COPY_TO),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue(null));
@@ -109,7 +109,7 @@ public function testCopyMethod()
             ->method('getValue')
             ->with(
                 $this->equalTo(InvoiceCommentIdentity::XML_PATH_EMAIL_COPY_METHOD),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('copy_method'));
@@ -125,7 +125,7 @@ public function testGuestTemplateId()
             ->method('getValue')
             ->with(
                 $this->equalTo(InvoiceCommentIdentity::XML_PATH_EMAIL_GUEST_TEMPLATE),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('template_id'));
@@ -141,7 +141,7 @@ public function testTemplateId()
             ->method('getValue')
             ->with(
                 $this->equalTo(InvoiceCommentIdentity::XML_PATH_EMAIL_TEMPLATE),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('template_id'));
@@ -188,7 +188,7 @@ public function testGetEmailIdentity()
             ->method('getValue')
             ->with(
                 $this->equalTo(InvoiceCommentIdentity::XML_PATH_EMAIL_IDENTITY),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue($emailIdentity));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/InvoiceIdentityTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/InvoiceIdentityTest.php
index 3e9db03217907..f580011c94f41 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/InvoiceIdentityTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/InvoiceIdentityTest.php
@@ -64,7 +64,7 @@ public function testIsEnabledTrue()
             ->method('isSetFlag')
             ->with(
                 $this->equalTo(InvoiceIdentity::XML_PATH_EMAIL_ENABLED),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue(true));
@@ -79,7 +79,7 @@ public function testGetEmailCopyTo()
             ->method('getValue')
             ->with(
                 $this->equalTo(InvoiceIdentity::XML_PATH_EMAIL_COPY_TO),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('test_value,test_value2'));
@@ -94,7 +94,7 @@ public function testGetEmailCopyToEmptyResult()
             ->method('getValue')
             ->with(
                 $this->equalTo(InvoiceIdentity::XML_PATH_EMAIL_COPY_TO),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue(null));
@@ -109,7 +109,7 @@ public function testCopyMethod()
             ->method('getValue')
             ->with(
                 $this->equalTo(InvoiceIdentity::XML_PATH_EMAIL_COPY_METHOD),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('copy_method'));
@@ -125,7 +125,7 @@ public function testGuestTemplateId()
             ->method('getValue')
             ->with(
                 $this->equalTo(InvoiceIdentity::XML_PATH_EMAIL_GUEST_TEMPLATE),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('template_id'));
@@ -141,7 +141,7 @@ public function testTemplateId()
             ->method('getValue')
             ->with(
                 $this->equalTo(InvoiceIdentity::XML_PATH_EMAIL_TEMPLATE),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('template_id'));
@@ -188,7 +188,7 @@ public function testGetEmailIdentity()
             ->method('getValue')
             ->with(
                 $this->equalTo(InvoiceIdentity::XML_PATH_EMAIL_IDENTITY),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue($emailIdentity));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentityTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentityTest.php
index 2e97be743c17d..5e9957e09e940 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentityTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/OrderCommentIdentityTest.php
@@ -64,7 +64,7 @@ public function testIsEnabledTrue()
             ->method('isSetFlag')
             ->with(
                 $this->equalTo(OrderCommentIdentity::XML_PATH_EMAIL_ENABLED),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue(true));
@@ -79,7 +79,7 @@ public function testGetEmailCopyTo()
             ->method('getValue')
             ->with(
                 $this->equalTo(OrderCommentIdentity::XML_PATH_EMAIL_COPY_TO),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('test_value,test_value2'));
@@ -94,7 +94,7 @@ public function testGetEmailCopyToEmptyResult()
             ->method('getValue')
             ->with(
                 $this->equalTo(OrderCommentIdentity::XML_PATH_EMAIL_COPY_TO),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue(null));
@@ -109,7 +109,7 @@ public function testCopyMethod()
             ->method('getValue')
             ->with(
                 $this->equalTo(OrderCommentIdentity::XML_PATH_EMAIL_COPY_METHOD),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('copy_method'));
@@ -125,7 +125,7 @@ public function testGuestTemplateId()
             ->method('getValue')
             ->with(
                 $this->equalTo(OrderCommentIdentity::XML_PATH_EMAIL_GUEST_TEMPLATE),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('template_id'));
@@ -141,7 +141,7 @@ public function testTemplateId()
             ->method('getValue')
             ->with(
                 $this->equalTo(OrderCommentIdentity::XML_PATH_EMAIL_TEMPLATE),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('template_id'));
@@ -188,7 +188,7 @@ public function testGetEmailIdentity()
             ->method('getValue')
             ->with(
                 $this->equalTo(OrderCommentIdentity::XML_PATH_EMAIL_IDENTITY),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue($emailIdentity));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/OrderIdentityTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/OrderIdentityTest.php
index 42832d4810530..577952abc4e30 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/OrderIdentityTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/OrderIdentityTest.php
@@ -64,7 +64,7 @@ public function testIsEnabledTrue()
             ->method('isSetFlag')
             ->with(
                 $this->equalTo(OrderIdentity::XML_PATH_EMAIL_ENABLED),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue(true));
@@ -79,7 +79,7 @@ public function testGetEmailCopyTo()
             ->method('getValue')
             ->with(
                 $this->equalTo(OrderIdentity::XML_PATH_EMAIL_COPY_TO),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('test_value,test_value2'));
@@ -94,7 +94,7 @@ public function testGetEmailCopyToEmptyResult()
             ->method('getValue')
             ->with(
                 $this->equalTo(OrderIdentity::XML_PATH_EMAIL_COPY_TO),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue(null));
@@ -109,7 +109,7 @@ public function testCopyMethod()
             ->method('getValue')
             ->with(
                 $this->equalTo(OrderIdentity::XML_PATH_EMAIL_COPY_METHOD),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('copy_method'));
@@ -125,7 +125,7 @@ public function testGuestTemplateId()
             ->method('getValue')
             ->with(
                 $this->equalTo(OrderIdentity::XML_PATH_EMAIL_GUEST_TEMPLATE),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('template_id'));
@@ -141,7 +141,7 @@ public function testTemplateId()
             ->method('getValue')
             ->with(
                 $this->equalTo(OrderIdentity::XML_PATH_EMAIL_TEMPLATE),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('template_id'));
@@ -188,7 +188,7 @@ public function testGetEmailIdentity()
             ->method('getValue')
             ->with(
                 $this->equalTo(OrderIdentity::XML_PATH_EMAIL_IDENTITY),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue($emailIdentity));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentityTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentityTest.php
index 489a14bef4dfb..90a0b371317e5 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentityTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/ShipmentCommentIdentityTest.php
@@ -64,7 +64,7 @@ public function testIsEnabledTrue()
             ->method('isSetFlag')
             ->with(
                 $this->equalTo(ShipmentCommentIdentity::XML_PATH_EMAIL_ENABLED),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue(true));
@@ -79,7 +79,7 @@ public function testGetEmailCopyTo()
             ->method('getValue')
             ->with(
                 $this->equalTo(ShipmentCommentIdentity::XML_PATH_EMAIL_COPY_TO),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('test_value,test_value2'));
@@ -94,7 +94,7 @@ public function testGetEmailCopyToEmptyResult()
             ->method('getValue')
             ->with(
                 $this->equalTo(ShipmentCommentIdentity::XML_PATH_EMAIL_COPY_TO),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue(null));
@@ -109,7 +109,7 @@ public function testCopyMethod()
             ->method('getValue')
             ->with(
                 $this->equalTo(ShipmentCommentIdentity::XML_PATH_EMAIL_COPY_METHOD),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('copy_method'));
@@ -125,7 +125,7 @@ public function testGuestTemplateId()
             ->method('getValue')
             ->with(
                 $this->equalTo(ShipmentCommentIdentity::XML_PATH_EMAIL_GUEST_TEMPLATE),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('template_id'));
@@ -141,7 +141,7 @@ public function testTemplateId()
             ->method('getValue')
             ->with(
                 $this->equalTo(ShipmentCommentIdentity::XML_PATH_EMAIL_TEMPLATE),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('template_id'));
@@ -188,7 +188,7 @@ public function testGetEmailIdentity()
             ->method('getValue')
             ->with(
                 $this->equalTo(ShipmentCommentIdentity::XML_PATH_EMAIL_IDENTITY),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue($emailIdentity));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/ShipmentIdentityTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/ShipmentIdentityTest.php
index 4fb9c6f998624..6e75e35666583 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/ShipmentIdentityTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Order/Email/Container/ShipmentIdentityTest.php
@@ -64,7 +64,7 @@ public function testIsEnabledTrue()
             ->method('isSetFlag')
             ->with(
                 $this->equalTo(ShipmentIdentity::XML_PATH_EMAIL_ENABLED),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue(true));
@@ -79,7 +79,7 @@ public function testGetEmailCopyTo()
             ->method('getValue')
             ->with(
                 $this->equalTo(ShipmentIdentity::XML_PATH_EMAIL_COPY_TO),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('test_value,test_value2'));
@@ -94,7 +94,7 @@ public function testGetEmailCopyToEmptyResult()
             ->method('getValue')
             ->with(
                 $this->equalTo(ShipmentIdentity::XML_PATH_EMAIL_COPY_TO),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue(null));
@@ -109,7 +109,7 @@ public function testCopyMethod()
             ->method('getValue')
             ->with(
                 $this->equalTo(ShipmentIdentity::XML_PATH_EMAIL_COPY_METHOD),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('copy_method'));
@@ -125,7 +125,7 @@ public function testGuestTemplateId()
             ->method('getValue')
             ->with(
                 $this->equalTo(ShipmentIdentity::XML_PATH_EMAIL_GUEST_TEMPLATE),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('template_id'));
@@ -141,7 +141,7 @@ public function testTemplateId()
             ->method('getValue')
             ->with(
                 $this->equalTo(ShipmentIdentity::XML_PATH_EMAIL_TEMPLATE),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue('template_id'));
@@ -188,7 +188,7 @@ public function testGetEmailIdentity()
             ->method('getValue')
             ->with(
                 $this->equalTo(ShipmentIdentity::XML_PATH_EMAIL_IDENTITY),
-                $this->equalTo(\Magento\Framework\Store\ScopeInterface::SCOPE_STORE),
+                $this->equalTo(\Magento\Store\Model\ScopeInterface::SCOPE_STORE),
                 $this->equalTo($this->storeId)
             )
             ->will($this->returnValue($emailIdentity));
diff --git a/dev/tests/unit/testsuite/Magento/Sales/Model/Rss/OrderStatusTest.php b/dev/tests/unit/testsuite/Magento/Sales/Model/Rss/OrderStatusTest.php
index 6673480ef2018..22a4678239195 100644
--- a/dev/tests/unit/testsuite/Magento/Sales/Model/Rss/OrderStatusTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sales/Model/Rss/OrderStatusTest.php
@@ -159,7 +159,7 @@ public function testGetData()
     public function testIsAllowed()
     {
         $this->scopeConfigInterface->expects($this->once())->method('getValue')
-            ->with('rss/order/status', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+            ->with('rss/order/status', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
             ->will($this->returnValue(true));
         $this->assertTrue($this->model->isAllowed());
     }
diff --git a/dev/tests/unit/testsuite/Magento/SalesRule/Block/Rss/DiscountsTest.php b/dev/tests/unit/testsuite/Magento/SalesRule/Block/Rss/DiscountsTest.php
index 4203a3b3ec1f6..0628db698dee1 100644
--- a/dev/tests/unit/testsuite/Magento/SalesRule/Block/Rss/DiscountsTest.php
+++ b/dev/tests/unit/testsuite/Magento/SalesRule/Block/Rss/DiscountsTest.php
@@ -24,7 +24,7 @@ class DiscountsTest extends \PHPUnit_Framework_TestCase
     protected $objectManagerHelper;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManagerInterface;
 
@@ -70,7 +70,7 @@ class DiscountsTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->storeManagerInterface = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerInterface = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->requestInterface = $this->getMock('Magento\Framework\App\RequestInterface');
         $this->rssBuilderInterface = $this->getMock('Magento\Framework\App\Rss\UrlBuilderInterface');
         $this->urlBuilderInterface = $this->getMock('Magento\Framework\UrlInterface');
diff --git a/dev/tests/unit/testsuite/Magento/SalesRule/Helper/CouponTest.php b/dev/tests/unit/testsuite/Magento/SalesRule/Helper/CouponTest.php
index 6b448768f5e7e..77848fbbd917b 100644
--- a/dev/tests/unit/testsuite/Magento/SalesRule/Helper/CouponTest.php
+++ b/dev/tests/unit/testsuite/Magento/SalesRule/Helper/CouponTest.php
@@ -81,7 +81,7 @@ public function testGetDefaultLength()
         $defaultLength = 100;
         $this->scopeConfig->expects($this->once())
             ->method('getValue')
-            ->with($helper::XML_PATH_SALES_RULE_COUPON_LENGTH, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+            ->with($helper::XML_PATH_SALES_RULE_COUPON_LENGTH, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
             ->will($this->returnValue($defaultLength));
 
         $this->assertEquals($defaultLength, $helper->getDefaultLength());
@@ -93,7 +93,7 @@ public function testGetDefaultFormat()
         $defaultFormat = 'format';
         $this->scopeConfig->expects($this->once())
             ->method('getValue')
-            ->with($helper::XML_PATH_SALES_RULE_COUPON_FORMAT, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+            ->with($helper::XML_PATH_SALES_RULE_COUPON_FORMAT, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
             ->will($this->returnValue($defaultFormat));
 
         $this->assertEquals($defaultFormat, $helper->getDefaultFormat());
@@ -105,7 +105,7 @@ public function testGetDefaultPrefix()
         $defaultPrefix = 'prefix';
         $this->scopeConfig->expects($this->once())
             ->method('getValue')
-            ->with($helper::XML_PATH_SALES_RULE_COUPON_PREFIX, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+            ->with($helper::XML_PATH_SALES_RULE_COUPON_PREFIX, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
             ->will($this->returnValue($defaultPrefix));
 
         $this->assertEquals($defaultPrefix, $helper->getDefaultPrefix());
@@ -117,7 +117,7 @@ public function testGetDefaultSuffix()
         $defaultSuffix = 'suffix';
         $this->scopeConfig->expects($this->once())
             ->method('getValue')
-            ->with($helper::XML_PATH_SALES_RULE_COUPON_SUFFIX, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+            ->with($helper::XML_PATH_SALES_RULE_COUPON_SUFFIX, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
             ->will($this->returnValue($defaultSuffix));
 
         $this->assertEquals($defaultSuffix, $helper->getDefaultSuffix());
@@ -129,10 +129,7 @@ public function testGetDefaultDashInterval()
         $defaultDashInterval = 4;
         $this->scopeConfig->expects($this->once())
             ->method('getValue')
-            ->with(
-                $helper::XML_PATH_SALES_RULE_COUPON_DASH_INTERVAL,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
-            )
+            ->with($helper::XML_PATH_SALES_RULE_COUPON_DASH_INTERVAL, \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
             ->will($this->returnValue($defaultDashInterval));
 
         $this->assertEquals($defaultDashInterval, $helper->getDefaultDashInterval());
diff --git a/dev/tests/unit/testsuite/Magento/Shipping/Helper/CarrierTest.php b/dev/tests/unit/testsuite/Magento/Shipping/Helper/CarrierTest.php
index b796111a3c835..2c291891ef642 100644
--- a/dev/tests/unit/testsuite/Magento/Shipping/Helper/CarrierTest.php
+++ b/dev/tests/unit/testsuite/Magento/Shipping/Helper/CarrierTest.php
@@ -49,7 +49,7 @@ public function testGetOnlineCarrierCodes($result, $carriers)
             'getValue'
         )->with(
             'carriers',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )->will(
             $this->returnValue($carriers)
         );
@@ -84,7 +84,7 @@ public function testGetCarrierConfigValue()
             'getValue'
         )->with(
             sprintf('carriers/%s/%s', $carrierCode, $configPath),
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )->will(
             $this->returnValue($configValue)
         );
diff --git a/dev/tests/unit/testsuite/Magento/Sitemap/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Sitemap/Helper/DataTest.php
index 258d6c942457b..90531e21b3ec2 100644
--- a/dev/tests/unit/testsuite/Magento/Sitemap/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Sitemap/Helper/DataTest.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Sitemap\Helper;
 
-use Magento\Framework\Store\ScopeInterface;
+use Magento\Store\Model\ScopeInterface;
 use Magento\TestFramework\Helper\ObjectManager;
 
 class DataTest extends \PHPUnit_Framework_TestCase
diff --git a/dev/tests/unit/testsuite/Magento/Store/App/Action/Plugin/StoreCheckTest.php b/dev/tests/unit/testsuite/Magento/Store/App/Action/Plugin/StoreCheckTest.php
index 93fa00f0d3cce..1d37e60cee1d1 100644
--- a/dev/tests/unit/testsuite/Magento/Store/App/Action/Plugin/StoreCheckTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/App/Action/Plugin/StoreCheckTest.php
@@ -42,7 +42,7 @@ class StoreCheckTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->_storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->_storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->_storeMock = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
         $this->_storeManagerMock->expects(
             $this->any()
diff --git a/dev/tests/unit/testsuite/Magento/Store/App/Response/RedirectTest.php b/dev/tests/unit/testsuite/Magento/Store/App/Response/RedirectTest.php
index fbec5b5792df8..9e1c20d4bdcd4 100644
--- a/dev/tests/unit/testsuite/Magento/Store/App/Response/RedirectTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/App/Response/RedirectTest.php
@@ -58,7 +58,7 @@ protected function setUp()
                 'getCookie'
             ]
         );
-        $this->_storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+        $this->_storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
         $this->_urlCoderMock = $this->getMock(
             '\Magento\Framework\Encryption\UrlCoder',
             [],
diff --git a/dev/tests/unit/testsuite/Magento/Store/Block/SwitcherTest.php b/dev/tests/unit/testsuite/Magento/Store/Block/SwitcherTest.php
index 5a35ba020947f..ea22d7f770013 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Block/SwitcherTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Block/SwitcherTest.php
@@ -19,12 +19,12 @@ class SwitcherTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Core\Helper\PostData|\PHPUnit_Framework_MockObject_MockObject */
     protected $corePostDataHelper;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $storeManager;
 
     protected function setUp()
     {
-        $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')->getMock();
+        $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')->getMock();
         $this->context = $this->getMock('Magento\Framework\View\Element\Template\Context', [], [], '', false);
         $this->context->expects($this->any())->method('getStoreManager')->will($this->returnValue($this->storeManager));
         $this->corePostDataHelper = $this->getMock('Magento\Core\Helper\PostData', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/App/EmulationTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/App/EmulationTest.php
index 76e710f51033e..94086ec908bce 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/App/EmulationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/App/EmulationTest.php
@@ -13,7 +13,7 @@
 class EmulationTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Store\StoreManagerInterface
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\StoreManagerInterface
      */
     private $storeManagerMock;
 
@@ -79,7 +79,7 @@ public function setUp()
         $this->designMock = $this->getMockBuilder('Magento\Theme\Model\Design')
             ->disableOriginalConstructor()
             ->setMethods([])->getMock();
-        $this->storeManagerMock = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+        $this->storeManagerMock = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->disableOriginalConstructor()
             ->setMethods([])->getMock();
         $this->translateMock = $this->getMockBuilder('Magento\Framework\TranslateInterface')
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/Config/Reader/StoreTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/Config/Reader/StoreTest.php
index 8e50450f2e488..ae7ed0a039ced 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/Config/Reader/StoreTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/Config/Reader/StoreTest.php
@@ -35,7 +35,7 @@ class StoreTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->_scopePullMock = $this->getMock('Magento\Framework\App\Config\ScopePool', [], [], '', false);
-        $this->_storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->_storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->_initialConfigMock = $this->getMock('Magento\Framework\App\Config\Initial', [], [], '', false);
         $this->_collectionFactory = $this->getMock(
             'Magento\Store\Model\Resource\Config\Collection\ScopedFactory',
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/Resolver/StoreTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/Resolver/StoreTest.php
index 60ebf91b2053c..1112cc695c473 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/Resolver/StoreTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/Resolver/StoreTest.php
@@ -24,7 +24,7 @@ class StoreTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->_storeManagerMock = $this->getMock(
-            'Magento\Framework\Store\StoreManagerInterface',
+            'Magento\Store\Model\StoreManagerInterface',
             [],
             [],
             '',
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/Resolver/WebsiteTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/Resolver/WebsiteTest.php
index 113414dfeb529..a618b5e7096c6 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/Resolver/WebsiteTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/Resolver/WebsiteTest.php
@@ -24,7 +24,7 @@ class WebsiteTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->_storeManagerMock = $this->getMock(
-            'Magento\Framework\Store\StoreManagerInterface',
+            'Magento\Store\Model\StoreManagerInterface',
             [],
             [],
             '',
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/Storage/DbTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/Storage/DbTest.php
index 432026e92e5a9..ac869a0ecaa3f 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/Storage/DbTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/Storage/DbTest.php
@@ -344,7 +344,7 @@ public function testIsSingleStoreMode()
             ->method('getValue')
             ->with(
                 \Magento\Store\Model\StoreManager::XML_PATH_SINGLE_STORE_MODE_ENABLED,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )->will($this->returnValue(true));
         $this->assertFalse($this->_model->isSingleStoreMode());
 
@@ -353,7 +353,7 @@ public function testIsSingleStoreMode()
             ->method('getValue')
             ->with(
                 \Magento\Store\Model\StoreManager::XML_PATH_SINGLE_STORE_MODE_ENABLED,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )->will($this->returnValue(false));
         $this->assertFalse($this->_model->isSingleStoreMode());
 
@@ -362,7 +362,7 @@ public function testIsSingleStoreMode()
             ->method('getValue')
             ->with(
                 \Magento\Store\Model\StoreManager::XML_PATH_SINGLE_STORE_MODE_ENABLED,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )->will($this->returnValue(true));
         //set $this->hasSingleStore() to true
         $this->prepareMockForReinit();
@@ -374,7 +374,7 @@ public function testIsSingleStoreMode()
             ->method('getValue')
             ->with(
                 \Magento\Store\Model\StoreManager::XML_PATH_SINGLE_STORE_MODE_ENABLED,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )->will($this->returnValue(false));
         $this->assertTrue($this->_model->isSingleStoreMode());
     }
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/StorageFactoryTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/StorageFactoryTest.php
index 04042d67ce8d9..d1b60f61bd714 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/StorageFactoryTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/StorageFactoryTest.php
@@ -130,7 +130,7 @@ protected function setUp()
         $this->helper = new \Magento\TestFramework\Helper\ObjectManager($this);
 
         $this->_appStateMock = $this->getMock('Magento\Framework\App\State', [], [], '', false);
-        $this->_storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->_storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->_httpContext = $this->getMock('Magento\Framework\App\Http\Context', [], [], '', false);
         $this->_scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
         $this->request = $this->getMock('Magento\Framework\App\RequestInterface', [], [], '', false);
@@ -190,7 +190,7 @@ public function testGetModeWithInternalCache()
             'isSetFlag'
         )->with(
             \Magento\Framework\Session\SidResolver::XML_PATH_USE_FRONTEND_SID,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )->will(
             $this->returnValue(true)
         );
@@ -290,12 +290,12 @@ public function getWithStoresReinitDataProvider()
     {
         return [
             ['', '', 21, 11, 'store1'],
-            ['11', \Magento\Framework\Store\ScopeInterface::SCOPE_GROUP, 21, null, 'store1'],
-            ['12', \Magento\Framework\Store\ScopeInterface::SCOPE_GROUP, 22, null, null],
-            ['11', \Magento\Framework\Store\ScopeInterface::SCOPE_GROUP, null, null, null],
-            ['website1', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE, 21, 11, 'store1'],
-            ['31', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE, 22, null, null],
-            ['website1', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE, null, 0, null],
+            ['11', \Magento\Store\Model\ScopeInterface::SCOPE_GROUP, 21, null, 'store1'],
+            ['12', \Magento\Store\Model\ScopeInterface::SCOPE_GROUP, 22, null, null],
+            ['11', \Magento\Store\Model\ScopeInterface::SCOPE_GROUP, null, null, null],
+            ['website1', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE, 21, 11, 'store1'],
+            ['31', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE, 22, null, null],
+            ['website1', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE, null, 0, null],
         ];
     }
 
@@ -345,9 +345,9 @@ public function testGetFromCookie($scopeCode, $scopeType)
     public function getFromCookieDataProvider()
     {
         return [
-            ['website1', \Magento\Framework\Store\ScopeInterface::SCOPE_WEBSITE],
-            ['11', \Magento\Framework\Store\ScopeInterface::SCOPE_GROUP],
-            ['store1', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE],
+            ['website1', \Magento\Store\Model\ScopeInterface::SCOPE_WEBSITE],
+            ['11', \Magento\Store\Model\ScopeInterface::SCOPE_GROUP],
+            ['store1', \Magento\Store\Model\ScopeInterface::SCOPE_STORE],
         ];
     }
 
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/StoreManagerTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/StoreManagerTest.php
index 403b10de640cd..aef8fbeab9509 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/StoreManagerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/StoreManagerTest.php
@@ -45,7 +45,7 @@ protected function setUp()
             '',
             false
         );
-        $this->_storage = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->_storage = $this->getMock('Magento\Store\Model\StoreManagerInterface');
 
         $this->_model = new \Magento\Store\Model\StoreManager(
             $this->_factoryMock,
@@ -146,7 +146,7 @@ public function testIsSingleStoreModeWhenSingleStoreModeEnabledAndHasSingleStore
             'getValue'
         )->with(
             \Magento\Store\Model\StoreManager::XML_PATH_SINGLE_STORE_MODE_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )->will(
             $this->returnValue(true)
         );
@@ -165,7 +165,7 @@ public function testIsSingleStoreModeWhenSingleStoreModeDisabledAndHasSingleStor
             'getValue'
         )->with(
             \Magento\Store\Model\StoreManager::XML_PATH_SINGLE_STORE_MODE_ENABLED,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )->will(
             $this->returnValue(false)
         );
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php
index 09cd47f8017ed..86b2436be1fe1 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/StoreTest.php
@@ -9,7 +9,6 @@
 namespace Magento\Store\Model;
 
 use Magento\Framework\App\Config\ReinitableConfigInterface;
-use Magento\Framework\Store\ScopeInterface;
 
 /**
  * @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -130,7 +129,7 @@ public function testSetWebsite()
      */
     public function testGetWebsite($websiteId, $website)
     {
-        $storeManager = $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface');
+        $storeManager = $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface');
         $storeManager->expects($this->any())
             ->method('getWebsite')
             ->with($websiteId)
@@ -166,7 +165,7 @@ public function testGetUrl()
             ->with($this->equalTo('test/route'), $this->equalTo($params))
             ->will($this->returnValue('http://test/url'));
 
-        $storeManager = $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface');
+        $storeManager = $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface');
         $storeManager->expects($this->any())
             ->method('getStore')
             ->will($this->returnValue($defaultStore));
@@ -353,7 +352,7 @@ public function testGetCurrentUrl($secure, $url, $expected)
         $urlMock->expects($this->any())->method('getUrl')
             ->will($this->returnValue($url));
 
-        $storeManager = $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface');
+        $storeManager = $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface');
         $storeManager->expects($this->any())
             ->method('getStore')
             ->will($this->returnValue($defaultStore));
@@ -403,7 +402,7 @@ public function testGetBaseCurrency($priceScope, $currencyCode)
                 ],
                 [
                     \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                     'scope_code',
                     'UAH'
                 ],
diff --git a/dev/tests/unit/testsuite/Magento/Store/Model/StoresConfigTest.php b/dev/tests/unit/testsuite/Magento/Store/Model/StoresConfigTest.php
index 3ef527069bd84..b99ffd42208e8 100644
--- a/dev/tests/unit/testsuite/Magento/Store/Model/StoresConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Store/Model/StoresConfigTest.php
@@ -39,7 +39,7 @@ protected function setUp()
     {
         $this->_storeOne = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
         $this->_storeTwo = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
-        $this->_storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->_storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->_config = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
 
         $this->_model = new \Magento\Store\Model\StoresConfig(
diff --git a/dev/tests/unit/testsuite/Magento/Store/Url/Plugin/RouteParamsResolverTest.php b/dev/tests/unit/testsuite/Magento/Store/Url/Plugin/RouteParamsResolverTest.php
new file mode 100644
index 0000000000000..0a424695c8b80
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Store/Url/Plugin/RouteParamsResolverTest.php
@@ -0,0 +1,196 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Store\Url\Plugin;
+
+class RouteParamsResolverTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\Config\ScopeConfigInterface
+     */
+    protected $scopeConfigMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\StoreManagerInterface
+     */
+    protected $storeManagerMock;
+
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\Url\QueryParamsResolverInterface
+     */
+    protected $queryParamsResolverMock;
+
+    /**
+     * @var \Magento\Store\Url\Plugin\RouteParamsResolver
+     */
+    protected $model;
+
+    protected function setUp()
+    {
+        $this->scopeConfigMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
+        $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface');
+        $this->queryParamsResolverMock = $this->getMock('Magento\Framework\Url\QueryParamsResolverInterface');
+        $this->model = new \Magento\Store\Url\Plugin\RouteParamsResolver(
+            $this->scopeConfigMock,
+            $this->storeManagerMock,
+            $this->queryParamsResolverMock
+        );
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     */
+    public function testAroundSetRouteParamsScopeInParams()
+    {
+        $storeCode = 'custom_store';
+        $this->scopeConfigMock
+            ->expects($this->once())
+            ->method('getValue')
+            ->with(
+                \Magento\Store\Model\Store::XML_PATH_STORE_IN_URL,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                $storeCode
+            )
+            ->will($this->returnValue(false));
+        $this->storeManagerMock->expects($this->any())->method('hasSingleStore')->willReturn(false);
+        $data = ['_scope' => $storeCode, '_scope_to_url' => true];
+        /** @var \PHPUnit_Framework_MockObject_MockObject $routeParamsResolverMock */
+        $routeParamsResolverMock = $this->getMockBuilder('Magento\Framework\Url\RouteParamsResolver')
+            ->setMethods(['setScope', 'getScope'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $routeParamsResolverMock->expects($this->once())->method('setScope')->with($storeCode);
+        $routeParamsResolverMock->expects($this->once())->method('getScope')->willReturn($storeCode);
+
+        $this->queryParamsResolverMock->expects($this->once())->method('setQueryParam')->with('___store', $storeCode);
+
+        $this->model->aroundSetRouteParams(
+            $routeParamsResolverMock,
+            function ($data, $unsetOldParams) {
+                $this->assertArrayNotHasKey('_scope_to_url', $data, 'This data item should have been unset.');
+                $this->assertArrayNotHasKey('_scope', $data, 'This data item should have been unset.');
+            },
+            $data
+        );
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     */
+    public function testAroundSetRouteParamsScopeUseStoreInUrl()
+    {
+        $storeCode = 'custom_store';
+        $this->scopeConfigMock
+            ->expects($this->once())
+            ->method('getValue')
+            ->with(
+                \Magento\Store\Model\Store::XML_PATH_STORE_IN_URL,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                $storeCode
+            )
+            ->will($this->returnValue(true));
+        $this->storeManagerMock->expects($this->any())->method('hasSingleStore')->willReturn(false);
+        $data = ['_scope' => $storeCode, '_scope_to_url' => true];
+        /** @var \PHPUnit_Framework_MockObject_MockObject $routeParamsResolverMock */
+        $routeParamsResolverMock = $this->getMockBuilder('Magento\Framework\Url\RouteParamsResolver')
+            ->setMethods(['setScope', 'getScope'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $routeParamsResolverMock->expects($this->once())->method('setScope')->with($storeCode);
+        $routeParamsResolverMock->expects($this->once())->method('getScope')->willReturn($storeCode);
+
+        $this->queryParamsResolverMock->expects($this->never())->method('setQueryParam');
+
+        $this->model->aroundSetRouteParams(
+            $routeParamsResolverMock,
+            function ($data, $unsetOldParams) {
+                $this->assertArrayNotHasKey('_scope_to_url', $data, 'This data item should have been unset.');
+                $this->assertArrayNotHasKey('_scope', $data, 'This data item should have been unset.');
+            },
+            $data
+        );
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     */
+    public function testAroundSetRouteParamsSingleStore()
+    {
+        $storeCode = 'custom_store';
+        $this->scopeConfigMock
+            ->expects($this->once())
+            ->method('getValue')
+            ->with(
+                \Magento\Store\Model\Store::XML_PATH_STORE_IN_URL,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                $storeCode
+            )
+            ->will($this->returnValue(false));
+        $this->storeManagerMock->expects($this->any())->method('hasSingleStore')->willReturn(true);
+        $data = ['_scope' => $storeCode, '_scope_to_url' => true];
+        /** @var \PHPUnit_Framework_MockObject_MockObject $routeParamsResolverMock */
+        $routeParamsResolverMock = $this->getMockBuilder('Magento\Framework\Url\RouteParamsResolver')
+            ->setMethods(['setScope', 'getScope'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $routeParamsResolverMock->expects($this->once())->method('setScope')->with($storeCode);
+        $routeParamsResolverMock->expects($this->once())->method('getScope')->willReturn($storeCode);
+
+        $this->queryParamsResolverMock->expects($this->never())->method('setQueryParam');
+
+        $this->model->aroundSetRouteParams(
+            $routeParamsResolverMock,
+            function ($data, $unsetOldParams) {
+                $this->assertArrayNotHasKey('_scope_to_url', $data, 'This data item should have been unset.');
+                $this->assertArrayNotHasKey('_scope', $data, 'This data item should have been unset.');
+            },
+            $data
+        );
+    }
+
+    /**
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
+     */
+    public function testAroundSetRouteParamsNoScopeInParams()
+    {
+        $storeCode = 'custom_store';
+        $this->scopeConfigMock
+            ->expects($this->once())
+            ->method('getValue')
+            ->with(
+                \Magento\Store\Model\Store::XML_PATH_STORE_IN_URL,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                $storeCode
+            )
+            ->will($this->returnValue(false));
+        $this->storeManagerMock->expects($this->any())->method('hasSingleStore')->willReturn(false);
+        /** @var \PHPUnit_Framework_MockObject_MockObject| $routeParamsResolverMock */
+        $storeMock = $this->getMockBuilder('Magento\Store\Model\Store')
+            ->setMethods(['getCode'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $storeMock->expects($this->any())->method('getCode')->willReturn($storeCode);
+        $this->storeManagerMock->expects($this->any())->method('getStore')->willReturn($storeMock);
+
+        $data = ['_scope_to_url' => true];
+        /** @var \PHPUnit_Framework_MockObject_MockObject $routeParamsResolverMock */
+        $routeParamsResolverMock = $this->getMockBuilder('Magento\Framework\Url\RouteParamsResolver')
+            ->setMethods(['setScope', 'getScope'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $routeParamsResolverMock->expects($this->never())->method('setScope');
+        $routeParamsResolverMock->expects($this->once())->method('getScope')->willReturn(false);
+
+        $this->queryParamsResolverMock->expects($this->once())->method('setQueryParam')->with('___store', $storeCode);
+
+        $this->model->aroundSetRouteParams(
+            $routeParamsResolverMock,
+            function ($data, $unsetOldParams) {
+                $this->assertArrayNotHasKey('_scope_to_url', $data, 'This data item should have been unset.');
+            },
+            $data
+        );
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Store/Url/Plugin/SecurityInfoTest.php b/dev/tests/unit/testsuite/Magento/Store/Url/Plugin/SecurityInfoTest.php
new file mode 100644
index 0000000000000..b873c5be0845e
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Store/Url/Plugin/SecurityInfoTest.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Store\Url\Plugin;
+
+class SecurityInfoTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $_scopeConfigMock;
+
+    /**
+     * @var \Magento\Store\Url\Plugin\SecurityInfo
+     */
+    protected $_model;
+
+    protected function setUp()
+    {
+        $this->_scopeConfigMock = $this->getMock('\Magento\Framework\App\Config\ScopeConfigInterface');
+        $this->_model = new \Magento\Store\Url\Plugin\SecurityInfo($this->_scopeConfigMock);
+    }
+
+    public function testAroundIsSecureDisabledInConfig()
+    {
+        $this->_scopeConfigMock
+            ->expects($this->once())
+            ->method('getValue')
+            ->with(
+                \Magento\Store\Model\Store::XML_PATH_SECURE_IN_FRONTEND,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            )
+            ->will($this->returnValue(false));
+        $this->assertFalse(
+            $this->_model->aroundIsSecure(
+                $this->getMock('Magento\Framework\Url\SecurityInfo'),
+                function () {
+                },
+                'http://example.com/account'
+            )
+        );
+    }
+
+    public function testAroundIsSecureEnabledInConfig()
+    {
+        $this->_scopeConfigMock
+            ->expects($this->once())
+            ->method('getValue')
+            ->with(
+                \Magento\Store\Model\Store::XML_PATH_SECURE_IN_FRONTEND,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            )
+            ->will($this->returnValue(true));
+        $this->assertTrue(
+            $this->_model->aroundIsSecure(
+                $this->getMock('Magento\Framework\Url\SecurityInfo'),
+                function () {
+                    return true;
+                },
+                'https://example.com/account'
+            )
+        );
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/ConfigTest.php
index 5ad3bbed4ae67..81a26c41c488c 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/ConfigTest.php
@@ -97,7 +97,7 @@ public function testScopeConfigMethods($method, $path, $configValue, $expectedVa
         $scopeConfigMock = $this->getMockForAbstractClass('Magento\Framework\App\Config\ScopeConfigInterface');
         $scopeConfigMock->expects($this->once())
             ->method('getValue')
-            ->with($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, null)
+            ->with($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, null)
             ->will($this->returnValue($configValue));
 
         /** @var \Magento\Tax\Model\Config */
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/Resource/CalculationTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/Resource/CalculationTest.php
index d2c3690cf75cb..bf4baed61a356 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/Resource/CalculationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/Resource/CalculationTest.php
@@ -20,7 +20,7 @@ public function testCreateSearchPostCodeTemplates($postalCode, $exactPostalcode)
     {
         // create the mocks
         $resource = $this->getMock('Magento\Framework\App\Resource', [], [], '', false);
-        $storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
+        $storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false);
 
         $taxData = $this->getMock('Magento\Tax\Helper\Data', ['getPostCodeSubStringLength'], [], '', false);
         $taxData
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
index 9549c99a99a3b..9973a6014f1db 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
@@ -88,7 +88,7 @@ public function testCollect($itemData, $appliedRatesData, $taxDetailsData, $quot
             ->method('getItems')
             ->will($this->returnValue($items));
 
-        $storeManager = $this->getMockBuilder('\Magento\Framework\Store\StoreManagerInterface')
+        $storeManager = $this->getMockBuilder('\Magento\Store\Model\StoreManagerInterface')
             ->disableOriginalConstructor()
             ->setMethods(['getStore', 'hasSingleStore', 'isSingleStoreMode', 'getStores', 'getWebsite', 'getWebsites',
                 'reinitStores', 'getDefaultStoreView', 'setIsSingleStoreModeAllowed', 'getGroup', 'getGroups',
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxCalculationTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxCalculationTest.php
index d58bbd4c21763..722e3b228a73e 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/TaxCalculationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/TaxCalculationTest.php
@@ -80,7 +80,7 @@ public function setUp()
             '',
             false
         );
-        $this->storeManager = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManager = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
         $this->dataObjectHelperMock = $this->getMockBuilder('\Magento\Framework\Api\DataObjectHelper')
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Model/Config/CustomizationTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/Config/CustomizationTest.php
index 00c5f3f70b44c..6e3e06437f6fb 100644
--- a/dev/tests/unit/testsuite/Magento/Theme/Model/Config/CustomizationTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Model/Config/CustomizationTest.php
@@ -12,7 +12,7 @@
 class CustomizationTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -39,7 +39,7 @@ class CustomizationTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->_storeManager = $this->getMockForAbstractClass(
-            'Magento\Framework\Store\StoreManagerInterface',
+            'Magento\Store\Model\StoreManagerInterface',
             [],
             '',
             true,
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/ConfigTest.php
index 0a68104437d23..13b27ebeeb803 100644
--- a/dev/tests/unit/testsuite/Magento/Theme/Model/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Model/ConfigTest.php
@@ -51,7 +51,7 @@ protected function setUp()
         /** @var $this->_themeMock \Magento\Theme\Model\Theme */
         $this->_themeMock = $this->getMock('Magento\Theme\Model\Theme', [], [], '', false);
         $this->_storeManagerMock = $this->getMockForAbstractClass(
-            'Magento\Framework\Store\StoreManagerInterface',
+            'Magento\Store\Model\StoreManagerInterface',
             [],
             '',
             true,
@@ -119,7 +119,7 @@ public function testAssignToStoreInSingleStoreMode()
             'addFieldToFilter'
         )->with(
             'scope',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORES
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORES
         )->will(
             $this->returnValue($this->_configData)
         );
@@ -170,7 +170,7 @@ public function testAssignToStoreNonSingleStoreMode()
             'addFieldToFilter'
         )->with(
             'scope',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORES
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORES
         )->will(
             $this->returnValue($this->_configData)
         );
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Model/CopyServiceTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/CopyServiceTest.php
index 7f8538a8c619b..dab6123e55544 100644
--- a/dev/tests/unit/testsuite/Magento/Theme/Model/CopyServiceTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Model/CopyServiceTest.php
@@ -170,14 +170,14 @@ protected function setUp()
 
         /* Init \Magento\Core\Model\Resource\Layout\Collection model  */
         $this->_updateFactory = $this->getMock(
-            'Magento\Core\Model\Layout\UpdateFactory',
+            'Magento\Widget\Model\Layout\UpdateFactory',
             ['create'],
             [],
             '',
             false
         );
         $this->_update = $this->getMock(
-            'Magento\Core\Model\Layout\Update',
+            'Magento\Widget\Model\Layout\Update',
             ['__wakeup', 'getCollection'],
             [],
             '',
@@ -185,7 +185,7 @@ protected function setUp()
         );
         $this->_updateFactory->expects($this->at(0))->method('create')->will($this->returnValue($this->_update));
         $this->_updateCollection = $this->getMock(
-            'Magento\Core\Model\Resource\Layout\Collection',
+            'Magento\Widget\Model\Resource\Layout\Update\Collection',
             ['addThemeFilter', 'delete', 'getIterator'],
             [],
             '',
@@ -201,14 +201,14 @@ protected function setUp()
 
         /* Init Link an Link_Collection model */
         $this->_link = $this->getMock(
-            'Magento\Core\Model\Layout\Link',
+            'Magento\Widget\Model\Layout\Link',
             ['__wakeup', 'getCollection'],
             [],
             '',
             false
         );
         $this->_linkCollection = $this->getMock(
-            'Magento\Core\Model\Resource\Layout\Link\Collection',
+            'Magento\Widget\Model\Resource\Layout\Link\Collection',
             ['addThemeFilter', 'getIterator'],
             [],
             '',
@@ -281,7 +281,7 @@ public function testCopyLayoutUpdates()
         $this->_linkCollection->expects($this->once())->method('addThemeFilter');
 
         $targetLinkOne = $this->getMock(
-            'Magento\Core\Model\Layout\Link',
+            'Magento\Widget\Model\Layout\Link',
             ['__wakeup', 'setId', 'setThemeId', 'save', 'setLayoutUpdateId'],
             [],
             '',
@@ -289,7 +289,7 @@ public function testCopyLayoutUpdates()
         );
         $targetLinkOne->setData(['id' => 1, 'layout_update_id' => 1]);
         $targetLinkTwo = $this->getMock(
-            'Magento\Core\Model\Layout\Link',
+            'Magento\Widget\Model\Layout\Link',
             ['__wakeup', 'setId', 'setThemeId', 'save', 'setLayoutUpdateId'],
             [],
             '',
@@ -311,7 +311,7 @@ public function testCopyLayoutUpdates()
         $this->_linkCollection->expects($this->any())->method('getIterator')->will($linkReturnValues);
 
         $targetUpdateOne = $this->getMock(
-            'Magento\Core\Model\Layout\Update',
+            'Magento\Widget\Model\Layout\Update',
             ['__wakeup', 'setId', 'load', 'save'],
             [],
             '',
@@ -319,7 +319,7 @@ public function testCopyLayoutUpdates()
         );
         $targetUpdateOne->setData(['id' => 1]);
         $targetUpdateTwo = $this->getMock(
-            'Magento\Core\Model\Layout\Update',
+            'Magento\Widget\Model\Layout\Update',
             ['__wakeup', 'setId', 'load', 'save'],
             [],
             '',
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Model/ObserverTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/ObserverTest.php
index 954a20598b876..7a74ae54dd83f 100644
--- a/dev/tests/unit/testsuite/Magento/Theme/Model/ObserverTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Model/ObserverTest.php
@@ -34,7 +34,7 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
     protected $themeImageFactory;
 
     /**
-     * @var \Magento\Core\Model\Resource\Layout\Update\Collection|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Widget\Model\Resource\Layout\Update\Collection|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $updateCollection;
 
@@ -103,7 +103,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->updateCollection = $this->getMockBuilder('Magento\Core\Model\Resource\Layout\Update\Collection')
+        $this->updateCollection = $this->getMockBuilder('Magento\Widget\Model\Resource\Layout\Update\Collection')
             ->setMethods(['addThemeFilter', 'delete'])
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Model/View/DesignTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/View/DesignTest.php
index 1e558461a9d45..d8b98208089ce 100644
--- a/dev/tests/unit/testsuite/Magento/Theme/Model/View/DesignTest.php
+++ b/dev/tests/unit/testsuite/Magento/Theme/Model/View/DesignTest.php
@@ -22,7 +22,7 @@ class DesignTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $storeManager = $this->getMockForAbstractClass('\Magento\Framework\Store\StoreManagerInterface');
+        $storeManager = $this->getMockForAbstractClass('\Magento\Store\Model\StoreManagerInterface');
         $flyweightThemeFactory = $this->getMock(
             '\Magento\Framework\View\Design\Theme\FlyweightFactory', [], [], '', false
         );
diff --git a/dev/tests/unit/testsuite/Magento/Tools/Di/_files/app/code/Magento/SomeModule/etc/adminhtml/system.xml b/dev/tests/unit/testsuite/Magento/Tools/Di/_files/app/code/Magento/SomeModule/etc/adminhtml/system.xml
index 3207b4a1666c6..deda396f9b3a7 100644
--- a/dev/tests/unit/testsuite/Magento/Tools/Di/_files/app/code/Magento/SomeModule/etc/adminhtml/system.xml
+++ b/dev/tests/unit/testsuite/Magento/Tools/Di/_files/app/code/Magento/SomeModule/etc/adminhtml/system.xml
@@ -10,7 +10,7 @@
         <section id="advanced" translate="label" type="text" sortOrder="910" showInDefault="1" showInWebsite="1" showInStore="1">
             <label>Advanced</label>
             <tab>advanced</tab>
-            <resource>Magento_Adminhtml::advanced</resource>
+            <resource>Magento_Backend::advanced</resource>
             <group id="modules_disable_output" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Disable Modules Output</label>
                 <frontend_model>Magento\Backend\Block\System\Config\Form\Fieldset\Modules\DisableOutput\Proxy</frontend_model>
diff --git a/dev/tests/unit/testsuite/Magento/Tools/Migration/System/Configuration/_files/convertedConfiguration.xml b/dev/tests/unit/testsuite/Magento/Tools/Migration/System/Configuration/_files/convertedConfiguration.xml
index 3c69a92286af4..5b2a7df2bb212 100644
--- a/dev/tests/unit/testsuite/Magento/Tools/Migration/System/Configuration/_files/convertedConfiguration.xml
+++ b/dev/tests/unit/testsuite/Magento/Tools/Migration/System/Configuration/_files/convertedConfiguration.xml
@@ -13,7 +13,7 @@
         <section id="section_1" sortOrder="10" type="text">
             <class>css class</class>
             <label>section label</label>
-            <resource>Magento_Adminhtml::acl</resource>
+            <resource>Magento_Backend::acl</resource>
             <header_css>some css class</header_css>
             <tab>tab_1</tab>
             <group id="group_1" sortOrder="10" type="text">
diff --git a/dev/tests/unit/testsuite/Magento/Tools/Migration/System/Configuration/_files/mappedConfiguration.php b/dev/tests/unit/testsuite/Magento/Tools/Migration/System/Configuration/_files/mappedConfiguration.php
index 7b4b77196cafe..15257c6ceb0a4 100644
--- a/dev/tests/unit/testsuite/Magento/Tools/Migration/System/Configuration/_files/mappedConfiguration.php
+++ b/dev/tests/unit/testsuite/Magento/Tools/Migration/System/Configuration/_files/mappedConfiguration.php
@@ -18,7 +18,7 @@
             'parameters' => [
                 ['name' => 'class', '#text' => 'css class'],
                 ['name' => 'label', '#text' => 'section label'],
-                ['name' => 'resource', '#text' => 'Magento_Adminhtml::acl'],
+                ['name' => 'resource', '#text' => 'Magento_Backend::acl'],
                 ['name' => 'header_css', '#text' => 'some css class'],
                 ['name' => 'tab', '#text' => 'tab_1'],
             ],
diff --git a/dev/tests/unit/testsuite/Magento/Translation/Model/Inline/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Translation/Model/Inline/ConfigTest.php
index 3f9b018dfe529..b3a3014567241 100644
--- a/dev/tests/unit/testsuite/Magento/Translation/Model/Inline/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Translation/Model/Inline/ConfigTest.php
@@ -43,7 +43,7 @@ public function testIsActive()
             'isSetFlag'
         )->with(
             $this->equalTo('dev/translate_inline/active'),
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->equalTo($store)
         )->will(
             $this->returnValue($result)
diff --git a/dev/tests/unit/testsuite/Magento/Ups/Model/CarrierTest.php b/dev/tests/unit/testsuite/Magento/Ups/Model/CarrierTest.php
index 8b0ac477996c0..a6cb5067125c0 100644
--- a/dev/tests/unit/testsuite/Magento/Ups/Model/CarrierTest.php
+++ b/dev/tests/unit/testsuite/Magento/Ups/Model/CarrierTest.php
@@ -60,13 +60,13 @@ public function testGetMethodPrice(
         $this->config->expects($this->any())->method('getValue')->will($this->returnValueMap([
             [
                 $path . 'free_method',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 null,
                 self::FREE_METHOD_NAME,
             ],
             [
                 $path . 'free_shipping_subtotal',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                 null,
                 $freeShippingSubtotal
             ],
diff --git a/dev/tests/unit/testsuite/Magento/UrlRewrite/Controller/RouterTest.php b/dev/tests/unit/testsuite/Magento/UrlRewrite/Controller/RouterTest.php
index 9d705dd2acb9f..850e12421ef6b 100644
--- a/dev/tests/unit/testsuite/Magento/UrlRewrite/Controller/RouterTest.php
+++ b/dev/tests/unit/testsuite/Magento/UrlRewrite/Controller/RouterTest.php
@@ -21,7 +21,7 @@ class RouterTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $url;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $storeManager;
 
     /** @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject */
@@ -40,7 +40,7 @@ protected function setUp()
     {
         $this->actionFactory = $this->getMock('Magento\Framework\App\ActionFactory', [], [], '', false);
         $this->url = $this->getMock('Magento\Framework\UrlInterface');
-        $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->response = $this->getMock('Magento\Framework\App\ResponseInterface', ['setRedirect', 'sendResponse']);
         $this->request = $this->getMockBuilder('\Magento\Framework\App\Request\Http')
             ->disableOriginalConstructor()->getMock();
diff --git a/dev/tests/unit/testsuite/Magento/UrlRewrite/Model/Resource/UrlRewriteCollectionTest.php b/dev/tests/unit/testsuite/Magento/UrlRewrite/Model/Resource/UrlRewriteCollectionTest.php
index 4446728a6dcfd..8d0324fe4cb03 100644
--- a/dev/tests/unit/testsuite/Magento/UrlRewrite/Model/Resource/UrlRewriteCollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/UrlRewrite/Model/Resource/UrlRewriteCollectionTest.php
@@ -10,7 +10,7 @@
 class UrlRewriteCollectionTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManager;
 
@@ -41,7 +41,7 @@ class UrlRewriteCollectionTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->storeManager = $this->getMock('Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManager = $this->getMock('Magento\Store\Model\StoreManagerInterface');
         $this->select = $this->getMock('Zend_Db_Select', ['from', 'where'], [], '', false);
         $this->adapter = $this->getMock(
             'Magento\Framework\DB\Adapter\Pdo\Mysql',
diff --git a/dev/tests/unit/testsuite/Magento/User/Model/UserTest.php b/dev/tests/unit/testsuite/Magento/User/Model/UserTest.php
index f099ca3793af9..4b9fa12f7394d 100644
--- a/dev/tests/unit/testsuite/Magento/User/Model/UserTest.php
+++ b/dev/tests/unit/testsuite/Magento/User/Model/UserTest.php
@@ -37,7 +37,7 @@ class UserTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Framework\Mail\TransportInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $_transportMock;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface|PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Store\Model\StoreManagerInterface|PHPUnit_Framework_MockObject_MockObject */
     protected $_storeManagerMock;
 
     /** @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject */
@@ -115,7 +115,7 @@ protected function setUp()
             []
         )->getMock();
         $this->_storeManagerMock = $this->getMockBuilder(
-            '\Magento\Framework\Store\StoreManagerInterface'
+            '\Magento\Store\Model\StoreManagerInterface'
         )->disableOriginalConstructor()->setMethods(
             []
         )->getMock();
diff --git a/dev/tests/unit/testsuite/Magento/Webapi/Model/Soap/ServerTest.php b/dev/tests/unit/testsuite/Magento/Webapi/Model/Soap/ServerTest.php
index 09c1e387172c0..b6ef9b2528e98 100644
--- a/dev/tests/unit/testsuite/Magento/Webapi/Model/Soap/ServerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Webapi/Model/Soap/ServerTest.php
@@ -21,7 +21,7 @@ class ServerTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Framework\DomDocument\Factory */
     protected $_domDocumentFactory;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface */
+    /** @var \Magento\Store\Model\StoreManagerInterface */
     protected $_storeManagerMock;
 
     /** @var \Magento\Webapi\Model\Soap\Server\Factory */
diff --git a/dev/tests/unit/testsuite/Magento/Webapi/Model/Soap/Wsdl/GeneratorTest.php b/dev/tests/unit/testsuite/Magento/Webapi/Model/Soap/Wsdl/GeneratorTest.php
index b411c829d8a5c..af5e050ff32a4 100644
--- a/dev/tests/unit/testsuite/Magento/Webapi/Model/Soap/Wsdl/GeneratorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Webapi/Model/Soap/Wsdl/GeneratorTest.php
@@ -24,7 +24,7 @@ class GeneratorTest extends \PHPUnit_Framework_TestCase
     /** @var \Magento\Framework\Reflection\TypeProcessor|\PHPUnit_Framework_MockObject_MockObject */
     protected $_typeProcessor;
 
-    /** @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
+    /** @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject */
     protected $storeManagerMock;
 
     protected function setUp()
@@ -73,7 +73,7 @@ protected function setUp()
         );
 
         $this->storeManagerMock = $this->getMockBuilder(
-            'Magento\Framework\Store\StoreManagerInterface'
+            'Magento\Store\Model\StoreManagerInterface'
         )->setMethods(['getStore'])->disableOriginalConstructor()->getMockForAbstractClass();
 
         $storeMock = $this->getMockBuilder(
diff --git a/dev/tests/unit/testsuite/Magento/Weee/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Weee/Model/ConfigTest.php
index 7510dd47d276b..4fb0f76897e0f 100644
--- a/dev/tests/unit/testsuite/Magento/Weee/Model/ConfigTest.php
+++ b/dev/tests/unit/testsuite/Magento/Weee/Model/ConfigTest.php
@@ -25,11 +25,11 @@ public function testScopeConfigMethods($method, $path, $configValue, $expectedVa
         $scopeConfigMock = $this->getMockForAbstractClass('Magento\Framework\App\Config\ScopeConfigInterface');
         $scopeConfigMock->expects($this->any())
             ->method('getValue')
-            ->with($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, null)
+            ->with($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, null)
             ->will($this->returnValue($configValue));
         $scopeConfigMock->expects($this->any())
             ->method('isSetFlag')
-            ->with($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE, null)
+            ->with($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, null)
             ->will($this->returnValue($configValue));
 
         $taxData = $this->getMock('Magento\Tax\Helper\Data', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Weee/Model/Resource/Attribute/Backend/Weee/TaxTest.php b/dev/tests/unit/testsuite/Magento/Weee/Model/Resource/Attribute/Backend/Weee/TaxTest.php
index 28b5a759954ca..96cdfee93ffa5 100644
--- a/dev/tests/unit/testsuite/Magento/Weee/Model/Resource/Attribute/Backend/Weee/TaxTest.php
+++ b/dev/tests/unit/testsuite/Magento/Weee/Model/Resource/Attribute/Backend/Weee/TaxTest.php
@@ -29,7 +29,7 @@ class TaxTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->storeManagerMock = $this->getMock('\Magento\Framework\Store\StoreManagerInterface');
+        $this->storeManagerMock = $this->getMock('\Magento\Store\Model\StoreManagerInterface');
         $this->adapterMock = $this->getMock('\Magento\Framework\DB\Adapter\AdapterInterface');
 
         $this->resourceMock = $this->getMock('\Magento\Framework\App\Resource', [], [], '', false);
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/UpdateTest.php b/dev/tests/unit/testsuite/Magento/Widget/Model/Layout/UpdateTest.php
similarity index 86%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Layout/UpdateTest.php
rename to dev/tests/unit/testsuite/Magento/Widget/Model/Layout/UpdateTest.php
index 01852e60d0e6c..9c0495df4ef58 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/UpdateTest.php
+++ b/dev/tests/unit/testsuite/Magento/Widget/Model/Layout/UpdateTest.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\Model\Layout;
+namespace Magento\Widget\Model\Layout;
 
 class UpdateTest extends \PHPUnit_Framework_TestCase
 {
@@ -15,7 +15,7 @@ class UpdateTest extends \PHPUnit_Framework_TestCase
     public function testBeforeSave()
     {
         $resourceModel = $this->getMock(
-            'Magento\Core\Model\Resource\Layout\Update',
+            'Magento\Widget\Model\Resource\Layout\Update',
             [
                 '__wakeup',
                 'formatDate',
@@ -41,9 +41,9 @@ public function testBeforeSave()
         );
 
         $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
-        /** @var $model \Magento\Core\Model\Layout\Update */
+        /** @var $model \Magento\Widget\Model\Layout\Update */
         $model = $helper->getObject(
-            'Magento\Core\Model\Layout\Update',
+            'Magento\Widget\Model\Layout\Update',
             ['resource' => $resourceModel, 'dateTime' => $dateTime]
         );
         $model->setId(0);
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/AbstractTestCase.php b/dev/tests/unit/testsuite/Magento/Widget/Model/Resource/Layout/AbstractTestCase.php
similarity index 97%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/AbstractTestCase.php
rename to dev/tests/unit/testsuite/Magento/Widget/Model/Resource/Layout/AbstractTestCase.php
index f0ec6ba2e5030..3e28ff445c2a4 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/AbstractTestCase.php
+++ b/dev/tests/unit/testsuite/Magento/Widget/Model/Resource/Layout/AbstractTestCase.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\Model\Resource\Layout;
+namespace Magento\Widget\Model\Resource\Layout;
 
 abstract class AbstractTestCase extends \PHPUnit_Framework_TestCase
 {
@@ -18,7 +18,7 @@ abstract class AbstractTestCase extends \PHPUnit_Framework_TestCase
     const TEST_DAYS_BEFORE = 3;
 
     /**
-     * @var \Magento\Core\Model\Resource\Layout\Update\Collection
+     * @var \Magento\Widget\Model\Resource\Layout\Update\Collection
      */
     protected $_collection;
 
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/Link/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Widget/Model/Resource/Layout/Link/CollectionTest.php
similarity index 87%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/Link/CollectionTest.php
rename to dev/tests/unit/testsuite/Magento/Widget/Model/Resource/Layout/Link/CollectionTest.php
index 4a5e11a66fa37..6f6bfca3b55bd 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/Link/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Widget/Model/Resource/Layout/Link/CollectionTest.php
@@ -3,14 +3,14 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\Model\Resource\Layout\Link;
+namespace Magento\Widget\Model\Resource\Layout\Link;
 
-class CollectionTest extends \Magento\Core\Model\Resource\Layout\AbstractTestCase
+class CollectionTest extends \Magento\Widget\Model\Resource\Layout\AbstractTestCase
 {
     /**
      * Name of test table
      */
-    const TEST_TABLE = 'core_layout_update';
+    const TEST_TABLE = 'layout_update';
 
     /**
      * Name of main table alias
@@ -21,13 +21,13 @@ class CollectionTest extends \Magento\Core\Model\Resource\Layout\AbstractTestCas
 
     /**
      * @param \Zend_Db_Select $select
-     * @return \Magento\Core\Model\Resource\Layout\Link\Collection
+     * @return \Magento\Widget\Model\Resource\Layout\Link\Collection
      */
     protected function _getCollection(\Zend_Db_Select $select)
     {
         $eventManager = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
 
-        return new \Magento\Core\Model\Resource\Layout\Link\Collection(
+        return new \Magento\Widget\Model\Resource\Layout\Link\Collection(
             $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false),
             $this->getMock('Psr\Log\LoggerInterface'),
             $this->getMockForAbstractClass('Magento\Framework\Data\Collection\Db\FetchStrategyInterface'),
@@ -77,7 +77,7 @@ public function filterFlagDataProvider()
     }
 
     /**
-     * @covers \Magento\Core\Model\Resource\Layout\Link\Collection::_joinWithUpdate
+     * @covers \Magento\Widget\Model\Resource\Layout\Link\Collection::_joinWithUpdate
      */
     public function testJoinWithUpdate()
     {
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/Update/CollectionTest.php b/dev/tests/unit/testsuite/Magento/Widget/Model/Resource/Layout/Update/CollectionTest.php
similarity index 86%
rename from dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/Update/CollectionTest.php
rename to dev/tests/unit/testsuite/Magento/Widget/Model/Resource/Layout/Update/CollectionTest.php
index 6bdfad2ae1062..9c573955cfec5 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Resource/Layout/Update/CollectionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Widget/Model/Resource/Layout/Update/CollectionTest.php
@@ -3,21 +3,21 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\Model\Resource\Layout\Update;
+namespace Magento\Widget\Model\Resource\Layout\Update;
 
-class CollectionTest extends \Magento\Core\Model\Resource\Layout\AbstractTestCase
+class CollectionTest extends \Magento\Widget\Model\Resource\Layout\AbstractTestCase
 {
     /**
      * Retrieve layout update collection instance
      *
      * @param \Zend_Db_Select $select
-     * @return \Magento\Core\Model\Resource\Layout\Update\Collection
+     * @return \Magento\Widget\Model\Resource\Layout\Update\Collection
      */
     protected function _getCollection(\Zend_Db_Select $select)
     {
         $eventManager = $this->getMock('Magento\Framework\Event\ManagerInterface', [], [], '', false);
 
-        return new \Magento\Core\Model\Resource\Layout\Update\Collection(
+        return new \Magento\Widget\Model\Resource\Layout\Update\Collection(
             $this->getMock('Magento\Framework\Data\Collection\EntityFactory', [], [], '', false),
             $this->getMock('Psr\Log\LoggerInterface'),
             $this->getMockForAbstractClass('Magento\Framework\Data\Collection\Db\FetchStrategyInterface'),
@@ -49,7 +49,7 @@ public function testAddStoreFilter()
     }
 
     /**
-     * @covers \Magento\Core\Model\Resource\Layout\Update\Collection::_joinWithLink
+     * @covers \Magento\Widget\Model\Resource\Layout\Update\Collection::_joinWithLink
      */
     public function testJoinWithLink()
     {
@@ -59,7 +59,7 @@ public function testJoinWithLink()
         )->method(
             'join'
         )->with(
-            ['link' => 'core_layout_link'],
+            ['link' => 'layout_link'],
             'link.layout_update_id = main_table.layout_update_id',
             $this->isType('array')
         );
@@ -77,7 +77,7 @@ public function testAddNoLinksFilter()
         )->method(
             'joinLeft'
         )->with(
-            ['link' => 'core_layout_link'],
+            ['link' => 'layout_link'],
             'link.layout_update_id = main_table.layout_update_id',
             [[]]
         );
diff --git a/dev/tests/unit/testsuite/Magento/Widget/Model/Template/FilterTest.php b/dev/tests/unit/testsuite/Magento/Widget/Model/Template/FilterTest.php
index 142c9bed0d36e..17faf17fc803d 100755
--- a/dev/tests/unit/testsuite/Magento/Widget/Model/Template/FilterTest.php
+++ b/dev/tests/unit/testsuite/Magento/Widget/Model/Template/FilterTest.php
@@ -5,7 +5,7 @@
  */
 namespace Magento\Widget\Model\Template;
 
-use Magento\Framework\Store\StoreManagerInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 class FilterTest extends \PHPUnit_Framework_TestCase
 {
@@ -21,7 +21,7 @@ public function testMediaDirective()
             ->willReturn($baseUrl);
 
         /** @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject $storeManagerMock */
-        $storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
+        $storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false);
         $storeManagerMock->expects($this->once())->method('getStore')->will($this->returnValue($storeMock));
 
         /** @var \Magento\Widget\Model\Template\Filter $filter */
diff --git a/dev/tests/unit/testsuite/Magento/Wishlist/Block/Rss/LinkTest.php b/dev/tests/unit/testsuite/Magento/Wishlist/Block/Rss/LinkTest.php
index ba6faf6d36d36..67388b2fb66f3 100644
--- a/dev/tests/unit/testsuite/Magento/Wishlist/Block/Rss/LinkTest.php
+++ b/dev/tests/unit/testsuite/Magento/Wishlist/Block/Rss/LinkTest.php
@@ -89,7 +89,7 @@ public function testIsRssAllowed()
         $this->scopeConfig
             ->expects($this->atLeastOnce())
             ->method('isSetFlag')
-            ->with('rss/wishlist/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+            ->with('rss/wishlist/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
             ->will($this->returnValue(true));
         $this->assertEquals(true, $this->link->isRssAllowed());
     }
diff --git a/dev/tests/unit/testsuite/Magento/Wishlist/Helper/DataTest.php b/dev/tests/unit/testsuite/Magento/Wishlist/Helper/DataTest.php
index 01f970be96f00..942f27723bbe8 100644
--- a/dev/tests/unit/testsuite/Magento/Wishlist/Helper/DataTest.php
+++ b/dev/tests/unit/testsuite/Magento/Wishlist/Helper/DataTest.php
@@ -56,7 +56,7 @@ public function setUp()
             ->with('wishlist/index/cart', ['item' => '%item%', 'uenc' => $encoded])
             ->will($this->returnValue($this->url));
 
-        $storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+        $storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->disableOriginalConstructor()
             ->getMock();
         $storeManager->expects($this->any())
diff --git a/dev/tests/unit/testsuite/Magento/Wishlist/Model/ItemTest.php b/dev/tests/unit/testsuite/Magento/Wishlist/Model/ItemTest.php
index 976eb06aa7335..d9a1114eafb60 100644
--- a/dev/tests/unit/testsuite/Magento/Wishlist/Model/ItemTest.php
+++ b/dev/tests/unit/testsuite/Magento/Wishlist/Model/ItemTest.php
@@ -37,7 +37,7 @@ class ItemTest extends \PHPUnit_Framework_TestCase
     protected $collection;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManager;
 
@@ -74,7 +74,7 @@ public function setUp()
         $this->registry = $this->getMockBuilder('Magento\Framework\Registry')
             ->disableOriginalConstructor()
             ->getMock();
-        $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+        $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->getMock();
         $this->date = $this->getMockBuilder('Magento\Framework\Stdlib\DateTime\DateTime')
             ->disableOriginalConstructor()
diff --git a/dev/tests/unit/testsuite/Magento/Wishlist/Model/Rss/WishlistTest.php b/dev/tests/unit/testsuite/Magento/Wishlist/Model/Rss/WishlistTest.php
index 570a389149c06..5ab6017080d67 100644
--- a/dev/tests/unit/testsuite/Magento/Wishlist/Model/Rss/WishlistTest.php
+++ b/dev/tests/unit/testsuite/Magento/Wishlist/Model/Rss/WishlistTest.php
@@ -161,13 +161,13 @@ public function testGetRssData()
                     [
                         [
                             'advanced/modules_disable_output/Magento_Rss',
-                            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                             null,
                             null,
                         ],
                         [
                             \Magento\Core\Helper\Data::XML_PATH_DEFAULT_LOCALE,
-                            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
+                            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
                             null,
                             $locale
                         ],
@@ -286,7 +286,7 @@ protected function processWishlistItemDescription($wishlistModelMock, $staticArg
     public function testIsAllowed()
     {
         $this->scopeConfig->expects($this->once())->method('getValue')
-            ->with('rss/wishlist/active', \Magento\Framework\Store\ScopeInterface::SCOPE_STORE)
+            ->with('rss/wishlist/active', \Magento\Store\Model\ScopeInterface::SCOPE_STORE)
             ->will($this->returnValue(true));
         $this->assertTrue($this->model->isAllowed());
     }
diff --git a/dev/tests/unit/testsuite/Magento/Wishlist/Model/WishlistTest.php b/dev/tests/unit/testsuite/Magento/Wishlist/Model/WishlistTest.php
index dd9617c941202..70cc8df9a6c7f 100644
--- a/dev/tests/unit/testsuite/Magento/Wishlist/Model/WishlistTest.php
+++ b/dev/tests/unit/testsuite/Magento/Wishlist/Model/WishlistTest.php
@@ -36,7 +36,7 @@ class WishlistTest extends \PHPUnit_Framework_TestCase
     protected $collection;
 
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Store\Model\StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $storeManager;
 
@@ -108,7 +108,7 @@ public function setUp()
         $this->collection = $this->getMockBuilder('Magento\Wishlist\Model\Resource\Wishlist\Collection')
             ->disableOriginalConstructor()
             ->getMock();
-        $this->storeManager = $this->getMockBuilder('Magento\Framework\Store\StoreManagerInterface')
+        $this->storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
             ->getMock();
         $this->date = $this->getMockBuilder('Magento\Framework\Stdlib\DateTime\DateTime')
             ->disableOriginalConstructor()
diff --git a/dev/tools/Magento/Tools/Migration/factory_table_names/replace_ce.php b/dev/tools/Magento/Tools/Migration/factory_table_names/replace_ce.php
index f386bfb6e2670..48d2513cd8a5f 100644
--- a/dev/tools/Magento/Tools/Migration/factory_table_names/replace_ce.php
+++ b/dev/tools/Magento/Tools/Migration/factory_table_names/replace_ce.php
@@ -132,8 +132,8 @@
     'core/email_template' => 'core_email_template',
     'core/file_storage' => 'core_file_storage',
     'core/flag' => 'core_flag',
-    'core/layout_link' => 'core_layout_link',
-    'core/layout_update' => 'core_layout_update',
+    'core/layout_link' => 'layout_link',
+    'core/layout_update' => 'layout_update',
     'core/resource' => 'core_resource',
     'core/session' => 'core_session',
     'core/store' => 'store',
diff --git a/lib/internal/Magento/Framework/App/ScopeResolverInterface.php b/lib/internal/Magento/Framework/App/ScopeResolverInterface.php
index c4cf8ab9e4d4b..4f1a59e63494f 100644
--- a/lib/internal/Magento/Framework/App/ScopeResolverInterface.php
+++ b/lib/internal/Magento/Framework/App/ScopeResolverInterface.php
@@ -14,4 +14,11 @@ interface ScopeResolverInterface
      * @return \Magento\Framework\App\ScopeInterface
      */
     public function getScope($scopeId = null);
+
+    /**
+     * Retrieve scopes array
+     *
+     * @return \Magento\Framework\App\ScopeInterface[]
+     */
+    public function getScopes();
 }
diff --git a/lib/internal/Magento/Framework/Url/RouteParamsResolver.php b/lib/internal/Magento/Framework/Url/RouteParamsResolver.php
index 7952aad49013f..d5637d906e018 100644
--- a/lib/internal/Magento/Framework/Url/RouteParamsResolver.php
+++ b/lib/internal/Magento/Framework/Url/RouteParamsResolver.php
@@ -3,52 +3,47 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\Url;
 
-class RouteParamsResolver extends \Magento\Framework\Object implements \Magento\Framework\Url\RouteParamsResolverInterface
+use Magento\Framework\Url\RouteParamsResolverInterface;
+
+/**
+ * Route params resolver.
+ *
+ * @method $this setType(string $type)
+ * @method string getType()
+ * @method $this setScope(string $scope)
+ * @method string getScope()
+ * @method $this setSecureIsForced(bool $isForced)
+ * @method bool getSecureIsForced()
+ * @method $this setSecure(bool $isForced)
+ * @method bool getSecure()
+ */
+class RouteParamsResolver extends \Magento\Framework\Object implements RouteParamsResolverInterface
 {
     /**
      * @var \Magento\Framework\App\RequestInterface
      */
-    protected $_request;
-
-    /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
-    /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
-     */
-    protected $_storeManager;
+    protected $request;
 
     /**
      * @var \Magento\Framework\Url\QueryParamsResolverInterface
      */
-    protected $_queryParamsResolver;
+    protected $queryParamsResolver;
 
     /**
      * @param \Magento\Framework\App\RequestInterface $request
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Url\QueryParamsResolverInterface $queryParamsResolver
      * @param array $data
      */
     public function __construct(
         \Magento\Framework\App\RequestInterface $request,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
         \Magento\Framework\Url\QueryParamsResolverInterface $queryParamsResolver,
         array $data = []
     ) {
         parent::__construct($data);
-        $this->_request = $request;
-        $this->_scopeConfig = $scopeConfig;
-        $this->_storeManager = $storeManager;
-        $this->_queryParamsResolver = $queryParamsResolver;
+        $this->request = $request;
+        $this->queryParamsResolver = $queryParamsResolver;
     }
 
     /**
@@ -63,11 +58,6 @@ public function setRouteParams(array $data, $unsetOldParams = true)
             unset($data['_type']);
         }
 
-        if (isset($data['_scope'])) {
-            $this->setScope($data['_scope']);
-            unset($data['_scope']);
-        }
-
         if (isset($data['_forced_secure'])) {
             $this->setSecure((bool)$data['_forced_secure']);
             $this->setSecureIsForced(true);
@@ -88,20 +78,20 @@ public function setRouteParams(array $data, $unsetOldParams = true)
         if (isset($data['_current'])) {
             if (is_array($data['_current'])) {
                 foreach ($data['_current'] as $key) {
-                    if (array_key_exists($key, $data) || !$this->_request->getUserParam($key)) {
+                    if (array_key_exists($key, $data) || !$this->request->getUserParam($key)) {
                         continue;
                     }
-                    $data[$key] = $this->_request->getUserParam($key);
+                    $data[$key] = $this->request->getUserParam($key);
                 }
             } elseif ($data['_current']) {
-                foreach ($this->_request->getUserParams() as $key => $value) {
+                foreach ($this->request->getUserParams() as $key => $value) {
                     if (array_key_exists($key, $data) || $this->getRouteParam($key)) {
                         continue;
                     }
                     $data[$key] = $value;
                 }
-                foreach ($this->_request->getQuery() as $key => $value) {
-                    $this->_queryParamsResolver->setQueryParam($key, $value);
+                foreach ($this->request->getQuery() as $key => $value) {
+                    $this->queryParamsResolver->setQueryParam($key, $value);
                 }
             }
             unset($data['_current']);
@@ -111,19 +101,6 @@ public function setRouteParams(array $data, $unsetOldParams = true)
             unset($data['_use_rewrite']);
         }
 
-        if (isset($data['_scope_to_url']) && (bool)$data['_scope_to_url'] === true) {
-            $store = $this->getScope() ?: $this->_storeManager->getStore();
-            if (!$this->_scopeConfig->getValue(
-                \Magento\Store\Model\Store::XML_PATH_STORE_IN_URL,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
-                $this->getScope()
-            ) && !$this->_storeManager->hasSingleStore()
-            ) {
-                $this->_queryParamsResolver->setQueryParam('___store', $store->getCode());
-            }
-        }
-        unset($data['_scope_to_url']);
-
         foreach ($data as $key => $value) {
             $this->setRouteParam($key, $value);
         }
diff --git a/lib/internal/Magento/Framework/Url/ScopeResolver.php b/lib/internal/Magento/Framework/Url/ScopeResolver.php
index 2a452d8db19f9..e53d1dd145cbc 100644
--- a/lib/internal/Magento/Framework/Url/ScopeResolver.php
+++ b/lib/internal/Magento/Framework/Url/ScopeResolver.php
@@ -5,26 +5,31 @@
  */
 namespace Magento\Framework\Url;
 
+/**
+ * Class ScopeResolver
+ *
+ * URL scope resolver.
+ */
 class ScopeResolver implements \Magento\Framework\Url\ScopeResolverInterface
 {
     /**
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Framework\App\ScopeResolverInterface
      */
-    protected $_storeManager;
+    protected $scopeResolver;
 
     /**
      * @var null|string
      */
-    protected $_areaCode;
+    protected $areaCode;
 
     /**
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Framework\App\ScopeResolverInterface $scopeResolver
      * @param string|null $areaCode
      */
-    public function __construct(\Magento\Framework\Store\StoreManagerInterface $storeManager, $areaCode = null)
+    public function __construct(\Magento\Framework\App\ScopeResolverInterface $scopeResolver, $areaCode = null)
     {
-        $this->_storeManager = $storeManager;
-        $this->_areaCode = $areaCode;
+        $this->scopeResolver = $scopeResolver;
+        $this->areaCode = $areaCode;
     }
 
     /**
@@ -32,7 +37,7 @@ public function __construct(\Magento\Framework\Store\StoreManagerInterface $stor
      */
     public function getScope($scopeId = null)
     {
-        $scope = $this->_storeManager->getStore($scopeId);
+        $scope = $this->scopeResolver->getScope($scopeId);
         if (!$scope instanceof \Magento\Framework\Url\ScopeInterface) {
             throw new \Magento\Framework\Exception('Invalid scope object');
         }
@@ -41,11 +46,13 @@ public function getScope($scopeId = null)
     }
 
     /**
-     * {@inheritdoc}
+     * Retrieve array of URL scopes.
+     *
+     * @return \Magento\Framework\Url\ScopeInterface[]
      */
     public function getScopes()
     {
-        return $this->_storeManager->getStores();
+        return $this->scopeResolver->getScopes();
     }
 
     /**
@@ -53,6 +60,6 @@ public function getScopes()
      */
     public function getAreaCode()
     {
-        return $this->_areaCode;
+        return $this->areaCode;
     }
 }
diff --git a/lib/internal/Magento/Framework/Url/ScopeResolverInterface.php b/lib/internal/Magento/Framework/Url/ScopeResolverInterface.php
index 8bdafba934fee..893443659220d 100644
--- a/lib/internal/Magento/Framework/Url/ScopeResolverInterface.php
+++ b/lib/internal/Magento/Framework/Url/ScopeResolverInterface.php
@@ -7,13 +7,6 @@
 
 interface ScopeResolverInterface extends \Magento\Framework\App\ScopeResolverInterface
 {
-    /**
-     * Retrieve scopes array
-     *
-     * @return \Magento\Framework\Url\ScopeInterface[]
-     */
-    public function getScopes();
-
     /**
      * Retrieve area code
      *
diff --git a/lib/internal/Magento/Framework/Url/SecurityInfo.php b/lib/internal/Magento/Framework/Url/SecurityInfo.php
index 873da1c701ca8..e868f45f5741d 100644
--- a/lib/internal/Magento/Framework/Url/SecurityInfo.php
+++ b/lib/internal/Magento/Framework/Url/SecurityInfo.php
@@ -9,35 +9,26 @@
 
 class SecurityInfo implements \Magento\Framework\Url\SecurityInfoInterface
 {
-    /**
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
-    protected $_scopeConfig;
-
     /**
      * List of secure url patterns
      *
      * @var array
      */
-    protected $_secureUrlList = [];
+    protected $secureUrlsList = [];
 
     /**
      * List of already checked urls
      *
      * @var array
      */
-    protected $_secureUrlCache = [];
+    protected $secureUrlsCache = [];
 
     /**
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param array $secureUrlList
+     * @param string[] $secureUrlList
      */
-    public function __construct(
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        array $secureUrlList = []
-    ) {
-        $this->_scopeConfig = $scopeConfig;
-        $this->_secureUrlList = $secureUrlList;
+    public function __construct($secureUrlList = [])
+    {
+        $this->secureUrlsList = $secureUrlList;
     }
 
     /**
@@ -48,23 +39,15 @@ public function __construct(
      */
     public function isSecure($url)
     {
-        if (!$this->_scopeConfig->getValue(
-            \Magento\Store\Model\Store::XML_PATH_SECURE_IN_FRONTEND,
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
-        )
-        ) {
-            return false;
-        }
-
-        if (!isset($this->_secureUrlCache[$url])) {
-            $this->_secureUrlCache[$url] = false;
-            foreach ($this->_secureUrlList as $match) {
+        if (!isset($this->secureUrlsCache[$url])) {
+            $this->secureUrlsCache[$url] = false;
+            foreach ($this->secureUrlsList as $match) {
                 if (strpos($url, (string)$match) === 0) {
-                    $this->_secureUrlCache[$url] = true;
+                    $this->secureUrlsCache[$url] = true;
                     break;
                 }
             }
         }
-        return $this->_secureUrlCache[$url];
+        return $this->secureUrlsCache[$url];
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Asset/Config.php b/lib/internal/Magento/Framework/View/Asset/Config.php
index 7a9460c23e2db..53650dc6f39e8 100644
--- a/lib/internal/Magento/Framework/View/Asset/Config.php
+++ b/lib/internal/Magento/Framework/View/Asset/Config.php
@@ -53,7 +53,7 @@ public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $
      */
     public function isMergeCssFiles()
     {
-        return (bool)$this->scopeConfig->isSetFlag(self::XML_PATH_MERGE_CSS_FILES, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return (bool)$this->scopeConfig->isSetFlag(self::XML_PATH_MERGE_CSS_FILES, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
@@ -63,7 +63,7 @@ public function isMergeCssFiles()
      */
     public function isMergeJsFiles()
     {
-        return (bool)$this->scopeConfig->isSetFlag(self::XML_PATH_MERGE_JS_FILES, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return (bool)$this->scopeConfig->isSetFlag(self::XML_PATH_MERGE_JS_FILES, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 
     /**
@@ -76,7 +76,7 @@ public function isAssetMinification($contentType)
     {
         return (bool)$this->scopeConfig->isSetFlag(
             sprintf(self::XML_PATH_MINIFICATION_ENABLED, $contentType),
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 
@@ -90,7 +90,7 @@ public function getAssetMinificationAdapter($contentType)
     {
         return (string)$this->scopeConfig->getValue(
             sprintf(self::XML_PATH_MINIFICATION_ADAPTER, $contentType),
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
index a19115c41dc33..73f90325de211 100644
--- a/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
+++ b/lib/internal/Magento/Framework/View/Element/AbstractBlock.php
@@ -622,7 +622,7 @@ public function toHtml()
         $this->_eventManager->dispatch('view_block_abstract_to_html_before', ['block' => $this]);
         if ($this->_scopeConfig->getValue(
             'advanced/modules_disable_output/' . $this->getModuleName(),
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         )) {
             return '';
         }
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Calendar.php b/lib/internal/Magento/Framework/View/Element/Html/Calendar.php
index 5eecfa73b8621..b9b7b2e4a7dfc 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Calendar.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Calendar.php
@@ -97,7 +97,7 @@ protected function _toHtml()
             'firstDay',
             (int)$this->_scopeConfig->getValue(
                 'general/locale/firstday',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             )
         );
         $this->assign(
@@ -105,7 +105,7 @@ protected function _toHtml()
             $this->encoder->encode(
                 (string)$this->_scopeConfig->getValue(
                     'general/locale/weekend',
-                    \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
                 )
             )
         );
diff --git a/lib/internal/Magento/Framework/View/Element/Template.php b/lib/internal/Magento/Framework/View/Element/Template.php
index 751a360cfa056..0b2f2a0e8cb91 100644
--- a/lib/internal/Magento/Framework/View/Element/Template.php
+++ b/lib/internal/Magento/Framework/View/Element/Template.php
@@ -79,7 +79,7 @@ class Template extends AbstractBlock
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -322,7 +322,7 @@ protected function isAllowSymlinks()
         if (null === $this->_allowSymlinks) {
             $this->_allowSymlinks = $this->_scopeConfig->isSetFlag(
                 self::XML_PATH_TEMPLATE_ALLOW_SYMLINK,
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
         return $this->_allowSymlinks;
diff --git a/lib/internal/Magento/Framework/View/Element/Template/Context.php b/lib/internal/Magento/Framework/View/Element/Template/Context.php
index f57017f504f3d..fab3a911e20a9 100644
--- a/lib/internal/Magento/Framework/View/Element/Template/Context.php
+++ b/lib/internal/Magento/Framework/View/Element/Template/Context.php
@@ -52,7 +52,7 @@ class Context extends \Magento\Framework\View\Element\Context
     /**
      * Store manager
      *
-     * @var \Magento\Framework\Store\StoreManagerInterface
+     * @var \Magento\Store\Model\StoreManagerInterface
      */
     protected $_storeManager;
 
@@ -84,7 +84,7 @@ class Context extends \Magento\Framework\View\Element\Context
      * @param \Magento\Framework\View\FileSystem $viewFileSystem
      * @param \Magento\Framework\View\TemplateEnginePool $enginePool
      * @param \Magento\Framework\App\State $appState
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\View\Page\Config $pageConfig
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -112,7 +112,7 @@ public function __construct(
         \Magento\Framework\View\FileSystem $viewFileSystem,
         \Magento\Framework\View\TemplateEnginePool $enginePool,
         \Magento\Framework\App\State $appState,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\View\Page\Config $pageConfig
     ) {
         parent::__construct(
@@ -198,7 +198,7 @@ public function getAppState()
     /**
      * Get store manager
      *
-     * @return \Magento\Framework\Store\StoreManagerInterface
+     * @return \Magento\Store\Model\StoreManagerInterface
      */
     public function getStoreManager()
     {
diff --git a/app/code/Magento/Core/Model/Layout/Merge.php b/lib/internal/Magento/Framework/View/Model/Layout/Merge.php
similarity index 83%
rename from app/code/Magento/Core/Model/Layout/Merge.php
rename to lib/internal/Magento/Framework/View/Model/Layout/Merge.php
index c9e81ae0953be..c675bf6d81d07 100644
--- a/app/code/Magento/Core/Model/Layout/Merge.php
+++ b/lib/internal/Magento/Framework/View/Model/Layout/Merge.php
@@ -3,9 +3,9 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\Model\Layout;
+namespace Magento\Framework\View\Model\Layout;
 
-use Magento\Core\Model\Layout\Update\Validator;
+use Magento\Framework\View\Model\Layout\Update\Validator;
 use Magento\Framework\App\Filesystem\DirectoryList;
 
 /**
@@ -41,84 +41,79 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
     const PAGE_LAYOUT_CACHE_SUFFIX = 'page_layout';
 
     /**
-     * @var \Magento\Theme\Model\Theme
+     * @var \Magento\Framework\View\Design\ThemeInterface
      */
-    private $_theme;
+    private $theme;
 
     /**
-     * @var \Magento\Store\Model\Store
+     * @var \Magento\Framework\Url\ScopeInterface
      */
-    private $_store;
+    private $scope;
 
     /**
      * In-memory cache for loaded layout updates
      *
      * @var \Magento\Framework\View\Layout\Element
      */
-    protected $_layoutUpdatesCache;
+    protected $layoutUpdatesCache;
 
     /**
      * Cumulative array of update XML strings
      *
      * @var array
      */
-    protected $_updates = [];
+    protected $updates = [];
 
     /**
      * Handles used in this update
      *
      * @var array
      */
-    protected $_handles = [];
+    protected $handles = [];
 
     /**
      * Page handle names sorted by from parent to child
      *
      * @var array
      */
-    protected $_pageHandles = [];
+    protected $pageHandles = [];
 
     /**
      * Substitution values in structure array('from' => array(), 'to' => array())
      *
      * @var array|null
      */
-    protected $_subst = null;
+    protected $subst = null;
 
     /**
      * @var \Magento\Framework\View\File\CollectorInterface
      */
-    private $_fileSource;
+    private $fileSource;
 
     /**
      * @var \Magento\Framework\View\File\CollectorInterface
      */
     private $pageLayoutFileSource;
 
-    /**
-     * @var \Magento\Core\Model\Resource\Layout\Update
-     */
-    private $_resource;
-
     /**
      * @var \Magento\Framework\App\State
      */
-    private $_appState;
+    private $appState;
 
     /**
      * @var \Magento\Framework\Cache\FrontendInterface
      */
-    protected $_cache;
+    protected $cache;
 
     /**
-     * @var \Magento\Core\Model\Layout\Update\Validator
+     * @var \Magento\Framework\View\Model\Layout\Update\Validator
      */
-    protected $_layoutValidator;
+    protected $layoutValidator;
 
     /**
      * @var \Psr\Log\LoggerInterface
      */
-    protected $_logger;
+    protected $logger;
 
     /**
      * @var \Magento\Framework\Filesystem
@@ -160,13 +155,12 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
      * Init merge model
      *
      * @param \Magento\Framework\View\DesignInterface $design
-     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Framework\Url\ScopeResolverInterface $scopeResolver
      * @param \Magento\Framework\View\File\CollectorInterface $fileSource
      * @param \Magento\Framework\View\File\CollectorInterface $pageLayoutFileSource
-     * @param \Magento\Core\Model\Resource\Layout\Update $resource
      * @param \Magento\Framework\App\State $appState
      * @param \Magento\Framework\Cache\FrontendInterface $cache
-     * @param \Magento\Core\Model\Layout\Update\Validator $validator
+     * @param \Magento\Framework\View\Model\Layout\Update\Validator $validator
      * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\View\Design\ThemeInterface $theme Non-injectable theme instance
@@ -175,27 +169,25 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
      */
     public function __construct(
         \Magento\Framework\View\DesignInterface $design,
-        \Magento\Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Framework\Url\ScopeResolverInterface $scopeResolver,
         \Magento\Framework\View\File\CollectorInterface $fileSource,
         \Magento\Framework\View\File\CollectorInterface $pageLayoutFileSource,
-        \Magento\Core\Model\Resource\Layout\Update $resource,
         \Magento\Framework\App\State $appState,
         \Magento\Framework\Cache\FrontendInterface $cache,
-        \Magento\Core\Model\Layout\Update\Validator $validator,
+        \Magento\Framework\View\Model\Layout\Update\Validator $validator,
         \Psr\Log\LoggerInterface $logger,
         \Magento\Framework\Filesystem $filesystem,
         \Magento\Framework\View\Design\ThemeInterface $theme = null,
         $cacheSuffix = ''
     ) {
-        $this->_theme = $theme ?: $design->getDesignTheme();
-        $this->_store = $storeManager->getStore();
-        $this->_fileSource = $fileSource;
+        $this->theme = $theme ?: $design->getDesignTheme();
+        $this->scope = $scopeResolver->getScope();
+        $this->fileSource = $fileSource;
         $this->pageLayoutFileSource = $pageLayoutFileSource;
-        $this->_resource = $resource;
-        $this->_appState = $appState;
-        $this->_cache = $cache;
-        $this->_layoutValidator = $validator;
-        $this->_logger = $logger;
+        $this->appState = $appState;
+        $this->cache = $cache;
+        $this->layoutValidator = $validator;
+        $this->logger = $logger;
         $this->filesystem = $filesystem;
         $this->cacheSuffix = $cacheSuffix;
     }
@@ -208,7 +200,7 @@ public function __construct(
      */
     public function addUpdate($update)
     {
-        $this->_updates[] = $update;
+        $this->updates[] = $update;
         return $this;
     }
 
@@ -219,7 +211,7 @@ public function addUpdate($update)
      */
     public function asArray()
     {
-        return $this->_updates;
+        return $this->updates;
     }
 
     /**
@@ -229,7 +221,7 @@ public function asArray()
      */
     public function asString()
     {
-        return implode('', $this->_updates);
+        return implode('', $this->updates);
     }
 
     /**
@@ -242,10 +234,10 @@ public function addHandle($handleName)
     {
         if (is_array($handleName)) {
             foreach ($handleName as $name) {
-                $this->_handles[$name] = $this->handleAdded;
+                $this->handles[$name] = $this->handleAdded;
             }
         } else {
-            $this->_handles[$handleName] = $this->handleAdded;
+            $this->handles[$handleName] = $this->handleAdded;
         }
         return $this;
     }
@@ -258,7 +250,7 @@ public function addHandle($handleName)
      */
     public function removeHandle($handleName)
     {
-        unset($this->_handles[$handleName]);
+        unset($this->handles[$handleName]);
         return $this;
     }
 
@@ -269,7 +261,7 @@ public function removeHandle($handleName)
      */
     public function getHandles()
     {
-        return array_keys($this->_handles);
+        return array_keys($this->handles);
     }
 
     /**
@@ -287,7 +279,7 @@ public function addPageHandles(array $handlesToTry)
                 continue;
             }
             $handles[] = $handleName;
-            $this->_pageHandles = $handles;
+            $this->pageHandles = $handles;
             $this->addHandle($handles);
             $handlesAdded = true;
         }
@@ -356,7 +348,7 @@ protected function _getPageHandleNode($handleName)
      */
     public function getPageHandles()
     {
-        return $this->_pageHandles;
+        return $this->pageHandles;
     }
 
     /**
@@ -389,7 +381,7 @@ public function getAllDesignAbstractions()
             $name = $node->getAttribute('id');
             $info = [
                 'name' => $name,
-                'label' => __((string)$node->getAttribute('label')),
+                'label' => (string)new \Magento\Framework\Phrase((string)$node->getAttribute('label')),
                 'design_abstraction' => $node->getAttribute('design_abstraction'),
             ];
             $result[$name] = $info;
@@ -456,12 +448,12 @@ public function load($handles = [])
     protected function _validateMergedLayout($cacheId, $layout)
     {
         $layoutStr = '<handle id="handle">' . $layout . '</handle>';
-        if ($this->_appState->getMode() === \Magento\Framework\App\State::MODE_DEVELOPER) {
-            if (!$this->_layoutValidator->isValid($layoutStr, Validator::LAYOUT_SCHEMA_MERGED, false)) {
-                $messages = $this->_layoutValidator->getMessages();
+        if ($this->appState->getMode() === \Magento\Framework\App\State::MODE_DEVELOPER) {
+            if (!$this->layoutValidator->isValid($layoutStr, Validator::LAYOUT_SCHEMA_MERGED, false)) {
+                $messages = $this->layoutValidator->getMessages();
                 //Add first message to exception
                 $message = reset($messages);
-                $this->_logger->info('Cache file with merged layout: ' . $cacheId . ': ' . $message);
+                $this->logger->info('Cache file with merged layout: ' . $cacheId . ': ' . $message);
             }
         }
         return $this;
@@ -501,15 +493,15 @@ protected function _loadXmlString($xmlString)
      */
     protected function _merge($handle)
     {
-        if (!isset($this->_handles[$handle]) || $this->_handles[$handle] == $this->handleAdded) {
-            $this->_handles[$handle] = $this->handleProcessing;
+        if (!isset($this->handles[$handle]) || $this->handles[$handle] == $this->handleAdded) {
+            $this->handles[$handle] = $this->handleProcessing;
             $this->_fetchPackageLayoutUpdates($handle);
             $this->_fetchDbLayoutUpdates($handle);
-            $this->_handles[$handle] = $this->handleProcessed;
-        } elseif ($this->_handles[$handle] == $this->handleProcessing
-            && $this->_appState->getMode() === \Magento\Framework\App\State::MODE_DEVELOPER
+            $this->handles[$handle] = $this->handleProcessed;
+        } elseif ($this->handles[$handle] == $this->handleProcessing
+            && $this->appState->getMode() === \Magento\Framework\App\State::MODE_DEVELOPER
         ) {
-            $this->_logger->info('Cyclic dependency in merged layout for handle: ' . $handle);
+            $this->logger->info('Cyclic dependency in merged layout for handle: ' . $handle);
         }
         return $this;
     }
@@ -544,7 +536,7 @@ protected function _fetchDbLayoutUpdates($handle)
     {
         $_profilerKey = 'layout_db_update: ' . $handle;
         \Magento\Framework\Profiler::start($_profilerKey);
-        $updateStr = $this->_getDbUpdateString($handle);
+        $updateStr = $this->getDbUpdateString($handle);
         if (!$updateStr) {
             \Magento\Framework\Profiler::stop($_profilerKey);
             return false;
@@ -569,18 +561,18 @@ protected function _fetchDbLayoutUpdates($handle)
      */
     protected function _substitutePlaceholders($xmlString)
     {
-        if ($this->_subst === null) {
+        if ($this->subst === null) {
             $placeholders = [
-                'baseUrl' => $this->_store->getBaseUrl(),
-                'baseSecureUrl' => $this->_store->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_LINK, true),
+                'baseUrl' => $this->scope->getBaseUrl(),
+                'baseSecureUrl' => $this->scope->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_LINK, true),
             ];
-            $this->_subst = [];
+            $this->subst = [];
             foreach ($placeholders as $key => $value) {
-                $this->_subst['from'][] = '{{' . $key . '}}';
-                $this->_subst['to'][] = $value;
+                $this->subst['from'][] = '{{' . $key . '}}';
+                $this->subst['to'][] = $value;
             }
         }
-        return str_replace($this->_subst['from'], $this->_subst['to'], $xmlString);
+        return str_replace($this->subst['from'], $this->subst['to'], $xmlString);
     }
 
     /**
@@ -589,9 +581,9 @@ protected function _substitutePlaceholders($xmlString)
      * @param string $handle
      * @return string
      */
-    protected function _getDbUpdateString($handle)
+    public function getDbUpdateString($handle)
     {
-        return $this->_resource->fetchUpdatesByHandle($handle, $this->_theme, $this->_store);
+        return null;
     }
 
     /**
@@ -620,8 +612,8 @@ protected function _fetchRecursiveUpdates($updateXml)
      */
     public function getFileLayoutUpdatesXml()
     {
-        if ($this->_layoutUpdatesCache) {
-            return $this->_layoutUpdatesCache;
+        if ($this->layoutUpdatesCache) {
+            return $this->layoutUpdatesCache;
         }
         $cacheId = $this->_getCacheId($this->cacheSuffix);
         $result = $this->_loadCache($cacheId);
@@ -631,7 +623,7 @@ public function getFileLayoutUpdatesXml()
             $result = $this->_loadFileLayoutUpdatesXml();
             $this->_saveCache($result->asXml(), $cacheId);
         }
-        $this->_layoutUpdatesCache = $result;
+        $this->layoutUpdatesCache = $result;
         return $result;
     }
 
@@ -643,7 +635,7 @@ public function getFileLayoutUpdatesXml()
      */
     protected function _getCacheId($suffix = '')
     {
-        return "LAYOUT_{$this->_theme->getArea()}_STORE{$this->_store->getId()}_{$this->_theme->getId()}{$suffix}";
+        return "LAYOUT_{$this->theme->getArea()}_STORE{$this->scope->getId()}_{$this->theme->getId()}{$suffix}";
     }
 
     /**
@@ -654,7 +646,7 @@ protected function _getCacheId($suffix = '')
      */
     protected function _loadCache($cacheId)
     {
-        return $this->_cache->load($cacheId);
+        return $this->cache->load($cacheId);
     }
 
     /**
@@ -667,7 +659,7 @@ protected function _loadCache($cacheId)
      */
     protected function _saveCache($data, $cacheId, array $cacheTags = [])
     {
-        $this->_cache->save($data, $cacheId, $cacheTags, null);
+        $this->cache->save($data, $cacheId, $cacheTags, null);
     }
 
     /**
@@ -679,8 +671,8 @@ protected function _saveCache($data, $cacheId, array $cacheTags = [])
     protected function _loadFileLayoutUpdatesXml()
     {
         $layoutStr = '';
-        $theme = $this->_getPhysicalTheme($this->_theme);
-        $updateFiles = $this->_fileSource->getFiles($theme, '*.xml');
+        $theme = $this->_getPhysicalTheme($this->theme);
+        $updateFiles = $this->fileSource->getFiles($theme, '*.xml');
         $updateFiles = array_merge($updateFiles, $this->pageLayoutFileSource->getFiles($theme, '*.xml'));
         $dir = $this->filesystem->getDirectoryRead(DirectoryList::ROOT);
         $useErrors = libxml_use_internal_errors(true);
@@ -727,7 +719,7 @@ protected function _logXmlErrors($fileName, $libXmlErrors)
                 $errors[] = "{$error->message} Line: {$error->line}";
             }
 
-            $this->_logger->info(
+            $this->logger->info(
                 sprintf("Theme layout update file '%s' is not valid.\n%s", $fileName, implode("\n", $errors))
             );
         }
@@ -788,7 +780,7 @@ public function getContainers()
         foreach ($containerNodes as $oneContainerNode) {
             $label = $oneContainerNode->getAttribute('label');
             if ($label) {
-                $result[$oneContainerNode->getAttribute('name')] = __($label);
+                $result[$oneContainerNode->getAttribute('name')] = (string)new \Magento\Framework\Phrase($label);
             }
         }
         return $result;
@@ -802,8 +794,8 @@ public function getContainers()
      */
     public function __destruct()
     {
-        $this->_updates = [];
-        $this->_layoutUpdatesCache = null;
+        $this->updates = [];
+        $this->layoutUpdatesCache = null;
     }
 
     /**
@@ -827,4 +819,24 @@ public function isPageLayoutDesignAbstraction(array $abstraction)
         }
         return $abstraction['design_abstraction'] === self::DESIGN_ABSTRACTION_PAGE_LAYOUT;
     }
+
+    /**
+     * Retrieve theme
+     *
+     * @return \Magento\Framework\View\Design\ThemeInterface
+     */
+    public function getTheme()
+    {
+        return $this->theme;
+    }
+
+    /**
+     * Retrieve current scope
+     *
+     * @return \Magento\Framework\Url\ScopeInterface
+     */
+    public function getScope()
+    {
+        return $this->scope;
+    }
 }
diff --git a/app/code/Magento/Core/Model/Layout/Translator.php b/lib/internal/Magento/Framework/View/Model/Layout/Translator.php
similarity index 97%
rename from app/code/Magento/Core/Model/Layout/Translator.php
rename to lib/internal/Magento/Framework/View/Model/Layout/Translator.php
index 26fa3a64f8a34..b2dc025bbc647 100644
--- a/app/code/Magento/Core/Model/Layout/Translator.php
+++ b/lib/internal/Magento/Framework/View/Model/Layout/Translator.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\Model\Layout;
+namespace Magento\Framework\View\Model\Layout;
 
 use Magento\Framework\Simplexml\Element;
 
@@ -126,6 +126,6 @@ protected function _getNodeValue(Element $node)
      */
     protected function _translateValue($value)
     {
-        return __($value);
+        return (string)new \Magento\Framework\Phrase($value);
     }
 }
diff --git a/app/code/Magento/Core/Model/Layout/Update/Validator.php b/lib/internal/Magento/Framework/View/Model/Layout/Update/Validator.php
similarity index 89%
rename from app/code/Magento/Core/Model/Layout/Update/Validator.php
rename to lib/internal/Magento/Framework/View/Model/Layout/Update/Validator.php
index 3e2008165b6a4..8721ae0be6dd0 100644
--- a/app/code/Magento/Core/Model/Layout/Update/Validator.php
+++ b/lib/internal/Magento/Framework/View/Model/Layout/Update/Validator.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Core\Model\Layout\Update;
+namespace Magento\Framework\View\Model\Layout\Update;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 
@@ -82,9 +82,9 @@ protected function _initMessageTemplates()
     {
         if (!$this->_messageTemplates) {
             $this->_messageTemplates = [
-                self::HELPER_ARGUMENT_TYPE => __('Helper arguments should not be used in custom layout updates.'),
-                self::UPDATER_MODEL => __('Updater model should not be used in custom layout updates.'),
-                self::XML_INVALID => __('Please correct the XML data and try again. %value%'),
+                self::HELPER_ARGUMENT_TYPE => (string)new \Magento\Framework\Phrase('Helper arguments should not be used in custom layout updates.'),
+                self::UPDATER_MODEL => (string)new \Magento\Framework\Phrase('Updater model should not be used in custom layout updates.'),
+                self::XML_INVALID => (string)new \Magento\Framework\Phrase('Please correct the XML data and try again. %value%'),
             ];
         }
         return $this;
diff --git a/lib/internal/Magento/Framework/View/Model/PageLayout/Config/BuilderInterface.php b/lib/internal/Magento/Framework/View/Model/PageLayout/Config/BuilderInterface.php
new file mode 100644
index 0000000000000..107bd1f278605
--- /dev/null
+++ b/lib/internal/Magento/Framework/View/Model/PageLayout/Config/BuilderInterface.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Framework\View\Model\PageLayout\Config;
+
+use Magento\Framework\View\LayoutInterface;
+
+/**
+ * Interface BuilderInterface
+ */
+interface BuilderInterface
+{
+    /**
+     * @return \Magento\Framework\View\PageLayout\Config
+     */
+    public function getPageLayoutsConfig();
+}
diff --git a/lib/internal/Magento/Framework/View/Page/Config.php b/lib/internal/Magento/Framework/View/Page/Config.php
index 56a903e20994c..9fe5599d6a992 100644
--- a/lib/internal/Magento/Framework/View/Page/Config.php
+++ b/lib/internal/Magento/Framework/View/Page/Config.php
@@ -234,7 +234,7 @@ public function getMediaType()
         if (empty($this->metadata['media_type'])) {
             $this->metadata['media_type'] = $this->scopeConfig->getValue(
                 'design/head/default_media_type',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
         return $this->metadata['media_type'];
@@ -260,7 +260,7 @@ public function getCharset()
         if (empty($this->metadata['charset'])) {
             $this->metadata['charset'] = $this->scopeConfig->getValue(
                 'design/head/default_charset',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
         return $this->metadata['charset'];
@@ -286,7 +286,7 @@ public function getDescription()
         if (empty($this->metadata['description'])) {
             $this->metadata['description'] = $this->scopeConfig->getValue(
                 'design/head/default_description',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
         return $this->metadata['description'];
@@ -312,7 +312,7 @@ public function getKeywords()
         if (empty($this->metadata['keywords'])) {
             $this->metadata['keywords'] = $this->scopeConfig->getValue(
                 'design/head/default_keywords',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
         return $this->metadata['keywords'];
@@ -338,7 +338,7 @@ public function getRobots()
         if (empty($this->metadata['robots'])) {
             $this->metadata['robots'] = $this->scopeConfig->getValue(
                 'design/search_engine_robots/default_robots',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
         return $this->metadata['robots'];
@@ -516,7 +516,7 @@ public function getIncludes()
         if (empty($this->includes)) {
             $this->includes = $this->scopeConfig->getValue(
                 'design/head/includes',
-                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
         }
         return $this->includes;
diff --git a/lib/internal/Magento/Framework/View/Page/Title.php b/lib/internal/Magento/Framework/View/Page/Title.php
index 07a6210ec5307..05540c3607b3f 100644
--- a/lib/internal/Magento/Framework/View/Page/Title.php
+++ b/lib/internal/Magento/Framework/View/Page/Title.php
@@ -92,10 +92,10 @@ protected function addConfigValues($title)
     {
         $preparedTitle = $this->scopeConfig->getValue(
             'design/head/title_prefix',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         ) . ' ' . $title . ' ' . $this->scopeConfig->getValue(
             'design/head/title_suffix',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         return trim($preparedTitle);
     }
@@ -109,7 +109,7 @@ public function getDefault()
     {
         $defaultTitle = $this->scopeConfig->getValue(
             'design/head/default_title',
-            \Magento\Framework\Store\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         return $this->addConfigValues($defaultTitle);
     }
diff --git a/lib/internal/Magento/Framework/View/Url/Config.php b/lib/internal/Magento/Framework/View/Url/Config.php
index 64d8fa73d1961..c70449e1e9458 100644
--- a/lib/internal/Magento/Framework/View/Url/Config.php
+++ b/lib/internal/Magento/Framework/View/Url/Config.php
@@ -30,6 +30,6 @@ public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $
      */
     public function getValue($path)
     {
-        return $this->_scopeConfig->getValue($path, \Magento\Framework\Store\ScopeInterface::SCOPE_STORE);
+        return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
     }
 }
diff --git a/lib/web/mage/translate-inline.js b/lib/web/mage/translate-inline.js
index f9c41e4b21a06..71d12032f7cd6 100644
--- a/lib/web/mage/translate-inline.js
+++ b/lib/web/mage/translate-inline.js
@@ -127,5 +127,33 @@
         }
     });
 
+    $.widget('ui.button', $.ui.button, {
+        _create: function () {
+            this._super();
+            /**
+             * Decode HTML entities to prevent incorrect rendering of dialog button label
+             */
+            this.options.label = this.options.label
+                ? jQuery('<div/>').html(this.options.label).text()
+                : this.options.label;
+            /**
+             * Reset button to make decoded label visible
+             */
+            this._resetButton();
+        }
+    });
+
+    $.widget('ui.dialog', $.ui.dialog, {
+        /**
+         * Prevent rendering of dialog title as escaped HTML
+         */
+        _title: function (title) {
+            this._super(title);
+            if (this.options.title) {
+                title.html(this.options.title);
+            }
+        }
+    });
+
     return $.mage.translateInline;
 }));