diff --git a/devkit-power-gobject/dkp-client.c b/devkit-power-gobject/dkp-client.c
index e8efe3d..f654edd 100644
--- a/devkit-power-gobject/dkp-client.c
+++ b/devkit-power-gobject/dkp-client.c
@@ -253,52 +253,51 @@ dkp_client_ensure_properties (DkpClient *client)
 		goto out;
 	}
 
-
-	value = g_hash_table_lookup (props, "daemon-version");
+	value = g_hash_table_lookup (props, "DaemonVersion");
 	if (value == NULL) {
-		g_warning ("No 'daemon-version' property");
+		g_warning ("No 'DaemonVersion' property");
 		goto out;
 	}
 	client->priv->daemon_version = g_strdup (g_value_get_string (value));
 
-	value = g_hash_table_lookup (props, "can-suspend");
+	value = g_hash_table_lookup (props, "CanSuspend");
 	if (value == NULL) {
-		g_warning ("No 'can-suspend' property");
+		g_warning ("No 'CanSuspend' property");
 		goto out;
 	}
 	client->priv->can_suspend = g_value_get_boolean (value);
 
-	value = g_hash_table_lookup (props, "can-hibernate");
+	value = g_hash_table_lookup (props, "CanHibernate");
 	if (value == NULL) {
-		g_warning ("No 'can-hibernate' property");
+		g_warning ("No 'CanHibernate' property");
 		goto out;
 	}
 	client->priv->can_hibernate = g_value_get_boolean (value);
 
-	value = g_hash_table_lookup (props, "lid-is-closed");
+	value = g_hash_table_lookup (props, "LidIsClosed");
 	if (value == NULL) {
-		g_warning ("No 'lid-is-closed' property");
+		g_warning ("No 'LidIsClosed' property");
 		goto out;
 	}
 	client->priv->lid_is_closed = g_value_get_boolean (value);
 
-	value = g_hash_table_lookup (props, "on-battery");
+	value = g_hash_table_lookup (props, "OnBattery");
 	if (value == NULL) {
-		g_warning ("No 'on-battery' property");
+		g_warning ("No 'OnBattery' property");
 		goto out;
 	}
 	client->priv->on_battery = g_value_get_boolean (value);
 
-	value = g_hash_table_lookup (props, "on-low-battery");
+	value = g_hash_table_lookup (props, "OnLowBattery");
 	if (value == NULL) {
-		g_warning ("No 'on-low-battery' property");
+		g_warning ("No 'OnLowBattery' property");
 		goto out;
 	}
 	client->priv->on_low_battery = g_value_get_boolean (value);
 
-	value = g_hash_table_lookup (props, "lid-is-present");
+	value = g_hash_table_lookup (props, "LidIsPresent");
 	if (value == NULL) {
-		g_warning ("No 'lid-is-present' property");
+		g_warning ("No 'LidIsPresent' property");
 		goto out;
 	}
 	client->priv->lid_is_present = g_value_get_boolean (value);
@@ -524,8 +523,6 @@ dkp_client_class_init (DkpClientClass *klass)
 	object_class->get_property = dkp_client_get_property;
 	object_class->finalize = dkp_client_finalize;
 
