diff --git a/test/append.t b/test/append.t
index 34dfa45e2..1f8a832d0 100755
--- a/test/append.t
+++ b/test/append.t
@@ -54,7 +54,7 @@ ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'append.rc', 'Cleanup');
 
 exit 0;
diff --git a/test/args.1.t b/test/args.1.t
index a3053b37f..1c6172ed0 100755
--- a/test/args.1.t
+++ b/test/args.1.t
@@ -60,7 +60,7 @@ ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'args.rc', 'Cleanup');
 
 exit 0;
diff --git a/test/args.2.t b/test/args.2.t
index ea54cbc0d..f48caf926 100755
--- a/test/args.2.t
+++ b/test/args.2.t
@@ -72,7 +72,7 @@ ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'args.rc', 'Cleanup');
 
 exit 0;
diff --git a/test/args.3.t b/test/args.3.t
index 75fbe7368..2db4d3da6 100755
--- a/test/args.3.t
+++ b/test/args.3.t
@@ -72,7 +72,7 @@ ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'args.rc', 'Cleanup');
 
 exit 0;
diff --git a/test/args.4.t b/test/args.4.t
index 2168f9f6d..9f5f4f0e0 100755
--- a/test/args.4.t
+++ b/test/args.4.t
@@ -72,7 +72,7 @@ ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'args.rc', 'Cleanup');
 
 exit 0;
diff --git a/test/args.5.t b/test/args.5.t
index c3c568057..815192b83 100755
--- a/test/args.5.t
+++ b/test/args.5.t
@@ -78,7 +78,7 @@ ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'args.rc', 'Cleanup');
 
 exit 0;
diff --git a/test/args.t b/test/args.t
index 99d4e6ae9..406752c20 100755
--- a/test/args.t
+++ b/test/args.t
@@ -66,7 +66,7 @@ ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'args.rc', 'Cleanup');
 
 exit 0;
diff --git a/test/bug.360.t b/test/bug.360.t
index eb2b01086..45a2b890b 100755
--- a/test/bug.360.t
+++ b/test/bug.360.t
@@ -70,7 +70,7 @@ ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'bug.rc', 'Cleanup');
 
 exit 0;
diff --git a/test/bug.580.t b/test/bug.580.t
index 9437e4900..31b1b305e 100755
--- a/test/bug.580.t
+++ b/test/bug.580.t
@@ -79,7 +79,7 @@ ok (! -r 'local/pending.data'   &&
     ! -r 'local/undo.data'      &&
     ! -r 'local/undo.save'      &&
     ! -r 'local/backlog.data'   &&
-    ! -r 'local/synch_key.data' &&
+    ! -r 'local/synch.key'      &&
     ! -r 'local.rc', 'Cleanup');
 
 unlink qw(remote/pending.data remote/completed.data remote/undo.data remote/backlog.data remote/synch.key remote.rc);
@@ -87,7 +87,7 @@ ok (! -r 'remote/pending.data'   &&
     ! -r 'remote/completed.data' &&
     ! -r 'remote/undo.data'      &&
     ! -r 'remote/backlog.data'   &&
-    ! -r 'remote/synch_key.data' &&
+    ! -r 'remote/synch.key'      &&
     ! -r 'remote.rc', 'Cleanup');
 
 rmdir("remote/extensions");
diff --git a/test/bug.708.t b/test/bug.708.t
index 873070e91..0ca92f92c 100755
--- a/test/bug.708.t
+++ b/test/bug.708.t
@@ -73,7 +73,7 @@ ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'bug.rc', 'Cleanup');
 
 exit 0;
diff --git a/test/bug.804.t b/test/bug.804.t
index 22884ef05..ce560e05f 100755
--- a/test/bug.804.t
+++ b/test/bug.804.t
@@ -62,7 +62,7 @@ ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'bug.rc', 'Cleanup');
 
 exit 0;
