diff --git a/src/etc/frontend/di.xml b/src/etc/frontend/di.xml
index 54ef73b..f66ed7e 100644
--- a/src/etc/frontend/di.xml
+++ b/src/etc/frontend/di.xml
@@ -2,14 +2,14 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <type name="Magento\CatalogInventory\Observer\AddInventoryDataObserver">
-        <plugin name="after_product_load" type="EcomDev\ProductDataPreLoader\Observer\ProductAfterLoad" />
+        <plugin name="EcomDev_ProductDataPreLoader::after_product_load" type="EcomDev\ProductDataPreLoader\Observer\ProductAfterLoad" />
     </type>
 
     <type name="Magento\Catalog\Model\ProductRepository">
-        <plugin name="fix_store_id_of_get_by_id" type="EcomDev\ProductDataPreLoader\Plugin\FixMissingStoreIdInProductRepository" />
+        <plugin name="EcomDev_ProductDataPreLoader::fix_store_id_of_get_by_id" type="EcomDev\ProductDataPreLoader\Plugin\FixMissingStoreIdInProductRepository" />
     </type>
 
     <type name="Magento\Quote\Model\ResourceModel\Quote\Item\Collection">
-        <plugin name="preserve_quote_for_item_collection" type="EcomDev\ProductDataPreLoader\Plugin\StoreShoppingCartIntoObserver"  />
+        <plugin name="EcomDev_ProductDataPreLoader::preserve_quote_for_item_collection" type="EcomDev\ProductDataPreLoader\Plugin\StoreShoppingCartIntoObserver"  />
     </type>
 </config>
diff --git a/src/etc/frontend/events.xml b/src/etc/frontend/events.xml
index 3baef19..cce337a 100644
--- a/src/etc/frontend/events.xml
+++ b/src/etc/frontend/events.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
     <event name="catalog_product_collection_load_after">
-        <observer name="preload_data_with_pre_loaders" instance="EcomDev\ProductDataPreLoader\Observer\ListCollectionAfterLoad" />
+        <observer name="EcomDev_ProductDataPreLoader::preload_data_with_pre_loaders" instance="EcomDev\ProductDataPreLoader\Observer\ListCollectionAfterLoad" />
     </event>
 
     <event name="sales_quote_item_collection_products_after_load">
-        <observer name="preload_data_with_pre_loaders" instance="EcomDev\ProductDataPreLoader\Observer\CartCollectionAfterLoad" />
+        <observer name="EcomDev_ProductDataPreLoader::preload_data_with_pre_loaders" instance="EcomDev\ProductDataPreLoader\Observer\CartCollectionAfterLoad" />
     </event>
 
     <event name="catalog_product_load_after">
-        <observer name="preload_data_with_pre_loaders" instance="EcomDev\ProductDataPreLoader\Observer\ProductAfterLoad"/>
+        <observer name="EcomDev_ProductDataPreLoader::preload_data_with_pre_loaders" instance="EcomDev\ProductDataPreLoader\Observer\ProductAfterLoad"/>
     </event>
 </config>
diff --git a/src/etc/webapi_rest/di.xml b/src/etc/webapi_rest/di.xml
index 54ef73b..f66ed7e 100644
--- a/src/etc/webapi_rest/di.xml
+++ b/src/etc/webapi_rest/di.xml
@@ -2,14 +2,14 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <type name="Magento\CatalogInventory\Observer\AddInventoryDataObserver">
-        <plugin name="after_product_load" type="EcomDev\ProductDataPreLoader\Observer\ProductAfterLoad" />
+        <plugin name="EcomDev_ProductDataPreLoader::after_product_load" type="EcomDev\ProductDataPreLoader\Observer\ProductAfterLoad" />
     </type>
 
     <type name="Magento\Catalog\Model\ProductRepository">
-        <plugin name="fix_store_id_of_get_by_id" type="EcomDev\ProductDataPreLoader\Plugin\FixMissingStoreIdInProductRepository" />
+        <plugin name="EcomDev_ProductDataPreLoader::fix_store_id_of_get_by_id" type="EcomDev\ProductDataPreLoader\Plugin\FixMissingStoreIdInProductRepository" />
     </type>
 
     <type name="Magento\Quote\Model\ResourceModel\Quote\Item\Collection">
-        <plugin name="preserve_quote_for_item_collection" type="EcomDev\ProductDataPreLoader\Plugin\StoreShoppingCartIntoObserver"  />
+        <plugin name="EcomDev_ProductDataPreLoader::preserve_quote_for_item_collection" type="EcomDev\ProductDataPreLoader\Plugin\StoreShoppingCartIntoObserver"  />
     </type>
 </config>
diff --git a/src/etc/webapi_rest/events.xml b/src/etc/webapi_rest/events.xml
index 7c32e91..5338c65 100644
--- a/src/etc/webapi_rest/events.xml
+++ b/src/etc/webapi_rest/events.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
     <event name="catalog_product_collection_load_after">
-        <observer name="preload_data_with_pre_loaders" instance="EcomDev\ProductDataPreLoader\Observer\ListCollectionAfterLoad" />
+        <observer name="EcomDev_ProductDataPreLoader::preload_data_with_pre_loaders" instance="EcomDev\ProductDataPreLoader\Observer\ListCollectionAfterLoad" />
     </event>
 
     <event name="core_collection_abstract_load_after">
-        <observer name="preload_data_with_pre_loaders" instance="EcomDev\ProductDataPreLoader\Observer\CartCollectionAfterLoad" />
+        <observer name="EcomDev_ProductDataPreLoader::preload_data_with_pre_loaders" instance="EcomDev\ProductDataPreLoader\Observer\CartCollectionAfterLoad" />
     </event>
 
     <event name="catalog_product_load_after">
-        <observer name="preload_data_with_pre_loaders" instance="EcomDev\ProductDataPreLoader\Observer\ProductAfterLoad"/>
+        <observer name="EcomDev_ProductDataPreLoader::preload_data_with_pre_loaders" instance="EcomDev\ProductDataPreLoader\Observer\ProductAfterLoad"/>
     </event>
 </config>