diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
index 0c198ebba3..ca5dd4c5e1 100644
--- a/config/CMakeLists.txt
+++ b/config/CMakeLists.txt
@@ -1,12 +1,12 @@
-macro_copy_file(${CMAKE_CURRENT_SOURCE_DIR}/csync.conf ${CMAKE_CURRENT_BINARY_DIR}/csync.conf)
-macro_copy_file(${CMAKE_CURRENT_SOURCE_DIR}/csync_exclude.conf ${CMAKE_CURRENT_BINARY_DIR}/csync_exclude.conf)
-macro_copy_file(${CMAKE_CURRENT_SOURCE_DIR}/csync_log.conf ${CMAKE_CURRENT_BINARY_DIR}/csync_log.conf)
+macro_copy_file(${CMAKE_CURRENT_SOURCE_DIR}/ocsync.conf ${CMAKE_CURRENT_BINARY_DIR}/ocsync.conf)
+macro_copy_file(${CMAKE_CURRENT_SOURCE_DIR}/ocsync_exclude.conf ${CMAKE_CURRENT_BINARY_DIR}/ocsync_exclude.conf)
+macro_copy_file(${CMAKE_CURRENT_SOURCE_DIR}/ocsync_log.conf ${CMAKE_CURRENT_BINARY_DIR}/ocsync_log.conf)
 
 install(
   FILES
-    csync.conf
-    csync_exclude.conf
-    csync_log.conf
+    ocsync.conf
+    ocsync_exclude.conf
+    ocsync_log.conf
   DESTINATION
-    ${SYSCONF_INSTALL_DIR}/csync
+    ${SYSCONF_INSTALL_DIR}/ocsync
 )
diff --git a/src/csync.h b/src/csync.h
index 8448d651d2..cc42015119 100644
--- a/src/csync.h
+++ b/src/csync.h
@@ -63,9 +63,9 @@ extern "C" {
 /*
  * csync file declarations
  */
-#define CSYNC_CONF_DIR ".csync"
-#define CSYNC_CONF_FILE "csync.conf"
-#define CSYNC_LOG_FILE "csync_log.conf"
+#define CSYNC_CONF_DIR ".ocsync"
+#define CSYNC_CONF_FILE "ocsync.conf"
+#define CSYNC_LOG_FILE "ocsync_log.conf"
 #define CSYNC_EXCLUDE_FILE "csync_exclude.conf"
 #define CSYNC_LOCK_FILE "lock"
 
diff --git a/src/csync_config.c b/src/csync_config.c
index 01fa5df793..3927694734 100644
--- a/src/csync_config.c
+++ b/src/csync_config.c
@@ -63,7 +63,7 @@ static int _csync_config_copy_default (const char *config) {
 #else
     CSYNC_LOG(CSYNC_LOG_PRIORITY_TRACE, "Copy %s/config/%s to %s", SYSCONFDIR,
         CSYNC_CONF_FILE, config);
-    if (c_copy(SYSCONFDIR "/csync/" CSYNC_CONF_FILE, config, 0644) < 0) {
+    if (c_copy(SYSCONFDIR "/ocsync/" CSYNC_CONF_FILE, config, 0644) < 0) {
       if (c_copy(BINARYDIR "/config/" CSYNC_CONF_FILE, config, 0644) < 0) {
         re = -1;
       }