-
-
 	g_object_class_install_property (object_class,
 					 PROP_DAEMON_VERSION,
 					 g_param_spec_string ("daemon-version",
diff --git a/devkit-power-gobject/dkp-device.c b/devkit-power-gobject/dkp-device.c
index 06dcf78..abedeaa 100644
--- a/devkit-power-gobject/dkp-device.c
+++ b/devkit-power-gobject/dkp-device.c
@@ -147,59 +147,59 @@ out:
 static void
 dkp_device_collect_props_cb (const char *key, const GValue *value, DkpDevice *device)
 {
-	if (g_strcmp0 (key, "native-path") == 0)
+	if (g_strcmp0 (key, "NativePath") == 0)
 		device->priv->native_path = g_strdup (g_value_get_string (value));
-	else if (g_strcmp0 (key, "vendor") == 0)
+	else if (g_strcmp0 (key, "Vendor") == 0)
 		device->priv->vendor = g_strdup (g_value_get_string (value));
-	else if (g_strcmp0 (key, "model") == 0)
+	else if (g_strcmp0 (key, "Model") == 0)
 		device->priv->model = g_strdup (g_value_get_string (value));
-	else if (g_strcmp0 (key, "serial") == 0)
+	else if (g_strcmp0 (key, "Serial") == 0)
 		device->priv->serial = g_strdup (g_value_get_string (value));
-	else if (g_strcmp0 (key, "update-time") == 0)
+	else if (g_strcmp0 (key, "UpdateTime") == 0)
 		device->priv->update_time = g_value_get_uint64 (value);
-	else if (g_strcmp0 (key, "type") == 0)
+	else if (g_strcmp0 (key, "Type") == 0)
 		device->priv->type = g_value_get_uint (value);
-	else if (g_strcmp0 (key, "online") == 0)
+	else if (g_strcmp0 (key, "Online") == 0)
 		device->priv->online = g_value_get_boolean (value);
-	else if (g_strcmp0 (key, "has-history") == 0)
+	else if (g_strcmp0 (key, "HasHistory") == 0)
 		device->priv->has_history = g_value_get_boolean (value);
-	else if (g_strcmp0 (key, "has-statistics") == 0)
+	else if (g_strcmp0 (key, "HasStatistics") == 0)
 		device->priv->has_statistics = g_value_get_boolean (value);
-	else if (g_strcmp0 (key, "energy") == 0)
+	else if (g_strcmp0 (key, "Energy") == 0)
 		device->priv->energy = g_value_get_double (value);
-	else if (g_strcmp0 (key, "energy-empty") == 0)
+	else if (g_strcmp0 (key, "EnergyEmpty") == 0)
 		device->priv->energy_empty = g_value_get_double (value);
-	else if (g_strcmp0 (key, "energy-full") == 0)
+	else if (g_strcmp0 (key, "EnergyFull") == 0)
 		device->priv->energy_full = g_value_get_double (value);
-	else if (g_strcmp0 (key, "energy-full-design") == 0)
+	else if (g_strcmp0 (key, "EnergyFullDesign") == 0)
 		device->priv->energy_full_design = g_value_get_double (value);
-	else if (g_strcmp0 (key, "energy-rate") == 0)
+	else if (g_strcmp0 (key, "EnergyRate") == 0)
 		device->priv->energy_rate = g_value_get_double (value);
-	else if (g_strcmp0 (key, "voltage") == 0)
+	else if (g_strcmp0 (key, "Voltage") == 0)
 		device->priv->voltage = g_value_get_double (value);
-	else if (g_strcmp0 (key, "time-to-full") == 0)
+	else if (g_strcmp0 (key, "TimeToFull") == 0)
 		device->priv->time_to_full = g_value_get_int64 (value);
-	else if (g_strcmp0 (key, "time-to-empty") == 0)
+	else if (g_strcmp0 (key, "TimeToEmpty") == 0)
 		device->priv->time_to_empty = g_value_get_int64 (value);
-	else if (g_strcmp0 (key, "percentage") == 0)
+	else if (g_strcmp0 (key, "Percentage") == 0)
 		device->priv->percentage = g_value_get_double (value);
-	else if (g_strcmp0 (key, "technology") == 0)
+	else if (g_strcmp0 (key, "Technology") == 0)
 		device->priv->technology = g_value_get_uint (value);
-	else if (g_strcmp0 (key, "is-present") == 0)
+	else if (g_strcmp0 (key, "IsPresent") == 0)
 		device->priv->is_present = g_value_get_boolean (value);
-	else if (g_strcmp0 (key, "is-rechargeable") == 0)
+	else if (g_strcmp0 (key, "IsRechargeable") == 0)
 		device->priv->is_rechargeable = g_value_get_boolean (value);
-	else if (g_strcmp0 (key, "power-supply") == 0)
+	else if (g_strcmp0 (key, "PowerSupply") == 0)
 		device->priv->power_supply = g_value_get_boolean (value);
-	else if (g_strcmp0 (key, "capacity") == 0)
+	else if (g_strcmp0 (key, "Capacity") == 0)
 		device->priv->capacity = g_value_get_double (value);
-	else if (g_strcmp0 (key, "state") == 0)
+	else if (g_strcmp0 (key, "State") == 0)
 		device->priv->state = g_value_get_uint (value);
-	else if (g_strcmp0 (key, "recall-notice") == 0)
+	else if (g_strcmp0 (key, "RecallNotice") == 0)
 		device->priv->recall_notice = g_value_get_boolean (value);
-	else if (g_strcmp0 (key, "recall-vendor") == 0)
+	else if (g_strcmp0 (key, "RecallVendor") == 0)
 		device->priv->recall_vendor = g_strdup (g_value_get_string (value));
-	else if (g_strcmp0 (key, "recall-url") == 0)
+	else if (g_strcmp0 (key, "RecallUrl") == 0)
 		device->priv->recall_url = g_strdup (g_value_get_string (value));
 	else
 		g_warning ("unhandled property '%s'", key);
@@ -851,7 +851,6 @@ dkp_device_get_property (GObject *object, guint prop_id, GValue *value, GParamSp
     }
 }
 
-
 /**
  * dkp_device_class_init:
  * @klass: The DkpDeviceClass
diff --git a/devkit-power-gobject/dkp-wakeups.c b/devkit-power-gobject/dkp-wakeups.c
index 77d43cc..1bd9f23 100644
--- a/devkit-power-gobject/dkp-wakeups.c
+++ b/devkit-power-gobject/dkp-wakeups.c
@@ -195,9 +195,9 @@ dkp_wakeups_ensure_properties (DkpWakeups *wakeups)
 		goto out;
 	}
 
-	value = g_hash_table_lookup (props, "has-capability");
+	value = g_hash_table_lookup (props, "HasCapability");
 	if (value == NULL) {
-		g_warning ("No 'has-capability' property");
+		g_warning ("No 'HasCapability' property");
 		goto out;
 	}
 	wakeups->priv->has_capability = g_value_get_boolean (value);
diff --git a/src/org.freedesktop.DeviceKit.Power.Device.xml b/src/org.freedesktop.DeviceKit.Power.Device.xml
index d6939d9..a73504d 100644
--- a/src/org.freedesktop.DeviceKit.Power.Device.xml
+++ b/src/org.freedesktop.DeviceKit.Power.Device.xml
@@ -257,7 +257,7 @@ method return sender=:1.386 -> dest=:1.477 reply_serial=2
     </method>
 
     <!-- ************************************************************ -->
-    <property name="native-path" type="s" access="read">
+    <property name="NativePath" type="s" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
@@ -271,7 +271,7 @@ method return sender=:1.386 -> dest=:1.477 reply_serial=2
       </doc:doc>
     </property>
 
-    <property name="vendor" type="s" access="read">
+    <property name="Vendor" type="s" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
@@ -281,7 +281,7 @@ method return sender=:1.386 -> dest=:1.477 reply_serial=2
       </doc:doc>
     </property>
 
-    <property name="model" type="s" access="read">
+    <property name="Model" type="s" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
@@ -291,7 +291,7 @@ method return sender=:1.386 -> dest=:1.477 reply_serial=2
       </doc:doc>
     </property>
 
-    <property name="serial" type="s" access="read">
+    <property name="Serial" type="s" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
@@ -301,7 +301,7 @@ method return sender=:1.386 -> dest=:1.477 reply_serial=2
       </doc:doc>
     </property>
 
-    <property name="update-time" type="t" access="read">
+    <property name="UpdateTime" type="t" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
@@ -312,7 +312,7 @@ method return sender=:1.386 -> dest=:1.477 reply_serial=2
       </doc:doc>
     </property>
 
-    <property name="type" type="u" access="read">
+    <property name="Type" type="u" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
@@ -351,7 +351,7 @@ method return sender=:1.386 -> dest=:1.477 reply_serial=2
       </doc:doc>
     </property>
 
-    <property name="power-supply" type="b" access="read">
+    <property name="PowerSupply" type="b" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
@@ -363,7 +363,7 @@ method return sender=:1.386 -> dest=:1.477 reply_serial=2
       </doc:doc>
     </property>
 
-    <property name="has-history" type="b" access="read">
+    <property name="HasHistory" type="b" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
@@ -373,7 +373,7 @@ method return sender=:1.386 -> dest=:1.477 reply_serial=2
       </doc:doc>
     </property>
 
-    <property name="has-statistics" type="b" access="read">
+    <property name="HasStatistics" type="b" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
@@ -383,20 +383,20 @@ method return sender=:1.386 -> dest=:1.477 reply_serial=2
       </doc:doc>
     </property>
 
-    <property name="online" type="b" access="read">
+    <property name="Online" type="b" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
             Whether power is currently being provided through line power.
             This property is only valid if the property
-            <doc:ref type="property" to="Source:type">type</doc:ref>
+            <doc:ref type="property" to="Source:Type">type</doc:ref>
             has the value "line-power".
           </doc:para>
         </doc:description>
       </doc:doc>
     </property>
 
-    <property name="energy" type="d" access="read">
+    <property name="Energy" type="d" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
@@ -404,14 +404,14 @@ method return sender=:1.386 -> dest=:1.477 reply_serial=2
             the power source.
           </doc:para><doc:para>
             This property is only valid if the property
-            <doc:ref type="property" to="Source:type">type</doc:ref>
+            <doc:ref type="property" to="Source:Type">type</doc:ref>
             has the value "battery".
           </doc:para>
         </doc:description>
       </doc:doc>
     </property>
 
-    <property name="energy-empty" type="d" access="read">
+    <property name="EnergyEmpty" type="d" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
@@ -419,14 +419,14 @@ method return sender=:1.386 -> dest=:1.477 reply_serial=2
             it's considered to be empty.
           </doc:para><doc:para>
             This property is only valid if the property
-            <doc:ref type="property" to="Source:type">type</doc:ref>
+            <doc:ref type="property" to="Source:Type">type</doc:ref>
             has the value "battery".
           </doc:para>
         </doc:description>
       </doc:doc>
     </property>
 
-    <property name="energy-full" type="d" access="read">
+    <property name="EnergyFull" type="d" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
@@ -434,14 +434,14 @@ method return sender=:1.386 -> dest=:1.477 reply_serial=2
             it's considered full.
           </doc:para><doc:para>
             This property is only valid if the property
-            <doc:ref type="property" to="Source:type">type</doc:ref>
+            <doc:ref type="property" to="Source:Type">type</doc:ref>
             has the value "battery".
           </doc:para>
         </doc:description>
       </doc:doc>
     </property>
 
-    <property name="energy-full-design" type="d" access="read">
+    <property name="EnergyFullDesign" type="d" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
@@ -449,14 +449,14 @@ method return sender=:1.386 -> dest=:1.477 reply_serial=2
             designed to hold when it's considered full.
           </doc:para><doc:para>
             This property is only valid if the property
-            <doc:ref type="property" to="Source:type">type</doc:ref>
+            <doc:ref type="property" to="Source:Type">type</doc:ref>
             has the value "battery".
           </doc:para>
         </doc:description>
       </doc:doc>
     </property>
 
-    <property name="energy-rate" type="d" access="read">
+    <property name="EnergyRate" type="d" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
@@ -465,14 +465,14 @@ method return sender=:1.386 -> dest=:1.477 reply_serial=2
             negative it's being charged.
           </doc:para><doc:para>
             This property is only valid if the property
-            <doc:ref type="property" to="Source:type">type</doc:ref>
+            <doc:ref type="property" to="Source:Type">type</doc:ref>
             has the value "battery".
           </doc:para>
         </doc:description>
       </doc:doc>
     </property>
 
-    <property name="voltage" type="d" access="read">
+    <property name="Voltage" type="d" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
@@ -482,7 +482,7 @@ method return sender=:1.386 -> dest=:1.477 reply_serial=2
       </doc:doc>
     </property>
 
-    <property name="time-to-empty" type="x" access="read">
+    <property name="TimeToEmpty" type="x" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
@@ -490,14 +490,14 @@ method return sender=:1.386 -> dest=:1.477 reply_serial=2
             Is set to 0 if unknown.
           </doc:para><doc:para>
             This property is only valid if the property
-            <doc:ref type="property" to="Source:type">type</doc:ref>
+            <doc:ref type="property" to="Source:Type">type</doc:ref>
             has the value "battery".
           </doc:para>
         </doc:description>
       </doc:doc>
     </property>
 
-    <property name="time-to-full" type="x" access="read">
+    <property name="TimeToFull" type="x" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
@@ -505,36 +505,36 @@ method return sender=:1.386 -> dest=:1.477 reply_serial=2
             Is set to 0 if unknown.
           </doc:para><doc:para>
             This property is only valid if the property
-            <doc:ref type="property" to="Source:type">type</doc:ref>
+            <doc:ref type="property" to="Source:Type">type</doc:ref>
             has the value "battery".
           </doc:para>
         </doc:description>
       </doc:doc>
     </property>
 
-    <property name="percentage" type="d" access="read">
+    <property name="Percentage" type="d" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
             The amount of energy left in the power source expressed as
             a percentage between 0 and 100. Typically this is the same as
-            (<doc:ref type="property" to="Source:energy">energy</doc:ref> -
-            <doc:ref type="property" to="Source:energy-empty">energy-empty</doc:ref>) /
-            (<doc:ref type="property" to="Source:energy-full">energy-full</doc:ref> -
-            <doc:ref type="property" to="Source:energy-empty">energy-empty</doc:ref>).
+            (<doc:ref type="property" to="Source:Energy">energy</doc:ref> -
+            <doc:ref type="property" to="Source:EnergyEmpty">energy-empty</doc:ref>) /
+            (<doc:ref type="property" to="Source:EnergyFull">energy-full</doc:ref> -
+            <doc:ref type="property" to="Source:EnergyEmpty">energy-empty</doc:ref>).
             However, some primitive power sources are capable of only
             reporting percentages and in this case the energy-*
             properties will be unset while this property is set.
           </doc:para><doc:para>
             This property is only valid if the property
-            <doc:ref type="property" to="Source:type">type</doc:ref>
+            <doc:ref type="property" to="Source:Type">type</doc:ref>
             has the value "battery".
           </doc:para>
         </doc:description>
       </doc:doc>
     </property>
 
-    <property name="is-present" type="b" access="read">
+    <property name="IsPresent" type="b" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
@@ -543,14 +543,14 @@ method return sender=:1.386 -> dest=:1.477 reply_serial=2
             expensive UPS and most laptop batteries.
           </doc:para><doc:para>
             This property is only valid if the property
-            <doc:ref type="property" to="Source:type">type</doc:ref>
+            <doc:ref type="property" to="Source:Type">type</doc:ref>
             has the value "battery".
           </doc:para>
         </doc:description>
       </doc:doc>
     </property>
 
-    <property name="state" type="u" access="read">
+    <property name="State" type="u" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
@@ -581,28 +581,28 @@ method return sender=:1.386 -> dest=:1.477 reply_serial=2
           </doc:list>
           <doc:para>
             This property is only valid if the property
-            <doc:ref type="property" to="Source:type">type</doc:ref>
+            <doc:ref type="property" to="Source:Type">type</doc:ref>
             has the value "battery".
           </doc:para>
         </doc:description>
       </doc:doc>
     </property>
 
-    <property name="is-rechargeable" type="b" access="read">
+    <property name="IsRechargeable" type="b" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
             If the power source is rechargeable.
           </doc:para><doc:para>
             This property is only valid if the property
-            <doc:ref type="property" to="Source:type">type</doc:ref>
+            <doc:ref type="property" to="Source:Type">type</doc:ref>
             has the value "battery".
           </doc:para>
         </doc:description>
       </doc:doc>
     </property>
 
-    <property name="capacity" type="d" access="read">
+    <property name="Capacity" type="d" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
@@ -610,20 +610,20 @@ method return sender=:1.386 -> dest=:1.477 reply_serial=2
             The capacity of the battery will reduce with age.
             A capacity value less than 75% is usually a sign that you should renew your battery.
             Typically this value is the same as
-            (<doc:ref type="property" to="Source:full-design">full-design</doc:ref> /
-            <doc:ref type="property" to="Source:full">full</doc:ref>) * 100.
+            (<doc:ref type="property" to="Source:FullDesign">full-design</doc:ref> /
+            <doc:ref type="property" to="Source:Full">full</doc:ref>) * 100.
             However, some primitive power sources are not capable reporting capacity
             and in this case the capacity property will be unset.
           </doc:para><doc:para>
             This property is only valid if the property
-            <doc:ref type="property" to="Source:type">type</doc:ref>
+            <doc:ref type="property" to="Source:Type">type</doc:ref>
             has the value "battery".
           </doc:para>
         </doc:description>
       </doc:doc>
     </property>
 
-    <property name="technology" type="u" access="read">
+    <property name="Technology" type="u" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
@@ -654,14 +654,14 @@ method return sender=:1.386 -> dest=:1.477 reply_serial=2
           </doc:list>
           <doc:para>
             This property is only valid if the property
-            <doc:ref type="property" to="Source:type">type</doc:ref>
+            <doc:ref type="property" to="Source:Type">type</doc:ref>
             has the value "battery".
           </doc:para>
         </doc:description>
       </doc:doc>
     </property>
 
-    <property name="recall-notice" type="b" access="read">
+    <property name="RecallNotice" type="b" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
@@ -674,7 +674,7 @@ method return sender=:1.386 -> dest=:1.477 reply_serial=2
       </doc:doc>
     </property>
 
-    <property name="recall-vendor" type="s" access="read">
+    <property name="RecallVendor" type="s" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
@@ -687,7 +687,7 @@ method return sender=:1.386 -> dest=:1.477 reply_serial=2
       </doc:doc>
     </property>
 
-    <property name="recall-url" type="s" access="read">
+    <property name="RecallUrl" type="s" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
diff --git a/src/org.freedesktop.DeviceKit.Power.Wakeups.xml b/src/org.freedesktop.DeviceKit.Power.Wakeups.xml
index d3e0342..27fa662 100644
--- a/src/org.freedesktop.DeviceKit.Power.Wakeups.xml
+++ b/src/org.freedesktop.DeviceKit.Power.Wakeups.xml
@@ -16,7 +16,7 @@
       </doc:description>
     </doc:doc>
 
-    <property name="has-capability" type="b" access="read">
+    <property name="HasCapability" type="b" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
diff --git a/src/org.freedesktop.DeviceKit.Power.xml b/src/org.freedesktop.DeviceKit.Power.xml
index f6f3df9..001cf9c 100644
--- a/src/org.freedesktop.DeviceKit.Power.xml
+++ b/src/org.freedesktop.DeviceKit.Power.xml
@@ -141,39 +141,39 @@ method return sender=:1.386 -> dest=:1.451 reply_serial=2
 
     <!-- ************************************************************ -->
 
-    <property name="daemon-version" type="s" access="read">
+    <property name="DaemonVersion" type="s" access="read">
       <doc:doc><doc:description><doc:para>
             Version of the running daemon, e.g. <doc:tt>002</doc:tt>.
       </doc:para></doc:description></doc:doc>
     </property>
 
-    <property name="can-suspend" type="b" access="read">
+    <property name="CanSuspend" type="b" access="read">
       <doc:doc><doc:description><doc:para>
             Whether the system is able to suspend.
       </doc:para></doc:description></doc:doc>
     </property>
 
-    <property name="can-hibernate" type="b" access="read">
+    <property name="CanHibernate" type="b" access="read">
       <doc:doc><doc:description><doc:para>
             Whether the system is able to hibernate.
       </doc:para></doc:description></doc:doc>
     </property>
 
-    <property name="on-battery" type="b" access="read">
+    <property name="OnBattery" type="b" access="read">
       <doc:doc><doc:description><doc:para>
             Indicates whether the system is running on battery power.
             This property is provided for convenience.
       </doc:para></doc:description></doc:doc>
     </property>
 
-    <property name="on-low-battery" type="b" access="read">
+    <property name="OnLowBattery" type="b" access="read">
       <doc:doc><doc:description><doc:para>
             Indicates whether the system is running on battery power and if the battery is critically low.
             This property is provided for convenience.
       </doc:para></doc:description></doc:doc>
     </property>
 
-    <property name="lid-is-closed" type="b" access="read">
+    <property name="LidIsClosed" type="b" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
@@ -183,7 +183,7 @@ method return sender=:1.386 -> dest=:1.451 reply_serial=2
       </doc:doc>
     </property>
 
-    <property name="lid-is-present" type="b" access="read">
+    <property name="LidIsPresent" type="b" access="read">
       <doc:doc>
         <doc:description>
           <doc:para>
diff --git a/tools/dkp-tool.c b/tools/dkp-tool.c
index 031e9d5..7d79311 100644
--- a/tools/dkp-tool.c
+++ b/tools/dkp-tool.c
@@ -210,7 +210,7 @@ main (int argc, char **argv)
 	DkpDevice *device;
 
 	const GOptionEntry entries[] = {
-		{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, _("Show extra debugging information"), NULL },
+		{ "verbose", '\0', 0, G_OPTION_ARG_NONE, &verbose, _("Show extra debugging information"), NULL },
 		{ "enumerate", 'e', 0, G_OPTION_ARG_NONE, &opt_enumerate, _("Enumerate objects paths for devices"), NULL },
 		{ "dump", 'd', 0, G_OPTION_ARG_NONE, &opt_dump, _("Dump all parameters for all objects"), NULL },
 		{ "wakeups", 'w', 0, G_OPTION_ARG_NONE, &opt_wakeups, _("Get the wakeup data"), NULL },