diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1f0bbaa..9c049b8 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -6,10 +6,10 @@ NULL =
 AUTOMAKE_OPTIONS = 1.7
 
 # The name of the module.
-DOC_MODULE=devkit-power
+DOC_MODULE=upower
 
 # The top-level SGML file.
-DOC_MAIN_SGML_FILE=devkit-power-docs.xml
+DOC_MAIN_SGML_FILE=upower-docs.xml
 
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS=--ignore-headers=config.h
@@ -67,8 +67,8 @@ FIXXREF_OPTIONS=
 MAINTAINERCLEANFILES =		\
 	*~			\
 	Makefile.in		\
-	devkit-power.types	\
-	devkit-power-*.txt	\
+	upower.types	\
+	upower-*.txt	\
 	$(NULL)
 
 if ENABLE_GTK_DOC
diff --git a/doc/devkit-power-docs.xml b/doc/upower-docs.xml
similarity index 89%
rename from doc/devkit-power-docs.xml
rename to doc/upower-docs.xml
index 51b67f2..14438d1 100644
--- a/doc/devkit-power-docs.xml
+++ b/doc/upower-docs.xml
@@ -5,7 +5,7 @@
 ]>
 <book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
-    <title>DeviceKit-power Reference Manual</title>
+    <title>UPower Reference Manual</title>
     <releaseinfo>Version &version;</releaseinfo>
     <authorgroup>
       <author>
@@ -20,8 +20,8 @@
     </authorgroup>
 
     <copyright>
-      <year>2008</year>
-      <holder>The DeviceKit-power Authors</holder>
+      <year>2010</year>
+      <holder>The UPower Authors</holder>
     </copyright>
 
     <legalnotice>
@@ -61,7 +61,7 @@
     <partintro>
       <para>
 	This part documents the D-Bus interface used to access the
-	DeviceKit-power daemon.
+	UPower daemon.
       </para>
     </partintro>
     <xi:include href="dbus/org.freedesktop.UPower.ref.xml"/>
@@ -73,12 +73,12 @@
     <title>Manual Pages</title>
     <partintro>
       <para>
-	This part contains the manual pages distributed with DeviceKit-power.
+	This part contains the manual pages distributed with UPower.
       </para>
     </partintro>
-    <xi:include href="man/DeviceKit-power.xml"/>
+    <xi:include href="man/UPower.xml"/>
     <xi:include href="man/upowerd.xml"/>
-    <xi:include href="man/devkit-power.xml"/>
+    <xi:include href="man/upower.xml"/>
   </reference>
 
   <index>