diff --git a/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php b/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php
index 7b5f0cb3d05..819f7e07139 100644
--- a/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php
+++ b/app/code/core/Mage/Catalog/Block/Product/List/Toolbar.php
@@ -33,7 +33,7 @@ class Mage_Catalog_Block_Product_List_Toolbar extends Mage_Core_Block_Template
     /**
      * Products collection
      *
-     * @var Mage_Core_Model_Mysql4_Collection_Abstract
+     * @var Mage_Core_Model_Resource_Db_Collection_Abstract
      */
     protected $_collection = null;
 
@@ -234,7 +234,7 @@ public function setCollection($collection)
     /**
      * Return products collection instance
      *
-     * @return Mage_Core_Model_Mysql4_Collection_Abstract
+     * @return Mage_Core_Model_Resource_Db_Collection_Abstract
      */
     public function getCollection()
     {
diff --git a/app/code/core/Mage/Core/Model/Config.php b/app/code/core/Mage/Core/Model/Config.php
index d6dbac903fd..3f5f4f172f7 100644
--- a/app/code/core/Mage/Core/Model/Config.php
+++ b/app/code/core/Mage/Core/Model/Config.php
@@ -180,7 +180,7 @@ class Mage_Core_Model_Config extends Mage_Core_Model_Config_Base
      * Resource model
      * Used for operations with DB
      *
-     * @var Mage_Core_Model_Mysql4_Config
+     * @var Mage_Core_Model_Resource_Config
      */
     protected $_resourceModel;
 
diff --git a/app/code/core/Mage/Reports/Block/Product/Abstract.php b/app/code/core/Mage/Reports/Block/Product/Abstract.php
index c2028656e2d..de9bb6f4c11 100644
--- a/app/code/core/Mage/Reports/Block/Product/Abstract.php
+++ b/app/code/core/Mage/Reports/Block/Product/Abstract.php
@@ -47,7 +47,7 @@ abstract class Mage_Reports_Block_Product_Abstract extends Mage_Catalog_Block_Pr
     /**
      * Product Index Collection
      *
-     * @var Mage_Reports_Model_Mysql4_Product_Index_Collection_Abstract
+     * @var Mage_Reports_Model_Resource_Product_Index_Collection_Abstract
      */
     protected $_collection;
 
diff --git a/app/code/core/Mage/Sales/Block/Billing/Agreement/View.php b/app/code/core/Mage/Sales/Block/Billing/Agreement/View.php
index b5c8241b138..e1ad0ac4112 100644
--- a/app/code/core/Mage/Sales/Block/Billing/Agreement/View.php
+++ b/app/code/core/Mage/Sales/Block/Billing/Agreement/View.php
@@ -51,14 +51,14 @@ class Mage_Sales_Block_Billing_Agreement_View extends Mage_Core_Block_Template
     /**
      * Related orders collection
      *
-     * @var Mage_Sales_Model_Mysql4_Order_Collection
+     * @var Mage_Sales_Model_Resource_Order_Collection
      */
     protected $_relatedOrders = null;
 
     /**
      * Retrieve related orders collection
      *
-     * @return Mage_Sales_Model_Mysql4_Order_Collection
+     * @return Mage_Sales_Model_Resource_Order_Collection
      */
     public function getRelatedOrders()
     {
diff --git a/app/code/core/Mage/Sales/Block/Billing/Agreements.php b/app/code/core/Mage/Sales/Block/Billing/Agreements.php
index 1bcb515bcd7..1599f642cac 100644
--- a/app/code/core/Mage/Sales/Block/Billing/Agreements.php
+++ b/app/code/core/Mage/Sales/Block/Billing/Agreements.php
@@ -38,7 +38,7 @@ class Mage_Sales_Block_Billing_Agreements extends Mage_Core_Block_Template
     /**
      * Billing agreements collection
      *
-     * @var Mage_Sales_Model_Mysql4_Billing_Agreement_Collection
+     * @var Mage_Sales_Model_Resource_Billing_Agreement_Collection
      */
     protected $_billingAgreements = null;
 
@@ -61,7 +61,7 @@ protected function _prepareLayout()
     /**
      * Retrieve billing agreements collection
      *
-     * @return Mage_Sales_Model_Mysql4_Billing_Agreement_Collection
+     * @return Mage_Sales_Model_Resource_Billing_Agreement_Collection
      */
     public function getBillingAgreements()
     {
diff --git a/app/code/core/Mage/Sales/Block/Order/Comments.php b/app/code/core/Mage/Sales/Block/Order/Comments.php
index ea55d957c8f..bb506b7996c 100644
--- a/app/code/core/Mage/Sales/Block/Order/Comments.php
+++ b/app/code/core/Mage/Sales/Block/Order/Comments.php
@@ -29,7 +29,7 @@ class Mage_Sales_Block_Order_Comments extends Mage_Core_Block_Template
     /**
      * Currect comments collection
      *
-     * @var Mage_Sales_Model_Mysql4_Order_Comment_Collection_Abstract
+     * @var Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract
      */
     protected $_commentCollection;
 
@@ -59,7 +59,7 @@ public function getEntity()
     /**
      * Initialize model comments and return comment collection
      *
-     * @return Mage_Sales_Model_Mysql4_Order_Comment_Collection_Abstract
+     * @return Mage_Sales_Model_Resource_Order_Comment_Collection_Abstract
      */
     public function getComments()
     {
diff --git a/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php b/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php
index 240695c28e6..4e9173a7acc 100644
--- a/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php
+++ b/app/code/core/Mage/Sales/Block/Order/Print/Shipment.php
@@ -38,7 +38,7 @@ class Mage_Sales_Block_Order_Print_Shipment extends Mage_Sales_Block_Items_Abstr
      /**
      * Order shipments collection
      *
-     * @var array|Mage_Sales_Model_Mysql4_Order_Shipment_Collection
+     * @var array|Mage_Sales_Model_Resource_Order_Shipment_Collection
      */
     protected $_shipmentsCollection;
 
diff --git a/app/code/core/Mage/Sales/Block/Recurring/Profile/View.php b/app/code/core/Mage/Sales/Block/Recurring/Profile/View.php
index 51a2808bab3..c63320c4a94 100644
--- a/app/code/core/Mage/Sales/Block/Recurring/Profile/View.php
+++ b/app/code/core/Mage/Sales/Block/Recurring/Profile/View.php
@@ -45,7 +45,7 @@ class Mage_Sales_Block_Recurring_Profile_View extends Mage_Core_Block_Template
     /**
      * Related orders collection
      *
-     * @var Mage_Sales_Model_Mysql4_Order_Collection
+     * @var Mage_Sales_Model_Resource_Order_Collection
      */
     protected $_relatedOrders = null;
 
diff --git a/app/code/core/Mage/Sales/Block/Recurring/Profiles.php b/app/code/core/Mage/Sales/Block/Recurring/Profiles.php
index 31f5cbf4fa7..981e16d4290 100644
--- a/app/code/core/Mage/Sales/Block/Recurring/Profiles.php
+++ b/app/code/core/Mage/Sales/Block/Recurring/Profiles.php
@@ -30,7 +30,7 @@ class Mage_Sales_Block_Recurring_Profiles extends Mage_Core_Block_Template
     /**
      * Profiles collection
      *
-     * @var Mage_Sales_Model_Mysql4_Recurring_Profile_Collection
+     * @var Mage_Sales_Model_Resource_Recurring_Profile_Collection
      */
     protected $_profiles = null;
 
diff --git a/app/code/core/Mage/Tag/Block/Customer/View.php b/app/code/core/Mage/Tag/Block/Customer/View.php
index 6daaa6064c6..3c7c62e6ac2 100644
--- a/app/code/core/Mage/Tag/Block/Customer/View.php
+++ b/app/code/core/Mage/Tag/Block/Customer/View.php
@@ -33,7 +33,7 @@ class Mage_Tag_Block_Customer_View extends Mage_Catalog_Block_Product_Abstract
     /**
      * Tagged Product Collection
      *
-     * @var Mage_Tag_Model_Mysql4_Product_Collection
+     * @var Mage_Tag_Model_Resource_Product_Collection
      */
     protected $_collection;
 
@@ -137,7 +137,7 @@ public function getMode()
     /**
      * Retrieve Tagged product(s) collection
      *
-     * @return Mage_Tag_Model_Mysql4_Product_Collection
+     * @return Mage_Tag_Model_Resource_Product_Collection
      */
     protected function _getCollection()
     {
diff --git a/app/code/core/Mage/Wishlist/Model/Wishlist.php b/app/code/core/Mage/Wishlist/Model/Wishlist.php
index 78a702c8ee0..7da7ad27231 100644
--- a/app/code/core/Mage/Wishlist/Model/Wishlist.php
+++ b/app/code/core/Mage/Wishlist/Model/Wishlist.php
@@ -48,7 +48,7 @@ class Mage_Wishlist_Model_Wishlist extends Mage_Core_Model_Abstract
     /**
      * Wishlist item collection
      *
-     * @var Mage_Wishlist_Model_Mysql4_Item_Collection
+     * @var Mage_Wishlist_Model_Resource_Item_Collection
      */
     protected $_itemCollection = null;