diff --git a/app/code/community/BL/CustomGrid/Block/Column/Renderer/Attribute/Select.php b/app/code/community/BL/CustomGrid/Block/Column/Renderer/Attribute/Select.php
index d9f662c..4dfdd11 100644
--- a/app/code/community/BL/CustomGrid/Block/Column/Renderer/Attribute/Select.php
+++ b/app/code/community/BL/CustomGrid/Block/Column/Renderer/Attribute/Select.php
@@ -91,7 +91,7 @@ public function getEditableJsonConfig()
     
     public function getConfigUrl()
     {
-        return $this->getUrl('customgrid/column_renderer_attribute/index');
+        return $this->getUrl('adminhtml/blcg_column_renderer_attribute/index');
     }
     
     protected function _toHtml()
diff --git a/app/code/community/BL/CustomGrid/Block/Column/Renderer/Collection/Select.php b/app/code/community/BL/CustomGrid/Block/Column/Renderer/Collection/Select.php
index 66cdc8e..004ca32 100644
--- a/app/code/community/BL/CustomGrid/Block/Column/Renderer/Collection/Select.php
+++ b/app/code/community/BL/CustomGrid/Block/Column/Renderer/Collection/Select.php
@@ -75,7 +75,7 @@ public function getRenderersJsonConfig($withEmpty=false, $code=null)
     
     public function getConfigUrl()
     {
-        return $this->getUrl('customgrid/column_renderer_collection/index');
+        return $this->getUrl('adminhtml/blcg_column_renderer_collection/index');
     }
     
     public function getDescriptionsOutput()
