13 files changed, 40 insertions, 40 deletions
diff --git a/src/linux/Makefile.am b/src/linux/Makefile.am
index 039cccb..da74584 100644
--- a/src/linux/Makefile.am
+++ b/src/linux/Makefile.am
@@ -20,18 +20,18 @@ noinst_LTLIBRARIES = libdkpshared.la
 endif
 
 libdkpshared_la_SOURCES =					\
-	dkp-device-supply.c					\
-	dkp-device-supply.h					\
-	dkp-device-csr.c					\
-	dkp-device-csr.h					\
-	dkp-device-hid.c					\
-	dkp-device-hid.h					\
-	dkp-device-wup.c					\
-	dkp-device-wup.h					\
-	dkp-input.c						\
-	dkp-input.h						\
-	dkp-backend.c						\
-	dkp-native.c						\
+	up-device-supply.c					\
+	up-device-supply.h					\
+	up-device-csr.c						\
+	up-device-csr.h						\
+	up-device-hid.c						\
+	up-device-hid.h						\
+	up-device-wup.c						\
+	up-device-wup.h						\
+	up-input.c						\
+	up-input.h						\
+	up-backend.c						\
+	up-native.c						\
 	sysfs-utils.c						\
 	sysfs-utils.h						\
 	$(BUILT_SOURCES)
diff --git a/src/linux/dkp-backend.c b/src/linux/up-backend.c
index a14ca9a..22fbaa3 100644
--- a/src/linux/dkp-backend.c
+++ b/src/linux/up-backend.c
@@ -30,16 +30,16 @@
 
 #include "egg-debug.h"
 
-#include "dkp-backend.h"
-#include "dkp-daemon.h"
-#include "dkp-marshal.h"
-#include "dkp-device.h"
-
-#include "dkp-device-supply.h"
-#include "dkp-device-csr.h"
-#include "dkp-device-wup.h"
-#include "dkp-device-hid.h"
-#include "dkp-input.h"
+#include "up-backend.h"
+#include "up-daemon.h"
+#include "up-marshal.h"
+#include "up-device.h"
+
+#include "up-device-supply.h"
+#include "up-device-csr.h"
+#include "up-device-wup.h"
+#include "up-device-hid.h"
+#include "up-input.h"
 
 static void	dkp_backend_class_init	(DkpBackendClass	*klass);
 static void	dkp_backend_init	(DkpBackend		*backend);
diff --git a/src/linux/dkp-device-csr.c b/src/linux/up-device-csr.c
index 69582c8..2c67174 100644
--- a/src/linux/dkp-device-csr.c
+++ b/src/linux/up-device-csr.c
@@ -37,8 +37,8 @@
 #include "sysfs-utils.h"
 #include "egg-debug.h"
 
-#include "dkp-enum.h"
-#include "dkp-device-csr.h"
+#include "up-enum.h"
+#include "up-device-csr.h"
 
 #define DKP_DEVICE_CSR_REFRESH_TIMEOUT		30L
 
diff --git a/src/linux/dkp-device-csr.h b/src/linux/up-device-csr.h
index 04e101b..d605853 100644
--- a/src/linux/dkp-device-csr.h
+++ b/src/linux/up-device-csr.h
@@ -23,7 +23,7 @@
 #define __DKP_DEVICE_CSR_H__
 
 #include <glib-object.h>
-#include "dkp-device.h"
+#include "up-device.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/linux/dkp-device-hid.c b/src/linux/up-device-hid.c
index c258fef..7e88d0c 100644
--- a/src/linux/dkp-device-hid.c
+++ b/src/linux/up-device-hid.c
@@ -50,8 +50,8 @@
 #include "sysfs-utils.h"
 #include "egg-debug.h"
 
-#include "dkp-enum.h"
-#include "dkp-device-hid.h"
+#include "up-enum.h"
+#include "up-device-hid.h"
 
 #define DKP_DEVICE_HID_REFRESH_TIMEOUT			30l
 
