diff --git a/app/code/Magento/Config/Model/Config/ScopeDefiner.php b/app/code/Magento/Config/Model/Config/ScopeDefiner.php
index f2230e2737e05b4f2707103e5fca4a8c4fe9cf73..f69e9dd96d2eb820a87a9d1f5905445df9c576df 100644
--- a/app/code/Magento/Config/Model/Config/ScopeDefiner.php
+++ b/app/code/Magento/Config/Model/Config/ScopeDefiner.php
@@ -39,6 +39,6 @@ class ScopeDefiner
             'store'
         ) ? StoreScopeInterface::SCOPE_STORE : ($this->_request->getParam(
             'website'
-        ) ? StoreScopeInterface::SCOPE_WEBSITE : StoreScopeInterface::SCOPE_DEFAULT);
+        ) ? StoreScopeInterface::SCOPE_WEBSITE : ScopeConfigInterface::SCOPE_TYPE_DEFAULT);
     }
 }
diff --git a/app/code/Magento/Email/Model/BackendTemplate.php b/app/code/Magento/Email/Model/BackendTemplate.php
index 6584fdbd21575e6ad0d5e429bee7bd97b7d197cc..c8bc6b34398e0c492f9123cfaeedc8182da23299 100644
--- a/app/code/Magento/Email/Model/BackendTemplate.php
+++ b/app/code/Magento/Email/Model/BackendTemplate.php
@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 namespace Magento\Email\Model;
+
 use Magento\Framework\App\Config\ScopeConfigInterface;
 
 /**
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Config/Backend/Email/AsyncSendingTest.php b/app/code/Magento/Sales/Test/Unit/Model/Config/Backend/Email/AsyncSendingTest.php
index 69f3f6e0df310d27dc7c7c6774ad5a62ca1e82cb..9359af03ee68dfcb020c7e7ed1a9923bd4d456ec 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Config/Backend/Email/AsyncSendingTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Config/Backend/Email/AsyncSendingTest.php
@@ -63,7 +63,7 @@ class AsyncSendingTest extends \PHPUnit_Framework_TestCase
     public function testAfterSave($value, $oldValue, $eventName)
     {
         $path = 'sales_email/general/async_sending';
-        $scope = \Magento\Framework\App\ScopeInterface::SCOPE_DEFAULT;
+        $scope = \Magento\Framework\App\Config\ScopeConfigInterface::SCOPE_TYPE_DEFAULT;
 
         $this->object->setData(['value' => $value, 'path' => $path, 'scope' => $scope]);
 
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Config/Backend/Grid/AsyncIndexingTest.php b/app/code/Magento/Sales/Test/Unit/Model/Config/Backend/Grid/AsyncIndexingTest.php
index 972cfae38e2ae4273235a2c7a7d1ac260b4f45a3..729c19940ccff8b5f464eeeb895bc74e5aeafa16 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Config/Backend/Grid/AsyncIndexingTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Config/Backend/Grid/AsyncIndexingTest.php
@@ -63,7 +63,7 @@ class AsyncIndexingTest extends \PHPUnit_Framework_TestCase
     public function testAfterSave($value, $oldValue, $eventName)
     {
         $path = 'dev/grid/async_indexing';
-        $scope = \Magento\Framework\App\ScopeInterface::SCOPE_DEFAULT;
+        $scope = \Magento\Framework\App\Config\ScopeConfigInterface::SCOPE_TYPE_DEFAULT;
 
         $this->object->setData(['value' => $value, 'path' => $path, 'scope' => $scope]);
 
diff --git a/app/code/Magento/Store/Model/Config/Reader/DefaultReader.php b/app/code/Magento/Store/Model/Config/Reader/DefaultReader.php
index 911e9bd8ae155e59d0e741d9ba3e4f4863f95b17..7bb9981369440c9c8062ffe6308376c8b089a05f 100644
--- a/app/code/Magento/Store/Model/Config/Reader/DefaultReader.php
+++ b/app/code/Magento/Store/Model/Config/Reader/DefaultReader.php
@@ -8,6 +8,7 @@
 namespace Magento\Store\Model\Config\Reader;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Exception\LocalizedException;
 
 class DefaultReader implements \Magento\Framework\App\Config\Scope\ReaderInterface
 {
@@ -45,14 +46,14 @@ class DefaultReader implements \Magento\Framework\App\Config\Scope\ReaderInterfa
      * Read configuration data
      *
      * @param null|string $scope
-     * @throws \Magento\Framework\Exception Exception is thrown when scope other than default is given
+     * @throws LocalizedException Exception is thrown when scope other than default is given
      * @return array
      */
     public function read($scope = null)
     {
         $scope = $scope === null ? ScopeConfigInterface::SCOPE_TYPE_DEFAULT : $scope;
         if ($scope !== ScopeConfigInterface::SCOPE_TYPE_DEFAULT) {
-            throw new \Magento\Framework\Exception("Only default scope allowed");
+            throw new \Magento\Framework\Exception\LocalizedException(__("Only default scope allowed"));
         }
 
         $config = $this->_initialConfig->getData($scope);
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php b/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php
index a31e0019851664fa6c4cf1ab7dd46b3c58fc2e03..1eb9f230505826dd576fb232ab7abffd6f9f4f00 100644
--- a/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php
+++ b/app/code/Magento/Tax/Controller/Adminhtml/Tax/IgnoreTaxNotification.php
@@ -6,8 +6,9 @@
  */
 namespace Magento\Tax\Controller\Adminhtml\Tax;
 
-use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Controller\ResultFactory;
+
 
 class IgnoreTaxNotification extends \Magento\Tax\Controller\Adminhtml\Tax
 {
diff --git a/app/code/Magento/Theme/Model/View/Design.php b/app/code/Magento/Theme/Model/View/Design.php
index a158874feff56bbf6d696c7a385d607cc4acb17b..f0cf795f6b4482b9c8ac59bc444e62f4af24f14c 100644
--- a/app/code/Magento/Theme/Model/View/Design.php
+++ b/app/code/Magento/Theme/Model/View/Design.php
@@ -5,6 +5,7 @@
  */
 
 namespace Magento\Theme\Model\View;
+
 use Magento\Framework\App\Config\ScopeConfigInterface;
 
 /**
diff --git a/dev/tests/integration/testsuite/Magento/Payment/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/Payment/Model/ObserverTest.php
index fd30d5b492fc7e9af0e9eaf12efa47e88bc03cf6..f83337a307eb201a8d5fd2fc8ef9dc8d6005880a 100644
--- a/dev/tests/integration/testsuite/Magento/Payment/Model/ObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Payment/Model/ObserverTest.php
@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 namespace Magento\Payment\Model;
+
 use Magento\Framework\App\Config\ScopeConfigInterface;
 
 /**
diff --git a/lib/internal/Magento/Framework/App/Config/Value.php b/lib/internal/Magento/Framework/App/Config/Value.php
index 64263bc7b69e8b3b6520d6ca65d5251a6cc77d32..92ee527a9c48eb77a35f527c2c471c2507d1b546 100644
--- a/lib/internal/Magento/Framework/App/Config/Value.php
+++ b/lib/internal/Magento/Framework/App/Config/Value.php
@@ -4,7 +4,6 @@
  * See COPYING.txt for license details.
  */
 namespace Magento\Framework\App\Config;
-use Magento\Framework\App\Config\ScopeConfigInterface;
 
 /**
  * Config data model