diff --git a/app/code/community/BL/CustomGrid/Block/Widget/Grid/Column/Filter/Product/Categories.php b/app/code/community/BL/CustomGrid/Block/Widget/Grid/Column/Filter/Product/Categories.php
index c447f34..081006c 100644
--- a/app/code/community/BL/CustomGrid/Block/Widget/Grid/Column/Filter/Product/Categories.php
+++ b/app/code/community/BL/CustomGrid/Block/Widget/Grid/Column/Filter/Product/Categories.php
@@ -31,7 +31,7 @@ public function getHtml()
         } else {
             $htmlId = Mage::helper('core')->uniqHash($this->_getHtmlId());
             $jsId   = Mage::helper('core')->uniqHash('blcgCategoriesFilter');
-            $url    = $this->getUrl('customgrid/custom_grid_column_filter/categories', array('js_object' => $jsId));
+            $url    = $this->getUrl('adminhtml/blcg_custom_grid_column_filter/categories', array('js_object' => $jsId));
             $window = Mage::helper('core')->jsonEncode(array(
                 'width'        => '700px',
                 'height'       => '480px',
diff --git a/app/code/community/BL/CustomGrid/Block/Widget/Grid/Column/Filter/Product/Categories/Chooser.php b/app/code/community/BL/CustomGrid/Block/Widget/Grid/Column/Filter/Product/Categories/Chooser.php
index 561c951..7eac03b 100644
--- a/app/code/community/BL/CustomGrid/Block/Widget/Grid/Column/Filter/Product/Categories/Chooser.php
+++ b/app/code/community/BL/CustomGrid/Block/Widget/Grid/Column/Filter/Product/Categories/Chooser.php
@@ -191,7 +191,7 @@ public function getCategoryChildrenJson($categoryId)
     
     public function getLoadTreeUrl($expanded=null)
     {
-        return $this->getUrl('customgrid/custom_grid_column_filter/categoriesJson', array('_current' => true));
+        return $this->getUrl('adminhtml/blcg_custom_grid_column_filter/categoriesJson', array('_current' => true));
     }
     
     public function getSelectedCategoriesPathIds($rootId=false)
diff --git a/app/code/community/BL/CustomGrid/Block/Widget/Grid/Columns/Config.php b/app/code/community/BL/CustomGrid/Block/Widget/Grid/Columns/Config.php
index 8269f55..d6c92dd 100644
--- a/app/code/community/BL/CustomGrid/Block/Widget/Grid/Columns/Config.php
+++ b/app/code/community/BL/CustomGrid/Block/Widget/Grid/Columns/Config.php
@@ -52,12 +52,12 @@ public function getJsObjectName()
     
     public function getSaveUrl()
     {
-        return $this->getUrl('customgrid/custom_grid/save');
+        return $this->getUrl('adminhtml/blcg_custom_grid/save');
     }
     
     public function getDeleteUrl()
     {
-        return $this->getUrl('customgrid/custom_grid/delete', array('grid_id' => $this->getGridModel()->getId()));
+        return $this->getUrl('adminhtml/blcg_custom_grid/delete', array('grid_id' => $this->getGridModel()->getId()));
     }
     
     public function getCustomizeButtonHtml()
diff --git a/app/code/community/BL/CustomGrid/Block/Widget/Grid/Columns/Config/Additional.php b/app/code/community/BL/CustomGrid/Block/Widget/Grid/Columns/Config/Additional.php
index 7ba15e8..2379b03 100644
--- a/app/code/community/BL/CustomGrid/Block/Widget/Grid/Columns/Config/Additional.php
+++ b/app/code/community/BL/CustomGrid/Block/Widget/Grid/Columns/Config/Additional.php
@@ -45,7 +45,7 @@ public function getCustomColumnsActionButtonHtml($htmlId)
     {
         return $this->_getCommonActionButtonHtml(
             $htmlId,
-            $this->getUrl('customgrid/custom_grid/saveCustomColumns')
+            $this->getUrl('adminhtml/blcg_custom_grid/saveCustomColumns')
         );
     }
     
@@ -53,7 +53,7 @@ public function getDefaultParametersActionButtonHtml($htmlId)
     {
         return $this->_getCommonActionButtonHtml(
             $htmlId,
-            $this->getUrl('customgrid/custom_grid/saveDefault')
+            $this->getUrl('adminhtml/blcg_custom_grid/saveDefault')
         );
     }
     
diff --git a/app/code/community/BL/CustomGrid/Block/Widget/Grid/Columns/Config/Columns.php b/app/code/community/BL/CustomGrid/Block/Widget/Grid/Columns/Config/Columns.php
index f4c56d4..722b3ad 100644
--- a/app/code/community/BL/CustomGrid/Block/Widget/Grid/Columns/Config/Columns.php
+++ b/app/code/community/BL/CustomGrid/Block/Widget/Grid/Columns/Config/Columns.php
@@ -151,12 +151,12 @@ public function getColumnLockedValues($columnId)
     
     public function getSaveUrl()
     {
-        return $this->getUrl('customgrid/custom_grid/save');
+        return $this->getUrl('adminhtml/blcg_custom_grid/save');
     }
     
     public function getCustomColumnConfigUrl()
     {
-        return $this->getUrl('customgrid/custom_column_config/index');
+        return $this->getUrl('adminhtml/blcg_custom_column_config/index');
     }
     
     // @todo restore getErrorText() from where it was lost
diff --git a/app/code/community/BL/CustomGrid/Block/Widget/Grid/Form/Helper/Product/Wysiwyg.php b/app/code/community/BL/CustomGrid/Block/Widget/Grid/Form/Helper/Product/Wysiwyg.php
index 97ce8ad..c1664e2 100644
--- a/app/code/community/BL/CustomGrid/Block/Widget/Grid/Form/Helper/Product/Wysiwyg.php
+++ b/app/code/community/BL/CustomGrid/Block/Widget/Grid/Form/Helper/Product/Wysiwyg.php
@@ -27,7 +27,7 @@ public function getAfterElementHtml()
                     'type'     => 'button',
                     'disabled' => $disabled,
                     'class'    => ($disabled) ? 'disabled' : '',
-                    'onclick'  => 'catalogWysiwygEditor.open(\''.Mage::helper('adminhtml')->getUrl('customgrid/custom_grid_editor_product/wysiwyg').'\', \''.$this->getHtmlId().'\')'
+                    'onclick'  => 'catalogWysiwygEditor.open(\''.Mage::helper('adminhtml')->getUrl('adminhtml/blcg_custom_grid_editor_product/wysiwyg').'\', \''.$this->getHtmlId().'\')'
                 ))->toHtml();
         }
         return $html;
