Reverted changes

Author: gelanivishal

app/code/Magento/Paypal/Block/Iframe.php

@@ -116,7 +116,7 @@ protected function _construct()
             if ($file && $directory->isExist($directory->getRelativePath($file))) {
                 $this->setTemplate($templateFile);
             } else {
-                $this->setTemplate('Magento_Paypal::hss/iframe.phtml');
+                $this->setTemplate('hss/iframe.phtml');
             }
         }
     }
@@ -198,7 +198,7 @@ protected function _beforeToHtml()
     protected function _toHtml()
     {
         if ($this->_isAfterPaymentSave()) {
-            $this->setTemplate('Magento_Paypal::hss/js.phtml');
+            $this->setTemplate('hss/js.phtml');
             return parent::_toHtml();
         }
         if (!$this->_shouldRender) {

app/code/Magento/Review/Block/Form.php

@@ -139,7 +139,7 @@ protected function _construct()
             );
         }
 
-        $this->setTemplate('Magento_Review::form.phtml');
+        $this->setTemplate('form.phtml');
     }
 
     /**

app/code/Magento/Review/Block/Rating/Entity/Detailed.php

@@ -49,7 +49,7 @@ protected function _toHtml()
         $reviewsCount = $this->_ratingFactory->create()->getTotalReviews($entityId, true);
         if ($reviewsCount == 0) {
             #return __('Be the first to review this product');
-            $this->setTemplate('Magento_Review::empty.phtml');
+            $this->setTemplate('empty.phtml');
             return parent::_toHtml();
         }
 

app/code/Magento/Tax/Plugin/Checkout/CustomerData/Cart.php

@@ -66,7 +66,7 @@ public function afterGetSectionData(\Magento\Checkout\CustomerData\Cart $subject
             foreach ($result['items'] as $key => $itemAsArray) {
                 if ($item = $this->findItemById($itemAsArray['item_id'], $items)) {
                     $this->itemPriceRenderer->setItem($item);
-                    $this->itemPriceRenderer->setTemplate('Magento_Tax::checkout/cart/item/price/sidebar.phtml');
+                    $this->itemPriceRenderer->setTemplate('checkout/cart/item/price/sidebar.phtml');
                     $result['items'][$key]['product_price']=$this->itemPriceRenderer->toHtml();
                 }
             }

app/code/Magento/UrlRewrite/Block/Edit.php

@@ -65,7 +65,7 @@ public function __construct(
      */
     protected function _prepareLayout()
     {
-        $this->setTemplate('Magento_UrlRewrite::edit.phtml');
+        $this->setTemplate('edit.phtml');
 
         $this->_addBackButton();
         $this->_prepareLayoutFeatures();

app/code/Magento/User/Block/Role/Tab/Users.php

@@ -45,7 +45,7 @@ protected function _construct()
         $roleId = $this->getRequest()->getParam('rid', false);
         /** @var \Magento\User\Model\ResourceModel\User\Collection $users */
         $users = $this->_userCollectionFactory->create()->load();
-        $this->setTemplate('Magento_User::role/users.phtml')
+        $this->setTemplate('role/users.phtml')
              ->assign('users', $users->getItems())
              ->assign('roleId', $roleId);
     }