diff --git a/HACKING b/HACKING
index 8d32cc0..332caaf 100644
--- a/HACKING
+++ b/HACKING
@@ -3,11 +3,11 @@ SCM
 
  - anonymous checkouts
 
-   $ git clone git://git.freedesktop.org/git/DeviceKit-disks.git
+   $ git clone git://git.freedesktop.org/git/DeviceKit-power.git
 
  - checkouts if you got an ssh account on fd.o (username@ is optional)
 
-   $ git clone ssh://[username@]git.freedesktop.org/git/DeviceKit-disks.git
+   $ git clone ssh://[username@]git.freedesktop.org/git/DeviceKit-power.git
 
  - commit to local repository
 
diff --git a/src/org.freedesktop.DeviceKit.Power.Source.xml b/src/org.freedesktop.DeviceKit.Power.Source.xml
index a98dbbd..bcf164f 100644
--- a/src/org.freedesktop.DeviceKit.Power.Source.xml
+++ b/src/org.freedesktop.DeviceKit.Power.Source.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE node PUBLIC
 "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd" [
-  <!ENTITY ERROR_GENERAL "org.freedesktop.DeviceKit.Disks.Power.Source.GeneralError">
+  <!ENTITY ERROR_GENERAL "org.freedesktop.DeviceKit.Power.Source.GeneralError">
 ]>
 <node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
   <interface name="org.freedesktop.DeviceKit.Power.Source">
diff --git a/src/org.freedesktop.DeviceKit.Power.xml b/src/org.freedesktop.DeviceKit.Power.xml
index f206b56..d9baaf5 100644
--- a/src/org.freedesktop.DeviceKit.Power.xml
+++ b/src/org.freedesktop.DeviceKit.Power.xml
@@ -16,7 +16,7 @@
       <doc:doc>
         <doc:description>
           <doc:para>
-            Enumerate all disks on the system.
+            Enumerate all power objects on the system.
           </doc:para>
         </doc:description>
       </doc:doc>
diff --git a/tools/devkit-power.c b/tools/devkit-power.c
index de79957..b22bf4f 100644
--- a/tools/devkit-power.c
+++ b/tools/devkit-power.c
@@ -312,7 +312,7 @@ main (int argc, char **argv)
         unsigned int         n;
         static GOptionEntry  entries []     = {
                 { "enumerate", 0, 0, G_OPTION_ARG_NONE, &opt_enumerate, "Enumerate objects paths for devices", NULL },
-                { "monitor", 0, 0, G_OPTION_ARG_NONE, &opt_monitor, "Monitor activity from the disk daemon", NULL },
+                { "monitor", 0, 0, G_OPTION_ARG_NONE, &opt_monitor, "Monitor activity from the power daemon", NULL },
                 { "monitor-detail", 0, 0, G_OPTION_ARG_NONE, &opt_monitor_detail, "Monitor with detail", NULL },
                 { "show-info", 0, 0, G_OPTION_ARG_STRING, &opt_show_info, "Show information about object path", NULL },
                 { NULL }