diff --git a/admin/applications.php b/admin/applications.php
index ec337c5bdd..db8411fe62 100644
--- a/admin/applications.php
+++ b/admin/applications.php
@@ -37,7 +37,7 @@
   $phpgw->template->set_var("lang_delete",lang("Delete"));
   $phpgw->template->set_var("lang_enabled",lang("Enabled"));
 
-  $phpgw->db->query("select * from applications $ordermethod",__LINE__,__FILE__);
+  $phpgw->db->query("select * from phpgw_applications $ordermethod",__LINE__,__FILE__);
   while ($phpgw->db->next_record()) {
      $tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
      $name = $phpgw->db->f("app_title");
diff --git a/admin/deleteapplication.php b/admin/deleteapplication.php
index 23ccbe7f41..dedbddfec3 100644
--- a/admin/deleteapplication.php
+++ b/admin/deleteapplication.php
@@ -20,7 +20,7 @@
   $phpgw->template->set_file(array("body" => "delete_common.tpl"));
 
   if ($confirm) {
-        $phpgw->db->query("delete from applications where app_name='$app_name'",__LINE__,__FILE__);
+        $phpgw->db->query("delete from phpgw_applications where app_name='$app_name'",__LINE__,__FILE__);
 
         Header("Location: " . $phpgw->link("applications.php"));
         $phpgw->common->phpgw_exit();
diff --git a/admin/editapplication.php b/admin/editapplication.php
index 3f3434f39f..94ad4a025c 100644
--- a/admin/editapplication.php
+++ b/admin/editapplication.php
@@ -48,7 +48,7 @@
         $error[$totalerrors++] = lang("You must enter an application title.");
 
      if ($old_app_name != $n_app_name) {
-        $phpgw->db->query("select count(*) from applications where app_name='"
+        $phpgw->db->query("select count(*) from phpgw_applications where app_name='"
      			   	. addslashes($n_app_name) . "'",__LINE__,__FILE__);
         $phpgw->db->next_record();
      
@@ -58,7 +58,7 @@
      }
         
      if (! $totalerrors) {
-        $phpgw->db->query("update applications set app_name='" . addslashes($n_app_name) . "',"
+        $phpgw->db->query("update phpgw_applications set app_name='" . addslashes($n_app_name) . "',"
                 	     . "app_title='" . addslashes($n_app_title) . "', app_enabled='"
                         . "$n_app_status',app_order='$app_order' where app_name='$old_app_name'",__LINE__,__FILE__);
 
@@ -72,7 +72,7 @@
         $phpgw->common->phpgw_exit();
      }
   }
-  $phpgw->db->query("select * from applications where app_name='$app_name'",__LINE__,__FILE__);
+  $phpgw->db->query("select * from phpgw_applications where app_name='$app_name'",__LINE__,__FILE__);
   $phpgw->db->next_record();
 
   if ($totalerrors) {
diff --git a/admin/index.php b/admin/index.php
index 76a27efd10..079d1c8d7c 100755
--- a/admin/index.php
+++ b/admin/index.php
@@ -41,7 +41,7 @@
   // We only want to list applications that are enabled, plus the common stuff
   // (if they can get to the admin page, the admin app is enabled, hence it is shown)
 
-  $phpgw->db->query("select app_name from applications where app_enabled = 1 order by app_title");
+  $phpgw->db->query("select app_name from phpgw_applications where app_enabled = 1 order by app_title",__LINE__,__FILE__);
   
   // Stuff it in an array in the off chance the admin includes need the db
   while ($phpgw->db->next_record() ) {
diff --git a/admin/newapplication.php b/admin/newapplication.php
index d47c2c4318..7bb0c72f94 100644
--- a/admin/newapplication.php
+++ b/admin/newapplication.php
@@ -37,7 +37,7 @@
         $app_order = 0;
      }
   
-     $phpgw->db->query("select count(*) from applications where app_name='"
+     $phpgw->db->query("select count(*) from phpgw_applications where app_name='"
                . addslashes($n_app_name) . "'",__LINE__,__FILE__);
      $phpgw->db->next_record();
      
@@ -56,7 +56,7 @@
         $error[$totalerrors++] = lang("You must enter an application title.");
      
      if (! $totalerrors) {
-        $phpgw->db->query("insert into applications (app_name,app_title,app_enabled,app_order) values('"
+        $phpgw->db->query("insert into phpgw_applications (app_name,app_title,app_enabled,app_order) values('"
                      . addslashes($n_app_name) . "','" . addslashes($n_app_title) . "','"
                      . "$n_app_status','$app_order')",__LINE__,__FILE__);
 
@@ -92,7 +92,7 @@
   display_row(lang("Status"),'<select name="n_app_status">' . $status_html . '</select>');
 
   if (! $app_order) {
-     $phpgw->db->query("select (max(app_order)+1) as max from applications");
+     $phpgw->db->query("select (max(app_order)+1) as max from phpgw_applications");
      $phpgw->db->next_record();
      $app_order = $phpgw->db->f("max");
   }
diff --git a/index.php b/index.php
index cec0bf8111..eea90d4770 100755
--- a/index.php
+++ b/index.php
@@ -95,7 +95,7 @@
 //  $phpgw->preferences->read_preferences("calendar");
 //  $phpgw->preferences->read_preferences("stocks");
   
-  $phpgw->db->query("select app_version from applications where app_name='admin'",__LINE__,__FILE__);
+  $phpgw->db->query("select app_version from phpgw_applications where app_name='admin'",__LINE__,__FILE__);
   $phpgw->db->next_record();
 
   if ($phpgw_info["server"]["versions"]["phpgwapi"] > $phpgw->db->f("app_version")) {
diff --git a/phpgwapi/inc/class.applications.inc.php b/phpgwapi/inc/class.applications.inc.php
index c241a1079a..f49de61996 100755
--- a/phpgwapi/inc/class.applications.inc.php
+++ b/phpgwapi/inc/class.applications.inc.php
@@ -146,7 +146,7 @@
 
     function read_installed_apps(){
       global $phpgw_info;
-      $this->db->query("select * from applications where app_enabled != '0' order by app_order asc",__LINE__,__FILE__);
+      $this->db->query("select * from phpgw_applications where app_enabled != '0' order by app_order asc",__LINE__,__FILE__);
       if($this->db->num_rows()) {
         while ($this->db->next_record()) {
           $name = $this->db->f("app_name");
diff --git a/setup/inc/phpgw_setup.inc.php b/setup/inc/phpgw_setup.inc.php
index 4440e92c3e..77ce4c84d3 100644
--- a/setup/inc/phpgw_setup.inc.php
+++ b/setup/inc/phpgw_setup.inc.php
@@ -192,7 +192,7 @@
       $tables = $this->db->table_names();
       if (is_array($tables) && count($tables) > 0){
         /* tables exists. checking for post beta version */
-        $this->db->query("select * from applications");
+        $this->db->query("select * from phpgw_applications");
         while (@$this->db->next_record()) {
           if ($this->db->f("app_name") == "admin"){$phpgw_info["setup"]["oldver"]["phpgwapi"] = $this->db->f("app_version");}
           $phpgw_info["setup"]["oldver"][$this->db->f("app_name")] = $this->db->f("app_version");
@@ -314,7 +314,7 @@
       $this->get_versions();
       reset ($phpgw_info["server"]["versions"]);
 
-      $this->db->query("select * from applications");
+      $this->db->query("select * from phpgw_applications");
       while ($this->db->next_record()){
         $phpgw_info["server"]["current_versions"][$this->db->f("app_name")] = $this->db->f("app_version");
       }
@@ -368,7 +368,7 @@
     function update_app_version($appname, $tableschanged = True){
       global $phpgw_info;
       if ($tableschanged == True){$phpgw_info["setup"]["tableschanged"] = True;}
-      $this->db->query("update applications set app_version='".$phpgw_info["setup"]["currentver"]["phpgwapi"]."' where app_name='".$appname."'");
+      $this->db->query("update phpgw_applications set app_version='".$phpgw_info["setup"]["currentver"]["phpgwapi"]."' where app_name='".$appname."'");
     }
   
     function manage_tables($appname=""){
diff --git a/setup/sql/default_applications.inc.php b/setup/sql/default_applications.inc.php
index f63e332f62..629cf52380 100644
--- a/setup/sql/default_applications.inc.php
+++ b/setup/sql/default_applications.inc.php
@@ -13,22 +13,22 @@
 
   // This is so we can enable or disable apps for the phpGroupWare and phpGroupWare Plus packges
   // This is for the base apps, which should always be included
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('admin', 'Administration', 1, 1, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('addressbook', 'Address Book', 1, 7, 'addressbook', '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('filemanager', 'File manager', 1, 6, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('calendar', 'Calendar', 1, 9, 'calendar_entry,calendar_entry_users,calendar_entry_repeats', '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('cron_apps', 'cron_apps', 0, 0, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('email', 'Email', 1, 10,NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('nntp', 'NNTP', 1, 11, 'newsgroups', '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('notes', 'Notes', 1, 14, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('admin', 'Administration', 1, 1, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('addressbook', 'Address Book', 1, 7, 'addressbook', '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('filemanager', 'File manager', 1, 6, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('calendar', 'Calendar', 1, 9, 'calendar_entry,calendar_entry_users,calendar_entry_repeats', '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('cron_apps', 'cron_apps', 0, 0, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('email', 'Email', 1, 10,NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('nntp', 'NNTP', 1, 11, 'newsgroups', '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('notes', 'Notes', 1, 14, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
   // This is for the add-on application, which are enabled/disabled based being in the regular or plus version
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('todo', 'ToDo List', 1, 8, 'todo', '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('transy', 'Translation Management', 1, 13, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('tts', 'Trouble Ticket System', 1, 2, NULL, '0.0.0')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('inv', 'Inventory', 1, 3, NULL, '0.0.0')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('chat', 'Chat', 1, 4, NULL, '0.0.0')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('headlines', 'Headlines', 1, 5, 'news_sites,news_headlines', '0.0.0')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('weather', 'Weather', 1, 12, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('bookmarks', 'Book Marks', 1, 15, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('manual', 'Manual', 1, 16, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('todo', 'ToDo List', 1, 8, 'todo', '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('transy', 'Translation Management', 1, 13, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('tts', 'Trouble Ticket System', 1, 2, NULL, '0.0.0')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('inv', 'Inventory', 1, 3, NULL, '0.0.0')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('chat', 'Chat', 1, 4, NULL, '0.0.0')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('headlines', 'Headlines', 1, 5, 'news_sites,news_headlines', '0.0.0')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('weather', 'Weather', 1, 12, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('bookmarks', 'Book Marks', 1, 15, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('manual', 'Manual', 1, 16, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
 ?>
\ No newline at end of file
diff --git a/setup/sql/default_applications_plus.inc.php b/setup/sql/default_applications_plus.inc.php
index 17899a46c8..ce8ecde361 100644
--- a/setup/sql/default_applications_plus.inc.php
+++ b/setup/sql/default_applications_plus.inc.php
@@ -13,22 +13,22 @@
 
   // This is so we can enable or disable apps for the phpGroupWare and phpGroupWare Plus packges
   // This is for the base apps, which should always be included
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('admin', 'Administration', 1, 1, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('addressbook', 'Address Book', 1, 7, 'addressbook', '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('filemanager', 'File manager', 1, 6, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('calendar', 'Calendar', 1, 9, 'calendar_entry,calendar_entry_users,calendar_entry_repeats', '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('cron_apps', 'cron_apps', 0, 0, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('email', 'Email', 1, 10,NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('nntp', 'NNTP', 1, 11, 'newsgroups', '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('notes', 'Notes', 1, 14, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('admin', 'Administration', 1, 1, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('addressbook', 'Address Book', 1, 7, 'addressbook', '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('filemanager', 'File manager', 1, 6, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('calendar', 'Calendar', 1, 9, 'calendar_entry,calendar_entry_users,calendar_entry_repeats', '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('cron_apps', 'cron_apps', 0, 0, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('email', 'Email', 1, 10,NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('nntp', 'NNTP', 1, 11, 'newsgroups', '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('notes', 'Notes', 1, 14, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
   // This is for the add-on application, which are enabled/disabled based being in the regular or plus version
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('todo', 'ToDo List', 1, 8, 'todo', '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('transy', 'Translation Management', 1, 13, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('tts', 'Trouble Ticket System', 1, 2, NULL, '0.0.0')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('inv', 'Inventory', 1, 3, NULL, '0.0.0')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('chat', 'Chat', 1, 4, NULL, '0.0.0')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('headlines', 'Headlines', 1, 5, 'news_sites,news_headlines', '0.0.0')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('weather', 'Weather', 1, 12, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('bookmarks', 'Book Marks', 1, 15, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
-  $phpgw_setup->db->query("insert into applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('manual', 'Manual', 1, 16, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('todo', 'ToDo List', 1, 8, 'todo', '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('transy', 'Translation Management', 1, 13, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('tts', 'Trouble Ticket System', 1, 2, NULL, '0.0.0')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('inv', 'Inventory', 1, 3, NULL, '0.0.0')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('chat', 'Chat', 1, 4, NULL, '0.0.0')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('headlines', 'Headlines', 1, 5, 'news_sites,news_headlines', '0.0.0')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('weather', 'Weather', 1, 12, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('bookmarks', 'Book Marks', 1, 15, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
+  $phpgw_setup->db->query("insert into phpgw_applications (app_name, app_title, app_enabled, app_order, app_tables, app_version) values ('manual', 'Manual', 1, 16, NULL, '".$phpgw_info["setup"]["currentver"]["phpgwapi"]."')");
 ?>
diff --git a/setup/sql/mysql_newtables.inc.php b/setup/sql/mysql_newtables.inc.php
index f18591b79f..302a696658 100644
--- a/setup/sql/mysql_newtables.inc.php
+++ b/setup/sql/mysql_newtables.inc.php
@@ -20,7 +20,7 @@
   )";
   $phpgw_setup->db->query($sql);  
  
-  $sql = "CREATE TABLE applications (
+  $sql = "CREATE TABLE phpgw_applications (
     app_name     varchar(25) NOT NULL,
     app_title    varchar(50),
     app_enabled  int,
diff --git a/setup/sql/mysql_upgrade_beta.inc.php b/setup/sql/mysql_upgrade_beta.inc.php
index 992b9c22e3..2377e195bf 100644
--- a/setup/sql/mysql_upgrade_beta.inc.php
+++ b/setup/sql/mysql_upgrade_beta.inc.php
@@ -970,6 +970,16 @@
 		$phpgw_info["setup"]["currentver"]["phpgwapi"] = "0.9.10pre7";
   }
 
+  $test[] = "0.9.10pre7";
+  function upgrade0_9_10pre7()
+  {
+		global $phpgw_info, $phpgw_setup;
+
+    $phpgw_setup->db->query("alter table applications rename phpgw_applications",__LINE__,__FILE__);
+     
+		$phpgw_info["setup"]["currentver"]["phpgwapi"] = "0.9.10pre8";
+  }
+
   reset ($test);
   while (list ($key, $value) = each ($test)){
     if ($phpgw_info["setup"]["currentver"]["phpgwapi"] == $value) {
@@ -984,7 +994,7 @@
       echo "</table></td></tr>\n";
       if ($tableschanged == True){$tablechanges = True;}
       if (!$phpgw_info["setup"]["prebeta"]){
-        $phpgw_setup->db->query("update applications set app_version='".$phpgw_info["setup"]["currentver"]["phpgwapi"]."' where (app_name='admin' or app_name='filemanager' or app_name='addressbook' or app_name='todo' or app_name='calendar' or app_name='email' or app_name='nntp' or app_name='cron_apps' or app_name='notes')");
+        $phpgw_setup->db->query("update phpgw_applications set app_version='".$phpgw_info["setup"]["currentver"]["phpgwapi"]."' where (app_name='admin' or app_name='filemanager' or app_name='addressbook' or app_name='todo' or app_name='calendar' or app_name='email' or app_name='nntp' or app_name='cron_apps' or app_name='notes')");
       }
     }
   }
diff --git a/setup/sql/pgsql_newtables.inc.php b/setup/sql/pgsql_newtables.inc.php
index 352e66a47b..8731092313 100644
--- a/setup/sql/pgsql_newtables.inc.php
+++ b/setup/sql/pgsql_newtables.inc.php
@@ -19,7 +19,7 @@
   )";
   $phpgw_setup->db->query($sql);
 
-  $sql = "create table applications (
+  $sql = "create table phpgw_applications (
     app_name     varchar(25) NOT NULL,
     app_title    varchar(50),
     app_enabled  int,
diff --git a/setup/sql/pgsql_upgrade_beta.inc.php b/setup/sql/pgsql_upgrade_beta.inc.php
index 46a039fff0..e3899275e7 100644
--- a/setup/sql/pgsql_upgrade_beta.inc.php
+++ b/setup/sql/pgsql_upgrade_beta.inc.php
@@ -1024,6 +1024,16 @@
 		$phpgw_info["setup"]["currentver"]["phpgwapi"] = "0.9.10pre7";
   }
 
+  $test[] = "0.9.10pre7";
+  function upgrade0_9_10pre7()
+  {
+		global $phpgw_info, $phpgw_setup;
+
+    $phpgw_setup->db->query("alter table applications rename phpgw_applications",__LINE__,__FILE__);
+     
+		$phpgw_info["setup"]["currentver"]["phpgwapi"] = "0.9.10pre8";
+  }
+
   reset ($test);
   while (list ($key, $value) = each ($test)){
     if ($phpgw_info["setup"]["currentver"]["phpgwapi"] == $value) {
@@ -1036,7 +1046,7 @@
       echo "</table>";
       if ($tableschanged == True){$tablechanges = True;}
       if (!$phpgw_info["setup"]["prebeta"]){
-        $phpgw_setup->db->query("update applications set app_version='".$phpgw_info["setup"]["currentver"]["phpgwapi"]."' where (app_name='admin' or app_name='filemanager' or app_name='addressbook' or app_name='todo' or app_name='calendar' or app_name='email' or app_name='nntp' or app_name='cron_apps' or app_name='notes')");
+        $phpgw_setup->db->query("update phpgw_applications set app_version='".$phpgw_info["setup"]["currentver"]["phpgwapi"]."' where (app_name='admin' or app_name='filemanager' or app_name='addressbook' or app_name='todo' or app_name='calendar' or app_name='email' or app_name='nntp' or app_name='cron_apps' or app_name='notes')");
       }
     }
   }
diff --git a/version.inc.php b/version.inc.php
index 4a4313c0b3..ea7a28c8c4 100644
--- a/version.inc.php
+++ b/version.inc.php
@@ -11,5 +11,5 @@
 
   /* $Id$ */
 
-  $phpgw_info["server"]["versions"]["phpgwapi"] = "0.9.10pre7";
+  $phpgw_info["server"]["versions"]["phpgwapi"] = "0.9.10pre8";
   $phpgw_info["server"]["versions"]["current_header"] = "1.11";