diff --git a/dbus/helpers.c b/cdbus/helpers.c
similarity index 100%
rename from dbus/helpers.c
rename to cdbus/helpers.c
diff --git a/dbus/helpers.h b/cdbus/helpers.h
similarity index 100%
rename from dbus/helpers.h
rename to cdbus/helpers.h
diff --git a/dbus/interface.c b/cdbus/interface.c
similarity index 100%
rename from dbus/interface.c
rename to cdbus/interface.c
diff --git a/dbus/interface.h b/cdbus/interface.h
similarity index 100%
rename from dbus/interface.h
rename to cdbus/interface.h
diff --git a/dbus/method.c b/cdbus/method.c
similarity index 100%
rename from dbus/method.c
rename to cdbus/method.c
diff --git a/dbus/method.h b/cdbus/method.h
similarity index 100%
rename from dbus/method.h
rename to cdbus/method.h
diff --git a/dbus/object_path.c b/cdbus/object_path.c
similarity index 100%
rename from dbus/object_path.c
rename to cdbus/object_path.c
diff --git a/dbus/object_path.h b/cdbus/object_path.h
similarity index 100%
rename from dbus/object_path.h
rename to cdbus/object_path.h
diff --git a/dbus/signal.c b/cdbus/signal.c
similarity index 100%
rename from dbus/signal.c
rename to cdbus/signal.c
diff --git a/dbus/signal.h b/cdbus/signal.h
similarity index 100%
rename from dbus/signal.h
rename to cdbus/signal.h
diff --git a/conf.c b/conf.c
index 365abdb1..87bff0e3 100644
--- a/conf.c
+++ b/conf.c
@@ -33,7 +33,7 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include "dbus/helpers.h"
+#include "cdbus/helpers.h"
 #include "dbus_constants.h"
 #include "common/catdup.h"
 #include "common/dirhelpers.h"
diff --git a/daemon/common.h b/daemon/common.h
index f459d59a..18bceee1 100644
--- a/daemon/common.h
+++ b/daemon/common.h
@@ -2,7 +2,7 @@
 /*
  * LADI Session Handler (ladish)
  *
- * Copyright (C) 2009,2010 Nedko Arnaudov <nedko@arnaudov.name>
+ * Copyright (C) 2009,2010,2011 Nedko Arnaudov <nedko@arnaudov.name>
  *
  **************************************************************************
  * This file contains stuff that is needed almost everywhere in the ladishd
@@ -32,7 +32,7 @@
 #include <errno.h>
 #include <uuid/uuid.h>
 
-#include "../dbus/helpers.h"
+#include "../cdbus/helpers.h"
 
 /* ~/BASE_DIR is where studio, room and project xml files are stored */
 #define BASE_DIR "/." BASE_NAME
diff --git a/gui/dbus.c b/gui/dbus.c
index 711587a2..e1c3a6ca 100644
--- a/gui/dbus.c
+++ b/gui/dbus.c
@@ -25,7 +25,7 @@
  */
 
 #include "internal.h"
-#include "../dbus/helpers.h"
+#include "../cdbus/helpers.h"
 #include <dbus/dbus-glib-lowlevel.h>
 
 void dbus_init(void)
diff --git a/jmcore.c b/jmcore.c
index 98802888..db2e1da9 100644
--- a/jmcore.c
+++ b/jmcore.c
@@ -31,7 +31,7 @@
 #include <jack/jack.h>
 #include <jack/midiport.h>
 
-#include "dbus/helpers.h"
+#include "cdbus/helpers.h"
 #include "dbus_constants.h"
 
 extern const struct cdbus_interface_descriptor g_interface;
diff --git a/lash_compat/liblash/lash.c b/lash_compat/liblash/lash.c
index 162ad274..d32782fc 100644
--- a/lash_compat/liblash/lash.c
+++ b/lash_compat/liblash/lash.c
@@ -41,7 +41,7 @@
 #include "../../common/dirhelpers.h"
 #include "../../common/file.h"
 #include "../../log.h"
-#include "../../dbus/helpers.h"
+#include "../../cdbus/helpers.h"
 #include "../../dbus_constants.h"
 
 #define LASH_CONFIG_SUBDIR "/.ladish_lash_dict/"
diff --git a/proxies/common.h b/proxies/common.h
index b8e996d6..c2e2e38c 100644
--- a/proxies/common.h
+++ b/proxies/common.h
@@ -2,7 +2,7 @@
 /*
  * LADI Session Handler (ladish)
  *
- * Copyright (C) 2009 Nedko Arnaudov <nedko@arnaudov.name>
+ * Copyright (C) 2009,2011 Nedko Arnaudov <nedko@arnaudov.name>
  *
  **************************************************************************
  * This file contains stuff that is needed my almost every proxy
@@ -28,7 +28,7 @@
 #define COMMON_H__0710E3D5_9B69_4C10_BDDB_80E0D92F44AF__INCLUDED
 
 #include "../common.h"
-#include "../dbus/helpers.h"
+#include "../cdbus/helpers.h"
 #include "../dbus_constants.h"
 
 #endif /* #ifndef COMMON_H__0710E3D5_9B69_4C10_BDDB_80E0D92F44AF__INCLUDED */
diff --git a/wscript b/wscript
index eaee30ca..c1281078 100644
--- a/wscript
+++ b/wscript
@@ -401,7 +401,7 @@ def build(bld):
         'interface.c',
         'helpers.c',
         ]:
-        daemon.source.append(os.path.join("dbus", source))
+        daemon.source.append(os.path.join("cdbus", source))
 
     for source in [
         'time.c',
@@ -430,7 +430,7 @@ def build(bld):
         'interface.c',
         'helpers.c',
         ]:
-        jmcore.source.append(os.path.join("dbus", source))
+        jmcore.source.append(os.path.join("cdbus", source))
 
     create_service_taskgen(bld, DBUS_NAME_BASE + '.jmcore.service', DBUS_NAME_BASE + ".jmcore", jmcore.target)
 
@@ -455,7 +455,7 @@ def build(bld):
         'interface.c',
         'helpers.c',
         ]:
-        ladiconfd.source.append(os.path.join("dbus", source))
+        ladiconfd.source.append(os.path.join("cdbus", source))
 
     create_service_taskgen(bld, DBUS_NAME_BASE + '.conf.service', DBUS_NAME_BASE + ".conf", ladiconfd.target)
 
@@ -493,7 +493,7 @@ def build(bld):
             'interface.c',
             'helpers.c',
             ]:
-            liblash.source.append(os.path.join("dbus", source))
+            liblash.source.append(os.path.join("cdbus", source))
 
         bld.install_files('${PREFIX}/include/lash', bld.path.ant_glob('lash_compat/liblash/lash/*.h'))
 
@@ -582,7 +582,7 @@ def build(bld):
             'method.c',
             'helpers.c',
             ]:
-            gladish.source.append(os.path.join("dbus", source))
+            gladish.source.append(os.path.join("cdbus", source))
 
         for source in [
             'catdup.c',
@@ -634,7 +634,7 @@ def get_tags_dirs():
         source_root = os.path.relpath(source_root)
     paths = source_root
     paths += " " + os.path.join(source_root, "common")
-    paths += " " + os.path.join(source_root, "dbus")
+    paths += " " + os.path.join(source_root, "cdbus")
     paths += " " + os.path.join(source_root, "proxies")
     paths += " " + os.path.join(source_root, "daemon")
     paths += " " + os.path.join(source_root, "gui")