diff --git a/test/bug.819.t b/test/bug.819.t
index 55b04c0e8..33f0b27e7 100755
--- a/test/bug.819.t
+++ b/test/bug.819.t
@@ -49,7 +49,7 @@ ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'bug.rc', 'Cleanup');
 
 exit 0;
diff --git a/test/bug.annotate.t b/test/bug.annotate.t
index a5c4505f4..e845586b5 100755
--- a/test/bug.annotate.t
+++ b/test/bug.annotate.t
@@ -56,7 +56,7 @@ ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'bug.rc', 'Cleanup');
 
 exit 0;
diff --git a/test/bug.annual.t b/test/bug.annual.t
index d9e5b93b0..ebd052689 100755
--- a/test/bug.annual.t
+++ b/test/bug.annual.t
@@ -74,7 +74,7 @@ ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'annual.rc', 'Cleanup');
 
 exit 0;
diff --git a/test/bug.concat.t b/test/bug.concat.t
index b777f52c6..7fc1e27a2 100755
--- a/test/bug.concat.t
+++ b/test/bug.concat.t
@@ -73,7 +73,7 @@ ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'bug.rc', 'Cleanup');
 
 exit 0;
diff --git a/test/bug.period.t b/test/bug.period.t
index d95870556..8b2af1f35 100755
--- a/test/bug.period.t
+++ b/test/bug.period.t
@@ -159,7 +159,7 @@ ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'period.rc', 'Cleanup');
 
 exit 0;
diff --git a/test/caseless.t b/test/caseless.t
index d9af12d0e..b054ac4fe 100755
--- a/test/caseless.t
+++ b/test/caseless.t
@@ -124,7 +124,7 @@ ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'caseless.rc', 'Cleanup');
 
 exit 0;
diff --git a/test/color.blocked.t b/test/color.blocked.t
index 828e15221..0d89c55e7 100755
--- a/test/color.blocked.t
+++ b/test/color.blocked.t
@@ -56,7 +56,7 @@ ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'color.rc', 'Cleanup');
 
 exit 0;
diff --git a/test/confirmation.t b/test/confirmation.t
index ca0204c28..7119e3d61 100755
--- a/test/confirmation.t
+++ b/test/confirmation.t
@@ -133,7 +133,7 @@ ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'confirm.rc'     &&
     ! -r 'response.txt', 'Cleanup');
 
diff --git a/test/count.t b/test/count.t
index 2b560026e..b4017fde2 100755
--- a/test/count.t
+++ b/test/count.t
@@ -68,7 +68,7 @@ ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'count.rc', 'Cleanup');
 
 exit 0;
diff --git a/test/delete.t b/test/delete.t
index 15d86e694..5f9e03218 100755
--- a/test/delete.t
+++ b/test/delete.t
@@ -76,7 +76,7 @@ ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'delete.rc', 'Cleanup');
 
 exit 0;
diff --git a/test/export.yaml.t b/test/export.yaml.t
index 239d21126..0251664ca 100755
--- a/test/export.yaml.t
+++ b/test/export.yaml.t
@@ -77,7 +77,7 @@ ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'export.rc'      &&
     ! -r 'export.txt', 'Cleanup');
 
diff --git a/test/import.t b/test/import.t
index a9a9ec933..d5e60f007 100755
--- a/test/import.t
+++ b/test/import.t
@@ -105,7 +105,7 @@ ok (! -r 'import.txt'     &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'import.rc', 'Cleanup');
 
 exit 0;
diff --git a/test/import.todo.sh.t b/test/import.todo.sh.t
index e36bf119d..29584a702 100755
--- a/test/import.todo.sh.t
+++ b/test/import.todo.sh.t
@@ -125,7 +125,7 @@ ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'import.rc'      &&
     ! -r 'import.txt'     &&
     ! -r 'import.json', 'Cleanup');
diff --git a/test/import.yaml.t b/test/import.yaml.t
index b003a3f99..3b808f528 100755
--- a/test/import.yaml.t
+++ b/test/import.yaml.t
@@ -145,7 +145,7 @@ ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'import.rc'      &&
     ! -r 'import.txt'     &&
     ! -r 'import.json', 'Cleanup');
