diff --git a/things/database.py b/things/database.py
index f21d882..d7c21f5 100755
--- a/things/database.py
+++ b/things/database.py
@@ -85,7 +85,7 @@
 # --------------------------------------------------
 
 DATE_CREATED = "creationDate"
-DATE_DEADLINE = "dueDate"
+DATE_DEADLINE = "deadline"
 DATE_MODIFIED = "userModificationDate"
 DATE_START = "startDate"
 DATE_STOP = "stopDate"
@@ -110,7 +110,7 @@
 IS_SOMEDAY = START_TO_FILTER["Someday"]
 
 # Repeats
-IS_NOT_RECURRING = "recurrenceRule IS NULL"
+IS_NOT_RECURRING = "rt1_recurrenceRule IS NULL"
 
 # Trash
 IS_TRASHED = TRASHED_TO_FILTER[True]
@@ -125,9 +125,9 @@
 # IS_SCHEDULED = f"{DATE_START} IS NOT NULL"
 # IS_NOT_SCHEDULED = f"{DATE_START} IS NULL"
 # IS_DEADLINE = f"{DATE_DEADLINE} IS NOT NULL"
-# RECURRING_IS_NOT_PAUSED = "instanceCreationPaused = 0"
-# IS_RECURRING = "recurrenceRule IS NOT NULL"
-# RECURRING_HAS_NEXT_STARTDATE = ("nextInstanceStartDate IS NOT NULL")
+# RECURRING_IS_NOT_PAUSED = "rt1_instanceCreationPaused = 0"
+# IS_RECURRING = "rt1_recurrenceRule IS NOT NULL"
+# RECURRING_HAS_NEXT_STARTDATE = ("rt1_nextInstanceStartDate IS NOT NULL")
 # IS_NOT_TRASHED = TRASHED_TO_FILTER[False]
 
 # pylint: disable=R0904,R0902
@@ -249,8 +249,8 @@ def get_tasks(  # pylint: disable=R0914
             {make_filter('TASK.uuid', uuid)}
             {make_filter("TASK.area", area)}
             {make_filter("TASK.project", project)}
-            {make_filter("TASK.actionGroup", heading)}
-            {make_filter("TASK.dueDateSuppressionDate", deadline_suppressed)}
+            {make_filter("TASK.heading", heading)}
+            {make_filter("TASK.deadlineSuppressionDate", deadline_suppressed)}
             {make_filter("TAG.title", tag)}
             {make_date_filter(f"TASK.{DATE_START}", start_date)}
             {make_date_filter(f"TASK.{DATE_STOP}", stop_date)}
@@ -543,7 +543,7 @@ def make_tasks_sql_query(where_predicate=None, order_predicate=None):
             LEFT OUTER JOIN
                 {TABLE_AREA} AREA ON TASK.area = AREA.uuid
             LEFT OUTER JOIN
-                {TABLE_TASK} HEADING ON TASK.actionGroup = HEADING.uuid
+                {TABLE_TASK} HEADING ON TASK.heading = HEADING.uuid
             LEFT OUTER JOIN
                 {TABLE_TASK} PROJECT_OF_HEADING
                 ON HEADING.project = PROJECT_OF_HEADING.uuid