diff --git a/app/code/Magento/Customer/Controller/Address/Delete.php b/app/code/Magento/Customer/Controller/Address/Delete.php
index 8ee4eb4f5433b0bfe361dc90af93ba5f811ab8b3..6c3344487794c66ae3649fa5e9ca48f28080d17f 100644
--- a/app/code/Magento/Customer/Controller/Address/Delete.php
+++ b/app/code/Magento/Customer/Controller/Address/Delete.php
@@ -9,7 +9,7 @@ namespace Magento\Customer\Controller\Address;
 class Delete extends \Magento\Customer\Controller\Address
 {
     /**
-     * @return \Magento\Backend\Model\View\Result\Redirect
+     * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Address/Edit.php b/app/code/Magento/Customer/Controller/Address/Edit.php
index 8c33588376f8352cdc8d3fcbc5121927148d3560..0691ffd8ad52739e16de23ed0457ccab39566941 100644
--- a/app/code/Magento/Customer/Controller/Address/Edit.php
+++ b/app/code/Magento/Customer/Controller/Address/Edit.php
@@ -11,11 +11,11 @@ class Edit extends \Magento\Customer\Controller\Address
     /**
      * Customer address edit action
      *
-     * @return \Magento\Backend\Model\View\Result\Forward
+     * @return \Magento\Framework\Controller\Result\Forward
      */
     public function execute()
     {
-        /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */
+        /** @var \Magento\Framework\Controller\Result\Forward $resultForward */
         $resultForward = $this->resultForwardFactory->create();
         return $resultForward->forward('form');
     }
diff --git a/app/code/Magento/Customer/Controller/Address/Form.php b/app/code/Magento/Customer/Controller/Address/Form.php
index 1750b06a70c258f481db25eab86c5618329fb2a3..8948125c397a63bd6e80d57567791dc8a6bee579 100644
--- a/app/code/Magento/Customer/Controller/Address/Form.php
+++ b/app/code/Magento/Customer/Controller/Address/Form.php
@@ -11,11 +11,11 @@ class Form extends \Magento\Customer\Controller\Address
     /**
      * Address book form
      *
-     * @return \Magento\Backend\Model\View\Result\Page
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
-        /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
+        /** @var \Magento\Framework\View\Result\Page $resultPage */
         $resultPage = $this->resultPageFactory->create();
         $resultPage->getLayout()->initMessages();
         $navigationBlock = $resultPage->getLayout()->getBlock('customer_account_navigation');
diff --git a/app/code/Magento/Customer/Controller/Address/FormPost.php b/app/code/Magento/Customer/Controller/Address/FormPost.php
index c952ff5ebf8eec7c98fe089d74e53050c5e71dd1..2fdf486d56d5c52073493dcf5de9972d1644c530 100644
--- a/app/code/Magento/Customer/Controller/Address/FormPost.php
+++ b/app/code/Magento/Customer/Controller/Address/FormPost.php
@@ -64,7 +64,7 @@ class FormPost extends \Magento\Customer\Controller\Address
     /**
      * Process address form save
      *
-     * @return \Magento\Backend\Model\View\Result\Redirect
+     * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Address/Index.php b/app/code/Magento/Customer/Controller/Address/Index.php
index 4b82b517b6418a3c232d4640c1d476f4a086f60b..de8e53def17893a7619ed4a10431a10b70d13b19 100644
--- a/app/code/Magento/Customer/Controller/Address/Index.php
+++ b/app/code/Magento/Customer/Controller/Address/Index.php
@@ -72,7 +72,7 @@ class Index extends \Magento\Customer\Controller\Address
     {
         $addresses = $this->customerRepository->getById($this->_getSession()->getCustomerId())->getAddresses();
         if (count($addresses)) {
-            /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
+            /** @var \Magento\Framework\View\Result\Page $resultPage */
             $resultPage = $this->resultPageFactory->create();
             $resultPage->getLayout()->initMessages();
             $block = $resultPage->getLayout()->getBlock('address_book');
diff --git a/app/code/Magento/Customer/Controller/Address/NewAction.php b/app/code/Magento/Customer/Controller/Address/NewAction.php
index 427f6329f2d47b18ecb16b888a504becf8dcc31e..4bfdabbbd5ef154644e6a12fb1fc43ab156c670e 100644
--- a/app/code/Magento/Customer/Controller/Address/NewAction.php
+++ b/app/code/Magento/Customer/Controller/Address/NewAction.php
@@ -9,11 +9,11 @@ namespace Magento\Customer\Controller\Address;
 class NewAction extends \Magento\Customer\Controller\Address
 {
     /**
-     * @return \Magento\Backend\Model\View\Result\Forward
+     * @return \Magento\Framework\Controller\Result\Forward
      */
     public function execute()
     {
-        /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */
+        /** @var \Magento\Framework\Controller\Result\Forward $resultForward */
         $resultForward = $this->resultForwardFactory->create();
         return $resultForward->forward('form');
     }