diff --git a/test/list.all.projects.t b/test/list.all.projects.t
index f65a173da..fb76b43e1 100755
--- a/test/list.all.projects.t
+++ b/test/list.all.projects.t
@@ -62,7 +62,7 @@ ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'projects.rc', 'Cleanup');
 
 exit 0;
diff --git a/test/list.all.tags.t b/test/list.all.tags.t
index b7bf74120..91f684ee5 100755
--- a/test/list.all.tags.t
+++ b/test/list.all.tags.t
@@ -62,7 +62,7 @@ ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'tags.rc', 'Cleanup');
 
 exit 0;
diff --git a/test/merge.duplicates.t b/test/merge.duplicates.t
index 8f96f0487..d8f98ee0d 100755
--- a/test/merge.duplicates.t
+++ b/test/merge.duplicates.t
@@ -182,7 +182,7 @@ ok (! -r 'data1/pending.data'   &&
     ! -r 'data1/undo.data'      &&
     ! -r 'data1/undo.save'      &&
     ! -r 'data1/backlog.data'   &&
-    ! -r 'data1/synch_key.data' &&
+    ! -r 'data1/synch.key'      &&
     ! -r '1.rc', 'data1 Cleanup');
 
 unlink qw(data2/pending.data data2/completed.data data2/undo.data data2/undo.save data2/backlog.data data2/synch.key 2.rc);
@@ -191,7 +191,7 @@ ok (! -r 'data2/pending.data'   &&
     ! -r 'data2/undo.data'      &&
     ! -r 'data2/undo.save'      &&
     ! -r 'data2/backlog.data'   &&
-    ! -r 'data2/synch_key.data' &&
+    ! -r 'data2/synch.key'      &&
     ! -r '2.rc', 'data2 Cleanup');
 
 unlink qw(data3/pending.data data3/completed.data data3/undo.data data3/undo.save data3/backlog.data data3/synch.key 3.rc);
@@ -200,7 +200,7 @@ ok (! -r 'data3/pending.data'   &&
     ! -r 'data3/undo.data'      &&
     ! -r 'data3/undo.save'      &&
     ! -r 'data3/backlog.data'   &&
-    ! -r 'data3/synch_key.data' &&
+    ! -r 'data3/synch.key'      &&
     ! -r '3.rc', 'data3 Cleanup');
 
 unlink qw(backup/pending.data backup/completed.data backup/undo.data backup/undo.save backup/backlog.data backup/synch.key);
@@ -209,7 +209,7 @@ ok (! -r 'backup/pending.data'   &&
     ! -r 'backup/undo.data'      &&
     ! -r 'backup/undo.save'      &&
     ! -r 'backup/backlog.data'   &&
-    ! -r 'backup/synch_key.data', 'backup Cleanup');
+    ! -r 'backup/synch.key', 'backup Cleanup');
 
 rmtree (['data1/extensions', 'data1', 'data2/extensions', 'data2', 'data3/extensions', 'data3', 'backup/extensions', 'backup'], 0, 1);
 ok (! -e 'data1/extensions'  &&
diff --git a/test/merge.t b/test/merge.t
index 67af0de31..3512b2345 100755
--- a/test/merge.t
+++ b/test/merge.t
@@ -235,7 +235,7 @@ ok (! -r 'local/pending.data'   &&
     ! -r 'local/undo.data'      &&
     ! -r 'local/undo.save'      &&
     ! -r 'local/backlog.data'   &&
-    ! -r 'local/synch_key.data' &&
+    ! -r 'local/synch.key'      &&
     ! -r 'local.rc', 'Local Cleanup');
 
 unlink qw(remote/pending.data remote/completed.data remote/undo.data remote/backlog.data remote/synch.key remote.rc);
@@ -243,7 +243,7 @@ ok (! -r 'remote/pending.data'   &&
     ! -r 'remote/completed.data' &&
     ! -r 'remote/undo.data'      &&
     ! -r 'remote/backlog.data'   &&
-    ! -r 'remote/synch_key.data' &&
+    ! -r 'remote/synch.key'      &&
     ! -r 'remote.rc', 'Remove Cleanup');
 
 rmtree (['remote/extensions', 'remote', 'local/extensions', 'local'], 0, 1);
diff --git a/test/prepend.t b/test/prepend.t
index 1dbf83ec2..e690916af 100755
--- a/test/prepend.t
+++ b/test/prepend.t
@@ -54,7 +54,7 @@ ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'prepend.rc', 'Cleanup');
 
 exit 0;
