gdbus: Fix up code style of d-bus interfaces

Bunch of cosmetic code-style changes, making our d-bus interface
conform to generally accepted rules.

4 files changed, 309 insertions, 299 deletions

diff --git a/metadata/meta-daemon.c b/metadata/meta-daemon.c
index 5a1362f8..7c3b7359 100644
--- a/metadata/meta-daemon.c
+++ b/metadata/meta-daemon.c
@@ -113,9 +113,9 @@ tree_info_lookup (const char *filename)
 static gboolean
 handle_set (GVfsMetadata *object,
             GDBusMethodInvocation *invocation,
-            const gchar *treefile,
-            const gchar *path,
-            GVariant *data,
+            const gchar *arg_treefile,
+            const gchar *arg_path,
+            GVariant *arg_data,
             GVfsMetadata *daemon)
 {
   TreeInfo *info;
@@ -126,27 +126,27 @@ handle_set (GVfsMetadata *object,
   GVariantIter iter;
   GVariant *value;
 
-  info = tree_info_lookup (treefile);
+  info = tree_info_lookup (arg_treefile);
   if (info == NULL)
     {
       g_dbus_method_invocation_return_error (invocation,
                                              G_IO_ERROR,
                                              G_IO_ERROR_NOT_FOUND,
                                              _("Can't find metadata file %s"),
-                                             treefile);
+                                             arg_treefile);
       return TRUE;
     }
 
   error = NULL;
 
-  g_variant_iter_init (&iter, data);
+  g_variant_iter_init (&iter, arg_data);
   while (g_variant_iter_next (&iter, "{&sv}", &key, &value))
     {
       if (g_variant_is_of_type (value, G_VARIANT_TYPE_STRING_ARRAY))
 	{
 	  /* stringv */
           strv = g_variant_get_strv (value, NULL);
-	  if (!meta_tree_set_stringv (info->tree, path, key, (gchar **) strv))
+	  if (!meta_tree_set_stringv (info->tree, arg_path, key, (gchar **) strv))
 	    {
 	      g_set_error_literal (&error, G_IO_ERROR,
                                    G_IO_ERROR_FAILED,
@@ -158,7 +158,7 @@ handle_set (GVfsMetadata *object,
 	{
 	  /* string */
           str = g_variant_get_string (value, NULL);
-	  if (!meta_tree_set_string (info->tree, path, key, str))
+	  if (!meta_tree_set_string (info->tree, arg_path, key, str))
 	    {
               g_set_error_literal (&error, G_IO_ERROR,
                                    G_IO_ERROR_FAILED,
@@ -168,7 +168,7 @@ handle_set (GVfsMetadata *object,
       else if (g_variant_is_of_type (value, G_VARIANT_TYPE_BYTE))
 	{
 	  /* Unset */
-	  if (!meta_tree_unset (info->tree, path, key))
+	  if (!meta_tree_unset (info->tree, arg_path, key))
 	    {
               g_set_error_literal (&error, G_IO_ERROR,
                                    G_IO_ERROR_FAILED,
@@ -234,9 +234,9 @@ enum_keys (const char *key,
 static gboolean
 handle_get (GVfsMetadata *object,
             GDBusMethodInvocation *invocation,
-            const gchar *treefile,
-            const gchar *path,
-            const gchar *const *keys,
+            const gchar *arg_treefile,
+            const gchar *arg_path,
+            const gchar *const *arg_keys,
             GVfsMetadata *daemon)
 {
   TreeInfo *info;
@@ -246,35 +246,35 @@ handle_get (GVfsMetadata *object,
   gchar **i;
   GVariantBuilder *builder;
 
-  info = tree_info_lookup (treefile);
+  info = tree_info_lookup (arg_treefile);
   if (info == NULL)
     {
       g_dbus_method_invocation_return_error (invocation,
                                              G_IO_ERROR,
                                              G_IO_ERROR_NOT_FOUND,
                                              _("Can't find metadata file %s"),
-                                             treefile);
+                                             arg_treefile);
       return TRUE;
     }
 
-  if (keys == NULL)
+  if (arg_keys == NULL)
     {
       /* Get all keys */
       free_keys = TRUE;
       meta_keys = g_ptr_array_new ();
-      meta_tree_enumerate_keys (info->tree, path, enum_keys, meta_keys);
+      meta_tree_enumerate_keys (info->tree, arg_path, enum_keys, meta_keys);
       iter_keys = (gchar **) g_ptr_array_free (meta_keys, FALSE);
     }
   else
     {
       free_keys = FALSE;
-      iter_keys = (gchar **) keys;
+      iter_keys = (gchar **) arg_keys;
     }
 
   builder = g_variant_builder_new (G_VARIANT_TYPE_VARDICT);
 
   for (i = iter_keys; *i; i++)
-    append_key (builder, info->tree, path, *i);
+    append_key (builder, info->tree, arg_path, *i);
   if (free_keys)
     g_strfreev (iter_keys);
   
@@ -288,25 +288,25 @@ handle_get (GVfsMetadata *object,
 static gboolean
 handle_unset (GVfsMetadata *object,
               GDBusMethodInvocation *invocation,
-              const gchar *treefile,
-              const gchar *path,
-              const gchar *key,
+              const gchar *arg_treefile,
+              const gchar *arg_path,
+              const gchar *arg_key,
               GVfsMetadata *daemon)
 {
   TreeInfo *info;
 
-  info = tree_info_lookup (treefile);
+  info = tree_info_lookup (arg_treefile);
   if (info == NULL)
     {
       g_dbus_method_invocation_return_error (invocation,
                                              G_IO_ERROR,
                                              G_IO_ERROR_NOT_FOUND,
                                              _("Can't find metadata file %s"),
-                                             treefile);
+                                             arg_treefile);
       return TRUE;
     }
 
-  if (!meta_tree_unset (info->tree, path, key))
+  if (!meta_tree_unset (info->tree, arg_path, arg_key))
     {
       g_dbus_method_invocation_return_error_literal (invocation,
                                                      G_IO_ERROR,
@@ -324,24 +324,24 @@ handle_unset (GVfsMetadata *object,
 static gboolean
 handle_remove (GVfsMetadata *object,
                GDBusMethodInvocation *invocation,
-               const gchar *treefile,
-               const gchar *path,
+               const gchar *arg_treefile,
+               const gchar *arg_path,
                GVfsMetadata *daemon)
 {
   TreeInfo *info;
 
-  info = tree_info_lookup (treefile);
+  info = tree_info_lookup (arg_treefile);
   if (info == NULL)
     {
       g_dbus_method_invocation_return_error (invocation,
                                              G_IO_ERROR,
                                              G_IO_ERROR_NOT_FOUND,
                                              _("Can't find metadata file %s"),
-                                             treefile);
+                                             arg_treefile);
       return TRUE;
     }
 
-  if (!meta_tree_remove (info->tree, path))
+  if (!meta_tree_remove (info->tree, arg_path))
     {
       g_dbus_method_invocation_return_error_literal (invocation,
                                                      G_IO_ERROR,
@@ -359,26 +359,26 @@ handle_remove (GVfsMetadata *object,
 static gboolean
 handle_move (GVfsMetadata *object,
              GDBusMethodInvocation *invocation,
-             const gchar *treefile,
-             const gchar *path,
-             const gchar *dest_path,
+             const gchar *arg_treefile,
+             const gchar *arg_path,
+             const gchar *arg_dest_path,
              GVfsMetadata *daemon)
 {
   TreeInfo *info;
 
-  info = tree_info_lookup (treefile);
+  info = tree_info_lookup (arg_treefile);
   if (info == NULL)
     {
       g_dbus_method_invocation_return_error (invocation,
                                              G_IO_ERROR,
                                              G_IO_ERROR_NOT_FOUND,
                                              _("Can't find metadata file %s"),
-                                             treefile);
+                                             arg_treefile);
       return TRUE;
     }
 
   /* Overwrites any dest */
-  if (!meta_tree_copy (info->tree, path, dest_path))
+  if (!meta_tree_copy (info->tree, arg_path, arg_dest_path))
     {
       g_dbus_method_invocation_return_error_literal (invocation,
                                                      G_IO_ERROR,
@@ -388,7 +388,7 @@ handle_move (GVfsMetadata *object,
     }
 
   /* Remove source if copy succeeded (ignoring errors) */
-  meta_tree_remove (info->tree, path);
+  meta_tree_remove (info->tree, arg_path);
 
   tree_info_schedule_writeout (info);
   gvfs_metadata_complete_move (object, invocation);
diff --git a/monitor/proxy/dbus-interfaces.xml b/monitor/proxy/dbus-interfaces.xml
index b7999896..49af8c76 100644
--- a/monitor/proxy/dbus-interfaces.xml
+++ b/monitor/proxy/dbus-interfaces.xml
@@ -28,148 +28,148 @@
 
     <!--  GIO side  -->
     <signal name="DriveChanged">
-      <arg type='s' name='TheDBusName'/>
-      <arg type='s' name='Id'/>
-      <arg type='(sssbbbbbbbbuasa{ss}sa{sv})' name='Drive'/>
+      <arg type='s' name='dbus_name'/>
+      <arg type='s' name='id'/>
+      <arg type='(sssbbbbbbbbuasa{ss}sa{sv})' name='drive'/>
     </signal>
     <signal name="DriveConnected">
-      <arg type='s' name='TheDBusName'/>
-      <arg type='s' name='Id'/>
-      <arg type='(sssbbbbbbbbuasa{ss}sa{sv})' name='Drive'/>
+      <arg type='s' name='dbus_name'/>
+      <arg type='s' name='id'/>
+      <arg type='(sssbbbbbbbbuasa{ss}sa{sv})' name='drive'/>
     </signal>
     <signal name="DriveDisconnected">
-      <arg type='s' name='TheDBusName'/>
-      <arg type='s' name='Id'/>
-      <arg type='(sssbbbbbbbbuasa{ss}sa{sv})' name='Drive'/> 
+      <arg type='s' name='dbus_name'/>
+      <arg type='s' name='id'/>
+      <arg type='(sssbbbbbbbbuasa{ss}sa{sv})' name='drive'/>
     </signal>
     <signal name="DriveEjectButton">
-      <arg type='s' name='TheDBusName'/>
-      <arg type='s' name='Id'/>
-      <arg type='(sssbbbbbbbbuasa{ss}sa{sv})' name='Drive'/>
+      <arg type='s' name='dbus_name'/>
+      <arg type='s' name='id'/>
+      <arg type='(sssbbbbbbbbuasa{ss}sa{sv})' name='drive'/>
     </signal>
     <signal name="DriveStopButton">
-      <arg type='s' name='TheDBusName'/>
-      <arg type='s' name='Id'/>
-      <arg type='(sssbbbbbbbbuasa{ss}sa{sv})' name='Drive'/> 
+      <arg type='s' name='dbus_name'/>
+      <arg type='s' name='id'/>
+      <arg type='(sssbbbbbbbbuasa{ss}sa{sv})' name='drive'/>
     </signal>
     <signal name="VolumeChanged">
-      <arg type='s' name='TheDBusName'/>
-      <arg type='s' name='Id'/>
-      <arg type='(sssssbbssa{ss}sa{sv})' name='Volume'/>
+      <arg type='s' name='dbus_name'/>
+      <arg type='s' name='id'/>
+      <arg type='(sssssbbssa{ss}sa{sv})' name='volume'/>
     </signal>
     <signal name="VolumeAdded">
-      <arg type='s' name='TheDBusName'/>
-      <arg type='s' name='Id'/>
-      <arg type='(sssssbbssa{ss}sa{sv})' name='Volume'/>
+      <arg type='s' name='dbus_name'/>
+      <arg type='s' name='id'/>
+      <arg type='(sssssbbssa{ss}sa{sv})' name='volume'/>
     </signal>
     <signal name="VolumeRemoved">
-      <arg type='s' name='TheDBusName'/>
-      <arg type='s' name='Id'/>
-      <arg type='(sssssbbssa{ss}sa{sv})' name='Volume'/>
+      <arg type='s' name='dbus_name'/>
+      <arg type='s' name='id'/>
+      <arg type='(sssssbbssa{ss}sa{sv})' name='volume'/>
     </signal>
     <signal name="MountChanged">
-      <arg type='s' name='TheDBusName'/>
-      <arg type='s' name='Id'/>
-      <arg type='(sssssbsassa{sv})' name='Mount'/>
+      <arg type='s' name='dbus_name'/>
+      <arg type='s' name='id'/>
+      <arg type='(sssssbsassa{sv})' name='mount'/>
     </signal>
     <signal name="MountAdded">
-      <arg type='s' name='TheDBusName'/>
-      <arg type='s' name='Id'/>
-      <arg type='(sssssbsassa{sv})' name='Mount'/>
+      <arg type='s' name='dbus_name'/>
+      <arg type='s' name='id'/>
+      <arg type='(sssssbsassa{sv})' name='mount'/>
     </signal>
     <signal name="MountPreUnmount">
-      <arg type='s' name='TheDBusName'/>
-      <arg type='s' name='Id'/>
-      <arg type='(sssssbsassa{sv})' name='Mount'/> 
+      <arg type='s' name='dbus_name'/>
+      <arg type='s' name='id'/>
+      <arg type='(sssssbsassa{sv})' name='mount'/>
     </signal>
     <signal name="MountRemoved">
-      <arg type='s' name='TheDBusName'/>
-      <arg type='s' name='Id'/>
-      <arg type='(sssssbsassa{sv})' name='Mount'/> 
+      <arg type='s' name='dbus_name'/>
+      <arg type='s' name='id'/>
+      <arg type='(sssssbsassa{sv})' name='mount'/>
     </signal>
     <signal name="MountOpAskPassword">
-      <arg type='s' name='TheDBusName'/>
-      <arg type='s' name='Id'/>
-      <arg type='s' name='MessageToShow'/>
-      <arg type='s' name='DefaultUser'/>
-      <arg type='s' name='DefaultDomain'/>
-      <arg type='u' name='Flags'/>
+      <arg type='s' name='dbus_name'/>
+      <arg type='s' name='id'/>
+      <arg type='s' name='message_to_show'/>
+      <arg type='s' name='default_user'/>
+      <arg type='s' name='default_domain'/>
+      <arg type='u' name='flags'/>
     </signal>
     <signal name="MountOpAskQuestion">
-      <arg type='s' name='TheDBusName'/>
-      <arg type='s' name='Id'/>
-      <arg type='s' name='MessageToShow'/>
-      <arg type='as' name='Choices'/>
+      <arg type='s' name='dbus_name'/>
+      <arg type='s' name='id'/>
+      <arg type='s' name='message_to_show'/>
+      <arg type='as' name='choices'/>
     </signal>
     <signal name="MountOpShowProcesses">
-      <arg type='s' name='TheDBusName'/>
-      <arg type='s' name='Id'/>
-      <arg type='s' name='MessageToShow'/>
-      <arg type='ai' name='Pid'/>
-      <arg type='as' name='Choices'/>
+      <arg type='s' name='dbus_name'/>
+      <arg type='s' name='id'/>
+      <arg type='s' name='message_to_show'/>
+      <arg type='ai' name='pid'/>
+      <arg type='as' name='choices'/>
     </signal>
     <signal name="MountOpAborted">
-      <arg type='s' name='TheDBusName'/>
-      <arg type='s' name='Id'/>
+      <arg type='s' name='dbus_name'/>
+      <arg type='s' name='id'/>
     </signal>
 
 
     <!--  Particular volume monitor implementations  -->
     <method name="IsSupported">
-      <arg type='b' name='IsSupported' direction='out'/>
+      <arg type='b' name='is_supported' direction='out'/>
     </method>
     <method name="List">
-      <arg type='a(sssbbbbbbbbuasa{ss}sa{sv})' name='Drives' direction='out'/>
-      <arg type='a(sssssbbssa{ss}sa{sv})' name='Volumes' direction='out'/>
-      <arg type='a(sssssbsassa{sv})' name='Mounts' direction='out'/>
+      <arg type='a(sssbbbbbbbbuasa{ss}sa{sv})' name='drives' direction='out'/>
+      <arg type='a(sssssbbssa{ss}sa{sv})' name='volumes' direction='out'/>
+      <arg type='a(sssssbsassa{sv})' name='mounts' direction='out'/>
     </method>
     <method name="CancelOperation">
-      <arg type='s' name='CancellationId' direction='in'/>
-      <arg type='b' name='WasCancelled' direction='out'/>
+      <arg type='s' name='cancellation_id' direction='in'/>
+      <arg type='b' name='was_cancelled' direction='out'/>
     </method>
     <method name="MountUnmount">
-      <arg type='s' name='Id' direction='in'/>
-      <arg type='s' name='CancellationId' direction='in'/>
-      <arg type='u' name='UnmountFlags' direction='in'/>
-      <arg type='s' name='MountOpId' direction='in'/>
+      <arg type='s' name='id' direction='in'/>
+      <arg type='s' name='cancellation_id' direction='in'/>
+      <arg type='u' name='unmount_flags' direction='in'/>
+      <arg type='s' name='mount_op_id' direction='in'/>
     </method>
     <method name="VolumeMount">
-      <arg type='s' name='Id' direction='in'/>
-      <arg type='s' name='CancellationId' direction='in'/>
-      <arg type='u' name='MountFlags' direction='in'/>
-      <arg type='s' name='MountOpId' direction='in'/>
+      <arg type='s' name='id' direction='in'/>
+      <arg type='s' name='cancellation_id' direction='in'/>
+      <arg type='u' name='mount_flags' direction='in'/>
+      <arg type='s' name='mount_op_id' direction='in'/>
     </method>
     <method name="DriveEject">
-      <arg type='s' name='Id' direction='in'/>
-      <arg type='s' name='CancellationId' direction='in'/>
-      <arg type='u' name='UnmountFlags' direction='in'/>
-      <arg type='s' name='MountOpId' direction='in'/>
+      <arg type='s' name='id' direction='in'/>
+      <arg type='s' name='cancellation_id' direction='in'/>
+      <arg type='u' name='unmount_flags' direction='in'/>
+      <arg type='s' name='mount_op_id' direction='in'/>
     </method>
     <method name="DrivePollForMedia">
-      <arg type='s' name='Id' direction='in'/>
-      <arg type='s' name='CancellationId' direction='in'/>
+      <arg type='s' name='id' direction='in'/>
+      <arg type='s' name='cancellation_id' direction='in'/>
     </method>
     <method name="DriveStart">
-      <arg type='s' name='Id' direction='in'/>
-      <arg type='s' name='CancellationId' direction='in'/>
-      <arg type='u' name='Flags' direction='in'/>
-      <arg type='s' name='MountOpId' direction='in'/>
+      <arg type='s' name='id' direction='in'/>
+      <arg type='s' name='cancellation_id' direction='in'/>
+      <arg type='u' name='flags' direction='in'/>
+      <arg type='s' name='mount_op_id' direction='in'/>
     </method>
     <method name="DriveStop">
-      <arg type='s' name='Id' direction='in'/>
-      <arg type='s' name='CancellationId' direction='in'/>
-      <arg type='u' name='UnmountFlags' direction='in'/>
-      <arg type='s' name='MountOpId' direction='in'/>
+      <arg type='s' name='id' direction='in'/>
+      <arg type='s' name='cancellation_id' direction='in'/>
+      <arg type='u' name='unmount_flags' direction='in'/>
+      <arg type='s' name='mount_op_id' direction='in'/>
     </method>
     <method name="MountOpReply">
-      <arg type='s' name='MountOpId' direction='in'/>
-      <arg type='i' name='Result' direction='in'/>
-      <arg type='s' name='UserName' direction='in'/>
-      <arg type='s' name='Domain' direction='in'/>
-      <arg type='s' name='EncodedPassword' direction='in'/>
-      <arg type='i' name='PasswordSave' direction='in'/>
-      <arg type='i' name='Choice' direction='in'/>
-      <arg type='b' name='Anonymous' direction='in'/>
+      <arg type='s' name='mount_op_id' direction='in'/>
+      <arg type='i' name='result' direction='in'/>
+      <arg type='s' name='user_name' direction='in'/>
+      <arg type='s' name='domain' direction='in'/>
+      <arg type='s' name='encoded_password' direction='in'/>
+      <arg type='i' name='password_save' direction='in'/>
+      <arg type='i' name='choice' direction='in'/>
+      <arg type='b' name='anonymous' direction='in'/>
     </method>
   </interface>
 </node>
diff --git a/monitor/proxy/gproxyvolumemonitor.c b/monitor/proxy/gproxyvolumemonitor.c
index 0a0fd591..57c127c3 100644
--- a/monitor/proxy/gproxyvolumemonitor.c
+++ b/monitor/proxy/gproxyvolumemonitor.c
@@ -348,9 +348,9 @@ get_mount_for_mount_path (const char *mount_path,
 
 static void
 drive_changed (GVfsRemoteVolumeMonitor *object,
-               const gchar *TheDBusName,
-               const gchar *Id,
-               GVariant *Drive,
+               const gchar *arg_dbus_name,
+               const gchar *arg_id,
+               GVariant *arg_drive,
                gpointer user_data)
 {
   GProxyVolumeMonitor *monitor = G_PROXY_VOLUME_MONITOR (user_data);
@@ -361,13 +361,13 @@ drive_changed (GVfsRemoteVolumeMonitor *object,
 
   klass = G_PROXY_VOLUME_MONITOR_CLASS (G_OBJECT_GET_CLASS (monitor));
 
-  if (strcmp (TheDBusName, klass->dbus_name) != 0)
+  if (strcmp (arg_dbus_name, klass->dbus_name) != 0)
     goto not_for_us;
   
-  d = g_hash_table_lookup (monitor->drives, Id);
+  d = g_hash_table_lookup (monitor->drives, arg_id);
   if (d != NULL)
     {
-      g_proxy_drive_update (d, Drive);
+      g_proxy_drive_update (d, arg_drive);
       signal_emit_in_idle (d, "changed", NULL);
       signal_emit_in_idle (monitor, "drive-changed", d);
     }
@@ -378,9 +378,9 @@ drive_changed (GVfsRemoteVolumeMonitor *object,
 
 static void
 drive_connected (GVfsRemoteVolumeMonitor *object,
-                 const gchar *TheDBusName,
-                 const gchar *Id,
-                 GVariant *Drive,
+                 const gchar *arg_dbus_name,
+                 const gchar *arg_id,
+                 GVariant *arg_drive,
                  gpointer user_data)
 {
   GProxyVolumeMonitor *monitor = G_PROXY_VOLUME_MONITOR (user_data);
@@ -391,14 +391,14 @@ drive_connected (GVfsRemoteVolumeMonitor *object,
 
   klass = G_PROXY_VOLUME_MONITOR_CLASS (G_OBJECT_GET_CLASS (monitor));
 
-  if (strcmp (TheDBusName, klass->dbus_name) != 0)
+  if (strcmp (arg_dbus_name, klass->dbus_name) != 0)
     goto not_for_us;
   
-  d = g_hash_table_lookup (monitor->drives, Id);
+  d = g_hash_table_lookup (monitor->drives, arg_id);
   if (d == NULL)
     {
       d = g_proxy_drive_new (monitor);
-      g_proxy_drive_update (d, Drive);
+      g_proxy_drive_update (d, arg_drive);
       g_hash_table_insert (monitor->drives, g_strdup (g_proxy_drive_get_id (d)), d);
       signal_emit_in_idle (monitor, "drive-connected", d);
     }
@@ -409,9 +409,9 @@ drive_connected (GVfsRemoteVolumeMonitor *object,
 
 static void
 drive_disconnected (GVfsRemoteVolumeMonitor *object,
-                    const gchar *TheDBusName,
-                    const gchar *Id,
-                    GVariant *Drive,
+                    const gchar *arg_dbus_name,
+                    const gchar *arg_id,
+                    GVariant *arg_drive,
                     gpointer user_data)
 {
   GProxyVolumeMonitor *monitor = G_PROXY_VOLUME_MONITOR (user_data);
@@ -422,14 +422,14 @@ drive_disconnected (GVfsRemoteVolumeMonitor *object,
 
   klass = G_PROXY_VOLUME_MONITOR_CLASS (G_OBJECT_GET_CLASS (monitor));
 
-  if (strcmp (TheDBusName, klass->dbus_name) != 0)
+  if (strcmp (arg_dbus_name, klass->dbus_name) != 0)
     goto not_for_us;
   
-  d = g_hash_table_lookup (monitor->drives, Id);
+  d = g_hash_table_lookup (monitor->drives, arg_id);
   if (d != NULL)
     {
       g_object_ref (d);
-      g_hash_table_remove (monitor->drives, Id);
+      g_hash_table_remove (monitor->drives, arg_id);
       signal_emit_in_idle (d, "disconnected", NULL);
       signal_emit_in_idle (monitor, "drive-disconnected", d);
       g_object_unref (d);
@@ -441,9 +441,9 @@ drive_disconnected (GVfsRemoteVolumeMonitor *object,
 
 static void
 drive_eject_button (GVfsRemoteVolumeMonitor *object,
-                    const gchar *TheDBusName,
-                    const gchar *Id,
-                    GVariant *Drive,
+                    const gchar *arg_dbus_name,
+                    const gchar *arg_id,
+                    GVariant *arg_drive,
                     gpointer user_data)
 {
   GProxyVolumeMonitor *monitor = G_PROXY_VOLUME_MONITOR (user_data);
@@ -454,10 +454,10 @@ drive_eject_button (GVfsRemoteVolumeMonitor *object,
 
   klass = G_PROXY_VOLUME_MONITOR_CLASS (G_OBJECT_GET_CLASS (monitor));
 
-  if (strcmp (TheDBusName, klass->dbus_name) != 0)
+  if (strcmp (arg_dbus_name, klass->dbus_name) != 0)
     goto not_for_us;
   
-  d = g_hash_table_lookup (monitor->drives, Id);
+  d = g_hash_table_lookup (monitor->drives, arg_id);
   if (d != NULL)
     {
       signal_emit_in_idle (d, "eject-button", NULL);
@@ -470,9 +470,9 @@ drive_eject_button (GVfsRemoteVolumeMonitor *object,
 
 static void
 drive_stop_button (GVfsRemoteVolumeMonitor *object,
-                   const gchar *TheDBusName,
-                   const gchar *Id,
-                   GVariant *Drive,
+                   const gchar *arg_dbus_name,
+                   const gchar *arg_id,
+                   GVariant *arg_drive,
                    gpointer user_data)
 {
   GProxyVolumeMonitor *monitor = G_PROXY_VOLUME_MONITOR (user_data);
@@ -483,10 +483,10 @@ drive_stop_button (GVfsRemoteVolumeMonitor *object,
 
   klass = G_PROXY_VOLUME_MONITOR_CLASS (G_OBJECT_GET_CLASS (monitor));
 
-  if (strcmp (TheDBusName, klass->dbus_name) != 0)
+  if (strcmp (arg_dbus_name, klass->dbus_name) != 0)
     goto not_for_us;
   
-  d = g_hash_table_lookup (monitor->drives, Id);
+  d = g_hash_table_lookup (monitor->drives, arg_id);
   if (d != NULL)
     {
       signal_emit_in_idle (d, "stop-button", NULL);
@@ -499,9 +499,9 @@ drive_stop_button (GVfsRemoteVolumeMonitor *object,
 
 static void
 mount_added (GVfsRemoteVolumeMonitor *object,
-             const gchar *TheDBusName,
-             const gchar *Id,
-             GVariant *Mount,
+             const gchar *arg_dbus_name,
+             const gchar *arg_id,
+             GVariant *arg_mount,
              gpointer user_data)
 {
   GProxyVolumeMonitor *monitor = G_PROXY_VOLUME_MONITOR (user_data);
@@ -512,14 +512,14 @@ mount_added (GVfsRemoteVolumeMonitor *object,
 
   klass = G_PROXY_VOLUME_MONITOR_CLASS (G_OBJECT_GET_CLASS (monitor));
 
-  if (strcmp (TheDBusName, klass->dbus_name) != 0)
+  if (strcmp (arg_dbus_name, klass->dbus_name) != 0)
     goto not_for_us;
   
-  m = g_hash_table_lookup (monitor->mounts, Id);
+  m = g_hash_table_lookup (monitor->mounts, arg_id);
   if (m == NULL)
     {
       m = g_proxy_mount_new (monitor);
-      g_proxy_mount_update (m, Mount);
+      g_proxy_mount_update (m, arg_mount);
       g_hash_table_insert (monitor->mounts, g_strdup (g_proxy_mount_get_id (m)), m);
       signal_emit_in_idle (monitor, "mount-added", m);
     }
@@ -530,9 +530,9 @@ mount_added (GVfsRemoteVolumeMonitor *object,
 
 static void
 mount_changed (GVfsRemoteVolumeMonitor *object,
-               const gchar *TheDBusName,
-               const gchar *Id,
-               GVariant *Mount,
+               const gchar *arg_dbus_name,
+               const gchar *arg_id,
+               GVariant *arg_mount,
                gpointer user_data)
 {
   GProxyVolumeMonitor *monitor = G_PROXY_VOLUME_MONITOR (user_data);
@@ -543,13 +543,13 @@ mount_changed (GVfsRemoteVolumeMonitor *object,
 
   klass = G_PROXY_VOLUME_MONITOR_CLASS (G_OBJECT_GET_CLASS (monitor));
 
-  if (strcmp (TheDBusName, klass->dbus_name) != 0)
+  if (strcmp (arg_dbus_name, klass->dbus_name) != 0)
     goto not_for_us;
   
-  m = g_hash_table_lookup (monitor->mounts, Id);
+  m = g_hash_table_lookup (monitor->mounts, arg_id);
   if (m != NULL)
     {
-      g_proxy_mount_update (m, Mount);
+      g_proxy_mount_update (m, arg_mount);
       signal_emit_in_idle (m, "changed", NULL);
       signal_emit_in_idle (monitor, "mount-changed", m);
     }
@@ -560,9 +560,9 @@ mount_changed (GVfsRemoteVolumeMonitor *object,
 
 static void
 mount_pre_unmount (GVfsRemoteVolumeMonitor *object,
-                   const gchar *TheDBusName,
-                   const gchar *Id,
-                   GVariant *Mount,
+                   const gchar *arg_dbus_name,
+                   const gchar *arg_id,
+                   GVariant *arg_mount,
                    gpointer user_data)
 {
   GProxyVolumeMonitor *monitor = G_PROXY_VOLUME_MONITOR (user_data);
@@ -573,10 +573,10 @@ mount_pre_unmount (GVfsRemoteVolumeMonitor *object,
 
   klass = G_PROXY_VOLUME_MONITOR_CLASS (G_OBJECT_GET_CLASS (monitor));
 
-  if (strcmp (TheDBusName, klass->dbus_name) != 0)
+  if (strcmp (arg_dbus_name, klass->dbus_name) != 0)
     goto not_for_us;
   
-  m = g_hash_table_lookup (monitor->mounts, Id);
+  m = g_hash_table_lookup (monitor->mounts, arg_id);
   if (m != NULL)
     {
       signal_emit_in_idle (m, "pre-unmount", NULL);
@@ -589,9 +589,9 @@ mount_pre_unmount (GVfsRemoteVolumeMonitor *object,
 
 static void
 mount_removed (GVfsRemoteVolumeMonitor *object,
-               const gchar *TheDBusName,
-               const gchar *Id,
-               GVariant *Mount,
+               const gchar *arg_dbus_name,
+               const gchar *arg_id,
+               GVariant *arg_mount,
                gpointer user_data)
 {
   GProxyVolumeMonitor *monitor = G_PROXY_VOLUME_MONITOR (user_data);
@@ -602,14 +602,14 @@ mount_removed (GVfsRemoteVolumeMonitor *object,
 
   klass = G_PROXY_VOLUME_MONITOR_CLASS (G_OBJECT_GET_CLASS (monitor));
 
-  if (strcmp (TheDBusName, klass->dbus_name) != 0)
+  if (strcmp (arg_dbus_name, klass->dbus_name) != 0)
     goto not_for_us;
   
-  m = g_hash_table_lookup (monitor->mounts, Id);
+  m = g_hash_table_lookup (monitor->mounts, arg_id);
   if (m != NULL)
     {
       g_object_ref (m);
-      g_hash_table_remove (monitor->mounts, Id);
+      g_hash_table_remove (monitor->mounts, arg_id);
       signal_emit_in_idle (m, "unmounted", NULL);
       signal_emit_in_idle (monitor, "mount-removed", m);
       g_object_unref (m);
@@ -621,8 +621,8 @@ mount_removed (GVfsRemoteVolumeMonitor *object,
 
 static void
 mount_op_aborted (GVfsRemoteVolumeMonitor *object,
-                  const gchar *TheDBusName,
-                  const gchar *Id,
+                  const gchar *arg_dbus_name,
+                  const gchar *arg_id,
                   gpointer user_data)
 {
   GProxyVolumeMonitor *monitor = G_PROXY_VOLUME_MONITOR (user_data);
@@ -632,10 +632,10 @@ mount_op_aborted (GVfsRemoteVolumeMonitor *object,
 
   klass = G_PROXY_VOLUME_MONITOR_CLASS (G_OBJECT_GET_CLASS (monitor));
 
-  if (strcmp (TheDBusName, klass->dbus_name) != 0)
+  if (strcmp (arg_dbus_name, klass->dbus_name) != 0)
     goto not_for_us;
   
-  g_proxy_mount_operation_handle_aborted (Id);
+  g_proxy_mount_operation_handle_aborted (arg_id);
 
   not_for_us:
    G_UNLOCK (proxy_vm);
@@ -643,12 +643,12 @@ mount_op_aborted (GVfsRemoteVolumeMonitor *object,
 
 static void
 mount_op_ask_password (GVfsRemoteVolumeMonitor *object,
-                       const gchar *TheDBusName,
-                       const gchar *Id,
-                       const gchar *MessageToShow,
-                       const gchar *DefaultUser,
-                       const gchar *DefaultDomain,
-                       guint Flags,
+                       const gchar *arg_dbus_name,
+                       const gchar *arg_id,
+                       const gchar *arg_message_to_show,
+                       const gchar *arg_default_user,
+                       const gchar *arg_default_domain,
+                       guint arg_flags,
                        gpointer user_data)
 {
   GProxyVolumeMonitor *monitor = G_PROXY_VOLUME_MONITOR (user_data);
@@ -658,14 +658,14 @@ mount_op_ask_password (GVfsRemoteVolumeMonitor *object,
 
   klass = G_PROXY_VOLUME_MONITOR_CLASS (G_OBJECT_GET_CLASS (monitor));
 
-  if (strcmp (TheDBusName, klass->dbus_name) != 0)
+  if (strcmp (arg_dbus_name, klass->dbus_name) != 0)
     goto not_for_us;
   
-  g_proxy_mount_operation_handle_ask_password (Id, 
-                                               MessageToShow,
-                                               DefaultUser, 
-                                               DefaultDomain, 
-                                               Flags);
+  g_proxy_mount_operation_handle_ask_password (arg_id,
+                                               arg_message_to_show,
+                                               arg_default_user,
+                                               arg_default_domain,
+                                               arg_flags);
 
   not_for_us:
    G_UNLOCK (proxy_vm);
@@ -673,10 +673,10 @@ mount_op_ask_password (GVfsRemoteVolumeMonitor *object,
 
 static void
 mount_op_ask_question (GVfsRemoteVolumeMonitor *object,
-                       const gchar *TheDBusName,
-                       const gchar *Id,
-                       const gchar *MessageToShow,
-                       const gchar *const *Choices,
+                       const gchar *arg_dbus_name,
+                       const gchar *arg_id,
+                       const gchar *arg_message_to_show,
+                       const gchar *const *arg_choices,
                        gpointer user_data)
 {
   GProxyVolumeMonitor *monitor = G_PROXY_VOLUME_MONITOR (user_data);
@@ -686,12 +686,12 @@ mount_op_ask_question (GVfsRemoteVolumeMonitor *object,
 
   klass = G_PROXY_VOLUME_MONITOR_CLASS (G_OBJECT_GET_CLASS (monitor));
 
-  if (strcmp (TheDBusName, klass->dbus_name) != 0)
+  if (strcmp (arg_dbus_name, klass->dbus_name) != 0)
     goto not_for_us;
   
-  g_proxy_mount_operation_handle_ask_question (Id,
-                                               MessageToShow,
-                                               Choices);
+  g_proxy_mount_operation_handle_ask_question (arg_id,
+                                               arg_message_to_show,
+                                               arg_choices);
 
   not_for_us:
    G_UNLOCK (proxy_vm);
@@ -699,11 +699,11 @@ mount_op_ask_question (GVfsRemoteVolumeMonitor *object,
 
 static void
 mount_op_show_processes (GVfsRemoteVolumeMonitor *object,
-                         const gchar *TheDBusName,
-                         const gchar *Id,
-                         const gchar *MessageToShow,
-                         GVariant *Pid,
-                         const gchar *const *Choices,
+                         const gchar *arg_dbus_name,
+                         const gchar *arg_id,
+                         const gchar *arg_message_to_show,
+                         GVariant *arg_pid,
+                         const gchar *const *arg_choices,
                          gpointer user_data)
 {
   GProxyVolumeMonitor *monitor = G_PROXY_VOLUME_MONITOR (user_data);
@@ -713,13 +713,13 @@ mount_op_show_processes (GVfsRemoteVolumeMonitor *object,
 
   klass = G_PROXY_VOLUME_MONITOR_CLASS (G_OBJECT_GET_CLASS (monitor));
 
-  if (strcmp (TheDBusName, klass->dbus_name) != 0)
+  if (strcmp (arg_dbus_name, klass->dbus_name) != 0)
     goto not_for_us;
   
-  g_proxy_mount_operation_handle_show_processes (Id, 
-                                                 MessageToShow,
-                                                 Pid,
-                                                 Choices);
+  g_proxy_mount_operation_handle_show_processes (arg_id,
+                                                 arg_message_to_show,
+                                                 arg_pid,
+                                                 arg_choices);
 
   not_for_us:
    G_UNLOCK (proxy_vm);
@@ -727,9 +727,9 @@ mount_op_show_processes (GVfsRemoteVolumeMonitor *object,
 
 static void
 volume_added (GVfsRemoteVolumeMonitor *object,
-              const gchar *TheDBusName,
-              const gchar *Id,
-              GVariant *Volume,
+              const gchar *arg_dbus_name,
+              const gchar *arg_id,
+              GVariant *arg_volume,
               gpointer user_data)
 {
   GProxyVolumeMonitor *monitor = G_PROXY_VOLUME_MONITOR (user_data);
@@ -740,14 +740,14 @@ volume_added (GVfsRemoteVolumeMonitor *object,
 
   klass = G_PROXY_VOLUME_MONITOR_CLASS (G_OBJECT_GET_CLASS (monitor));
 
-  if (strcmp (TheDBusName, klass->dbus_name) != 0)
+  if (strcmp (arg_dbus_name, klass->dbus_name) != 0)
     goto not_for_us;
   
-  v = g_hash_table_lookup (monitor->volumes, Id);
+  v = g_hash_table_lookup (monitor->volumes, arg_id);
   if (v == NULL)
     {
       v = g_proxy_volume_new (monitor);
-      g_proxy_volume_update (v, Volume);
+      g_proxy_volume_update (v, arg_volume);
       g_hash_table_insert (monitor->volumes, g_strdup (g_proxy_volume_get_id (v)), v);
       signal_emit_in_idle (monitor, "volume-added", v);
     }
@@ -758,9 +758,9 @@ volume_added (GVfsRemoteVolumeMonitor *object,
 
 static void
 volume_changed (GVfsRemoteVolumeMonitor *object,
-                const gchar *TheDBusName,
-                const gchar *Id,
-                GVariant *Volume,
+                const gchar *arg_dbus_name,
+                const gchar *arg_id,
+                GVariant *arg_volume,
                 gpointer user_data)
 {
   GProxyVolumeMonitor *monitor = G_PROXY_VOLUME_MONITOR (user_data);
@@ -771,15 +771,15 @@ volume_changed (GVfsRemoteVolumeMonitor *object,
 
   klass = G_PROXY_VOLUME_MONITOR_CLASS (G_OBJECT_GET_CLASS (monitor));
 
-  if (strcmp (TheDBusName, klass->dbus_name) != 0)
+  if (strcmp (arg_dbus_name, klass->dbus_name) != 0)
     goto not_for_us;
   
-  v = g_hash_table_lookup (monitor->volumes, Id);
+  v = g_hash_table_lookup (monitor->volumes, arg_id);
   if (v != NULL)
     {
       GProxyShadowMount *shadow_mount;
 
-      g_proxy_volume_update (v, Volume);
+      g_proxy_volume_update (v, arg_volume);
       signal_emit_in_idle (v, "changed", NULL);
       signal_emit_in_idle (monitor, "volume-changed", v);
 
@@ -798,9 +798,9 @@ volume_changed (GVfsRemoteVolumeMonitor *object,
 
 static void
 volume_removed (GVfsRemoteVolumeMonitor *object,
-                const gchar *TheDBusName,
-                const gchar *Id,
-                GVariant *Volume,
+                const gchar *arg_dbus_name,
+                const gchar *arg_id,
+                GVariant *arg_volume,
                 gpointer user_data)
 {
   GProxyVolumeMonitor *monitor = G_PROXY_VOLUME_MONITOR (user_data);
@@ -811,14 +811,14 @@ volume_removed (GVfsRemoteVolumeMonitor *object,
 
   klass = G_PROXY_VOLUME_MONITOR_CLASS (G_OBJECT_GET_CLASS (monitor));
 
-  if (strcmp (TheDBusName, klass->dbus_name) != 0)
+  if (strcmp (arg_dbus_name, klass->dbus_name) != 0)
     goto not_for_us;
   
-  v = g_hash_table_lookup (monitor->volumes, Id);
+  v = g_hash_table_lookup (monitor->volumes, arg_id);
   if (v != NULL)
     {
       g_object_ref (v);
-      g_hash_table_remove (monitor->volumes, Id);
+      g_hash_table_remove (monitor->volumes, arg_id);
       signal_emit_in_idle (v, "removed", NULL);
       signal_emit_in_idle (monitor, "volume-removed", v);
       dispose_in_idle (v);
diff --git a/monitor/proxy/gvfsproxyvolumemonitordaemon.c b/monitor/proxy/gvfsproxyvolumemonitordaemon.c
index 5812150c..4d449c20 100644
--- a/monitor/proxy/gvfsproxyvolumemonitordaemon.c
+++ b/monitor/proxy/gvfsproxyvolumemonitordaemon.c
@@ -892,7 +892,8 @@ append_mount (GMount *mount)
 
 static gboolean
 handle_list (GVfsRemoteVolumeMonitor *object,
-             GDBusMethodInvocation *invocation)
+             GDBusMethodInvocation *invocation,
+             gpointer user_data)
 {
   GList *drives;
   GList *volumes;
@@ -969,10 +970,11 @@ mount_unmount_cb (GMount *mount, GAsyncResult *result, GDBusMethodInvocation *in
 static gboolean
 handle_mount_unmount (GVfsRemoteVolumeMonitor *object,
                       GDBusMethodInvocation *invocation,
-                      const gchar *Id,
-                      const gchar *CancellationId,
-                      guint UnmountFlags,
-                      const gchar *MountOpId)
+                      const gchar *arg_id,
+                      const gchar *arg_cancellation_id,
+                      guint arg_unmount_flags,
+                      const gchar *arg_mount_op_id,
+                      gpointer user_data)
 {
   const char *sender;
   GCancellable *cancellable;
@@ -992,7 +994,7 @@ handle_mount_unmount (GVfsRemoteVolumeMonitor *object,
 
       mount = G_MOUNT (l->data);
       mount_id = g_strdup_printf ("%p", mount);
-      if (strcmp (mount_id, Id) == 0)
+      if (strcmp (mount_id, arg_id) == 0)
         break;
 
       g_free (mount_id);
@@ -1019,7 +1021,7 @@ handle_mount_unmount (GVfsRemoteVolumeMonitor *object,
   cancellable = g_cancellable_new ();
   g_object_set_data_full (G_OBJECT (mount), "cancellable", cancellable, g_object_unref);
   g_object_set_data_full (G_OBJECT (cancellable), "owner", g_strdup (sender), g_free);
-  g_object_set_data_full (G_OBJECT (cancellable), "cancellation_id", g_strdup (CancellationId), g_free);
+  g_object_set_data_full (G_OBJECT (cancellable), "cancellation_id", g_strdup (arg_cancellation_id), g_free);
   G_LOCK (outstanding_ops_lock);
   outstanding_ops = g_list_prepend (outstanding_ops, cancellable);
   G_UNLOCK (outstanding_ops_lock);
@@ -1028,15 +1030,15 @@ handle_mount_unmount (GVfsRemoteVolumeMonitor *object,
                      NULL);
 
   mount_operation = NULL;
-  if (MountOpId != NULL && strlen (MountOpId) > 0)
+  if (arg_mount_op_id != NULL && strlen (arg_mount_op_id) > 0)
     {
-      mount_operation = wrap_mount_op (MountOpId, sender, object);
+      mount_operation = wrap_mount_op (arg_mount_op_id, sender, object);
       g_object_set_data_full (G_OBJECT (mount), "mount_operation", mount_operation, g_object_unref);
     }
 
   g_object_ref (mount);
   g_mount_unmount_with_operation (mount,
-                                  UnmountFlags,
+                                  arg_unmount_flags,
                                   mount_operation,
                                   cancellable,
                                   (GAsyncReadyCallback) mount_unmount_cb,
@@ -1056,14 +1058,15 @@ handle_mount_unmount (GVfsRemoteVolumeMonitor *object,
 static gboolean
 handle_mount_op_reply (GVfsRemoteVolumeMonitor *object,
                        GDBusMethodInvocation *invocation,
-                       const gchar *MountOpId,
-                       guint Result,
-                       const gchar *UserName,
-                       const gchar *Domain,
-                       const gchar *EncodedPassword,
-                       guint PasswordSave,
-                       guint Choice,
-                       gboolean Anonymous)
+                       const gchar *arg_mount_op_id,
+                       gint arg_result,
+                       const gchar *arg_user_name,
+                       const gchar *arg_domain,
+                       const gchar *arg_encoded_password,
+                       gint arg_password_save,
+                       gint arg_choice,
+                       gboolean arg_anonymous,
+                       gpointer user_data)
 {
   char *decoded_password;
   gsize decoded_password_len;
@@ -1088,7 +1091,7 @@ handle_mount_op_reply (GVfsRemoteVolumeMonitor *object,
 
       owner = g_object_get_data (G_OBJECT (op), "mount_op_owner");
       id = g_object_get_data (G_OBJECT (op), "mount_op_id");
-      if (g_strcmp0 (owner, sender) == 0 && g_strcmp0 (id, MountOpId) == 0)
+      if (g_strcmp0 (owner, sender) == 0 && g_strcmp0 (id, arg_mount_op_id) == 0)
         {
           print_debug ("found mount_op");
           mount_operation = op;
@@ -1105,16 +1108,16 @@ handle_mount_op_reply (GVfsRemoteVolumeMonitor *object,
       goto out;
     }
 
-  decoded_password = (gchar *) g_base64_decode (EncodedPassword, &decoded_password_len);
+  decoded_password = (gchar *) g_base64_decode (arg_encoded_password, &decoded_password_len);
 
-  g_mount_operation_set_username (mount_operation, UserName);
-  g_mount_operation_set_domain (mount_operation, Domain);
+  g_mount_operation_set_username (mount_operation, arg_user_name);
+  g_mount_operation_set_domain (mount_operation, arg_domain);
   g_mount_operation_set_password (mount_operation, decoded_password);
-  g_mount_operation_set_password_save (mount_operation, PasswordSave);
-  g_mount_operation_set_choice (mount_operation, Choice);
-  g_mount_operation_set_anonymous (mount_operation, Anonymous);
+  g_mount_operation_set_password_save (mount_operation, arg_password_save);
+  g_mount_operation_set_choice (mount_operation, arg_choice);
+  g_mount_operation_set_anonymous (mount_operation, arg_anonymous);
 
-  g_mount_operation_reply (mount_operation, Result);
+  g_mount_operation_reply (mount_operation, arg_result);
 
   gvfs_remote_volume_monitor_complete_mount_op_reply (object, invocation);
 
@@ -1153,10 +1156,11 @@ volume_mount_cb (GVolume *volume, GAsyncResult *result, GDBusMethodInvocation *i
 static gboolean
 handle_volume_mount (GVfsRemoteVolumeMonitor *object,
                      GDBusMethodInvocation *invocation,
-                     const gchar *Id,
-                     const gchar *CancellationId,
-                     guint MountFlags,
-                     const gchar *MountOpId)
+                     const gchar *arg_id,
+                     const gchar *arg_cancellation_id,
+                     guint arg_mount_flags,
+                     const gchar *arg_mount_op_id,
+                     gpointer user_data)
 {
   const char *sender;
   GList *volumes, *l;
@@ -1176,7 +1180,7 @@ handle_volume_mount (GVfsRemoteVolumeMonitor *object,
 
       volume = G_VOLUME (l->data);
       volume_id = g_strdup_printf ("%p", volume);
-      if (strcmp (volume_id, Id) == 0)
+      if (strcmp (volume_id, arg_id) == 0)
         break;
 
       g_free (volume_id);
@@ -1201,16 +1205,16 @@ handle_volume_mount (GVfsRemoteVolumeMonitor *object,
     }
 
   mount_operation = NULL;
-  if (MountOpId != NULL && strlen (MountOpId) > 0)
+  if (arg_mount_op_id != NULL && strlen (arg_mount_op_id) > 0)
     {
-      mount_operation = wrap_mount_op (MountOpId, sender, object);
+      mount_operation = wrap_mount_op (arg_mount_op_id, sender, object);
       g_object_set_data_full (G_OBJECT (volume), "mount_operation", mount_operation, g_object_unref);
     }
 
   cancellable = g_cancellable_new ();
   g_object_set_data_full (G_OBJECT (volume), "cancellable", cancellable, g_object_unref);
   g_object_set_data_full (G_OBJECT (cancellable), "owner", g_strdup (sender), g_free);
-  g_object_set_data_full (G_OBJECT (cancellable), "cancellation_id", g_strdup (CancellationId), g_free);
+  g_object_set_data_full (G_OBJECT (cancellable), "cancellation_id", g_strdup (arg_cancellation_id), g_free);
   G_LOCK (outstanding_ops_lock);
   outstanding_ops = g_list_prepend (outstanding_ops, cancellable);
   G_UNLOCK (outstanding_ops_lock);
@@ -1219,7 +1223,7 @@ handle_volume_mount (GVfsRemoteVolumeMonitor *object,
                      NULL);
 
   g_volume_mount (volume,
-                  MountFlags,
+                  arg_mount_flags,
                   mount_operation,
                   cancellable,
                   (GAsyncReadyCallback) volume_mount_cb,
@@ -1264,10 +1268,11 @@ drive_eject_cb (GDrive *drive, GAsyncResult *result, GDBusMethodInvocation *invo
 static gboolean
 handle_drive_eject (GVfsRemoteVolumeMonitor *object,
                     GDBusMethodInvocation *invocation,
-                    const gchar *Id,
-                    const gchar *CancellationId,
-                    guint UnmountFlags,
-                    const gchar *MountOpId)
+                    const gchar *arg_id,
+                    const gchar *arg_cancellation_id,
+                    guint arg_unmount_flags,
+                    const gchar *arg_mount_op_id,
+                    gpointer user_data)
 {
   const char *sender;
   GMountOperation *mount_operation;
@@ -1287,7 +1292,7 @@ handle_drive_eject (GVfsRemoteVolumeMonitor *object,
 
       drive = G_DRIVE (l->data);
       drive_id = g_strdup_printf ("%p", drive);
-      if (strcmp (drive_id, Id) == 0)
+      if (strcmp (drive_id, arg_id) == 0)
         break;
 
       g_free (drive_id);
@@ -1314,7 +1319,7 @@ handle_drive_eject (GVfsRemoteVolumeMonitor *object,
   cancellable = g_cancellable_new ();
   g_object_set_data_full (G_OBJECT (drive), "cancellable", cancellable, g_object_unref);
   g_object_set_data_full (G_OBJECT (cancellable), "owner", g_strdup (sender), g_free);
-  g_object_set_data_full (G_OBJECT (cancellable), "cancellation_id", g_strdup (CancellationId), g_free);
+  g_object_set_data_full (G_OBJECT (cancellable), "cancellation_id", g_strdup (arg_cancellation_id), g_free);
   G_LOCK (outstanding_ops_lock);
   outstanding_ops = g_list_prepend (outstanding_ops, cancellable);
   G_UNLOCK (outstanding_ops_lock);
@@ -1323,14 +1328,14 @@ handle_drive_eject (GVfsRemoteVolumeMonitor *object,
                      NULL);
 
   mount_operation = NULL;
-  if (MountOpId != NULL && strlen (MountOpId) > 0)
+  if (arg_mount_op_id != NULL && strlen (arg_mount_op_id) > 0)
     {
-      mount_operation = wrap_mount_op (MountOpId, sender, object);
+      mount_operation = wrap_mount_op (arg_mount_op_id, sender, object);
       g_object_set_data_full (G_OBJECT (drive), "mount_operation", mount_operation, g_object_unref);
     }
 
   g_drive_eject_with_operation (drive,
-                                UnmountFlags,
+                                arg_unmount_flags,
                                 mount_operation,
                                 cancellable,
                                 (GAsyncReadyCallback) drive_eject_cb,
@@ -1375,10 +1380,11 @@ drive_stop_cb (GDrive *drive, GAsyncResult *result, GDBusMethodInvocation *invoc
 static gboolean
 handle_drive_stop (GVfsRemoteVolumeMonitor *object,
                    GDBusMethodInvocation *invocation,
-                   const gchar *Id,
-                   const gchar *CancellationId,
-                   guint UnmountFlags,
-                   const gchar *MountOpId)
+                   const gchar *arg_id,
+                   const gchar *arg_cancellation_id,
+                   guint arg_unmount_flags,
+                   const gchar *arg_mount_op_id,
+                   gpointer user_data)
 {
   const char *sender;
   GMountOperation *mount_operation;
@@ -1398,7 +1404,7 @@ handle_drive_stop (GVfsRemoteVolumeMonitor *object,
 
       drive = G_DRIVE (l->data);
       drive_id = g_strdup_printf ("%p", drive);
-      if (strcmp (drive_id, Id) == 0)
+      if (strcmp (drive_id, arg_id) == 0)
         break;
 
       g_free (drive_id);
@@ -1425,7 +1431,7 @@ handle_drive_stop (GVfsRemoteVolumeMonitor *object,
   cancellable = g_cancellable_new ();
   g_object_set_data_full (G_OBJECT (drive), "cancellable", cancellable, g_object_unref);
   g_object_set_data_full (G_OBJECT (cancellable), "owner", g_strdup (sender), g_free);
-  g_object_set_data_full (G_OBJECT (cancellable), "cancellation_id", g_strdup (CancellationId), g_free);
+  g_object_set_data_full (G_OBJECT (cancellable), "cancellation_id", g_strdup (arg_cancellation_id), g_free);
   G_LOCK (outstanding_ops_lock);
   outstanding_ops = g_list_prepend (outstanding_ops, cancellable);
   G_UNLOCK (outstanding_ops_lock);
@@ -1434,14 +1440,14 @@ handle_drive_stop (GVfsRemoteVolumeMonitor *object,
                      NULL);
 
   mount_operation = NULL;
-  if (MountOpId != NULL && strlen (MountOpId) > 0)
+  if (arg_mount_op_id != NULL && strlen (arg_mount_op_id) > 0)
     {
-      mount_operation = wrap_mount_op (MountOpId, sender, object);
+      mount_operation = wrap_mount_op (arg_mount_op_id, sender, object);
       g_object_set_data_full (G_OBJECT (drive), "mount_operation", mount_operation, g_object_unref);
     }
 
   g_drive_stop (drive,
-                UnmountFlags,
+                arg_unmount_flags,
                 mount_operation,
                 cancellable,
                 (GAsyncReadyCallback) drive_stop_cb,
@@ -1486,10 +1492,11 @@ drive_start_cb (GDrive *drive, GAsyncResult *result, GDBusMethodInvocation *invo
 static gboolean
 handle_drive_start (GVfsRemoteVolumeMonitor *object,
                     GDBusMethodInvocation *invocation,
-                    const gchar *Id,
-                    const gchar *CancellationId,
-                    guint Flags,
-                    const gchar *MountOpId)
+                    const gchar *arg_id,
+                    const gchar *arg_cancellation_id,
+                    guint arg_flags,
+                    const gchar *arg_mount_op_id,
+                    gpointer user_data)
 {
   const char *sender;
   GList *drives, *l;
@@ -1509,7 +1516,7 @@ handle_drive_start (GVfsRemoteVolumeMonitor *object,
 
       drive = G_DRIVE (l->data);
       drive_id = g_strdup_printf ("%p", drive);
-      if (strcmp (drive_id, Id) == 0)
+      if (strcmp (drive_id, arg_id) == 0)
         break;
 
       g_free (drive_id);
@@ -1534,16 +1541,16 @@ handle_drive_start (GVfsRemoteVolumeMonitor *object,
     }
 
   mount_operation = NULL;
-  if (MountOpId != NULL && strlen (MountOpId) > 0)
+  if (arg_mount_op_id != NULL && strlen (arg_mount_op_id) > 0)
     {
-      mount_operation = wrap_mount_op (MountOpId, sender, object);
+      mount_operation = wrap_mount_op (arg_mount_op_id, sender, object);
       g_object_set_data_full (G_OBJECT (drive), "mount_operation", mount_operation, g_object_unref);
     }
 
   cancellable = g_cancellable_new ();
   g_object_set_data_full (G_OBJECT (drive), "cancellable", cancellable, g_object_unref);
   g_object_set_data_full (G_OBJECT (cancellable), "owner", g_strdup (sender), g_free);
-  g_object_set_data_full (G_OBJECT (cancellable), "cancellation_id", g_strdup (CancellationId), g_free);
+  g_object_set_data_full (G_OBJECT (cancellable), "cancellation_id", g_strdup (arg_cancellation_id), g_free);
   G_LOCK (outstanding_ops_lock);
   outstanding_ops = g_list_prepend (outstanding_ops, cancellable);
   G_UNLOCK (outstanding_ops_lock);
@@ -1552,7 +1559,7 @@ handle_drive_start (GVfsRemoteVolumeMonitor *object,
                      NULL);
 
   g_drive_start (drive,
-                 Flags,
+                 arg_flags,
                  mount_operation,
                  cancellable,
                  (GAsyncReadyCallback) drive_start_cb,
@@ -1596,8 +1603,9 @@ drive_poll_for_media_cb (GDrive *drive, GAsyncResult *result, GDBusMethodInvocat
 static gboolean
 handle_drive_poll_for_media (GVfsRemoteVolumeMonitor *object,
                              GDBusMethodInvocation *invocation,
-                             const gchar *Id,
-                             const gchar *CancellationId)
+                             const gchar *arg_id,
+                             const gchar *arg_cancellation_id,
+                             gpointer user_data)
 {
   const char *sender;
   GCancellable *cancellable;
@@ -1616,7 +1624,7 @@ handle_drive_poll_for_media (GVfsRemoteVolumeMonitor *object,
 
       drive = G_DRIVE (l->data);
       drive_id = g_strdup_printf ("%p", drive);
-      if (strcmp (drive_id, Id) == 0)
+      if (strcmp (drive_id, arg_id) == 0)
         break;
 
       g_free (drive_id);
@@ -1643,7 +1651,7 @@ handle_drive_poll_for_media (GVfsRemoteVolumeMonitor *object,
   cancellable = g_cancellable_new ();
   g_object_set_data_full (G_OBJECT (drive), "cancellable", cancellable, g_object_unref);
   g_object_set_data_full (G_OBJECT (cancellable), "owner", g_strdup (sender), g_free);
-  g_object_set_data_full (G_OBJECT (cancellable), "cancellation_id", g_strdup (CancellationId), g_free);
+  g_object_set_data_full (G_OBJECT (cancellable), "cancellation_id", g_strdup (arg_cancellation_id), g_free);
   G_LOCK (outstanding_ops_lock);
   outstanding_ops = g_list_prepend (outstanding_ops, cancellable);
   G_UNLOCK (outstanding_ops_lock);
@@ -1669,7 +1677,8 @@ handle_drive_poll_for_media (GVfsRemoteVolumeMonitor *object,
 
 static gboolean
 handle_is_supported (GVfsRemoteVolumeMonitor *object,
-                     GDBusMethodInvocation *invocation)
+                     GDBusMethodInvocation *invocation,
+                     gpointer user_data)
 {
   print_debug ("in handle_supported");
 
@@ -1693,7 +1702,8 @@ handle_is_supported (GVfsRemoteVolumeMonitor *object,
 static gboolean
 handle_cancel_operation (GVfsRemoteVolumeMonitor *object,
                          GDBusMethodInvocation *invocation,
-                         const gchar *CancellationId)
+                         const gchar *arg_cancellation_id,
+                         gpointer user_data)
 {
   gboolean was_cancelled;
   const char *sender;
@@ -1715,7 +1725,7 @@ handle_cancel_operation (GVfsRemoteVolumeMonitor *object,
 
       owner = g_object_get_data (G_OBJECT (cancellable), "owner");
       id = g_object_get_data (G_OBJECT (cancellable), "cancellation_id");
-      if (g_strcmp0 (owner, sender) == 0 && g_strcmp0 (id, CancellationId) == 0)
+      if (g_strcmp0 (owner, sender) == 0 && g_strcmp0 (id, arg_cancellation_id) == 0)
         {
           print_debug ("found op to cancel");
           g_cancellable_cancel (cancellable);
@@ -1738,8 +1748,8 @@ handle_cancel_operation (GVfsRemoteVolumeMonitor *object,
 
 typedef GVariant * (*AppendFunc) (void *object);
 typedef void (*MonitorSignalFunc) (GVfsRemoteVolumeMonitor *object, 
-                                   const gchar *TheDBusName,
-                                   const gchar *Id,
+                                   const gchar *arg_dbus_name,
+                                   const gchar *arg_id,
                                    GVariant *val);
 
 static void