diff --git a/app/code/community/Netzarbeiter/CustomerActivation/Model/Observer.php b/app/code/community/Netzarbeiter/CustomerActivation/Model/Observer.php
index a33db44..b6736b7 100644
--- a/app/code/community/Netzarbeiter/CustomerActivation/Model/Observer.php
+++ b/app/code/community/Netzarbeiter/CustomerActivation/Model/Observer.php
@@ -297,7 +297,7 @@ public function adminhtmlBlockHtmlBefore(Varien_Event_Observer $observer)
                 'customer_activated',
                 array(
                     'label' => $helper->__('Customer Activated'),
-                    'url' => Mage::getUrl('customeractivation/admin/massActivation'),
+                    'url' => Mage::getUrl('adminhtml/customerActivation/massActivation'),
                     'additional' => array(
                         'status' => array(
                             'name' => 'customer_activated',
diff --git a/app/code/community/Netzarbeiter/CustomerActivation/controllers/AdminController.php b/app/code/community/Netzarbeiter/CustomerActivation/controllers/CustomerActivationController.php
similarity index 97%
rename from app/code/community/Netzarbeiter/CustomerActivation/controllers/AdminController.php
rename to app/code/community/Netzarbeiter/CustomerActivation/controllers/CustomerActivationController.php
index 79b7fc2..beca27e 100755
--- a/app/code/community/Netzarbeiter/CustomerActivation/controllers/AdminController.php
+++ b/app/code/community/Netzarbeiter/CustomerActivation/controllers/CustomerActivationController.php
@@ -17,7 +17,7 @@
  * license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-class Netzarbeiter_CustomerActivation_AdminController extends Mage_Adminhtml_Controller_Action
+class Netzarbeiter_CustomerActivation_CustomerActivationController extends Mage_Adminhtml_Controller_Action
 {
     /**
      * Activate or deactivate all selected customers
@@ -124,4 +124,4 @@ protected function _isAllowed()
     {
         return Mage::getSingleton('admin/session')->isAllowed('customer/manage');
     }
-}
\ No newline at end of file
+}
diff --git a/app/code/community/Netzarbeiter/CustomerActivation/etc/config.xml b/app/code/community/Netzarbeiter/CustomerActivation/etc/config.xml
index 7f8ec14..408626e 100644
--- a/app/code/community/Netzarbeiter/CustomerActivation/etc/config.xml
+++ b/app/code/community/Netzarbeiter/CustomerActivation/etc/config.xml
@@ -89,13 +89,13 @@
     </global>
     <admin>
         <routers>
-            <customeractivation>
-                <use>admin</use>
+            <adminhtml>
                 <args>
-                    <module>Netzarbeiter_CustomerActivation</module>
-                    <frontName>customeractivation</frontName>
+                    <modules>
+                        <netzarbeiter_customeractivation>Netzarbeiter_CustomerActivation</netzarbeiter_customeractivation>
+                    </modules>
                 </args>
-            </customeractivation>
+            </adminhtml>
         </routers>
     </admin>
     <frontend>