diff --git a/test/roundtrip.t b/test/roundtrip.t
index 51e8caf4f..825bb8573 100755
--- a/test/roundtrip.t
+++ b/test/roundtrip.t
@@ -72,7 +72,7 @@ ok (! -r 'roundtrip.txt'  &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'roundtrip.rc', 'Cleanup');
 
 exit 0;
diff --git a/test/shell.t b/test/shell.t
index bfe722ca0..61fda9b6e 100755
--- a/test/shell.t
+++ b/test/shell.t
@@ -57,7 +57,7 @@ ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'shell.rc', 'Cleanup');
 
 exit 0;
diff --git a/test/tdb2.t.cpp b/test/tdb2.t.cpp
index eeb22d124..909f1b1b2 100644
--- a/test/tdb2.t.cpp
+++ b/test/tdb2.t.cpp
@@ -64,7 +64,7 @@ int main (int argc, char** argv)
     t.is ((int) completed.size (), 0, "TDB2 Read empty completed");
     t.is ((int) undo.size (),      0, "TDB2 Read empty undo");
     t.is ((int) backlog.size (),   0, "TDB2 Read empty backlog");
-    t.is ((int) synch_key.size (), 0, "TDB2 Read empty synch_key");
+    t.is ((int) synch_key.size (), 0, "TDB2 Read empty synch.key");
 
     // Add a task.
     Task task ("[description:\"description\" name:\"value\"]");
@@ -80,7 +80,7 @@ int main (int argc, char** argv)
     t.is ((int) completed.size (), 0, "TDB2 after add, 0 completed tasks");
     t.is ((int) undo.size (),      3, "TDB2 after add, 3 undo lines");
     t.is ((int) backlog.size (),   1, "TDB2 after add, 1 backlog task");
-    t.is ((int) synch_key.size (), 0, "TDB2 after add, 0 synch_key");
+    t.is ((int) synch_key.size (), 0, "TDB2 after add, 0 synch.key");
 
     task.set ("description", "This is a test");
     context.tdb2.modify (task);
@@ -95,7 +95,7 @@ int main (int argc, char** argv)
     t.is ((int) completed.size (), 0, "TDB2 after add, 0 completed tasks");
     t.is ((int) undo.size (),      7, "TDB2 after add, 7 undo lines");
     t.is ((int) backlog.size (),   2, "TDB2 after add, 2 backlog task");
-    t.is ((int) synch_key.size (), 0, "TDB2 after add, 0 synch_key");
+    t.is ((int) synch_key.size (), 0, "TDB2 after add, 0 synch.key");
 
     context.tdb2.commit ();
 
diff --git a/test/timesheet.t b/test/timesheet.t
index a973f6baa..508947102 100755
--- a/test/timesheet.t
+++ b/test/timesheet.t
@@ -87,7 +87,7 @@ ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'time.rc', 'Cleanup');
 
 exit 0;
diff --git a/test/uuid.t b/test/uuid.t
index 2bc591ac4..b237680a5 100755
--- a/test/uuid.t
+++ b/test/uuid.t
@@ -111,7 +111,7 @@ ok (! -r 'pending.data'   &&
     ! -r 'completed.data' &&
     ! -r 'undo.data'      &&
     ! -r 'backlog.data'   &&
-    ! -r 'synch_key.data' &&
+    ! -r 'synch.key'      &&
     ! -r 'uuid.rc', 'Cleanup');
 
 exit 0;