diff --git a/app/code/community/BL/CustomGrid/Model/Grid/Type/Abstract.php b/app/code/community/BL/CustomGrid/Model/Grid/Type/Abstract.php
index ed4a567..a72e482 100644
--- a/app/code/community/BL/CustomGrid/Model/Grid/Type/Abstract.php
+++ b/app/code/community/BL/CustomGrid/Model/Grid/Type/Abstract.php
@@ -243,11 +243,11 @@ protected function _getExportTypes($type)
     {
         return array(
             'csv' => array(
-                'url'   => 'customgrid/custom_grid/exportCsv',
+                'url'   => 'adminhtml/blcg_custom_grid/exportCsv',
                 'label' => Mage::helper('customgrid')->__('CSV'),
             ),
             'xml' => array(
-                'url'   => 'customgrid/custom_grid/exportExcel', 
+                'url'   => 'adminhtml/blcg_custom_grid/exportExcel', 
                 'label' => Mage::helper('customgrid')->__('Excel'),
             ),
         );
@@ -292,7 +292,7 @@ public function getExportTypes($gridType)
     */
     public function isExportRequest($request, $gridType)
     {
-        $action = $request->getModuleName()
+        $action = $request->getRouteName()
             . '/' . $request->getControllerName()
             . '/' . $request->getActionName();
             
@@ -444,7 +444,7 @@ protected function _getFieldEditUrl($type, $id, $config)
     {
         return $this->_getFieldUrl(
             $type, $id, $config,
-            'customgrid/custom_grid_editor/edit' . ($config['in_grid'] ? 'InGrid' : '')
+            'adminhtml/blcg_custom_grid_editor/edit' . ($config['in_grid'] ? 'InGrid' : '')
         );
     }
     
@@ -460,7 +460,7 @@ protected function _getFieldSaveUrl($type, $id, $config)
     {
         return $this->_getFieldUrl(
             $type, $id, $config,
-            'customgrid/custom_grid_editor/save'
+            'adminhtml/blcg_custom_grid_editor/save'
         );
     }
     
@@ -499,7 +499,7 @@ protected function _getAttributeEditUrl($type, $code, $attribute, $config)
     {
         return $this->_getAttributeUrl(
             $type, $code, $attribute, $config,
-            'customgrid/custom_grid_editor/edit' . ($config['in_grid'] ? 'InGrid' : '')
+            'adminhtml/blcg_custom_grid_editor/edit' . ($config['in_grid'] ? 'InGrid' : '')
         );
     }
     
@@ -516,7 +516,7 @@ protected function _getAttributeSaveUrl($type, $code, $attribute, $config)
     {
         return $this->_getAttributeUrl(
             $type, $code, $attribute, $config,
-            'customgrid/custom_grid_editor/save'
+            'adminhtml/blcg_custom_grid_editor/save'
         );
     }
     
diff --git a/app/code/community/BL/CustomGrid/controllers/Column/Renderer/AttributeController.php b/app/code/community/BL/CustomGrid/controllers/Blcg/Column/Renderer/AttributeController.php
similarity index 97%
rename from app/code/community/BL/CustomGrid/controllers/Column/Renderer/AttributeController.php
rename to app/code/community/BL/CustomGrid/controllers/Blcg/Column/Renderer/AttributeController.php
index 5be934a..cff2164 100644
--- a/app/code/community/BL/CustomGrid/controllers/Column/Renderer/AttributeController.php
+++ b/app/code/community/BL/CustomGrid/controllers/Blcg/Column/Renderer/AttributeController.php
@@ -13,7 +13,7 @@
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-class BL_CustomGrid_Column_Renderer_AttributeController
+class BL_CustomGrid_Blcg_Column_Renderer_AttributeController
     extends Mage_Adminhtml_Controller_Action
 {
     protected function _initRenderer()
diff --git a/app/code/community/BL/CustomGrid/controllers/Column/Renderer/CollectionController.php b/app/code/community/BL/CustomGrid/controllers/Blcg/Column/Renderer/CollectionController.php
similarity index 94%
rename from app/code/community/BL/CustomGrid/controllers/Column/Renderer/CollectionController.php
rename to app/code/community/BL/CustomGrid/controllers/Blcg/Column/Renderer/CollectionController.php
index c6bb606..4a64c33 100644
--- a/app/code/community/BL/CustomGrid/controllers/Column/Renderer/CollectionController.php
+++ b/app/code/community/BL/CustomGrid/controllers/Blcg/Column/Renderer/CollectionController.php
@@ -13,7 +13,7 @@
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-class BL_CustomGrid_Column_Renderer_CollectionController
+class BL_CustomGrid_Blcg_Column_Renderer_CollectionController
     extends Mage_Adminhtml_Controller_Action
 {
     protected function _initRenderer()
@@ -46,7 +46,7 @@ public function indexAction()
             $this->loadLayout(array(
                 'empty', 
                 strtolower($this->getFullActionName()),
-                'customgrid_column_renderer_collection_unknown',
+                'adminhtml_blcg_column_renderer_collection_unknown',
             ))->renderLayout();
         }
     }
diff --git a/app/code/community/BL/CustomGrid/controllers/Custom/Column/ConfigController.php b/app/code/community/BL/CustomGrid/controllers/Blcg/Custom/Column/ConfigController.php
similarity index 94%
rename from app/code/community/BL/CustomGrid/controllers/Custom/Column/ConfigController.php
rename to app/code/community/BL/CustomGrid/controllers/Blcg/Custom/Column/ConfigController.php
index b2830dc..8ae65f3 100644
--- a/app/code/community/BL/CustomGrid/controllers/Custom/Column/ConfigController.php
+++ b/app/code/community/BL/CustomGrid/controllers/Blcg/Custom/Column/ConfigController.php
@@ -13,7 +13,7 @@
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-class BL_CustomGrid_Custom_Column_ConfigController
+class BL_CustomGrid_Blcg_Custom_Column_ConfigController
     extends Mage_Adminhtml_Controller_Action
 {
     protected function _initCustomColumn()
@@ -48,7 +48,7 @@ public function indexAction()
             $this->loadLayout(array(
                 'empty', 
                 strtolower($this->getFullActionName()),
-                'customgrid_custom_column_config_unknown',
+                'adminhtml_blcg_custom_column_config_unknown',
             ))->renderLayout();
         }
     }
diff --git a/app/code/community/BL/CustomGrid/controllers/Custom/Grid/Column/FilterController.php b/app/code/community/BL/CustomGrid/controllers/Blcg/Custom/Grid/Column/FilterController.php
similarity index 96%
rename from app/code/community/BL/CustomGrid/controllers/Custom/Grid/Column/FilterController.php
rename to app/code/community/BL/CustomGrid/controllers/Blcg/Custom/Grid/Column/FilterController.php
index e6fc0d5..709c523 100644
--- a/app/code/community/BL/CustomGrid/controllers/Custom/Grid/Column/FilterController.php
+++ b/app/code/community/BL/CustomGrid/controllers/Blcg/Custom/Grid/Column/FilterController.php
@@ -13,7 +13,7 @@
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-class BL_CustomGrid_Custom_Grid_Column_FilterController
+class BL_CustomGrid_Blcg_Custom_Grid_Column_FilterController
     extends Mage_Adminhtml_Controller_Action
 {
     public function categoriesAction()
diff --git a/app/code/community/BL/CustomGrid/controllers/Custom/Grid/Editor/ProductController.php b/app/code/community/BL/CustomGrid/controllers/Blcg/Custom/Grid/Editor/ProductController.php
similarity index 95%
rename from app/code/community/BL/CustomGrid/controllers/Custom/Grid/Editor/ProductController.php
rename to app/code/community/BL/CustomGrid/controllers/Blcg/Custom/Grid/Editor/ProductController.php
index 02494d2..9a3fe37 100644
--- a/app/code/community/BL/CustomGrid/controllers/Custom/Grid/Editor/ProductController.php
+++ b/app/code/community/BL/CustomGrid/controllers/Blcg/Custom/Grid/Editor/ProductController.php
@@ -13,7 +13,7 @@
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-class BL_CustomGrid_Custom_Grid_Editor_ProductController
+class BL_CustomGrid_Blcg_Custom_Grid_Editor_ProductController
     extends Mage_Adminhtml_Controller_Action
 {
     public function wysiwygAction()
diff --git a/app/code/community/BL/CustomGrid/controllers/Custom/Grid/EditorController.php b/app/code/community/BL/CustomGrid/controllers/Blcg/Custom/Grid/EditorController.php
similarity index 99%
rename from app/code/community/BL/CustomGrid/controllers/Custom/Grid/EditorController.php
rename to app/code/community/BL/CustomGrid/controllers/Blcg/Custom/Grid/EditorController.php
index 3e97dd4..a944db5 100644
--- a/app/code/community/BL/CustomGrid/controllers/Custom/Grid/EditorController.php
+++ b/app/code/community/BL/CustomGrid/controllers/Blcg/Custom/Grid/EditorController.php
@@ -13,7 +13,7 @@
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-class BL_CustomGrid_Custom_Grid_EditorController
+class BL_CustomGrid_Blcg_Custom_Grid_EditorController
     extends Mage_Adminhtml_Controller_Action
 {
     protected function _initGridModel()
diff --git a/app/code/community/BL/CustomGrid/controllers/Custom/GridController.php b/app/code/community/BL/CustomGrid/controllers/Blcg/Custom/GridController.php
similarity index 99%
rename from app/code/community/BL/CustomGrid/controllers/Custom/GridController.php
rename to app/code/community/BL/CustomGrid/controllers/Blcg/Custom/GridController.php
index c6b454b..cb3cef9 100644
--- a/app/code/community/BL/CustomGrid/controllers/Custom/GridController.php
+++ b/app/code/community/BL/CustomGrid/controllers/Blcg/Custom/GridController.php
@@ -13,7 +13,7 @@
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-class BL_CustomGrid_Custom_GridController
+class BL_CustomGrid_Blcg_Custom_GridController
     extends Mage_Adminhtml_Controller_Action
 {
     protected function _initAction()
diff --git a/app/code/community/BL/CustomGrid/controllers/Options/SourceController.php b/app/code/community/BL/CustomGrid/controllers/Blcg/Options/SourceController.php
similarity index 97%
rename from app/code/community/BL/CustomGrid/controllers/Options/SourceController.php
rename to app/code/community/BL/CustomGrid/controllers/Blcg/Options/SourceController.php
index 95878f3..0dc5d5d 100644
--- a/app/code/community/BL/CustomGrid/controllers/Options/SourceController.php
+++ b/app/code/community/BL/CustomGrid/controllers/Blcg/Options/SourceController.php
@@ -13,7 +13,7 @@
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-class BL_CustomGrid_Options_SourceController extends Mage_Adminhtml_Controller_Action
+class BL_CustomGrid_Blcg_Options_SourceController extends Mage_Adminhtml_Controller_Action
 {
     protected function _initAction($layoutIds=null)
     {
@@ -78,7 +78,7 @@ public function newAction()
         $this->_initAction(array(
             'default',
             strtolower($this->getFullActionName()),
-            'customgrid_options_source_'.$source->getType()
+            'adminhtml_blcg_options_source_'.$source->getType()
         ))->_title($this->__('New Options Source'))->renderLayout();
     }
     
@@ -98,7 +98,7 @@ public function editAction()
         $this->_initAction(array(
             'default',
             strtolower($this->getFullActionName()),
-            'customgrid_options_source_'.$source->getType()
+            'adminhtml_blcg_options_source_'.$source->getType()
         ))->_title($source->getName())
             ->_addBreadcrumb($source->getName(), $source->getName())
             ->renderLayout();
diff --git a/app/code/community/BL/CustomGrid/etc/adminhtml.xml b/app/code/community/BL/CustomGrid/etc/adminhtml.xml
index 04ff79f..42711e8 100644
--- a/app/code/community/BL/CustomGrid/etc/adminhtml.xml
+++ b/app/code/community/BL/CustomGrid/etc/adminhtml.xml
@@ -142,12 +142,12 @@
                         <grids translate="title" module="customgrid">
                             <title>List</title>
                             <sort_order>10</sort_order>
-                            <action>customgrid/custom_grid/index</action>
+                            <action>adminhtml/blcg_custom_grid/index</action>
                         </grids>
                         <options_source translate="title" module="customgrid">
                             <title>Manage Options Source</title>
                             <sort_order>20</sort_order>
-                            <action>customgrid/options_source/index</action>
+                            <action>adminhtml/blcg_options_source/index</action>
                         </options_source>
                         <setup translate="title" module="customgrid">
                             <title>Base Configuration</title>
diff --git a/app/code/community/BL/CustomGrid/etc/config.xml b/app/code/community/BL/CustomGrid/etc/config.xml
index 3b64e4c..ee4f7bc 100644
--- a/app/code/community/BL/CustomGrid/etc/config.xml
+++ b/app/code/community/BL/CustomGrid/etc/config.xml
@@ -17,7 +17,7 @@
 <config>
     <modules>
         <BL_CustomGrid>
-            <version>0.9.0</version>
+            <version>0.9.0.1</version>
         </BL_CustomGrid>
     </modules>
     <global>
@@ -63,13 +63,13 @@
     </global>
     <admin>
         <routers>
-            <customgrid>
-                <use>admin</use>
+            <adminhtml>
                 <args>
-                    <module>BL_CustomGrid</module>
-                    <frontName>customgrid</frontName>
+                    <modules>
+                        <customgrid after="Mage_Adminhtml">BL_CustomGrid</customgrid>
+                    </modules>
                 </args>
-            </customgrid>
+            </adminhtml>
         </routers>
     </admin>
     <adminhtml>
diff --git a/app/design/adminhtml/default/default/layout/bl/customgrid.xml b/app/design/adminhtml/default/default/layout/bl/customgrid.xml
index 6664547..431ded0 100644
--- a/app/design/adminhtml/default/default/layout/bl/customgrid.xml
+++ b/app/design/adminhtml/default/default/layout/bl/customgrid.xml
@@ -44,89 +44,89 @@
         </reference> 
     </blcg_magento_version_from_17>
     
-    <customgrid_custom_grid_index>
+    <adminhtml_blcg_custom_grid_index>
         <reference name="content">
             <block type="customgrid/custom_grid" name="customgrid.custom_grid" />
         </reference>
-    </customgrid_custom_grid_index>
+    </adminhtml_blcg_custom_grid_index>
     
-    <customgrid_custom_grid_edit>
+    <adminhtml_blcg_custom_grid_edit>
         <reference name="content">
             <block type="customgrid/custom_grid_edit" name="custom_grid_edit" />
         </reference>
         <reference name="left">
             <block type="customgrid/custom_grid_edit_tabs" name="custom_grid_tabs" />
         </reference>
-    </customgrid_custom_grid_edit>
+    </adminhtml_blcg_custom_grid_edit>
     
-    <customgrid_column_renderer_collection_index>
+    <adminhtml_blcg_column_renderer_collection_index>
         <block name="column_renderer_collection" type="customgrid/column_renderer_collection" output="toHtml" />
-    </customgrid_column_renderer_collection_index>
+    </adminhtml_blcg_column_renderer_collection_index>
     
-    <customgrid_column_renderer_collection_unknown>
+    <adminhtml_blcg_column_renderer_collection_unknown>
         <remove name="column_renderer_collection" />
         <block type="adminhtml/template" name="column_renderer_collection.unknown" output="toHtml">
             <action method="setTemplate"><template>bl/customgrid/column/renderer/collection/unknown.phtml</template></action>
         </block>
-    </customgrid_column_renderer_collection_unknown>
+    </adminhtml_blcg_column_renderer_collection_unknown>
     
-    <customgrid_column_renderer_attribute_index>
+    <adminhtml_blcg_column_renderer_attribute_index>
         <block name="column_renderer_attribute" type="customgrid/column_renderer_attribute" output="toHtml" />
-    </customgrid_column_renderer_attribute_index>
+    </adminhtml_blcg_column_renderer_attribute_index>
     
-    <customgrid_column_renderer_attribute_unknown>
+    <adminhtml_blcg_column_renderer_attribute_unknown>
         <remove name="column_renderer_attribute" />
         <block type="adminhtml/template" name="column_renderer_attribute.unknown" output="toHtml">
             <action method="setTemplate"><template>bl/customgrid/column/renderer/attribute/unknown.phtml</template></action>
         </block>
-    </customgrid_column_renderer_attribute_unknown>
+    </adminhtml_blcg_column_renderer_attribute_unknown>
     
-    <customgrid_custom_column_config_index>
+    <adminhtml_blcg_custom_column_config_index>
         <block name="custom_column_config" type="customgrid/custom_column_config" output="toHtml" />
-    </customgrid_custom_column_config_index>
+    </adminhtml_blcg_custom_column_config_index>
     
-    <customgrid_custom_column_config_unknown>
+    <adminhtml_blcg_custom_column_config_unknown>
         <remove name="column_renderer_attribute" />
         <block type="adminhtml/template" name="custom_column_config.unknown" output="toHtml">
             <action method="setTemplate"><template>bl/customgrid/custom/column/config/unknown.phtml</template></action>
         </block>
-    </customgrid_custom_column_config_unknown>
+    </adminhtml_blcg_custom_column_config_unknown>
     
-    <customgrid_options_source_index>
+    <adminhtml_blcg_options_source_index>
         <reference name="content">
             <block type="customgrid/options_source" name="customgrid.options_source" />
         </reference>
-    </customgrid_options_source_index>
+    </adminhtml_blcg_options_source_index>
     
-    <customgrid_options_source_new>
+    <adminhtml_blcg_options_source_new>
         <reference name="content">
             <block type="customgrid/options_source_edit" name="options_source_edit" />
         </reference>
         <reference name="left">
             <block type="customgrid/options_source_edit_tabs" name="options_source_tabs" />
         </reference>
-    </customgrid_options_source_new>
+    </adminhtml_blcg_options_source_new>
     
-    <customgrid_options_source_edit>
+    <adminhtml_blcg_options_source_edit>
         <reference name="content">
             <block type="customgrid/options_source_edit" name="options_source_edit" />
         </reference>
         <reference name="left">
             <block type="customgrid/options_source_edit_tabs" name="options_source_tabs" />
         </reference>
-    </customgrid_options_source_edit>
+    </adminhtml_blcg_options_source_edit>
     
-    <customgrid_options_source_custom_list>
+    <adminhtml_blcg_options_source_custom_list>
         <reference name="options_source_tabs">
             <action method="addTab"><name>custom_list</name><block>customgrid/options_source_edit_tab_custom</block></action>
         </reference>
-    </customgrid_options_source_custom_list>
+    </adminhtml_blcg_options_source_custom_list>
     
-    <customgrid_options_source_mage_model>
+    <adminhtml_blcg_options_source_mage_model>
         <reference name="options_source_tabs">
             <action method="addTab"><name>mage_model</name><block>customgrid/options_source_edit_tab_model</block></action>
         </reference>
-    </customgrid_options_source_mage_model>
+    </adminhtml_blcg_options_source_mage_model>
     
     <custom_grid_editor_handle_editor>
         <update handle="editor" />
@@ -143,15 +143,15 @@
         </reference>
     </custom_grid_editor_handle_product>
     
-    <customgrid_custom_grid_editor_edit>
+    <adminhtml_blcg_custom_grid_editor_edit>
         <update handle="popup" />
         <remove name="footer" />
         <reference name="content">
             <block type="customgrid/widget_grid_form_container" name="customgrid.grid_form_container" />
         </reference>
-    </customgrid_custom_grid_editor_edit>
+    </adminhtml_blcg_custom_grid_editor_edit>
     
-    <customgrid_custom_grid_column_filter_categories>
+    <adminhtml_blcg_custom_grid_column_filter_categories>
         <update handle="popup" />
         <remove name="footer" />
         <reference name="head">
@@ -160,5 +160,5 @@
         <reference name="content">
             <block type="customgrid/widget_grid_column_filter_product_categories_chooser" name="customgrid.filter.categories.chooser" />
         </reference>
-    </customgrid_custom_grid_column_filter_categories>
+    </adminhtml_blcg_custom_grid_column_filter_categories>
 </layout>
\ No newline at end of file
diff --git a/skin/adminhtml/default/default/bl/customgrid/styles.css b/skin/adminhtml/default/default/bl/customgrid/styles.css
index ff7e7b8..09ce806 100644
--- a/skin/adminhtml/default/default/bl/customgrid/styles.css
+++ b/skin/adminhtml/default/default/bl/customgrid/styles.css
@@ -113,8 +113,8 @@ button.blcg-export span { padding-left:20px; background-image:url(images/ico_exp
 .blcg-column-editor-editing .blcg-editor-required-marker { display:none; }
 .grid table td.blcg-column-editor-editing-required { background:#ffdcdc !important; }
 .blcg-editor-scope-label { font-size:0.9em; }
-.customgrid-custom-grid-editor-edit { background:#fff; }
-.customgrid-custom-grid-editor-edit .middle { background:none; min-height:0; }
+.adminhtml-blcg-custom-grid-editor-edit { background:#fff; }
+.adminhtml-blcg-custom-grid-editor-edit .middle { background:none; min-height:0; }
 
 /* COLUMNS RENDERERS */
 
@@ -150,9 +150,9 @@ ul.blcg-custom-columns-help-features li { height:16px; padding:0 0 0 16px; line-
 .grid tr.filter .blcg-categories-filter .blcg-filter-button { position:absolute; top:0; right:0; }
 .grid tr.filter .blcg-filter-value { font-weight:normal; }
 .blcg-filter-form-buttons { float:right; }
-.customgrid-custom-grid-column-filter-categories { background:#fff; }
-.customgrid-custom-grid-column-filter-categories .middle { background:none; min-height:0; }
-.customgrid-custom-grid-column-filter-categories .wrapper-popup { min-width:680px; }
+.adminhtml-blcg-custom-grid-column-filter-categories { background:#fff; }
+.adminhtml-blcg-custom-grid-column-filter-categories .middle { background:none; min-height:0; }
+.adminhtml-blcg-custom-grid-column-filter-categories .wrapper-popup { min-width:680px; }
 
 /* PINNABLE GRID HEADER */
 
@@ -162,11 +162,11 @@ ul.blcg-custom-columns-help-features li { height:16px; padding:0 0 0 16px; line-
 
 /* CATEGORY FILTER TREE ACTION */
 
-.customgrid-custom-grid-column-filter-categories { background:#fff; }
-.customgrid-custom-grid-column-filter-categories .middle { background:none; min-height:0; }
-.customgrid-custom-grid-column-filter-categories .wrapper-popup { min-width:680px; }
-.customgrid-custom-grid-column-filter-categories .entry-edit { clear:both; }
-.customgrid-custom-grid-column-filter-categories .entry-edit .entry-edit-head { background:#666; }
+.adminhtml-blcg-custom-grid-column-filter-categories { background:#fff; }
+.adminhtml-blcg-custom-grid-column-filter-categories .middle { background:none; min-height:0; }
+.adminhtml-blcg-custom-grid-column-filter-categories .wrapper-popup { min-width:680px; }
+.adminhtml-blcg-custom-grid-column-filter-categories .entry-edit { clear:both; }
+.adminhtml-blcg-custom-grid-column-filter-categories .entry-edit .entry-edit-head { background:#666; }
 
 /* WINDOW STYLES */