diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bb79921eb..6751e3ee8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -42,7 +42,7 @@ set(csync_SRCS
   csync.c
   csync_config.c
   csync_exclude.c
-  csync_journal.c
+  csync_statedb.c
   csync_lock.c
   csync_time.c
   csync_util.c
diff --git a/src/csync.c b/src/csync.c
index c7a402256..5be99a422 100644
--- a/src/csync.c
+++ b/src/csync.c
@@ -36,7 +36,7 @@
 #include "csync_config.h"
 #include "csync_exclude.h"
 #include "csync_lock.h"
-#include "csync_journal.h"
+#include "csync_statedb.h"
 #include "csync_time.h"
 #include "csync_util.h"
 
diff --git a/src/csync_journal.c b/src/csync_statedb.c
similarity index 99%
rename from src/csync_journal.c
rename to src/csync_statedb.c
index 94380e184..7c11284e9 100644
--- a/src/csync_journal.c
+++ b/src/csync_statedb.c
@@ -33,7 +33,7 @@
 
 #include "c_lib.h"
 #include "csync_private.h"
-#include "csync_journal.h"
+#include "csync_statedb.h"
 #include "csync_util.h"
 
 #define CSYNC_LOG_CATEGORY_NAME "csync.journal"
diff --git a/src/csync_journal.h b/src/csync_statedb.h
similarity index 100%
rename from src/csync_journal.h
rename to src/csync_statedb.h
diff --git a/src/csync_update.c b/src/csync_update.c
index cb4ce1757..69151b98b 100644
--- a/src/csync_update.c
+++ b/src/csync_update.c
@@ -32,7 +32,7 @@
 
 #include "csync_private.h"
 #include "csync_exclude.h"
-#include "csync_journal.h"
+#include "csync_statedb.h"
 #include "csync_update.h"
 #include "csync_util.h"
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index baff29c1a..28e03dabf 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -34,13 +34,13 @@ macro_add_check_test(check_csync_create csync_tests/check_csync_create.c ${TEST_
 macro_add_check_test(check_csync_lock csync_tests/check_csync_lock.c ${TEST_TARGET_LIBRARIES})
 macro_add_check_test(check_csync_config csync_tests/check_csync_config.c ${TEST_TARGET_LIBRARIES})
 macro_add_check_test(check_csync_exclude csync_tests/check_csync_exclude.c ${TEST_TARGET_LIBRARIES})
-macro_add_check_test(check_csync_journal_load csync_tests/check_csync_journal_load.c ${TEST_TARGET_LIBRARIES})
+macro_add_check_test(check_csync_statedb_load csync_tests/check_csync_statedb_load.c ${TEST_TARGET_LIBRARIES})
 macro_add_check_test(check_csync_time csync_tests/check_csync_time.c ${TEST_TARGET_LIBRARIES})
 macro_add_check_test(check_csync_util csync_tests/check_csync_util.c ${TEST_TARGET_LIBRARIES})
 
 # csync tests which require init
 macro_add_check_test(check_csync_init csync_tests/check_csync_init.c ${TEST_TARGET_LIBRARIES})
-macro_add_check_test(check_csync_journal_query csync_tests/check_csync_journal_query.c ${TEST_TARGET_LIBRARIES})
+macro_add_check_test(check_csync_statedb_query csync_tests/check_csync_statedb_query.c ${TEST_TARGET_LIBRARIES})
 
 # vio
 macro_add_check_test(check_vio_handle vio_tests/check_vio_handle.c ${TEST_TARGET_LIBRARIES})
diff --git a/tests/csync_tests/check_csync_journal_load.c b/tests/csync_tests/check_csync_statedb_load.c
similarity index 99%
rename from tests/csync_tests/check_csync_journal_load.c
rename to tests/csync_tests/check_csync_statedb_load.c
index 5cc91cbe9..2a0c262f0 100644
--- a/tests/csync_tests/check_csync_journal_load.c
+++ b/tests/csync_tests/check_csync_statedb_load.c
@@ -5,7 +5,7 @@
 #include "support.h"
 
 #define CSYNC_TEST 1
-#include "csync_journal.c"
+#include "csync_statedb.c"
 
 CSYNC *csync;
 const char *testdb = (char *) "/tmp/check_csync1/test.db";
diff --git a/tests/csync_tests/check_csync_journal_query.c b/tests/csync_tests/check_csync_statedb_query.c
similarity index 99%
rename from tests/csync_tests/check_csync_journal_query.c
rename to tests/csync_tests/check_csync_statedb_query.c
index c35aaf2d1..22cadd550 100644
--- a/tests/csync_tests/check_csync_journal_query.c
+++ b/tests/csync_tests/check_csync_statedb_query.c
@@ -5,7 +5,7 @@
 #include "support.h"
 
 #define CSYNC_TEST 1
-#include "csync_journal.c"
+#include "csync_statedb.c"
 
 CSYNC *csync;
 const char *testdb = (char *) "/tmp/check_csync1/test.db";