diff --git a/bootstrap.php b/bootstrap.php
index a49d8dcd98530af5842123898776108b9411c606..e056f8a7f1259b8c8be078204e49f58676dcbcc6 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -98,7 +98,7 @@ class Bootstrap {
 
         define('TICKET_TABLE',$prefix.'ticket');
         define('TICKET_CDATA_TABLE', $prefix.'ticket__cdata');
-        define('TICKET_EVENT_TABLE',$prefix.'ticket_event');
+        define('THREAD_EVENT_TABLE',$prefix.'thread_event');
         define('THREAD_COLLABORATOR_TABLE', $prefix.'thread_collaborator');
         define('TICKET_STATUS_TABLE', $prefix.'ticket_status');
         define('TICKET_PRIORITY_TABLE',$prefix.'ticket_priority');
diff --git a/include/ajax.reports.php b/include/ajax.reports.php
index 6086e3cb0b65fb214c14dd141d874976c25c0916..7b2e4f450a74e0b780b8bbede6515d0382684152 100644
--- a/include/ajax.reports.php
+++ b/include/ajax.reports.php
@@ -90,7 +90,7 @@ class OverviewReportAjaxAPI extends AjaxController {
                 COUNT(*)-COUNT(NULLIF(A1.state, "closed")) AS Closed,
                 COUNT(*)-COUNT(NULLIF(A1.state, "reopened")) AS Reopened
             FROM '.$info['table'].' T1
-                LEFT JOIN '.TICKET_EVENT_TABLE.' A1
+                LEFT JOIN '.THREAD_EVENT_TABLE.' A1
                     ON (A1.'.$info['pk'].'=T1.'.$info['pk'].'
                          AND NOT annulled
                          AND (A1.timestamp BETWEEN '.$start.' AND '.$stop.'))
@@ -190,7 +190,7 @@ class OverviewReportAjaxAPI extends AjaxController {
         list($start, $stop) = $this->_getDateRange();
 
         # Fetch all types of events over the timeframe
-        $res = db_query('SELECT DISTINCT(state) FROM '.TICKET_EVENT_TABLE
+        $res = db_query('SELECT DISTINCT(state) FROM '.THREAD_EVENT_TABLE
             .' WHERE timestamp BETWEEN '.$start.' AND '.$stop
                 .' ORDER BY 1');
         $events = array();
@@ -200,7 +200,7 @@ class OverviewReportAjaxAPI extends AjaxController {
         # XXX: Implement annulled column from the %ticket_event table
         $res = db_query('SELECT state, DATE_FORMAT(timestamp, \'%Y-%m-%d\'), '
                 .'COUNT(ticket_id)'
-            .' FROM '.TICKET_EVENT_TABLE
+            .' FROM '.THREAD_EVENT_TABLE
             .' WHERE timestamp BETWEEN '.$start.' AND '.$stop
             .' AND NOT annulled'
             .' GROUP BY state, DATE_FORMAT(timestamp, \'%Y-%m-%d\')'
diff --git a/include/class.export.php b/include/class.export.php
index acdc333582c6d7d54b35c0fd17d4db5ccd5ec473..68b907282853cbf55b5ebde39f367230905d4ebc 100644
--- a/include/class.export.php
+++ b/include/class.export.php
@@ -345,7 +345,7 @@ class DatabaseExporter {
         FAQ_TOPIC_TABLE, FAQ_CATEGORY_TABLE, DRAFT_TABLE,
         CANNED_TABLE, TICKET_TABLE, ATTACHMENT_TABLE,
         THREAD_TABLE, THREAD_ENTRY_TABLE, THREAD_ENTRY_EMAIL_TABLE,
-        LOCK_TABLE, TICKET_EVENT_TABLE, TICKET_PRIORITY_TABLE,
+        LOCK_TABLE, THREAD_EVENT_TABLE, TICKET_PRIORITY_TABLE,
         EMAIL_TABLE, EMAIL_TEMPLATE_TABLE, EMAIL_TEMPLATE_GRP_TABLE,
         FILTER_TABLE, FILTER_RULE_TABLE, SLA_TABLE, API_KEY_TABLE,
         TIMEZONE_TABLE, SESSION_TABLE, PAGE_TABLE,
diff --git a/include/class.thread.php b/include/class.thread.php
index 3b4676b9a0305a739fee589c9340979d8090c9ba..b228fd63e3d3de9f083b45314d5bebbcd4947dae 100644
--- a/include/class.thread.php
+++ b/include/class.thread.php
@@ -1421,7 +1421,7 @@ RolePermission::register(/* @trans */ 'Tickets', ThreadEntry::getPermissions());
 
 class ThreadEvent extends VerySimpleModel {
     static $meta = array(
-        'table' => TICKET_EVENT_TABLE,
+        'table' => THREAD_EVENT_TABLE,
         'pk' => array('id'),
         'joins' => array(
             // Originator of activity