diff --git a/src/linux/dkp-device-hid.h b/src/linux/up-device-hid.h
index 8607331..7736c94 100644
--- a/src/linux/dkp-device-hid.h
+++ b/src/linux/up-device-hid.h
@@ -22,7 +22,7 @@
 #define __DKP_DEVICE_HID_H__
 
 #include <glib-object.h>
-#include "dkp-device.h"
+#include "up-device.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/linux/dkp-device-supply.c b/src/linux/up-device-supply.c
index c562088..c7ca2e1 100644
--- a/src/linux/dkp-device-supply.c
+++ b/src/linux/up-device-supply.c
@@ -36,8 +36,8 @@
 #include "sysfs-utils.h"
 #include "egg-debug.h"
 
-#include "dkp-enum.h"
-#include "dkp-device-supply.h"
+#include "up-enum.h"
+#include "up-device-supply.h"
 
 #define DKP_DEVICE_SUPPLY_REFRESH_TIMEOUT	30	/* seconds */
 #define DKP_DEVICE_SUPPLY_UNKNOWN_TIMEOUT	2	/* seconds */
diff --git a/src/linux/dkp-device-supply.h b/src/linux/up-device-supply.h
index b767eac..e1b042f 100644
--- a/src/linux/dkp-device-supply.h
+++ b/src/linux/up-device-supply.h
@@ -23,7 +23,7 @@
 #define __DKP_DEVICE_SUPPLY_H__
 
 #include <glib-object.h>
-#include "dkp-device.h"
+#include "up-device.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/linux/dkp-device-wup.c b/src/linux/up-device-wup.c
index df34fa0..8fc3296 100644
--- a/src/linux/dkp-device-wup.c
+++ b/src/linux/up-device-wup.c
@@ -44,8 +44,8 @@
 #include "sysfs-utils.h"
 #include "egg-debug.h"
 
-#include "dkp-enum.h"
-#include "dkp-device-wup.h"
+#include "up-enum.h"
+#include "up-device-wup.h"
 
 #define DKP_DEVICE_WUP_REFRESH_TIMEOUT			10 /* seconds */
 #define DKP_DEVICE_WUP_RESPONSE_OFFSET_WATTS		0x0
diff --git a/src/linux/dkp-device-wup.h b/src/linux/up-device-wup.h
index 02eaa4b..9d39360 100644
--- a/src/linux/dkp-device-wup.h
+++ b/src/linux/up-device-wup.h
@@ -22,7 +22,7 @@
 #define __DKP_DEVICE_WUP_H__
 
 #include <glib-object.h>
-#include "dkp-device.h"
+#include "up-device.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/linux/dkp-input.c b/src/linux/up-input.c
index e213033..78194d6 100644
--- a/src/linux/dkp-input.c
+++ b/src/linux/up-input.c
@@ -42,10 +42,10 @@
 #include "sysfs-utils.h"
 #include "egg-debug.h"
 
-#include "dkp-enum.h"
-#include "dkp-daemon.h"
-#include "dkp-input.h"
-#include "dkp-daemon.h"
+#include "up-enum.h"
+#include "up-daemon.h"
+#include "up-input.h"
+#include "up-daemon.h"
 
 struct DkpInputPrivate
 {
diff --git a/src/linux/dkp-input.h b/src/linux/up-input.h
index bae5005..c064d8f 100644
--- a/src/linux/dkp-input.h
+++ b/src/linux/up-input.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include "dkp-daemon.h"
+#include "up-daemon.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/linux/dkp-native.c b/src/linux/up-native.c
index f41b972..7419889 100644
--- a/src/linux/dkp-native.c
+++ b/src/linux/up-native.c
@@ -21,7 +21,7 @@
 #include <glib.h>
 #include <gudev/gudev.h>
 
-#include "dkp-native.h"
+#include "up-native.h"
 
 /**
  * dkp_native_get_native_path: