diff --git a/plugins/admin/acl/tabs_acl_role.inc b/plugins/admin/acl/tabs_acl_role.inc
index 60e39861e515af27e0c74b144f1406041436925e..df34127fb2d54bdb0bd9bafceb4701a8e7f026cc 100644
--- a/plugins/admin/acl/tabs_acl_role.inc
+++ b/plugins/admin/acl/tabs_acl_role.inc
@@ -23,10 +23,10 @@
 class aclroletab extends tabs
 {
 
-  function aclroletab($config, $data, $dn, $cat = "", $copied_object = NULL)
+  function __construct($config, $data, $dn, $cat = "", $copied_object = NULL)
   {
     $data = array(array("CLASS" => "aclrole" , "NAME" => _("ACL Templates")));
-    tabs::tabs($config, $data, $dn, "acl", $copied_object);
+    parent::__construct($config, $data, $dn, "acl", $copied_object);
   }
 
   function save($ignore_account = FALSE)
diff --git a/plugins/admin/departments/tabs_department.inc b/plugins/admin/departments/tabs_department.inc
index 5043ec5d65cb66b087f2f071318ecacbf24dafeb..5053bb7d2708fde77e18c8e0811f2eabaed6cc78 100644
--- a/plugins/admin/departments/tabs_department.inc
+++ b/plugins/admin/departments/tabs_department.inc
@@ -26,9 +26,9 @@ class deptabs extends tabs
   var $moved      = FALSE;
   var $base_name  = "department";
 
-  function deptabs($config, $data, $dn, $category, $copied_object = NULL)
+  function __construct($config, $data, $dn, $category, $copied_object = NULL)
   {
-    parent::tabs($config, $data, $dn, $category, $copied_object);
+    parent::__construct($config, $data, $dn, $category, $copied_object);
 
     /* Detect the base class  (The classs which extends from department)
      */
diff --git a/plugins/admin/groups/tabs_group.inc b/plugins/admin/groups/tabs_group.inc
index 219965f03fe26e51090513b438759600ed978b68..f4a226edba211a377263f2f243073e096fbe3594 100644
--- a/plugins/admin/groups/tabs_group.inc
+++ b/plugins/admin/groups/tabs_group.inc
@@ -23,9 +23,9 @@
 class grouptabs extends tabs
 {
 
-  function grouptabs($config, $data, $dn, $cat = "", $copied_object = NULL)
+  function __construct($config, $data, $dn, $cat = "", $copied_object = NULL)
   {
-    tabs::tabs($config, $data, $dn, "group", $copied_object);
+    parent::__construct($config, $data, $dn, "group", $copied_object);
     $this->addSpecialTabs();
   }
 
diff --git a/plugins/admin/ogroups/tabs_ogroups.inc b/plugins/admin/ogroups/tabs_ogroups.inc
index 9bc2a226d1c0c99a5e80702f68d7932663a81a13..5980d9efe0c3f7f9ea749c2727e3f9e9f28d1966 100644
--- a/plugins/admin/ogroups/tabs_ogroups.inc
+++ b/plugins/admin/ogroups/tabs_ogroups.inc
@@ -26,6 +26,39 @@ class ogrouptabs extends tabs
   var $acl_category;
   var $dynamic_tabs;
 
+  function __construct($config, $data, $dn, $category = "ogroup", $copied_object = NULL)
+  {
+    parent::__construct($config, $data, $dn, $category, $copied_object);
+    $this->base = $this->by_object['ogroup']->base;
+    $this->acl_category = $category;
+
+    /* Add references/acls/snapshots */
+    $this->dynamic_tabs = array(
+      "/T/" => array(
+        'termservice'     => _('Devices'),
+        'termstartup'     => _('Startup'),
+      ),
+      "/[WT]/" => array(
+        'termgroup'       => _('Systems'),
+      ),
+      "/W/" => array(
+        'workservice'     => _('Devices'),
+      ),
+      "/[SW]/" => array(
+        'workstartup'     => _('Workstartup'),
+        'debconfStartup'  => _('Debconf'),
+        'faiStartup'      => _('FAI'),
+        'faiSummary'      => _('FAI summary'),
+        'argonautClient'  => _('Argonaut client'),
+      ),
+      "/O/" => array(
+        'opsiClient'      => _('OPSI'),
+      ),
+    );
+    $this->reload($this->by_object['ogroup']->gosaGroupObjects);
+    $this->addSpecialTabs();
+  }
+
   function reload($dd)
   {
     $objects = preg_replace('/[\[\]]/', '', $dd);
@@ -213,41 +246,6 @@ class ogrouptabs extends tabs
     return $str;
   }
 
-  function ogrouptabs($config, $data, $dn, $category = "ogroup", $copied_object = NULL)
-  {
-
-    tabs::tabs($config, $data, $dn, $category, $copied_object);
-    $this->base = $this->by_object['ogroup']->base;
-    $this->acl_category = $category;
-
-    /* Add references/acls/snapshots */
-    $this->dynamic_tabs = array(
-      "/T/" => array(
-        'termservice'     => _('Devices'),
-        'termstartup'     => _('Startup'),
-      ),
-      "/[WT]/" => array(
-        'termgroup'       => _('Systems'),
-      ),
-      "/W/" => array(
-        'workservice'     => _('Devices'),
-      ),
-      "/[SW]/" => array(
-        'workstartup'     => _('Workstartup'),
-        'debconfStartup'  => _('Debconf'),
-        'faiStartup'      => _('FAI'),
-        'faiSummary'      => _('FAI summary'),
-        'argonautClient'  => _('Argonaut client'),
-      ),
-      "/O/" => array(
-        'opsiClient'      => _('OPSI'),
-      ),
-    );
-    $this->reload($this->by_object['ogroup']->gosaGroupObjects);
-    $this->addSpecialTabs();
-  }
-
-
   function check($ignore_account = FALSE)
   {
     return parent::check(FALSE);