diff --git a/scripts/models-ext/DomainHandler.php b/scripts/models-ext/DomainHandler.php
index 4867bb7f..c05a24d3 100644
--- a/scripts/models-ext/DomainHandler.php
+++ b/scripts/models-ext/DomainHandler.php
@@ -27,10 +27,6 @@ class DomainHandler {
     
     public function add($domain, $desc, $a, $m, $t, $q, $default, $backup){
       
-      $table_domain =  table_by_key('domain');
-      $table_alias = table_by_key('alias');
-      
-      
       ($backup == true) ? $backup = db_get_boolean(true) : $backup = db_get_boolean(false);
       
       $arr = array(
@@ -43,7 +39,7 @@ class DomainHandler {
             'backupmx' => $backup,
             );
         
-        $result = db_insert($table_domain, $arr, array('created', 'modified') );
+        $result = db_insert('domain', $arr, array('created', 'modified') );
         if ($result != 1)
         {
             $this->errormsg[] = Lang::read('pAdminCreate_domain_result_error') . "\n($domain)\n";
@@ -61,7 +57,7 @@ class DomainHandler {
                         'goto' => $goto,
                         'domain' => $domain,
                         );
-                    $result = db_insert ($table_alias, $arr, array('created', 'modified') );
+                    $result = db_insert ('alias', $arr, array('created', 'modified') );
                 }
             }
             $tMessage = Lang::read('pAdminCreate_domain_result_success') . "<br />($domain)</br />";
diff --git a/scripts/models-ext/UserHandler.php b/scripts/models-ext/UserHandler.php
index 116e57ab..d6156e93 100644
--- a/scripts/models-ext/UserHandler.php
+++ b/scripts/models-ext/UserHandler.php
@@ -164,7 +164,7 @@ class UserHandler {
             'active' => $active,
             );
         
-        $result = db_insert($table_alias, $arr, array('created', 'modified') );
+        $result = db_insert('alias', $arr, array('created', 'modified') );
         if ($result != 1)
         {
             $this->errormsg[] = Lang::read('pAlias_result_error') . "\n($address -> $address)\n";
@@ -190,7 +190,7 @@ class UserHandler {
             'domain' => $domain,
             'active' => $active,
             );
-        $result = db_insert($table_mailbox, $arr2, array('created', 'modified') );
+        $result = db_insert('mailbox', $arr2, array('created', 'modified') );
         if ($result != 1 || !mailbox_postcreation($address,$domain,$maildir, $quota))
         {
             $this->errormsg[] = Lang::read('pCreate_mailbox_result_error') . "\n($address)\n";
@@ -269,7 +269,7 @@ class UserHandler {
         $result = db_query("SELECT * FROM $table_alias WHERE address = '$username' AND domain = '$domain'");
         if($result['rows'] == 1) {
             //$result = db_query ("DELETE FROM $table_alias WHERE address='$username' AND domain='$domain'");
-            $result = db_delete($table_alias, 'address', $username);
+            $result = db_delete('alias', 'address', $username);
             db_log ('CONSOLE', $domain, 'delete_alias', $username);
         }
 
@@ -278,7 +278,7 @@ class UserHandler {
         if ($result['rows'] == 1)
         {
             //$result = db_query ("DELETE FROM $table_mailbox WHERE username='$username' AND domain='$domain'");
-            $result = db_delete($table_mailbox, 'username', $username);
+            $result = db_delete('mailbox', 'username', $username);
             $postdel_res=mailbox_postdeletion($username,$domain);
             if ($result != 1 || !$postdel_res)
             {
@@ -301,9 +301,9 @@ class UserHandler {
         $result = db_query("SELECT * FROM $table_vacation WHERE email = '$username' AND domain = '$domain'");
         if($result['rows'] == 1) {
             //db_query ("DELETE FROM $table_vacation WHERE email='$username' AND domain='$domain'");
-            db_delete($table_vacation, 'email', $username);
+            db_delete('vacation', 'email', $username);
             //db_query ("DELETE FROM $table_vacation_notification WHERE on_vacation ='$username' "); /* should be caught by cascade, if PgSQL */
-            db_delete($table_vacation_notification, 'on_vacation', $username);
+            db_delete('vacation_notification', 'on_vacation', $username);
         }
         return 0;
     }